gentoo resync : 18.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
commit: fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree: 326613a08f25851c388715e205576a2e7d25dc4f /dev-util
parent: b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)
144 files changed, 1646 insertions, 697 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0c7ffe34a793..c1a5aa6e4d53 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 223fcca6ef2e..0b90b0d83f4b 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -2,7 +2,7 @@ AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951
 DIST android-studio-ide-182.5199772-linux.zip 1059268546 BLAKE2B b5485c444eea49e10b155a763d40a08c09a05e34c151cf21b79bfbb9b039f0bb112fc806b3b8cf4fe7e17127fe89c8651fac7ff83163ff1cf78c24b330273490 SHA512 76647fc50fbe06f93b733962b51dc8fb57d59c1e30364b82bf7a03a7700a0f7835eab240db6bd93ae71f4147408cbe8641b41965c97d40494c2e5fe0fecfba4d
 DIST android-studio-ide-183.5452501-linux.tar.gz 1087166186 BLAKE2B 07c17dc854d24c7e96a91346887dfb96067acad330d485c996f13107bf2a92d6b85e791638c1f6d2f08ea9ea47eb0ee45568605b95f6cdefc2fbf4d350bfeb0e SHA512 c686c2dd89a19d9b2fabffff8ce5a7b5b96ff05bb8c9fbf3c1a7a7b78896653114a527b30d2a9795541f5c70dc80f59d7d3b0d2a56141fea48932bfbb51e8b5f
 DIST android-studio-ide-183.5522156-linux.tar.gz 1087847976 BLAKE2B 6bff44f3d4dd5de1ce65ebc444c5b30d717b92ee34ccdfc268706f1ea07cc6c431ca6a42d361f89fdbe852f347b63afbfb9667acfd80980b869d244e5b957249 SHA512 2d9f10fc53c0d8036e413897c5003b07be106c5108a494d347b8c035b0e8155e13fcd487627b2b4910e918f41b1972b96cd078d09e3469eef2e18ce04a416b05
-EBUILD android-studio-3.3.0.20.182.5199772.ebuild 3240 BLAKE2B 7c2780bd4988f6ed98717846474992a3332599f16570f71837bfcf3a82c5659154cac12066a5a2362db6abd15468fb20816b35df0656aad24f55684b22b077af SHA512 8abdb86fba3d3135faff90623bfa68cd92c83374b2a01754657c17007aac46c408179c1ab4ffcb7c74dc123f0177bcdc251171856837044a76b4ca7eb51816eb
-EBUILD android-studio-3.4.0.18.183.5452501.ebuild 3824 BLAKE2B e55d7fcacf1cf84302d53ce243df58f8ca8c9826df1a49b3378a4d77d8716d9a794c6121b05d46595667c8570f2a31dae5ba9e33d9d123911b1c9ac782e45f91 SHA512 0751583b69d3aa79c19ede7f74ab8fd5a9120b1704d99397a745f43373d272cb062ec1669aa117b41c7348def2e3c18f86c053f19619a6ff42a0c494da5ac39c
-EBUILD android-studio-3.4.1.0.183.5522156.ebuild 3826 BLAKE2B 798274d2f8c082f8edaa446593c2cc1fafac1c4a40c1d774720886a05738b141511a5fa8a599c290a9f4792355e748deee49a6a3ed72ba96034d8b88198d103e SHA512 a6d1ba053b6f4dc39202e63b2a21276f7695b49ddea2a346d22cef43f30d1abd5ac1bd055e0e3270d01179e78b02e4a5dbc2c1738a400497f16db0c26a27dc90
+EBUILD android-studio-3.3.0.20.182.5199772.ebuild 3246 BLAKE2B bb1d2ddc1275e9a3bf805e569434789ff6a7ebcbc41e0fff1a9546e80f830f37d56c33b9f4cb5c731715c492d289c565c2bc813218c6ac095f2240f76f05a0b1 SHA512 7d76cfaff9b061dad50e371f0bc9ce7d0679b99439c7dfcddc91f9a38aaada98879148fdd7b385d9fcd8397555d7ba838fd3681ac2766ba00676d060d5500075
+EBUILD android-studio-3.4.0.18.183.5452501.ebuild 3830 BLAKE2B 831f1991c2591c797838516608dfecf2ef73b923e9bb1b3436ea81e742f46019f59c1638247f1619bd751dffae057c4b3156e8e4e0b306e57b74e465e4686f5f SHA512 6a2408ebacbb96b3edac57d665bef8202d73f3f3f6a42a2cec89dc7557ce5cf94c1b35abd1e1fb9862522dc3c66a5216192be6446f8c874d3421b1b4e8e7ec6c
+EBUILD android-studio-3.4.1.0.183.5522156.ebuild 3832 BLAKE2B cb726335042d2062d09b7619bbd28f3fc12d7b12774adac49c14a2c84f5bfb17d85660e1f5a2a1e8a698f7e27c1a4aae145b65ef3c34d8b024121508e0cf4192 SHA512 ffc2209130bf34057c60367e46584df4822eb55c93a8070938431aa7291985980faeeb978c12558139e4ffa2ce691b09072e9e6dfc080feed2112e62234c2df9
 MISC metadata.xml 313 BLAKE2B 623366c889e8b0d9c33a56fd3ca96156208db355e1549bbf8040a6839a953a82459b3c87e5a0f16f1d67ede403ee5a9e1747c445e855434f25d0f03fe5a6c43a SHA512 1c3e18bd57e48e7f65791f8904bcdde910f1d97d83e781c7c3815df6127aaac9063614e0a11cf7762059f762c4696e2b89ca446ffb9e631a2c85ff2b350e972a
diff --git a/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild b/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild
index 008bd20b140e..09471fbd5607 100644
--- a/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild
+++ b/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild
@@ -47,7 +47,7 @@ RDEPEND=">=virtual/jdk-1.7
 	>=media-libs/fontconfig-2.10.92
 	>=media-libs/freetype-2.5.5
 	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8
+	>=media-libs/mesa-10.2.8[X(+)]
 	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
 	>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
 	>=sys-libs/zlib-1.2.8-r1
diff --git a/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild b/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild
index 8a6b5cc35200..060c081b0e81 100644
--- a/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild
+++ b/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/fontconfig-2.10.92
 	>=media-libs/freetype-2.5.5
 	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8
+	>=media-libs/mesa-10.2.8[X(+)]
 	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
 	>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
 	>=sys-libs/zlib-1.2.8-r1
diff --git a/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild b/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
index 655d30a45bdd..239a3b30918e 100644
--- a/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
+++ b/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/fontconfig-2.10.92
 	>=media-libs/freetype-2.5.5
 	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8
+	>=media-libs/mesa-10.2.8[X(+)]
 	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
 	>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
 	>=sys-libs/zlib-1.2.8-r1
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 937fde6425b9..03f9702b8fe4 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -27,6 +27,6 @@ DIST boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz 13030361 BLAKE2B
 DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B ca2f6757807adc265314a7444605c6199a19847fb426384bafa201bf63f4e3c7c567fb8094b740b8a00caf0d106bb1efea2893b00d45c9772740a81dc0a186f3 SHA512 c6695d078ee7b3694898dfdc0ee3382d01f9bb592ea46eb64026c73565735fd7251bbb0fd3e8c8552394bcdad5717de7ee5106cf1ed91aacec05d779ad693f6a
 EBUILD android-tools-5.1.1_p13.ebuild 2077 BLAKE2B edb2e3a9f69c2c8a4f86170b39aedb1f44b173df943b2edcb96f7d90384658c6689925e06873c3d5331c20f360732860f70e0bfecdb0d5518dfbb9d90816b671 SHA512 3659aca002096aa11dc94631de73f1081cda5a5728f2842aa767844b6b3e12e0bdcdd0abbc2903efbb1d9f11666e7bd392be694910ffae58fce1e8b52a8cd090
 EBUILD android-tools-6.0.1_p79.ebuild 2820 BLAKE2B a87ef5bc6d814ef772c3fe4292563c73beabd59cacebae706721d4019059be8b2cf31e27594c473abe202ed1f4afb78993ae3e947ef7c21b5016245797f90b45 SHA512 ccdd6e4fbc6a98ca0e9cfd89618c6a13e11e174abd6c6b3dd1d1b8f7a592a4574cf83e0f4770750918ee481b129d01425ae56fd55ddc323b3409add6ddf10279
-EBUILD android-tools-8.1.0_p1.ebuild 3962 BLAKE2B c90050118d3a0fab1032c59479b604eb390ec12ab347412dca37837fa8c7b421b00a43800b89510d32377b8d7e015d2c0a8f97a6ca25035a5d166ab9ad728db9 SHA512 7174b75f654eb92951aea67a5b5e915c87b7f6d047b57062938ce16486be30c0c464a1b9c3ea96f43959423b77a25c52055fc8c0bd3ae804795847aaa529c862
-EBUILD android-tools-9.0.0_p3.ebuild 4511 BLAKE2B 910f057922f0171c32c6c775d102c8308eca894260d5dd1cfe96ccff60c64f8d99c6d5daba66481844cd93cbf109a0e5713d57da9184f30b41bfa004fcae385f SHA512 fee26749b8015d8c4b64e0ff8aaed139c5de055bddfb6bba1dbbe4bfc64cdccabb0d224f01ccd6a16e468cb3e6bd0bcd0b2695452b5dcafbf44d4d2b75117a2c
+EBUILD android-tools-8.1.0_p1.ebuild 4012 BLAKE2B 9c0a75fefed96a2e86fb9d76c4897789d61eeba3434db61a7e3c0041b7dafa9f8919fb9ff20c14e90d070746d2e077cf9de86e0ecfc6ab55991bc4e01e210d77 SHA512 8ae858338e3c73666ca3aa2c1fcc831ea3902b0da5f91a7df01cc401c9917a7e10eaf7a5353e1f358fce0aed6e5a45c7a75b0de533dcb344f4fc4425ae114374
+EBUILD android-tools-9.0.0_p3.ebuild 4561 BLAKE2B 9c975e4be98866b9fe5156bc4a90b1c787e73f3160fc97bc70ff2f89d0a537b5bf97c25236d8e6e28a96742a14796f11cafb067b7d38cf90a7845505f6394d65 SHA512 c381cf35048c7f40b519670064ab803bc879f5edf6b75e23e9089b01c0d5b421ef49e365cad881755537a8f979e0888fa396dc5b7df94200ea066de8bf3a0958
 MISC metadata.xml 643 BLAKE2B 99ac01fb57cc1d2908955720cd2fee6e97f98a19d9fe9bbbb07e0f9f915b7efca184a75c5f5eb5372b9c21d3ba7db542d061de47ac6f89e6c58fa3dc886d4f21 SHA512 51ee41cf77548eb1ce543b2c1f5f37e9634250c2fa42b36a8128b4a80a73a270b90b9e9e1c2c58d7aeb6dee85238ec73345f1a3a4ac398a4f7b2cd8e8c6e84ee
diff --git a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
index 9e63f95cdd3e..db699e1b6823 100644
--- a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
+++ b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
@@ -30,6 +30,7 @@ LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86 ~x86-linux"
 IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="sys-libs/zlib:=
 	dev-libs/libpcre2:=
diff --git a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
index 7ba1bd762351..ad1df383e858 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
@@ -31,6 +31,7 @@ LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86 ~x86-linux"
 IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="sys-libs/zlib:=
 	dev-libs/libpcre2:=
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index a9abd2670ef0..aefdc8816f03 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -5,5 +5,5 @@ AUX apitrace-8.0-glxtrace-only.patch 1591 BLAKE2B 45dae3a9bfdea147fd865124db7865
 AUX apitrace-8.0-system-snappy1.patch 846 BLAKE2B 5c5ba05af785556dcd0a7508698693cf73a283a2a476df89b0e0072841de0ed301aaf5d991353f294511aae29c38bc039c1b6b9b23d3d8f61377bbda05843fc6 SHA512 334f607959f6b4d6b0798e6ba6a1e252d6f8fda4560d0ca44be38da803ce545ea15ce951c40604464d283cebb99b16b606dd0403aaa7c9538380f871b3ec87e7
 AUX apitrace-8.0-system-snappy2.patch 1319 BLAKE2B 4c02a87fde35c004177f1fe9df074e3fa01fbcc7dcf6ab9b497cb69259243f9bfb8b76fd2c78194d624ebaf2fbfbb871155a031d6a58e6dc1b9c426c116a590d SHA512 67e7b3bd69023db8341c74fe30d0f846f6b751cc972681062d491414d31dc65c3869e0387b436436394aaf11e0d001652970daa895b6740f94de9bc4544ef0e7
 DIST apitrace-8.0.tar.gz 3601109 BLAKE2B f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc SHA512 1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c
-EBUILD apitrace-8.0.ebuild 2548 BLAKE2B f7de5ec357788b50e2cfd957e589e79d105c8614fb7f082bf4ddd797fd0c57b2abb99157471aa968cf8ec0c6bae2fbad39a7ed91b497d9fed265681226370dd4 SHA512 90154019510cedf394c737e1a51fcd61807e2392fb255a83d5aac2407faa4e8772b54746b0951fdd3c670140c83ad410ed25597f87d262b1c28e2e128ea3669e
+EBUILD apitrace-8.0.ebuild 2553 BLAKE2B cf9ef80a045211a03d13e62eda959d2c6406d61958d0dc1c2e1738f99ee71604c015c661ce9c7d1a679f7546908a5db7b6a3166e013966142f6e030284cb2ce1 SHA512 3bd0f34a52c50e62845605511fef3f0304740abe143a0548614c1cd5944b02ec59e8406316296d23b2d8a2e7ff5737b9a4b2c0772084afce4024306d2218b4b2
 MISC metadata.xml 438 BLAKE2B f88a54537c6bd0c1f9965ec8d520928cea727ba4f8424b49993c4e310078676d9394ddaa64c3c0fb9e0f1bf9eca36142260148945f455e0700dbc362dce73fd6 SHA512 45a818f2bbbfd046e403940734323c027929de373f8366a7de29e4342fe3f98ea27ba2c151f80dbbd33d1110acf2f363669c3c4176d2c15d8b5a783182128cd5
diff --git a/dev-util/apitrace/apitrace-8.0.ebuild b/dev-util/apitrace/apitrace-8.0.ebuild
index 2e34348ebc21..d37d8c20af6b 100644
--- a/dev-util/apitrace/apitrace-8.0.ebuild
+++ b/dev-util/apitrace/apitrace-8.0.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}
 	app-arch/brotli:=
 	media-libs/libpng:0=
-	media-libs/mesa[egl?,${MULTILIB_USEDEP}]
+	media-libs/mesa[egl?,X(+),${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	sys-process/procps:=
 	x11-libs/libX11
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index ecd5d9dff6fa..57506c3a98af 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,8 +1,11 @@
 AUX 0.17.1-no-libevent.patch 1316 BLAKE2B 5f3f0f38394039a45b299e20ff30092d48bda0475de8c9a4c30b99c31837245e08309009aaf94cdf3395929c26d49a9c3b0f0b3e9d99c03761fea48f39923af9 SHA512 6761a62c11390bff223181237c3f61b8dc2992bcc62bdb051ed0cde8044fae285867f0cc3def1b6fd16c9e82e25e61d8fc682dc307ad119767925cc9b65f8342
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
+DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 0303bba89b3595a115ec8e5e743c362fc5feb0072ae493455cf3bcf1085b7f44d6b10142c05cb7ea59fadc630095de3a5f648007eb28f79551f2415db5c4f560 SHA512 b4c30c63cb6c770e04abd18e626db6e095b0d8b5aaf59e64b55eb8e19d4fdb559a3a2b939ab0e09967b4d3465b560e1379fa21b8efb3f25c22f84a2a1c655d16
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
+DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822 SHA512 a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2
 EBUILD bitcoin-tx-0.16.3.ebuild 2427 BLAKE2B c3410c5a84de81fcafedae1236e339f034938e7adf817a4dcdeed76f7ea64cc2c84e529785732de392bca904b34563cd80bf40f755a7f5f4d8afb92fcd97cc4d SHA512 0b277b10e5fd15866a07e06bb33f6f398b6fbf88fd4159ab50b33947f42e88870b67b9fc3e3375cf16dd15fe3828a550cb30067ca03eafcc9aa93fd1ad2bdccf
 EBUILD bitcoin-tx-0.17.1.ebuild 2470 BLAKE2B 81ea64fa5f95068a0d81b9e589f3672baa4f913e26ae4e03570945dde7ca00b4764be3a3e3d1ced57358f4bf25d59da431af956fc1f4cff8eff475d58ee4af27 SHA512 5f05504d9d68b025ecb0ede47e43af2fb672deaf6b06e1188678a2f15337e5d9438e927cdb6217f311e55ea7a809d0c053e1cf736dbe11cfef4e03d9245a2cca
+EBUILD bitcoin-tx-0.18.0.ebuild 2487 BLAKE2B f2493f52b3828959491dd4cb44be7647eccfee02796c66003bc001578d0274dd807cb759b7ee2f0be963934ff53989a2507f5b945962d74cc402677e20320351 SHA512 928208211ba05e806e4f987046f848dcccf9b4dc396f96354245d23eada6ac578d5c7ca3e6eabbad88e8bdd26b31eb8524ecd3371ed6c17db778b96d74e1bf0a
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.18.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.18.0.ebuild
new file mode 100644
index 000000000000..9c64bb0e597b
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.18.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="2472733a24a9364e4c6233ccd04166a26a68cc65"
+KNOTS_PV="${PV}.knots20190502"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="knots libressl"
+
+DEPEND="
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	>=dev-libs/univalue-1.0.4:=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2019/05/02/release-${PV}/"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		--disable-asm
+		--without-qtdbus
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--enable-util-tx
+		--disable-util-cli
+		--disable-util-wallet
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--without-gui
+		--without-rapidcheck
+		--disable-fuzz
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+}
diff --git a/dev-util/bite/Manifest b/dev-util/bite/Manifest
index 11a060595002..100da7aca423 100644
--- a/dev-util/bite/Manifest
+++ b/dev-util/bite/Manifest
@@ -1,2 +1,2 @@
-EBUILD bite-9999.ebuild 1494 BLAKE2B af88db1ec2167dd56c7b90b5cfb2a86f65db20a4d14945cdbdc70244ad49958e6fde27b9703a16b0fe42edf1aa4d2c8efae77baa1f2aa580d05541d4ea041274 SHA512 f763b6d97f8670c1106201f1cf309e0d5d98a8ca4a14741a0f0f62c059937af66f628d5007d6fe5b2a921f69b6511add0ea212622506ae446ad9da5d49577722
+EBUILD bite-9999.ebuild 1491 BLAKE2B b8fd0e78ec66d010a246e849bf630da5d5f5e4ff1936ef78fcf85df258fa3a86a5daf671c3d436c5d0322b21144655fdbb490b982cb975ebf7484fb3eabaf94b SHA512 ee4b75263d707a226e7296a82e84c96ec0c7f81fbceac7c53735eb5d1e07ecee8df77d3f10a0efbb8fd7e27cd9a2c6c7c58f3f37574e4e5cc0a3c6bbe2f7b463
 MISC metadata.xml 330 BLAKE2B 84591ee05d14a0a3c7db1cd1fc966aca6a614c129babd365d5c2717ca19845a3b391c280e1861ae8c900e8a6124b725a15c775292181f2fc8cf6e5dc000eee01 SHA512 790542c11e1210fef48d1235385493814128da8cb6f1ab33e569e0f37e862b568ffe92f4a18ad6cf0ac8f8917bd884513fe40597540ad299af9feaf7722d2bb8
diff --git a/dev-util/bite/bite-9999.ebuild b/dev-util/bite/bite-9999.ebuild
index fc1ffd808d2f..adddde77b9b9 100644
--- a/dev-util/bite/bite-9999.ebuild
+++ b/dev-util/bite/bite-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,7 +31,7 @@ RDEPEND="
 	app-crypt/gpgme[python,${PYTHON_USEDEP}]
 "
 if [[ ${PV} == *9999 ]] ; then
-	RDEPEND+=" =dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 	SPHINX="dev-python/sphinx[${PYTHON_USEDEP}]"
 else
 	RDEPEND+=" >=dev-python/snakeoil-0.8[${PYTHON_USEDEP}]"
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 15f87484ae54..41fb8fe89d8d 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -11,5 +11,5 @@ AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
 DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49
 EBUILD boost-build-1.65.0.ebuild 3913 BLAKE2B c809eedd69ea76b6a80347281be4448b2aa15ce8e8bb4ec4ba451b0d9cb9f24eb31635dc9c186f11a0a9ce40d1920f5d476daccb7a2b990966b48dec596a90cc SHA512 c396c03fc690189243d9883a8419f13de4f771acbf0a6294051d4b84211d2c9a45ac8021003dcd6ea43cee762ec722481f7cc265c8aba6d7729c4a4b716872e2
-EBUILD boost-build-1.70.0.ebuild 3887 BLAKE2B 5d4d6251f3cdaf04e9b7249362769849ff8601310ece060215bdc5520b1c9947ba05a67b11963aee22bb195e06c670d4678ea4c4f8058f7066c0cf7c9b22bc91 SHA512 fc0df2c619189585c604ed514bbe8fa21977602c01a01783419c5070d4d5c161dd455cc9cc207b04b1dd95a5c378f8269196ce5e61c909898a0cddcc01097536
+EBUILD boost-build-1.70.0.ebuild 3887 BLAKE2B 753d36197c3e7552c82a86ccb10f441108a31b3b963fc17e3749aab68d8794dbbd020cb3d9a8037199727c338c22654c32e81cb5d1d8cbc4903a122abc30eee0 SHA512 1116d687410cd78fd720c6a7b2a2bcb562d9cbd560439cc40ddfc31bffc0bbffd612154f139334459817c6f2d245d883387d9fdb369158b995460c022f7ef222
 MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
diff --git a/dev-util/boost-build/boost-build-1.70.0.ebuild b/dev-util/boost-build/boost-build-1.70.0.ebuild
index 954e06df9453..fd6a1f8d2269 100644
--- a/dev-util/boost-build/boost-build-1.70.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.70.0.ebuild
@@ -65,7 +65,7 @@ src_prepare() {
 	cd "${S}/engine" || die
 	sed -i \
 		-e 's|-s\b||' \
-		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
+		-e "/libpython/s;lib ];$(get_libdir) ];" \
 		build.jam || die "sed failed"
 
 	# Force regeneration
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index 6da020da3372..7610f797e4a4 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,5 +1,8 @@
 DIST catfish-1.4.7.tar.bz2 162289 BLAKE2B 2f24485f0f059a177a8544632ab583acad1149f96921f8b10027e5788adb2eaf4da0911f3363174feef570c8f75615ec1f943a2d5d2e8622efd4be9892a0fcd2 SHA512 cafa8eaaa40522f50111b3bb9c09a116ebad827532b0cfc88bc643fb2e2d89edee53057fbbed23719f4091ca384d7ea025633e571e160d7dfced008f788a3ffd
 DIST catfish-1.4.8.tar.bz2 181027 BLAKE2B c03270832cb2e6bdc39528801d257d37c52f0c6f361c9225002c31a258a18a1c98cf7af640ca15a4f6e32ac4ac802bda84327123a7bf13d47a1410e67988bfab SHA512 46c9e9112116e0f8ee7957c5a71d16ecdde8c16a60a030f3339933a6f9e73d61d360fed52d5904b0fff21448050cc17df5af63f6254476404760fe9166dfad00
+DIST catfish-1.4.9.tar.bz2 182247 BLAKE2B 343a9a83bed73a5f0416fa2ec61869dd3fdb13b8bc45a46dba7d4901c36d97b17e9f32f616baae8cceece566f4e529d34e55f81cb071504b750f4edda048185b SHA512 c62596a09ed481eac5a4544dcfcc71c02177c115b6bf050b1f2421a575ef589c0c1569ef26d6864e472f2331f0561c7f1146c58bc7873af8036d6e7350465c3d
 EBUILD catfish-1.4.7.ebuild 947 BLAKE2B cb3fa62e138ae25d38f6d01e9adf0dbaeb6b4d67b6dd35de6f1e479ce29a1fd12ae1dd8a020db2d77e26cc8ee1442c9f5bacfc49fbb14eb18ac9b2792641feaf SHA512 0cb196c16e7f798c0db251f5aa1942d5c9c7388dad8e44e153c86c3fbcc981d1a86c1a91807de303a68a739d7c8ffa8bc28e9a923a1da242e814a27d9525b2c6
+EBUILD catfish-1.4.8-r1.ebuild 1071 BLAKE2B 99e71a14716847ec22defeca8824dde5abd2cded8a423f29b7a55e35c3bebd5e0592cad3a912036382fbf27d17b84ac07e407b09de7dae60f32483b7a8ea767f SHA512 5e3ee490a3dcd677c983b7f90c9a3d35f15d022d7125adf644ddc0e4989a5fc91d076e560649bd9ff56480d7ec8d61bedb3ed5541219e2bdcd31a1c459a49977
 EBUILD catfish-1.4.8.ebuild 949 BLAKE2B f07556d8a90c1f5fb0510ddfd10ed5721871be076199e51fb5caa2bcac541e85b1202c336fbc0febf1ea34792c259647b0216c6a74554f027a6e755947fd55de SHA512 dc32d008d3620f787b21013a454021290e7e5ed45f5fc299a75361ceb2b48f4870824aaeacd10c238eeba06a1630560e2655f0bd456aa2b8208e220541fab890
+EBUILD catfish-1.4.9.ebuild 1089 BLAKE2B eecfd11133132625e85709f77c28e3d9ebad74b2061773369542f0e470532be320a1d25df825c5863ac89c1ca68023dd32b890f47c317f67d6b96416b9393f79 SHA512 9733034aac8ab0e60a4dd74684754a7f8e924fed1ff21c2559ff239848060760dfc54b368bb20aebddd021f2a1e479cb097aed8e1b7268800bcaa6f200e23edc
 MISC metadata.xml 216 BLAKE2B 9fe308faad3ff5d9aac2a6d04341fe2b775153198ea734e1b17d15eab6b9eb1f781686089a6487ebc2e9cceddfd3f8c4ad1513baaacf931802201aadbe9589f6 SHA512 780eab488d269f38416e3bfc9c02d1a6bc70cee7755ac7cdc9b0bc42a3a50bb8b0b403da139629767d2f0439b15edce7d7b4078a6f528a4e04cecc1aa9bd01e7
diff --git a/dev-util/catfish/catfish-1.4.8-r1.ebuild b/dev-util/catfish/catfish-1.4.8-r1.ebuild
new file mode 100644
index 000000000000..31a5b419e965
--- /dev/null
+++ b/dev-util/catfish/catfish-1.4.8-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
+SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	virtual/freedesktop-icon-theme
+"
+DEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	sys-devel/gettext
+"
+
+python_install() {
+	distutils-r1_python_install
+	rm -r "${ED%/}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/dev-util/catfish/catfish-1.4.9.ebuild b/dev-util/catfish/catfish-1.4.9.ebuild
new file mode 100644
index 000000000000..8833b3e29740
--- /dev/null
+++ b/dev-util/catfish/catfish-1.4.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
+SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
+
+# yep, GPL-2 only
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	virtual/freedesktop-icon-theme
+"
+DEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	sys-devel/gettext
+"
+
+python_install() {
+	distutils-r1_python_install
+	rm -r "${ED%/}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 0b3077ac5943..5a2609ac1961 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -108,5 +108,5 @@ EBUILD cbindgen-0.6.7.ebuild 952 BLAKE2B 25e4bdcde7e4b0987b0f03a838c4bb3d6c01b58
 EBUILD cbindgen-0.7.1.ebuild 987 BLAKE2B 91339558e85ad7f8eaa70e3c4889ef7a01ff2df2f53eb9384dd9446cb034916255f1afbce29a045553177daffe94597c6991dd30917f7a17ad86100e530121c1 SHA512 be4cae3e22bbe5f9ebd6e00627d626615a9e8a04118e080432d4415ca0fe201aa76b5553e6360fa3b429624bd6f3850540e9b348e6751b5a3ba8b58becb5fe75
 EBUILD cbindgen-0.8.2.ebuild 1126 BLAKE2B 8db73faae848c3ca588625c9f86416d053bcec19743dd49b11793a5b12cf67d61b69301ac397ca54d7f53bb1548134ce33c1490c559242e2061c9c24f7efefa6 SHA512 aae96c92797b4159c04ab4ff3dcc5d7363132cf9cefaae5a980b608eb89a587b6dec74353cd265e866f58a2d06af9f12eda22932b7452189214a567893172dfe
 EBUILD cbindgen-0.8.7.ebuild 1126 BLAKE2B e4ba38b90ac624dd8c6c3fa781e45fbcfbd625be3477861d6390ca35821ea9032cbeb5ae06ee5e629cd191480c6f5dd530b9334e731740922b0fdea3109f7164 SHA512 81391a5777d22c6ef923075845cff5999ffc2b36d2bab5d7d79e6f3f7824eaa4d6a9742915e49adf840f38d0807ccd0d60e0049f99810b47addf4996df06a1a1
-EBUILD cbindgen-0.9.0.ebuild 1100 BLAKE2B e544beb72172f7a69a9dcf5d6a77dc573a243efd4a493a9603087a6c5d3406d3196fb9a100d8921590557e4b173931ced9f2d2ca0f94bf8fc415e196a2664bfb SHA512 e251dd0b30790ed03976f0400501d286ecf1ae41909b5de3a7b0c59eeb1a7f9fa51cd76cc26950d783ce90464af476321ba007483d3275f3d7c99433c282937a
+EBUILD cbindgen-0.9.0.ebuild 1107 BLAKE2B 52c4bc8a893c828aee841f3cf46e93afa9fda0b0d991055545bfe830966c1a8a3f9541eecbb372235cc1e45073317dd8e6bc80527662b94415db0055e74a9ce5 SHA512 23106fb9ee3553c701235ae596fd890d0ac2bd560a2285677fc70ed4e58fd7a2cebbb4fc3a394a681b03fd9d8f965e0ac325fd1b00a5e224e27a3f5991e69822
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.9.0.ebuild b/dev-util/cbindgen/cbindgen-0.9.0.ebuild
index ff6909f7da6d..56405284ac6d 100644
--- a/dev-util/cbindgen/cbindgen-0.9.0.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.9.0.ebuild
@@ -58,6 +58,6 @@ HOMEPAGE="https://github.com/eqrion/cbindgen/"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 BDEPEND=">=virtual/cargo-1.30.0"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 3a3b83e15f78..f06c7782a3f0 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -3,12 +3,10 @@ AUX ccache-3.4-size-on-disk.patch 567 BLAKE2B 8ac22301eabf54922f69d135ad99a8ad9a
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
 AUX ccache-3.6-disable-sized-cleanup.patch 834 BLAKE2B a8f6ef6fc900c7cff9ae68a25f997c8e5b2cf1e98392047837efd07c91ede129dbbca2d6aa1a2532d149675f658220aa251b0fe066597f862aa2c44ec30fbda3 SHA512 3d0ab124e119b1757fd272a3585aee14e83c092459411d300fef198ca16483ec9149baedb54a9a8333b5a24a34506da550afcdf4e10ae2657c01164244e1519d
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
-DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
-DIST ccache-3.6.tar.xz 340608 BLAKE2B fa92180f53612f84b71c68da4acccefee129e5bfc9b269caa45a9c16219ed835ccf034d61ff938a54f3673fa23410d960475cc37cf5d27d7be641e7518a43f0a SHA512 13ce4c9084983ce77617cf005235987715cd6b630dac13a17cb9badce24aab71bff505e63da4206878e32d337cc674f05fbf78540711ec5b33a0b8384c47fa0d
 DIST ccache-3.7.1.tar.xz 349276 BLAKE2B 4f36ccb378b614668777d8be32dd343a0e59e36885a845ba004082f7ca0f69a5e4d01ed08af445c33bff218d33ad0385ed6ade383c06da20e3d0271b2f7423dd SHA512 c2f369c861998f82600272deedc436840af7f85baa355a1e119dacea8f41275d601a0805c3e2a8bc434df621a4e52647bd8654a71c2329542a8b160f7f179cdf
 DIST ccache-3.7.2.tar.xz 351168 BLAKE2B 6e5c8847f961bd5aa2cf325e582ece9e8bfb9c015fe3dcb01c8ca1e1834fdfb82a351ec49e203721486817df58c6aebf28e0af011f470fb739d5016f72191654 SHA512 3290f0609c27a2f063e632392be01ef163273115700f87a6d2954fcfd52fcc14bf66fc147ecbd2b692258317e113bf8be9f7efdf377560e2e8d9dd67cef58147
-EBUILD ccache-3.3.4-r1.ebuild 1917 BLAKE2B 740c0be412ab1c4402682dc403e292c96e3f7b4ef9c881bc71d8a4dfcf58716141a8eba73baba94ceb21d25cb3398c1e3f2a5a0e5435acc02f9c561e3777dc9b SHA512 d4c0899d3bd5f7c8040e4591a658ee93fa7fb96339a0f72169016ef433266a98e558242250697ba9b5abad0eccd636fd23892f6e88e7ee30f9bed84a38eba04b
-EBUILD ccache-3.6.ebuild 2095 BLAKE2B 55e4efe5c7aca294c71b4233840bdb9c71a72160f67857c96711e6f7856f464c647dfba632ef193ceb79aadea423a89fe974f39810c3c06d6a705364ae0cecbc SHA512 d90c00c9cbf75b7cca03c22e35976c14e1ede3a35954c984ca4d5012318fb2f21fe84bc34d4248a1e71c5d6c6059a56e95fc8f0300db881ccda661692f13e5d0
+DIST ccache-3.7.3.tar.xz 351416 BLAKE2B f825eea87e89246edecbbc0b02cd0f67bbb0e9eb082a4f0c3d9aadca14a20e2d8e9af5f2c067d78393ea92c11878a11423402160210f3f79a3135d345225e0ad SHA512 74e6dd9558273af74aaf085d932955e8ded3d9f7d7b316172109af8f703f00a75fcc27187469d9cb5ba8654bcad12e406bede77cfcacbc0a752d5ca42e52c628
 EBUILD ccache-3.7.1.ebuild 2136 BLAKE2B c9e243c7cabac39716581c38271779a706f95a20d35cb40c3bef1d6b3768260fe5abcc05a35a43b34017e3ad5637758f27a386ff0b9cddf6be6751fe3a9fb50b SHA512 77335fd55a5fc9166a21a6b94a272107c97cb5b8b74bef26b3cc69a50f62a2c4f04673dba3f9dda1784c962effc2934be25fd5fe838ca5523c59a3131e1fddd2
-EBUILD ccache-3.7.2.ebuild 2149 BLAKE2B 4445dbcc88ac22f85a29fa14259181fa0b4f3a1084615ca988085694dcba1387b93604dedd20945fd94e5294b8adefe412da69ed34a037b33193d5979a2e95ea SHA512 289124fd35a518af43a580d39096eeb6d4ddef8b515334dd6035d063f9521f32b2e9b43c6b37cf7f8cf87561354fa23553229cf2af8feaf9bd4d4a10496a3f4d
+EBUILD ccache-3.7.2.ebuild 2144 BLAKE2B 5c8ac9b8bea16f12337003d234fc8ce0b3416f1b4e46e3ddcfbeee18aa129066256adc77b4f1d2ff344553101f2b38bdef4ee90755ddf85d7697335d35efa8b2 SHA512 9d6b49ede8ffb44d1815cb9f6eecdd51e970a40d9e745ba22a84b3ba2d352d176b85716ed0989d4de6e30af58b07a8aa2e3b44475d22a7ad218b333128d57657
+EBUILD ccache-3.7.3.ebuild 2036 BLAKE2B d9a00991a72a8ccf1ea4f218edd246c39dd780ffa1b435e6f311d2c7f029b3bc8a000971d1c7b05d86dafdfd63e2bd9bc66dedf1e0e32a9223b123669521bb5f SHA512 50c39ce2528656d7eae8ec9089ab1d2fa3cb33c72802c441ac14caabe23234dbaa1facd7b7569b2d95f86fb83771caf614caf002a7a78b90f211fdf5c3767c71
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.3.4-r1.ebuild b/dev-util/ccache/ccache-3.3.4-r1.ebuild
deleted file mode 100644
index f031f691f2a1..000000000000
--- a/dev-util/ccache/ccache-3.3.4-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.samba.org/"
-SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
-	sys-libs/zlib"
-RDEPEND="${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions"
-
-src_prepare() {
-	# make sure we always use system zlib
-	rm -rf zlib || die
-	eapply "${FILESDIR}"/${PN}-3.3-size-on-disk.patch #456178
-	eapply_user
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_install() {
-	DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.md )
-	default
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<'/usr/lib/ccache/bin'
-
-	DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}/usr/bin.
-Portage 2.0.46-r11+ will automatically take advantage of ccache with
-no additional steps.  If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
-ccache now supports sys-devel/clang and dev-lang/icc, too!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]] ; then
-		eselect compiler-shadow remove ccache
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${ROOT} == / ]]; then
-		eselect compiler-shadow update ccache
-	fi
-
-	# nuke broken symlinks from previous versions that shouldn't exist
-	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/ccache-3.7.2.ebuild b/dev-util/ccache/ccache-3.7.2.ebuild
index 9722ebbef665..9f539b9ea7b2 100644
--- a/dev-util/ccache/ccache-3.7.2.ebuild
+++ b/dev-util/ccache/ccache-3.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.6.ebuild b/dev-util/ccache/ccache-3.7.3.ebuild
index 905e13b61112..f3a519ee73c5 100644
--- a/dev-util/ccache/ccache-3.6.ebuild
+++ b/dev-util/ccache/ccache-3.7.3.ebuild
@@ -6,12 +6,12 @@ EAPI=7
 inherit readme.gentoo-r1
 
 DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.samba.org/"
-SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
+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 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
@@ -21,9 +21,7 @@ RDEPEND="${DEPEND}
 	sys-apps/gentoo-functions"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
 	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-	"${FILESDIR}"/${PN}-3.6-disable-sized-cleanup.patch #649440
 )
 
 src_prepare() {
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 17c67e23b8ec..e9c42b3ceaa1 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -14,13 +14,11 @@ AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b65
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
-DIST cmake-3.14.3.tar.gz 8851085 BLAKE2B 92da2c563f7ddc3b12457f63eead850eb99b123298632b5a9e8f80f3e32db20e2b25bc60778855400261d13d4ef42600162248f4a92907a0c581e202fc6620eb SHA512 e257a96334f21f2b2f17e8d43aa32c2b069d13194604393c5ac9d3da193000d5328181c6cf861696186d022aba57679ee2d08073d8a7112727746b2b145a47e2
 DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
-DIST cmake-3.15.0.tar.gz 9266870 BLAKE2B e0ab6950d96a95c972e04dcdcecbf999262ddbd753784bec81954a85730279ef0298bdd7079d2d1095a14de7be5349749b1c5d54e022c6443e041e7e75cb0bab SHA512 f7286513a215a9b9094c1f630761995dbc7f4e33c38bc5585ddc89d9b4742630962921aff59570e0de39887e0cc66df6eebc83ab478796876364d2de5d2c0d6f
 DIST cmake-3.15.1.tar.gz 9268592 BLAKE2B 3b0dbca9203b1029922d06df9abc3bbfa6f7b8320e43b11b468cd7e129171e2bb1b645fc07bf2d46c9b3c08642f1a11741240d0029f96ac3b2d7a8bb44d398da SHA512 6900a84c7764034331fb6f00801841a7a3e667ac39813c35ceb3db983b33a5bf6addbbc8539c39a0c0be9e10204c79d6236886a9d50ce901a56275b53619ec73
+DIST cmake-3.15.2.tar.gz 9269449 BLAKE2B 539a1dede60741f5159fef72f6a7fdd7dd4fd457fab73d33f01b042adee7b5179b2b620ece0556f1612745f911ffe6cd714efb18a4663ac67ed6a20e09feb233 SHA512 154494fe4c8673c3b17a6f1823c55f06fbb35d7ea048b63a5c3e3157108f222693cf1606c879a3cf425edea686dfe19e27974b338e5d281ec118b1a51c632ccc
 EBUILD cmake-3.13.5.ebuild 6215 BLAKE2B cfb13f69a7987ff65183910288f70cb3b0a10532af213fc9567ddf722f9aa5042235daa2fe093610b55b6b8f0c94937e452894edb7c54a2ddbe55ae053003238 SHA512 dddf1c391c2c9787f731acbc894e907118b83fcc1cffbb943338bb56a035b9220c7b4316ffb5bd4c411f6d0ac2b2631ed940a0760b0c7a5419fd49dfc8c58427
-EBUILD cmake-3.14.3.ebuild 6242 BLAKE2B f60aecf31afb3a1d18dcc73eb49a725692bbd2429398b05f9b241d82f9842b93aeece44624a50b8406355ff82bf2484bbae55ec863987b82d1e27d04e58b1d58 SHA512 22317c7a34fb11df8eedf9251520db7a956eb44306aa5c7c2d950de1aa0b2844043a84ede7122ea38fe144fea2f52760ac097b84063b1f2f5b8885c858d29c81
 EBUILD cmake-3.14.6.ebuild 6242 BLAKE2B f60aecf31afb3a1d18dcc73eb49a725692bbd2429398b05f9b241d82f9842b93aeece44624a50b8406355ff82bf2484bbae55ec863987b82d1e27d04e58b1d58 SHA512 22317c7a34fb11df8eedf9251520db7a956eb44306aa5c7c2d950de1aa0b2844043a84ede7122ea38fe144fea2f52760ac097b84063b1f2f5b8885c858d29c81
-EBUILD cmake-3.15.0.ebuild 6253 BLAKE2B 4dc2e38854b99aa6b8aa80b8a044fa1e02211b9a7fb50c8f8f9161220e2313c4bc7af5d2af47f9c166ae85101313898f39603fa3bc73ad1159cda1398e012704 SHA512 9916b5c93b0a80ca38731d40a9d8d1538c4ec37563e8dcb2e9eea3ca622c09bbe119ec51a44ed3e74cc7c9d8bf27e1e46c7b0d49a2a15decf7d3ea4aa0ea010f
 EBUILD cmake-3.15.1.ebuild 6253 BLAKE2B 4dc2e38854b99aa6b8aa80b8a044fa1e02211b9a7fb50c8f8f9161220e2313c4bc7af5d2af47f9c166ae85101313898f39603fa3bc73ad1159cda1398e012704 SHA512 9916b5c93b0a80ca38731d40a9d8d1538c4ec37563e8dcb2e9eea3ca622c09bbe119ec51a44ed3e74cc7c9d8bf27e1e46c7b0d49a2a15decf7d3ea4aa0ea010f
+EBUILD cmake-3.15.2.ebuild 6253 BLAKE2B 4dc2e38854b99aa6b8aa80b8a044fa1e02211b9a7fb50c8f8f9161220e2313c4bc7af5d2af47f9c166ae85101313898f39603fa3bc73ad1159cda1398e012704 SHA512 9916b5c93b0a80ca38731d40a9d8d1538c4ec37563e8dcb2e9eea3ca622c09bbe119ec51a44ed3e74cc7c9d8bf27e1e46c7b0d49a2a15decf7d3ea4aa0ea010f
 MISC metadata.xml 372 BLAKE2B de2835a1f98bccd88e343ab7c058b40df0e9aa4afe938770d67a6e764ac85926b369b6d9ac4851d5deec3954436d3cb8a112b5543ac1debf74205f05641ed2ee SHA512 6c457abaf6c174d6d14b77af47c4fb65b26873cbb7a5a4fbafc558ff4c5c7c6cb0200c0f69e7a492007af4b402baeaf54177f6755c3e6da0ace149eb9bcfe69a
diff --git a/dev-util/cmake/cmake-3.14.3.ebuild b/dev-util/cmake/cmake-3.14.3.ebuild
deleted file mode 100644
index 01f4a37c8333..000000000000
--- a/dev-util/cmake/cmake-3.14.3.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5 test"
-
-RDEPEND="
-	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	# Next patch requires new work from prefix people
-	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.14.0_rc1-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
-	if [[ $? -eq 0 ]] ; then
-		par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest \
-		-j "$(makeopts_jobs)" \
-		--test-load "$(makeopts_loadavg)" \
-		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# disable Xcode hooks, bug #652134
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-			Source/cmGlobalXCodeGenerator.cxx || die
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_preinst() {
-	use qt5 && xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use qt5 && xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use qt5 && xdg_pkg_postrm
-}
diff --git a/dev-util/cmake/cmake-3.15.0.ebuild b/dev-util/cmake/cmake-3.15.2.ebuild
index 06184a6bfe5f..06184a6bfe5f 100644
--- a/dev-util/cmake/cmake-3.15.0.ebuild
+++ b/dev-util/cmake/cmake-3.15.2.ebuild
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index bc5436400172..7fda679c3427 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -7,4 +7,4 @@ EBUILD codeblocks-17.12-r300.ebuild 2014 BLAKE2B 6b99be334575d995d4537c192b90785
 EBUILD codeblocks-17.12-r301.ebuild 2173 BLAKE2B d4626ed172b0205e9d6efcb256eebc8d7e148346762ca206ad1b6cceef19e819a6c3849b40541915415ab2e96c0283ef75e092c3839b25535cac2501bbcc9a92 SHA512 e476b514275ed881bff370c342acd47ec9f612ed84fb0d796cd983b441a0b72ff772415495e35d660fcdeca56e39dae65753fefbce2a85ed2679a28c5ac05070
 EBUILD codeblocks-17.12.ebuild 2009 BLAKE2B a2266b73e5b75e95173240f01929146cb81d9313c570589899142c4631660bf214384fdbb73522bca1bf33d7a40cc0217eb5beb78d1b1998bf2e483ace970bdb SHA512 43d790abbd465566cf5aa18ca86133e7835c51643a570d23b43ac8df74e74a764079077e1e40c1a7b5d30c19d28cf4f9377f6b689f5618bac4e9e8539b57d132
 EBUILD codeblocks-9999.ebuild 1632 BLAKE2B 7b595b20cb9bb49870c01ced1e8b5602ceaedcf4e4461bf9a1fcacc8d9a270e49f84c7bf28b735ac6304852a2576e58d70a129c55a1fc5cb626db969c278c91f SHA512 a4e0032db0edd1a4da5d370d60f733aa79624dba2c4fcf3742e1d898b05cf5d70f467f2d7e24337daa0e8427a4814a1859f9349fec42ca9d2cb4c6883e5a85a2
-MISC metadata.xml 673 BLAKE2B 2868f0b98e33bfa54b217038a440d01d7f289093a6d31873b33f9eb3570c9f83c57476d2aaeabfbbdc180ec00fbdb300ec68cbb45ee95ddf99b3ddf7e92681f6 SHA512 54996828105be8435499880af88e1bb48eb746787f4838e691ddf740c86c3ca84a09973a9925ff160308ba1a28a5e746f58d2d1b646f922a2949368dc3a016fc
+MISC metadata.xml 675 BLAKE2B db56c15590a97e891e387377cafcb743716d9c84f6adaaf43e3885993842e5456086ef1a59a6579fd5058d5d964cf49b34b7993d56cb5a2e78611a4e9edd0618 SHA512 459846c3e46109fb82d0f37d016fea29e3f69cbf8d03ae2ed2aa0beff443e4206082d9f2e53afc6cdac6862f76037dc652f2dc544d6b9bdf15f2de09d863c735
diff --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
index 4d0690ce374b..e0bd14a62a12 100644
--- a/dev-util/codeblocks/metadata.xml
+++ b/dev-util/codeblocks/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>torokhov_s_a@mail.ru</email>
+    <email>torokhov-s-a@yandex.ru</email>
     <name>Sergey Torokhov</name>
   </maintainer>
   <maintainer type="project">
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 2e1ed4fd7524..e406b1cc4ab9 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,3 +1,5 @@
 DIST conan-1.0.4.tar.gz 580404 BLAKE2B a3099e7f5bdb882591bab031da267f3df5582975d93a840cd7bf42d7b5b57850d42a28ea33440f6570149b7db8c2ae6a395460f375fee084a9336435d42e7df6 SHA512 47fe9632b0007cdc0456004e6c9122df387869c33b58694b4a2dca9956daf977532f79c204207b21d3a4e7d90337a25dba49cf84cba98c1f9bde3170f1a185a9
+DIST conan-1.18.1.tar.gz 532813 BLAKE2B d4c8ec62100b8c4038f9bef8338aa0afccc38ab39d8d953c41934efc43d6ba8e5abda1438e3f8c3f4bba4b770b871a1afc5ef19749771a55873b35f28a427b1b SHA512 f9c4c4cb768c3f015a84adb3d4926cf91a372a8dae6655df9396b645c24c8694f47795064c0e93ee799864d19f6f77983da0a1679ad511d8f11702250ae95124
 EBUILD conan-1.0.4-r1.ebuild 1612 BLAKE2B c8ad7f6357da3783488241aedfee8414d9ece36cdd2313dc4d765413eb509f995ea1229211ef755191cec69cee6d9a1c3df64f9b49bc0f9dce7d86a790e3eb4f SHA512 0d41b2e92bcead2243fdc18181202302490a5d2a53ca660036049b46fe4b770c8e961e5872227e44f2d606d61771036a7a5a93aa894b94acdcf3bb5555956722
-MISC metadata.xml 735 BLAKE2B 0897f7e1776d123435a6843abf5f61168f1d089ed0bc3e62497961e552ba6e5826c1e09a77dcf5760f8559417c5db850455caa12cf0c8f77684abdaaabc55d06 SHA512 410e22e6701f402d13447f034e0c72180ca739fac1c18efc0b52739c9d11aea90125db1f732d5811ac798d9d74a2d7616c18bd779321ec4d8bbaf67a8a1d93dc
+EBUILD conan-1.18.1.ebuild 1957 BLAKE2B 3e33f1d58e6bcccd4fc02c6ecd6a28afe33106bf532c90e85958a385dbf610b19c3bdc4f74d861ddb9f6459a4adaa57d14bf5b88ce9f844d1d57c394aa80b2d2 SHA512 2c77ea4a0223e62a9f211b99622598becaeeed8010152fa1a469939e5b74ee3b7856cbc8b9f3da1ca1fc280c898fb6da3e1e55a8bd07a15cd06df641d8f718e1
+MISC metadata.xml 739 BLAKE2B 475521b92c84335a4ebda1d68dac1905a99f96b0fbecc8f06b6918e0c075648024ba3bebeaf85cb11ef0b96b917a2ebcf2a0146bd5b37c976d90cee08365c595 SHA512 27c7a3cea74ef2e22fd3dd238fa736efd1786fea4eaf01b9b51e07f7276101ddd7022ad7aedf767d1dbcdba2c29ddf48c07581e4fe5ec089d5e10c5b880c9970
diff --git a/dev-util/conan/conan-1.18.1.ebuild b/dev-util/conan/conan-1.18.1.ebuild
new file mode 100644
index 000000000000..150071e1dc00
--- /dev/null
+++ b/dev-util/conan/conan-1.18.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed C/C++ package manager"
+HOMEPAGE="https://conan.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# overly strict requirements?
+# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
+RDEPEND="
+	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/patch-1.16[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	>=dev-python/node-semver-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pylint-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/future-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/astroid-1.6.5[${PYTHON_USEDEP}]
+	>=dev-python/deprecation-2.0[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.1.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-lang/go
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+		>=dev-python/nose-parameterized-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
+		dev-util/cmake
+	)
+"
+
+src_prepare() {
+	default
+	# Fix strict dependencies
+	sed -i \
+		-e "s:patch==1.16:patch>=1.16:g" \
+		-e "s:node-semver==0.6.1:node-semver>=0.6.1:g" \
+		-e "s:future==0.16.0:future>=0.16.0:g" \
+		conans/requirements.txt
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	PYTHONPATH=. nosetests -v . || die
+}
diff --git a/dev-util/conan/metadata.xml b/dev-util/conan/metadata.xml
index af7e11d6bb6c..eec79f76ea9f 100644
--- a/dev-util/conan/metadata.xml
+++ b/dev-util/conan/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>beschindler@gmail.com</email>
-    <name>Benjamin Schindler</name>
+    <email>azamat.hackimov@gmail.com</email>
+    <name>Azamat H. Hackimov</name>
   </maintainer>
   <maintainer type="project">
   <email>proxy-maint@gentoo.org</email>
diff --git a/dev-util/cpputest/Manifest b/dev-util/cpputest/Manifest
index 501c364082ce..fd100af79dab 100644
--- a/dev-util/cpputest/Manifest
+++ b/dev-util/cpputest/Manifest
@@ -1,3 +1,3 @@
 DIST cpputest-3.8.tar.gz 2722956 BLAKE2B 1da16c06d242703462dcaf9c6c26eb875c2622bcce4113fd0b990805d06ee7401a6776d2f0451eda49e7914caa59a5665a92387684ffb6dbbe884cf0fe07bd86 SHA512 a9592bdc9ffab8b42026ef2010f504e7e37d77fc2f197f89d23f7c9285a101059a0ec66418b914db0383974616d31b26addd1938fb27f45c3e7d9496ed0a0fac
-EBUILD cpputest-3.8.ebuild 487 BLAKE2B d5b0451cfcf95ae2366ff5f2b31fe16f03b819356019e6aba14f15c1d4e7d0a399b3e718e1cce5ab970e17bd6eeaf62a9a3424fe3f5db6a63e1d1011bfd0fe4e SHA512 849d2fd192fa93b5aa258a8f1eb8f0e1dafe6be7eb39b3909b2713900c4f6e8cdd2f5b8d15c24d41925f98d15cd9c843b05fd1d953902d54bd1d6c031de6b1ed
+EBUILD cpputest-3.8.ebuild 511 BLAKE2B 8b1f275c74baf9a59790f57cdfbcd1639724d9aca33c7ada61013025cc7a457ff21a5bb2b853e3e918f012143603221a09c4389b39fa0c56bc5b5c50e435c39b SHA512 c7fa74a40acf842fe0cdbbba04c07f74eb40803f4df874d331314832c0b634f790b587c453dc50eb4b2d09bf0497019a354c13615816b822b8bc55f299ea06c5
 MISC metadata.xml 328 BLAKE2B dbdadf9d2d03017d5e24445929a424c4c8b23382641b2abdec83a1da14ce67ea7f8e4087b1c0d36786da46068a47acf9a94247140b3bb539176c88bc586f5e91 SHA512 fc08c57ee29388f77cdd94b984673c63793f055b5a399c77ebbe4a71e546437b19727a497a9a5f20a1d3b90129e731c824d52f57d028dbcd9556a1fd30d8e9c5
diff --git a/dev-util/cpputest/cpputest-3.8.ebuild b/dev-util/cpputest/cpputest-3.8.ebuild
index 4c3046bb40e4..f76d8b2c9190 100644
--- a/dev-util/cpputest/cpputest-3.8.ebuild
+++ b/dev-util/cpputest/cpputest-3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,9 +11,8 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
-DEPEND="
-	test? ( >=dev-cpp/gtest-1.8.0 )
-"
+DEPEND="test? ( >=dev-cpp/gtest-1.8.0 )"
 
 DOCS=( AUTHORS README.md README_CppUTest_for_C.txt )
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 68f9657e547b..d982a0d02b81 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,5 +1,3 @@
-DIST cucumber-core-1.5.0.gem 45056 BLAKE2B 39c56fd48386556f36921694940d8d8be7e2345c81bec83e7a47b4a07e96b22f4d30898cbdcedeebc44be671c166b42cb52d55c36b7196eb05b9cb82333a76d3 SHA512 544d2c5707bde46d0c12dc975b3858e663776d9bc87ef044681525a547ef2de171a74ba0c53fb28dafcbdf90a153bea5357ec1a129f11b2c0dfedd288c5def74
 DIST cucumber-core-3.2.1.tar.gz 49868 BLAKE2B e5d18797fb6821fa9c300898bc8c14d57559b790d77a191d7147a987e27893ce89076716f82fa2048632e1b033ad607c748fe29f6b8fc600abd523290c4a9f50 SHA512 ba45e804d8454a6ef306eb90f32e6cdf3ee25fdd6613e9ba8308ecfce4044f27ee3dc012ad7f9ca481e94fe5e1d9deb9e0c46ca811a8e25bb27981a78c528ddb
-EBUILD cucumber-core-1.5.0.ebuild 733 BLAKE2B 217c3b09430a5fecbca7ed945fb3189113fca5e6bb3ee61f04681c0f7f6cb64377c07ef957dadc4c0dd1b88713aa08fe3309181a118644f0c677d59476424464 SHA512 2ba20e7e2f6b6d33c34cc88f0cf7e816d9d5ef3c060f067a1e2e10df0a61a60e482c20dffce7a7d896bdfbf91709a7f77d06a3a1e6401a099edb3c546ef45189
 EBUILD cucumber-core-3.2.1.ebuild 1005 BLAKE2B c872fa761d7970f8d708dfe10a04d1aea2e193159e7b6bd22e6d554f883618a8e28958ec3d735b54e3beae422e8c6d9791c734323f07d25b8e9baccf9105d449 SHA512 a08de3b7d23e9d8f68ad2f4b41525f0d5fe1470777f20ea4e8697e0b3a1447a8d6da77bc7ab452959cc16db46a57d9ec3514c0fc66df7302b92de8ec5dd22d23
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild b/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild
deleted file mode 100644
index 0e0b55d4e916..000000000000
--- a/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-LICENSE="Ruby"
-
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/unindent-1.0
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/gherkin-4.0:4
-"
-
-all_ruby_prepare() {
-	# Avoid dependency on kramdown to keep dependency list manageable for all arches.
-	rm -f spec/readme_spec.rb || die
-}
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index 77cfaa3c9d9a..f0853b8152ea 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,5 +1,7 @@
 DIST cucumber-rails-1.6.0.gem 409088 BLAKE2B 05263cd0183a6b6ae4a3091eba6e4d6f6bc1f21f434757e86b0f150c1c18c98773b210db31a4f58710c05d09324605048586aa8d62274ed1861dd7e2bba97b25 SHA512 dab37f8777e2bc06c07141baa84091cd5128fa90631f1ecf381e2a8fb22f024a1f5af96edd212148c4a9e30791efb9f2602a71058f3b7c6fc494dfd10bfefb00
 DIST cucumber-rails-1.7.0.gem 411648 BLAKE2B 09f6e79384869e0d901cb7dda607f2db29b0a924cd57fac56f88e5a90ef5f79348246e91195ecb437ae88e2e5f3f2e17bbfc651b8ff6e01cfc92cc86c544b5be SHA512 05f91606ebfd5db6608120b7057c767efaccee1dfb2eb99113e9cc6f55e594bd4181f54c8a38780b451bf7dc53862180e80a3c62a81ee8b1ea6aaf54682599c2
+DIST cucumber-rails-1.8.0.gem 43008 BLAKE2B ac2fbc89ea952add031429b281986de37b3a8511e398b34d49435c70221b3c454589c51acd5b1fcecdf0285a8e446d4c2c0e0a77216eb78f8fa222086fb6db36 SHA512 757f50719309418353cf1e6b42902ce6166806d2e2a9cd1a27842ffde3d8ce61af97de12f4ffa9e31a50693cc8c40ece9a74e5ec91973096e77860b56034d439
 EBUILD cucumber-rails-1.6.0.ebuild 1213 BLAKE2B ba430abc294ee09c4d903f91aba1e6ff62cb5069df4d511bdd47184379b8269fe607b630d5dffcb6bbcc45db7fad514c5d74ca6a28f166379a6d681cc275e460 SHA512 25896ea0452c98e291cd03f0c05801fb15b01b98e143dd465eaf6fd5e55d37b2f5f7ae4c6028ba8fed04a2b0357b14de66727343b5572d25bf76257c7a9b130b
 EBUILD cucumber-rails-1.7.0.ebuild 1212 BLAKE2B 3395490b1f7a8956b8a72a9a2c18978089bb4d1c9ad423e5c10e669c4e21046db58e9ee8e769dde5e875e04ebcb03ea772c1fc6754cb4eebeb6176f13eb79ed7 SHA512 40ef5370f37e771af3c681f9df15a657bb8158d96ec9f98b06893abfb19c38784a373104e7609ba9b53c6a4cb8ec48a0eb0b356668dda18618016f757a5d3785
+EBUILD cucumber-rails-1.8.0.ebuild 1184 BLAKE2B 418d8325a0cd90834c31ef87e86d3fb7a7a8b6602fb73546e4c8b9cc86c492e6556055d5ef8bb2fdac12b97f9cd6b53594cf45e4892f8b356a209aaf57c3688c SHA512 fa921b40e01409ab7f3da2b5dc9b781059a2c8d05f6ef9d4e94360005f58e601d99423aae349af78c23ec17e390728f716375ac80784b2065e5c23d5f4ee91e8
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.8.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.8.0.ebuild
new file mode 100644
index 000000000000..c81500b4da15
--- /dev/null
+++ b/dev-util/cucumber-rails/cucumber-rails-1.8.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 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="rspec"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios for Rails"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="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-4
+	>=dev-ruby/nokogiri-1.8
+	>=dev-ruby/capybara-2.12:* <dev-ruby/capybara-4:*
+	>=dev-ruby/railties-4.2:* <dev-ruby/railties-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/cutter/Manifest b/dev-util/cutter/Manifest
index 99b68eaeb7b7..47d64e2dbcfc 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -15,6 +15,6 @@ EBUILD cutter-1.4.ebuild 1009 BLAKE2B a0056eeecee4e95a9b9e6332b9d8ddd9007ff569d9
 EBUILD cutter-1.6.ebuild 1009 BLAKE2B b511368dcafb04f330ba2a9212cc5a2ce451f6ac69efc4b02dd789f63c326536af8a1b2339c2a17c50a2f47fa41f80bf5465ceced2c3880a90e482fcca372137 SHA512 3ec586afa2c3c9b040acb05e54a37b767dcf35fe0e9fe840befb0d8cd7221d2c6f91d994ce3006fb0d45666c29d79c47fdd0d3c4a3160aaf4661de077c00b903
 EBUILD cutter-1.7.4.ebuild 1177 BLAKE2B d692a0279ecfe0dec8e7b6d13c0ca45e0ed3b8ba4cfd4797a8a2853e80d0fcae422939da225a45e2df2be60740d935e1cca6d9dbf1d6e27766f5293fe11a6ae6 SHA512 3f92f93fc9c9718a688c6cd0c4b5ca3a16092c87a14cab00cfdb47430067fd20fb0a651ab4f744cebf5f735e6dc517410c4ff1686490940c421195bdeb19e48e
 EBUILD cutter-1.7.ebuild 1180 BLAKE2B 298213403869122e505d67cb655aa5604be2c51e8ff8370e5ddda46157c4ce4c549237c96412c7435a90096d7d78f0c9346dc2c6cab4fec66f4b6a1d2ed122c9 SHA512 ea4eedb00a260567cf62853d3452b368d0c84fcd889c00ed67c224450fee010ab0096b1f2dbad03376791ea2908fac2accf024865fead13861c1f2609c97e829
-EBUILD cutter-1.8.0.ebuild 1291 BLAKE2B 4a0b06bd35e99427330f72177e94923bdefd5b56d9c7f148941be136561e5caadcd55b0518f0e8973cc40f10b62f03c09d593894ca46dd9af52754e425d37f06 SHA512 f93d7fc5ffcc45bfe93f0410ed0a6dd55b5b098bfc05d5213836ca9dd2b68839dbfd972082eedf15d6450cd41725b47f19d3709303c867dd458519d7062bf101
-EBUILD cutter-1.8.2.ebuild 1221 BLAKE2B 8d8c20d1e46541b34f99165894e41ec200957a21d7dfa001bf747fa2b8e90b4c1ea4263afaa9833f320165f59fc1b6f165c60bfe5e296acb95bffed42fd17140 SHA512 bab9ea68a895f16298887d5eb7fcc81b1590e26b857898290892d37861fa94159e753ed4bf3b2562c68a89fcd907b4f9a7effffda147a59b87a8b9c1e9449a28
+EBUILD cutter-1.8.0.ebuild 1315 BLAKE2B 39b58b6706349f3ab3df854eb700ae7818d38f65a63651ab469c0ac8f54cab99f82ace36e15869210935c62a5d735b0f65dd1388ba4303fee518e648d3189cf9 SHA512 8072da1f6ec027c390e8a1938e7b0bcdfe984e4ce62ccba46c5c063f0270135f05d37a1baadda37193862835d8e9f6cb18f826162477d384ce54501bb17ae09a
+EBUILD cutter-1.8.2.ebuild 1245 BLAKE2B a34d1b452f7fcadc22021dd4e1c5c5de55bf4ba0634bc2216f971e6bc7d299226e31a5caf07f4929d581eefb6eafce382297ee6631c665dc939d1c26300e9b66 SHA512 a8adece880ff5a6fd550d2ef0f18cd2bb1ad8f82d182643bdf61888f672101c9032eb14216e42c501f5d2db1d715f3bd2bf83c8a69e890470347c5cfa8fe98c5
 MISC metadata.xml 687 BLAKE2B 5b8a5f4de7ba5d53d9aa63fa173c39cc590af4700bae0fb950ae79c89c78c90e1ecef29ddae7fac2882bb5281ac4535c5c78d9192fdb0fee96f52b564bb8d362 SHA512 9a7255a0a0d560adc6569a5776bea0a0acefb3b2735ccf082fc599b03c50ccc40a3ddf98058031c01ae0bd5966ec569efb75c3fd982895854fe0bc2c26dea96b
diff --git a/dev-util/cutter/cutter-1.8.0.ebuild b/dev-util/cutter/cutter-1.8.0.ebuild
index e1e21ad2836a..36ab4ff606ef 100644
--- a/dev-util/cutter/cutter-1.8.0.ebuild
+++ b/dev-util/cutter/cutter-1.8.0.ebuild
@@ -15,7 +15,8 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="jupyter webengine"
-REQUIRED_USE="webengine? ( jupyter )"
+REQUIRED_USE="webengine? ( jupyter )
+	${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/cutter/cutter-1.8.2.ebuild b/dev-util/cutter/cutter-1.8.2.ebuild
index dde00637bbf8..c31e6b2f6d5e 100644
--- a/dev-util/cutter/cutter-1.8.2.ebuild
+++ b/dev-util/cutter/cutter-1.8.2.ebuild
@@ -15,7 +15,8 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="jupyter webengine"
-REQUIRED_USE="webengine? ( jupyter )"
+REQUIRED_USE="webengine? ( jupyter )
+	${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index b5e22aa384d4..21f8f2e45543 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
-DIST debhelper_12.1.1.tar.xz 483732 BLAKE2B 39938f9ec0793154da6405c1b0ef2a8a10a10753475b09f8fbc6e7411457713eb7bc035dfc21f9b7b9f82ec276674802c0cd7599252956cf455cc8d203070a9c SHA512 ab006450258c6c3d5c89bddb8bc5a87d61d80e8232cbbd2f15a32d1045d1fa9f1858df536d8cf813048f4e755a8e5bca765f1da7800ebf8f1237096e659d9ddd
-DIST debhelper_12.2.3.tar.xz 492468 BLAKE2B 2771364f0f531b29d676ea5dd3a7bb0a138b6fea3b11fc92d4c5dc19748e3b029d6d620e650cd997d3b164913be992868727c8f37e3194d7d89e8bd846a811aa SHA512 83acc2961dd964cfc0cda67b523fe5b41385e35f3884b6cf02ae6fc57c00e5b0633a0a5a57feb0fbd1898cb7028271102f291c761e58006449c2b278191c0af3
+DIST debhelper_12.3.tar.xz 493796 BLAKE2B 65ed2b494bd7dc70ecefe1a999681af1648385ec4addde8dbe39a650e37d4613c1712ba8005dd1efc8bcc688c02f23d02afe661e6126d29d8855930a34ed74d7 SHA512 94abe39f4df1d0b95b49fc20141f46f8f0438de89f904556dcb26f9ddcb6530d04d92c2c719549c0f1f5bc8c5edc395fd770e74097b353ec521affa227d77f4f
+DIST debhelper_12.4.tar.xz 493916 BLAKE2B f1478c30a1043f66eea4aa3bbe0cd5bcc10b9d8d2a2caf9ec82b6eaaa4bff03ee7c72ee2aa87ff96827a09b6f33874fd85d7743df2f5c8b1eaaf957c3cbc4066 SHA512 82897feadfa953d12bbc6e5e8fb1fbccd4de9e42cafa5c23e188960ff11e7c14a5db0ba7a5a50873b2f399da71580a36b27156c03a11d418c58fbe5cc431b006
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-12.1.1.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
-EBUILD debhelper-12.2.3.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
+EBUILD debhelper-12.3.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
+EBUILD debhelper-12.4.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
 EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-12.1.1.ebuild b/dev-util/debhelper/debhelper-12.3.ebuild
index e546013a4fd6..e546013a4fd6 100644
--- a/dev-util/debhelper/debhelper-12.1.1.ebuild
+++ b/dev-util/debhelper/debhelper-12.3.ebuild
diff --git a/dev-util/debhelper/debhelper-12.2.3.ebuild b/dev-util/debhelper/debhelper-12.4.ebuild
index e546013a4fd6..e546013a4fd6 100644
--- a/dev-util/debhelper/debhelper-12.2.3.ebuild
+++ b/dev-util/debhelper/debhelper-12.4.ebuild
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 02616f42f6d0..04c3a97fc06f 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -3,6 +3,6 @@ DIST debootstrap_1.0.115.tar.gz 75691 BLAKE2B ef2ddd8b76d7eafdf5be50e3cbb9972506
 DIST debootstrap_1.0.89.tar.gz 69020 BLAKE2B 9175d0936b6c9a28a29ee1b24bd835c41aaf807bc24a029201aaa45d07789206ee06e38b0a70c1e507ab448a3ec9c0fded2838bfb868334270b5159b34cbe9eb SHA512 3f230ce3eff6359353d106c806ce395861fb47fc1416eb0b498af7ce12a45ce7572b18284633d6d4d07b73a4a203e03bc205df3eae0db6f637237d25d0a69b1a
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
 EBUILD debootstrap-1.0.114.ebuild 1198 BLAKE2B bae17c6b5280b0980acec1796b4d3974f7dc8b4be709642379cb53eeea1d9dc98de059109ab30501ab0510e617af9c2d467a1aef01114af1b71be1134e06b868 SHA512 1f9a40f3fd3a275da0184488833e3161fc017eaf439aed8a50b2c6a14ffa8218e0ab1ad90d0094fbec5f46f712a0b150a26abfbe774e3a2905ccab025af9f1c0
-EBUILD debootstrap-1.0.115.ebuild 1179 BLAKE2B e668240a1e791eeac1ae105cd9f23a5b41be0232488364dd84bf719f5fa359d1e0feaff80ce0222a4a7af8bf5863a363bbff9d6f3a53f3d37d85241d41e30b1b SHA512 eb12d2206e869c0e88501317c41e6fe8b98c374de2b1facc345b8244778bc7d771424fadbe2a2fcfca1f8dd21562ea880c98e79acb0e49e5eb5254e6c0762b0d
+EBUILD debootstrap-1.0.115.ebuild 1171 BLAKE2B 4e13c7d15f3aa36735f50211a86ee1d53994891ff7dde8111fa3500cc691a4aa270fe8273dc1bae67f2850e524f51ae2e0d244cb92c57f434598f7da45399f22 SHA512 304eb1e43b484866d020374ed58121b7115eda3250600517e785109934ae66c139ee15dd0f05a30b2b61979d1c8419ad8506779fd5953aef751df471b794336a
 EBUILD debootstrap-1.0.89.ebuild 1193 BLAKE2B cc444d24b614d76a8e57d1cb9fbadf86c2d541d3426fd68e75306bce4e4326905200a46a580c355e38cf3ebf45fd74c02325a36123abe193c6d37213ffe15cea SHA512 495eb8eaaee17ee6766b6e9ab5a6021c055be48cd2798baab428ff98ce4ee72171714d39f28e1a8d6a983677a1a849a925958a469fe18e05d40fd4a5cb163b7a
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.115.ebuild b/dev-util/debootstrap/debootstrap-1.0.115.ebuild
index 8214beb8d505..5ce11a6bce2e 100644
--- a/dev-util/debootstrap/debootstrap-1.0.115.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.115.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index ddf6c2c00657..770330283514 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1,6 +1,6 @@
 AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d890364edc33f0a55983b9a1ae76bcaf78a784fae92eaa66dc24c270ecf160f747e848872fa17e9c331dce7ad2deb498492b1 SHA512 5fc03fb9c9eea7d4c19c9b263413fb4f7f247b6bd40a7452b26f7e175646dc9b3af945d25cafc42a01a8d95059324652c56baa4bb5768b62dbd58f3ae4f05fe3
 DIST desktop-file-utils-0.23.tar.xz 132000 BLAKE2B 95273125dd8332db7438c3a4a7a5ecc4566d552c1fc9ff94a68fdf13f5fca74f943e02a10b1fb4417494f9fd44daa9f80c519215982cee8e082648027a010e7b SHA512 66a8ddfbb2be8edc14e16427e0dafa6fb1ef7491c816f19221fb5d5782e964cdcc3ae89807339f1c565af828aa83403cc56edeb2d03b3f93e013f3c5e9e6fe6a
 DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
-EBUILD desktop-file-utils-0.23.ebuild 1293 BLAKE2B 2ba978bf08a86fe0fba730f2fcbace91bb7759ddbc30e40a8bf441e74dfe4e0b87c3afd945133227f87c08d3dfae686f37f3286d2845e194f8e7dc9d139f759d SHA512 22b8e108ee0e9f8e127648b9fb285585c55154cb6c73fd8201072582830e3d8d84954461687259e6d370b762ba949c9226e3c13088b50a397feb7de856c8a802
+EBUILD desktop-file-utils-0.23.ebuild 1300 BLAKE2B 3e2c3ccde3cb9fd4058c109b0c5f73b898e6e0e9d403fa5ea520b63092d277c7a0b33359c232737378df88f703d1e8b12cfcdfd91eda9e13d1d5dd175367c929 SHA512 fdfa1d93d2b05afb08ff503df9faf26fea8b4e586fd9723d01ccb47fe52781942f6e6154fb44f4078257a64049f9fd2ae4b3614fc5f6a9fb2bea7ef69a72499d
 EBUILD desktop-file-utils-0.24.ebuild 1309 BLAKE2B 609df4aebad904f4f2d6f634abe4d0ccfd304f272aaea1167f44b3adb72089e13817450b5b687a8259c0f38b754e2880b28fb42a9cf9f6b7e039cdb543b2f896 SHA512 d515e7eb089887d2193a3ba6e677521c7fbd522b2cd1201e873f64645c44133b46fb557926678aa9bcd2d3fb31d3d592515ee2dda271373cf68c830ea9ebc019
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
index 2135025ef096..e3606f624473 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
@@ -10,7 +10,7 @@ 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 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 63e3d3cce52a..b93a25870f32 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,7 @@
 DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
-DIST dialog-1.3-20190211.tar.gz 534749 BLAKE2B 3b721cf98b961c60a97975b7720722d4a46a47d7b861fb7c27de2db2fc3fa704d249b40bf28a6845f68cffabf41b66d77d5f1acf49a342e38cb83a24907e9379 SHA512 247639190c97c1baa6aa2cc75bc17593a0e33fcfcfd6dbc4a1903b55709f8f102c965de03f0620c48463f018525eb77f9b62b39db8331b811a227bbf39b254c4
-DIST dialog-1.3-20190724.tar.gz 534551 BLAKE2B 184865abfc98a509fbb2746e8476433c53b08157a53b9786066d7c48c94f3c2e50785c3546a963516f66af382903a33778188d0bfca85ef1f513165157c18196 SHA512 85dbec30bbd5bf5f3e40c8cf2af54236050fe3f96ca66c22d21e0447c2b851d7529b3d155d76b946e9360262959a44bf436b7f7fcf49040b38cc3f6c106c4b81
+DIST dialog-1.3-20190728.tar.gz 534764 BLAKE2B c38df2a2a71036a60c08b2f9caa0cb0b6be9f07ed0137d592ed48c6f3e57a0d24760ff85df44f0fdb4cc690b47c6a206f6eaf84a7ea7e71366424dedb7a9e1d6 SHA512 e539f9691fbca289192deec87439b9d6a463b875b24082f6684c2a1c7f7b46bed1ba29a5380dd93dadd800a99bc7c60c9d065d7230bf21dcfbb8f361d7d15de6
+DIST dialog-1.3-20190808.tar.gz 537376 BLAKE2B 38c849ef12ae6c5fc703fe5f8d172c92ba9c6d498e163d622b5dfc7c638a7058fbca79ecfbf1f3e4f274fd53c6cce0d4ef0f67fc5efb8dc16b451064d609e214 SHA512 780cecaf68616723242426f9e78c772f81ec63f0761f67061c4fa06510ba9ca229c921ee15443b63c1581726751f79bf3e6d3b6b8148bbbb3a986043b6b82f86
 EBUILD dialog-1.3.20170131.ebuild 1277 BLAKE2B 1cd46769259be314020f8f638ede023ae62f8c0c6c0d007baf8f364f018f00619301026e17bc956b53c291a2a22afacb70188e7a6946cc975a795aa9d9fa40f5 SHA512 9f72fa481b62e1ca43aee9cbc5856e139fad8c3b0d02f75fd33b8708437051eecc82c926fcc3a30f65e1829f232f92e3057fc25fe28794bf144a76535bcf8ada
-EBUILD dialog-1.3.20190211.ebuild 1276 BLAKE2B 1cbe7f171a6536cbd9fb454dec409e023b1d9b2bfb788cdf63cfaf779f718944f2a6f16c87e7fb3f8882afa5a39f556e6a64b8d661835482d26281eab7997a1e SHA512 bee75c253b382b622db52b32e762685314b35fbe9b0af4b43a7ba4ba7a7ae8ccaf7d72909fcc0efb7c856f89319c59fec8010c7cf12095ac7c9f132648d01d09
-EBUILD dialog-1.3.20190724.ebuild 1276 BLAKE2B 1cbe7f171a6536cbd9fb454dec409e023b1d9b2bfb788cdf63cfaf779f718944f2a6f16c87e7fb3f8882afa5a39f556e6a64b8d661835482d26281eab7997a1e SHA512 bee75c253b382b622db52b32e762685314b35fbe9b0af4b43a7ba4ba7a7ae8ccaf7d72909fcc0efb7c856f89319c59fec8010c7cf12095ac7c9f132648d01d09
+EBUILD dialog-1.3.20190728.ebuild 1276 BLAKE2B 1cbe7f171a6536cbd9fb454dec409e023b1d9b2bfb788cdf63cfaf779f718944f2a6f16c87e7fb3f8882afa5a39f556e6a64b8d661835482d26281eab7997a1e SHA512 bee75c253b382b622db52b32e762685314b35fbe9b0af4b43a7ba4ba7a7ae8ccaf7d72909fcc0efb7c856f89319c59fec8010c7cf12095ac7c9f132648d01d09
+EBUILD dialog-1.3.20190808.ebuild 1276 BLAKE2B 1cbe7f171a6536cbd9fb454dec409e023b1d9b2bfb788cdf63cfaf779f718944f2a6f16c87e7fb3f8882afa5a39f556e6a64b8d661835482d26281eab7997a1e SHA512 bee75c253b382b622db52b32e762685314b35fbe9b0af4b43a7ba4ba7a7ae8ccaf7d72909fcc0efb7c856f89319c59fec8010c7cf12095ac7c9f132648d01d09
 MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20190211.ebuild b/dev-util/dialog/dialog-1.3.20190728.ebuild
index 021642f25719..021642f25719 100644
--- a/dev-util/dialog/dialog-1.3.20190211.ebuild
+++ b/dev-util/dialog/dialog-1.3.20190728.ebuild
diff --git a/dev-util/dialog/dialog-1.3.20190724.ebuild b/dev-util/dialog/dialog-1.3.20190808.ebuild
index 021642f25719..021642f25719 100644
--- a/dev-util/dialog/dialog-1.3.20190724.ebuild
+++ b/dev-util/dialog/dialog-1.3.20190808.ebuild
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index ca3d0f3055d0..edb6106cf908 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -2,4 +2,4 @@ DIST diffoscope-87.tar.gz 1026242 BLAKE2B 5055607c21504bf05f71793b112c1452556ac4
 DIST diffoscope-88.tar.gz 1027126 BLAKE2B 18d2ebc532f5820fcb3f3a2e96a834a06a0f2adf4c14e17a1aa2d7aabc360f6180af2bf2151aac5b4eb33e38aade36e38b5894afbfd73ffa79e74bc45c085cbf SHA512 0fdb4385a0d842dccacc60c9b48b8720f00185bb4b6a5b30b88454a1f08e6ff7ead8fc392f406d2d2aff8b1b901caaa950a011b674d83e354dda4a01ac39ab1c
 EBUILD diffoscope-87.ebuild 1835 BLAKE2B 7e11544ca6290e664e2f243640e70a483ae5aa86ed12b1904c56e46ecb3bfccdf6351e8460df5287006f6ca0c76ed6892bbe8b7804e863f3cc6f592319e4562d SHA512 58ab6f85b61caf31261ede9f807c6bc55a663a3d6582c1f73458b52d8c81bc1009ca8d4966222e2539fce78c0379fe05b938f6f362548b8e5e5f0b785343a1ca
 EBUILD diffoscope-88.ebuild 1884 BLAKE2B dbd6e3783941065ecd855b677b58ae2235cc90f631d9b0d7d415603b730513d32b46da275c3d442990d0b660c5f55761b028170db82737067fec6e4ce6c2a7e4 SHA512 382393caf25441d14a073376273c18691207e4dc3913c736998bac413d5ad1b86bd7843a9030b7bf9d4d78752f538050f95a25887acffc809a07657f116524e4
-MISC metadata.xml 2138 BLAKE2B 026602198d2a0adaf2e0e753ae0b11b2de858dd66303531e8d23dce85e871cb7f14b50267c37d52b16390b0892559e1c29f468637149d08b43e4a33be521bd45 SHA512 9f00c504e6ec4cdf5589e8f37d79567ad6fac661740ac482dbef1b3fae8bc60f24b80585eea8d17f18beb1c4c8e40e6f4172193b405be3e51428f027d2545776
+MISC metadata.xml 2078 BLAKE2B 06fb9631030fb0f6d9a482c998238884bb2094751d7f99fb424e5c4f78f97c731eed98b783b14d0215224f786186e5a536e3775a5b7f7b6d980cd468ec243cdb SHA512 69afd9a3ba85d3a6ad92a64811b76708700f0790bff588762a92ad178da94690a940c939de09ca1719fa47ef5c85f10988debda26abef283b9ab01941b3232fc
diff --git a/dev-util/diffoscope/metadata.xml b/dev-util/diffoscope/metadata.xml
index c6b5b3df2213..3899d895c5bd 100644
--- a/dev-util/diffoscope/metadata.xml
+++ b/dev-util/diffoscope/metadata.xml
@@ -13,7 +13,6 @@
 </longdescription>
 <use>
   <flag name="binutils">Use <pkg>sys-devel/binutils</pkg></flag>
-  <flag name="colord">Use <pkg>x11-misc/colord</pkg></flag>
   <flag name="cpio">Use <pkg>app-arch/cpio</pkg></flag>
   <flag name="diff">Use <pkg>sys-apps/diffutils</pkg></flag>
   <flag name="docx">Use <pkg>app-text/docx2txt</pkg></flag>
diff --git a/dev-util/dogtail/Manifest b/dev-util/dogtail/Manifest
index b904e6c00b00..07f13933f4b8 100644
--- a/dev-util/dogtail/Manifest
+++ b/dev-util/dogtail/Manifest
@@ -1,4 +1,4 @@
 AUX dogtail-0.9.10-gentoo-paths.patch 2705 BLAKE2B 6a3d9b7a7ced2388bea7216c4a6f95e531247b5d5f7316b64375215ea5a7e0e1a8deb974115bd613baf6d22c7af502efce01f00412cb8ff101042d08cfb9fe1d SHA512 ce792bf24713c8b2948874faa11ee53d341d4d1d25bba95cd11f9a31e2e76e813a20b0d9932268a2110c990de1fdf15382fa1867f02e31ea1d25349e48bb42c1
 DIST dogtail-0.9.10.tar.gz 125995 BLAKE2B e28e9a6330cefc8746b850501a5beba07e18f1e5d5f935ce182103a9ea4ffc95483b3530a705565cbfae1bff24da57839f7e7b6939f42821e31b287150e33b4d SHA512 08ce4ad6e5e492ab04be9964cc6583d96d2d8a707a49721c1bca9248e5c56702fe5d0d84dd992023f731fe87016c88e21929319baff561aa113c6e101343fc3e
-EBUILD dogtail-0.9.10.ebuild 1467 BLAKE2B 84de0fc6e90e18b9e4511267fbb2e3cf2718dd01c2d38b3242ec143464c3369660f894b0095f0f316b88ad111fa7d2d50d037c9998062086cd553ebd81fa025c SHA512 2a807d2b10497cf325c7153a5c93f48490a0689c958eed6c6bbd8a03824a29430958e620ad9e5c2cc63ccc0de659825d0d4c25a13a836a8557f9ab22d4fe102f
+EBUILD dogtail-0.9.10.ebuild 1474 BLAKE2B f85e0a2466c0ffd66066725c167bfb7bdab288fff002eb1a8a7beb84df2c674695469b2140a7825da318ef5121fdae3390228507a6b3b8241342365313de8c8f SHA512 dafdecacab0a9932c0789d18dda7837bef905c673a5f31e82380deecd0a27a6afec6033935fe10ad323df8bdcc0720904ebdc4657b7adbd222d4b231370c47ec
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-util/dogtail/dogtail-0.9.10.ebuild b/dev-util/dogtail/dogtail-0.9.10.ebuild
index dee95fd89411..982905cafcaa 100644
--- a/dev-util/dogtail/dogtail-0.9.10.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/${PN}/${PN}/raw/released/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index 8db22289dfcf..a585e5f95493 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -3,4 +3,4 @@ DIST edb-debugger-1.0.0.tgz 1106351 BLAKE2B fbf888018afc069ef1be817bbcb45ee276c1
 EBUILD edb-debugger-0.9.21.ebuild 2064 BLAKE2B 5e72e1670db4ef64d840a0d41f0b961fdd63003d40b06c92f129e0f63a1f5e0e7a051219bef9eb0b2826c020a943bda6a952e6c4a1ed5dd5392197e0d0216385 SHA512 3057033e815a93d42558904216f22ffae56d0a3a8afa99c0b000060cd185ae52059f87ce904f5fa9c1149f37536a1b1b6c61c0ad72e6ad0980d637fd80fc640f
 EBUILD edb-debugger-1.0.0-r2.ebuild 1090 BLAKE2B 5ff08750c0014efabd46d0531035f4c7761f5c2f3c111f317a938b942720e5b8f8c78eac555803ffd4af5db32991a48f1497c1029b6e847298651bb7c9fb1864 SHA512 cad7a47d3511372561eb62186b18272c4750f05f84fcffc01dff3f35ff3886f15d026add49dc785a1b03dcdf5594574610f3bbc967999ef5720e17d16a7cd55c
 EBUILD edb-debugger-9999.ebuild 922 BLAKE2B f2d5453d64c1608e64832bdcb30c1fb4c8f7af715f9b3b901c193c1149222b16e39361069b61599a47b5a184c884ccfae9575741b25da8d0fb6657fcfa9c88ec SHA512 48f54cc3d2c7b1a536cabfcbb279f846e5edee2fea578a9bc1e0f2eaf442428189c98ea3cc2b8ed184d2517bebc5bcb89d9b24aa4dd04c177a71b45d69b291ed
-MISC metadata.xml 692 BLAKE2B 495f0c9c21e56b476f6b18c8d0359215bf50c1be0e358c9ea96b6ab0a52aa885da2b3a4255da8e98cd61370160b007d02c84dc1e5d7ecda6997e418fe4936073 SHA512 979d1ca4dac0942b6f09d54df2be405c2fb65cc5a96ff417b078451d3f0a19d680b0a0eb50a6e44b159630cce6a9294166d63c742cf52471d573c8e6e2e555a8
+MISC metadata.xml 625 BLAKE2B 892c86b51532607c2387d664df6d8d468f1dfe1de27475d4e528a63c04271daf586dd5be8c70e202a7dbadd7c36e9f8e9da970df1cc56ed0c8c9e36e0bd46805 SHA512 7e399f334c4462f200e10c482110de80940ad5f28b6965a227436b6e2122e574531745c3e4dd64f95490797ac537264cc93c96e5293d57fbd657939241b0fe4c
diff --git a/dev-util/edb-debugger/metadata.xml b/dev-util/edb-debugger/metadata.xml
index cf47b0a1cf3b..d22e537d27af 100644
--- a/dev-util/edb-debugger/metadata.xml
+++ b/dev-util/edb-debugger/metadata.xml
@@ -11,7 +11,6 @@
 	</maintainer>
 	<use>
 	<flag name="legacy-mem-write">Probe if writes to /proc/PID/mem are broken.</flag>
-	<flag name="graphviz">Add support for the Graphviz library</flag>
 	<flag name="jumbo-build">Experimental jumbo (also known as unity) build capability</flag>
 	<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
 	</use>
diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest
index 6155ffea48ca..990b5841af47 100644
--- a/dev-util/electron/Manifest
+++ b/dev-util/electron/Manifest
@@ -13,5 +13,5 @@ DIST electron-node-51abeb37cad3f2098c0f0fffdff739f4ac2393e8.tar.gz 50344964 BLAK
 DIST electron-patches-26715595f4fe3658a73adb0d2fb338f62c79e492.tar.gz 115022 BLAKE2B 04f0982d9ac63068fd9e83f53341e43fec8f375d9591777dbcb6612213ecf0473be6d38883cdf0f99fe412f65b494d8765818260ecefd9e77dbd503d5459d9be SHA512 8d05f21d2ab4242cd896f58d1608ccee5ba3b65dae73cacb2261458e2f163e216176276d036cf8fe3375c06a94d08f7a04af79e92eb3d4312d975acd870103d8
 DIST electron-pdf-viewer-a5251e497fb52e699b28f627e3cbb6d8cefb62df.tar.gz 42117 BLAKE2B afd5ca8897ff70cc8d1d51855c6b1cfdf9a6e1ffb667c740f323ef9e4e11ed22ecac7e8c0447dbaa6488e4b11ba4e8606e654f792bb42d0b4c805e7d4a32aab4 SHA512 2db9c756ebff5148c6011775b2740671b7ab6693242400b417893eace648720c51e709bd108d766910f24b543b88c60fd292ba9aa8aa88bff1ea40d43961ad5b
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
-EBUILD electron-2.0.17-r2.ebuild 28910 BLAKE2B d869e797c36fcc0c33009568cdeaaa411f2afccc6a473d54a66c887cd4684466c9b649e2aaf749251e4f05d41ead30a3524392a333bd4d0f4a55860df0865042 SHA512 5bbc2f20157a2a66a9ea0cb14140ebec0b5c174941b6a1a8dfe1ea3131a745047dba9bb6b00b81e50f262b2f8b8171436be8b18c0cc4bc8206a56b5d6b077017
-MISC metadata.xml 1388 BLAKE2B eb16eead177e1e0fdcd51e5e95a9d6e76d605f41a0e9ed51b6e4c8cb212eb8536399f4850a69d7c841760181b784bd2bc9910826a2dc1908f17b0052e2eb5d78 SHA512 162c5d3d1f6cc7f6585908a87a81a627fe59b8d7bb514b1bc6d4a5f7e1c1a009ed96c16f68333ff69453e573b2a89140b13cf083cb73e30a82043478dbd06df2
+EBUILD electron-2.0.17-r2.ebuild 28904 BLAKE2B d96cd10bf8cccdc4666dbc8995b6eb2e385d10bb11c4c32078eac8c99df45bc83c13f92504c8c459d7ababdaf7cd86a37f060abbeceaf0c58948b423250665c7 SHA512 0781959662ed8d940e041259ccb8ad9fbd38ab418641c80a5f5a8db2a9afd70e6f2268d140dd0dad90de13d865e122a0e13b92fa0ff975ad4ebfbcbb10b4b490
+MISC metadata.xml 1187 BLAKE2B f248c347af37f080c18430b63ecae6c5c81e9cffa78dc83abf95a11727031bcb448fcf08667c058d09dd43d7e4ea85348f7512392c76f98cc00a3968897d8682 SHA512 51f6c09e9303148c4d0d5bd1630ca3d799df78fd8dbcc76f257ea0f177d2cc2691ae140f676b98fc334bc186b738a730bd75dcdda7054e549cc274d219055da3
diff --git a/dev-util/electron/electron-2.0.17-r2.ebuild b/dev-util/electron/electron-2.0.17-r2.ebuild
index e367ebc4c075..d713ad9ac622 100644
--- a/dev-util/electron/electron-2.0.17-r2.ebuild
+++ b/dev-util/electron/electron-2.0.17-r2.ebuild
@@ -327,7 +327,7 @@ src_prepare() {
 	rsync -a "${WORKDIR}/${ASAR_P}/node_modules/" \
 		"${S}/node_modules/" || die
 	rsync -a "${WORKDIR}/${BROWSERIFY_P}/node_modules/" \
-        "${S}/node_modules/" || die
+		"${S}/node_modules/" || die
 
 	# node patches
 	cd "${NODE_S}" || die
diff --git a/dev-util/electron/metadata.xml b/dev-util/electron/metadata.xml
index def1c51b38bc..fde29b921837 100644
--- a/dev-util/electron/metadata.xml
+++ b/dev-util/electron/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>elvis@magic.io</email>
-		<name>Elvis Pranskevichus</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<longdescription>Electron is a cross platform application development framework based on web technologies based on Chromium</longdescription>
 	<use>
 		<flag name="gconf">Use gnome-base/gconf</flag>
diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest
index 03da114e1737..5482eacea6ad 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -4,4 +4,4 @@ DIST global-6.3.1.tar.gz 1369634 BLAKE2B 8d93222ccbb4a45c0b9f114cd84b342b3f6ab99
 DIST global-6.5.7.tar.gz 2940567 BLAKE2B e0c692e09f9f7ea64ecbe47e18691efd3c641f28826e19751fb812690cd9d64a53af03055de9ec8199637da46dbd6084fec16380d7f295c83ed77553a8e301fd SHA512 0d33f718839e5e00bdd6d042b415a69c5e1f232d843610870505f8f20635b445810149b1b84ea8b77881f5f64814783ebe3cdcab2f84b8a085223b64293a9045
 EBUILD global-6.3.1.ebuild 1617 BLAKE2B dffa8f04a1d8598330b7cecb9a61810dba059fc12cdd3c8960c62c9511b37695eaaa399e0e2a8a5cee3d5a8670620038c591f0dab016543540fca670e069a08d SHA512 2a926a45bd9cd724a56bc77f080e5b5aa00642196b177f2d3330c038601c25f5e3a610ac690a1770d2894e3b899f33f1ae91ff4ded914cfc8386417ec134701c
 EBUILD global-6.5.7.ebuild 1633 BLAKE2B 40e16753307ae07fd9585340f1e8baefbb77833dbaf2a6ed7b598aff143fd7adb1c77d98f883a0ce5d2ef576ee29e2aa65f7fffbc27d38fcadaac09620a9be2b SHA512 99b22b10d0c983872e4db53d158b73ac468b4a5fc289f4da4859c0d1ffced1e0d7b7fccc4d00e3fd7c5dc75be317c4d83c2c2fbb07ee56f9f9427f096cfdbfcc
-MISC metadata.xml 523 BLAKE2B cb405d162cba446087d71184d8a8cab49b71f92161dadd534fde3edc6c00a40f6b2ce51cd3ad0d9192a95d12ddb2af25c3c4cf6e4423bba9e896dea0982cca10 SHA512 f4b82abf0a3f88651400730d36b488cedb64a06cc957efdb4164888c99adea1cc6a4ff20372cbc332cbbafe76140d2c42495d375285c635e25d3d1754406818b
+MISC metadata.xml 398 BLAKE2B fb266f584dfc0e682d13870da7bbb4bbb46027cea3101b196b48d033766d627c723928f9a2f4ac4c8c6159a8ea147810b82fcec9ceb4981dc5491e54ef367c17 SHA512 89b426c4682fa885cedc1755f4720f1a003f9bc2dac725667ae45e098edebf627897830c911762f7d8856fc66cafb1c60d0f315173ddbbebada0d05ca6d8d5e8
diff --git a/dev-util/global/metadata.xml b/dev-util/global/metadata.xml
index b8ecaba5d8e0..8dbeee5f3285 100644
--- a/dev-util/global/metadata.xml
+++ b/dev-util/global/metadata.xml
@@ -6,11 +6,7 @@
 	</maintainer>
 	<maintainer type="person">
 		<email>arfrever.fta@gmail.com</email> 
-	</maintainer>    
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>    
+	</maintainer>
 	<use>
 		<flag name="vim">Integrate the GNU GLOBAL source code tag system with Vim</flag>
 	</use>
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index 9839962f85c3..8ca1e6abd168 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -2,8 +2,8 @@ AUX gn-gen-r1.patch 2045 BLAKE2B dcc370a2625f59475cc5c818800e5b8aa6d3ff0b24a356d
 AUX gn-gen-r3.patch 1560 BLAKE2B b76caed0277797f9e478465d329933be1418ea01d54cbf2620dfd8bd77fde428705c188a1a5eb2ac0d755622a870c30cebf7e027550ec69698297a64d04145a0 SHA512 80d18a413523ccceccbe8669527cca4b402a400d61c067ece21f8dc2bc9a00d3ac38b24c3f4f399f352d7af20675e1b81eeef3fbde2c681d50354296a8b4cbf5
 DIST gn-0.1463.tar.gz 905571 BLAKE2B e048e642704533d478fb751748a97f60283f63868ab1ab6fa5b8e7bc0322745cf21464eaa16194f684869b50f306668d3c7d3b4f72c3985b865d8492d1ff0901 SHA512 f32861a8fa44034b932e6aae4787fd7da6e4c6c19c5b6919de7b0d0f1ba20f415c1c55db95a08958a338b7b9de740ff49a29ab894a9c4e9049a89450d8c88281
 DIST gn-0.1544.tar.gz 911124 BLAKE2B b8bac7783c373e8101cf727c254c2ee50af49c3e679a8df2cb337a0637e305f1f9094517e6af6a76a19300f533a41d9433624a7963ba0151a88a636bc7e6b4f8 SHA512 5cb3a25b66d44cd26063453ddf96563d62b24e8a961ca7fa29a48ee7bde4a423bd0dace36c432b46b677e042fcac9a4fb23afa5dc27e994fca54030b972dad29
-DIST gn-0.1583.tar.xz 648856 BLAKE2B 997e469bd1411c5307ebf03fca0c533356b6d652f4782212681de7e57f21c493d9d4ae8856877d259234babf4be4e13e529532ba5075ea0de3b823f66cb1ff1e SHA512 8026f9fe549fb2fe8d83ad1ae93ebfd31851e64bc43765fbebda9963b2719c25b551a5db4cf833ac475a797abb928ccc03c74be8be49a3dd184ea944e5d749e2
+DIST gn-0.1616.tar.xz 660332 BLAKE2B dab581d9f05cbe7ed91758d0ec68c61bd4e9fd0357b9cfa04f5276185ed6e810b37d9e2177cf3daec29e25633af2d32c6f733507a77cee7e37681bb977a59818 SHA512 42f68b40eebc423b785b1ba735548b3e5d2b64abd0dc1bb22940b9336c491308f062f547f81b5366c1dfe1f0e3bb41390ed3e3712637765cac1a50499a5e04d2
 EBUILD gn-0.1463.ebuild 1034 BLAKE2B b415c7f196a387de4d3460b9b56f4546a76da2c400d246d14cb9e56ca2eb30c3aa8647b5f58ba73c51f7be41793fd799ffc0152a70f81d47c40407eb2e9756f7 SHA512 8a02e407c0a6b78107932705df99ffc1d8180f66f5d3e23ef3c3121d6d42434ba176012ede5ef1b21d47a3a3bda61578af7165d177c4f8d5b1350af0f57a1790
-EBUILD gn-0.1544.ebuild 1195 BLAKE2B a8476c5c8a3c0cde6dc09e87635764327e95f550977a98d46e1bcfa21255775a95ae999390cb0bcebd60e801c7252fac48d64daf4ca0ea134d68a3cc1db1f457 SHA512 999dc0bc2ee0559259649e19a26372f858e7fb32ce2e3acbff486e890076864d702a3bf203f1e92e5dab54ad0a59895e2b13d691ccba47888d7c9f1c626a2ea4
-EBUILD gn-0.1583.ebuild 1207 BLAKE2B 6db9a7ee497b95fd4f3d3d3471e2e51cc46db59a6b82682941d689b9c579b83ff180145a9717aba7214b577ab018e7f5a58af111ab12d90abf9115a393e61c76 SHA512 9b3d50155570b52488ac2fa13c4682c427ff7d2daf859fd645c61dcec6b7b03b96c2968e0143ef5ec44215ceb3529ea6dc0b9bb10c4a12d2fd21611d3feb3caa
+EBUILD gn-0.1544.ebuild 1202 BLAKE2B c4af8539a46361bedc5bb0d214b36c5fad5fff7e5fe541ad53db4dde9d322988461d826b4f3ce4d1888b3eb6a897d6332efff066f1b1a8b49d4c0beb8c90097a SHA512 4b6544fc24a36e926fa72eb7856cbd47d635ff9c800683105830d12b287b4edc3e410cdf8d74523602e94ee615bba8f650109b8eef930cb1dc65ded4c02a6624
+EBUILD gn-0.1616.ebuild 1214 BLAKE2B 612f3c78c9ec7dd5447b466c9f43611784eba78b9b419165694044a2e081928411e0eddc4d1a5ebf384bdf46a31a668570e3c45437053e3ada88e6af7499935b SHA512 4842cdd116d9c6524522c77c5d1628ca81a3fc3dcfc8701b9b220962980e31e3c9ffd3a35ecb12b3898453397a5e4b49ebe2acb2618d5be2b744e32331646ed3
 MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696
diff --git a/dev-util/gn/gn-0.1544.ebuild b/dev-util/gn/gn-0.1544.ebuild
index 92d8f91252f3..2ab8a04093f4 100644
--- a/dev-util/gn/gn-0.1544.ebuild
+++ b/dev-util/gn/gn-0.1544.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="vim-syntax"
 
 BDEPEND="
diff --git a/dev-util/gn/gn-0.1583.ebuild b/dev-util/gn/gn-0.1616.ebuild
index 60df97bc0fed..172a7364d2a3 100644
--- a/dev-util/gn/gn-0.1583.ebuild
+++ b/dev-util/gn/gn-0.1616.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="vim-syntax"
 
 BDEPEND="
diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
index c5bfcc4734a8..02d3ccd0265e 100644
--- a/dev-util/gource/Manifest
+++ b/dev-util/gource/Manifest
@@ -1,3 +1,3 @@
 DIST gource-0.49.tar.gz 874349 BLAKE2B b7d24f415944921deb7df33be4e9918291f5df6dd4813bf98727894e0192b881a583a1dacec2d6e8f2d1a0d6b644bc3b735ef8d7c0b7882d77bcd80913fe08c5 SHA512 cb3482dd06cf38bd775f2ac4b8f3bee78e480dd51e37527024df6e59d6e613290297d65e167a21364aa6251eff78a50ecc8a5fd3772a6e9a4ad22ca21b4b615e
-EBUILD gource-0.49.ebuild 1061 BLAKE2B 40ab499742cca7e452ca81132b7e7e21504858d2103ab3d93074737abe9910bb1829b7b670a33a2c17923643a26c3e0ad804d12b650e07e34c109fe5f0bf84b5 SHA512 55cfcb3801f93bd1b2aac880fcde2d8706549f3905847198c99d55d23677c23cf6ad1cd12112d570ccb5f6f3128f4001b646d7920262e8de637194b9f66ac889
+EBUILD gource-0.49.ebuild 1067 BLAKE2B 239950d5088a2a7d8901b60b1b5514a27aae8b4065a1ed6db44d123236bc1bccdf200ed6d3371b331702cf49032aeb162e201d29febc3d552f991034e45efad3 SHA512 f8511d169bb3db902d7bd9f0aa4c0a33cae3d92123a234d516b0ce03044217cdd846241bc979151c683282c9f457eaeb5daf011d283592114135e2a117a5e8f4
 MISC metadata.xml 353 BLAKE2B 86c28b45e78dacf7183e323130cd947f36f88278cbfca6d5e50d52268f309394d934836ca6a150af8297a153025c1be7756ba7cbc5ac7088bf2fff763f3b85d9 SHA512 d203593d1819671dc81ede02a2c7fdfc81f69b9d66a6587fd096ea89ca3274adba144f06244792f2044f8c8bfc788fbebbc6eca20a7cd9b5da18f3c1fb392729
diff --git a/dev-util/gource/gource-0.49.ebuild b/dev-util/gource/gource-0.49.ebuild
index 29159bcde85b..2674015bbd8c 100644
--- a/dev-util/gource/gource-0.49.ebuild
+++ b/dev-util/gource/gource-0.49.ebuild
@@ -23,7 +23,7 @@ COMMON_DEPEND="
 	dev-libs/libpcre:3
 	dev-libs/tinyxml
 	media-libs/freetype:2
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	virtual/glu:0
 "
 RDEPEND="${COMMON_DEPEND}
diff --git a/dev-util/gyp/Manifest b/dev-util/gyp/Manifest
index 2bb597d0b51a..52334b18529e 100644
--- a/dev-util/gyp/Manifest
+++ b/dev-util/gyp/Manifest
@@ -1,4 +1,4 @@
 DIST gyp-20170904022846.tar.xz 447608 BLAKE2B 41f0e28d04039358a9e4ec9628fe1d936d19748061ea882a4e47f2cb23549db3866c5281e102b8f95d6ed37cfe999e7342129a81333671ee42534fc53d2a0d0e SHA512 9336be1103048fe5f51f90fcb2a153bba7638e71e4b579c47b725db81ae4257a56a8f7dacddc936e627862ee6149a453f1c7f5bede633cbd3076e0fa2fce07a7
-EBUILD gyp-20170904022846.ebuild 938 BLAKE2B c1711e9a6f0737542267dd8a920b150656c14531e39b80e9cd3379e11597725ae2999c9f72650f04b7bae6aa8c6543aae497b914b3df4f19d07fd4b0ccfc4cfd SHA512 e6fc396ae251df01fe8c2016ef6f5efacca3ee9332fe47bc93d843c43dbdcab427e3a030e7a82db339ea169b7da76b4c65d64ae35b44e56a88127d6ca093a05e
-EBUILD gyp-99999999999999.ebuild 922 BLAKE2B 2574ac2db772ded501d63581a59992d36b14385dcfc5411835391c7f5e43c41deb30ad3c677bc59a2772e58f0d49c443b756efbca816c6e658ed33d79bd782aa SHA512 2d214292e558fc23426a9a1f57ad5f808b3b0a14151fa7c5a1a073d81641f4835724b3aeb790e7464b1199e2d8300a00aa0d1da7e62544d57ec5f9e5e368532f
+EBUILD gyp-20170904022846.ebuild 917 BLAKE2B 80903a671bf2f4839514d0078fa44cb7b99461f08f09974c1892bd42cc445a72f5a577d9ae508bd5b635e2dc213b789b18452bc4b9c19b58d545cac5d66b7ff3 SHA512 2e725f98f1bac4af1b8f8519f178335ba111a8831b110c8137d152d777efe6fb35f85413f086e566f2e3c00ed98737085b3b4a35f07e473e7660aac29515a72a
+EBUILD gyp-99999999999999.ebuild 901 BLAKE2B 7796a9f7cdbc7bb7742e5637246a393214a149fc81d3be3e928b637ce3000bfd7fa629e8e1c4f735f6a63abe56d029535327d8f53528e48f9cea14bf5a6e8822 SHA512 723a2c6be5dd7e4b0032462eee18949cbfb8596d158c37fb08220020bceae4070ba6db3a037e23b6b5479291d54451923aba8834f272afc530f63f8a8418d34c
 MISC metadata.xml 273 BLAKE2B 287fddc66f0f3a2547c1d7892ca0ca381ca3f90c0a24935119d1cf30b0a2be976d20ce00b92f720fb58cec08d6b1147dee207bee998d17c80638c8a6a95d7a63 SHA512 52d2bba092d7ed694e06c90dd9cfca1a0003e34fffc0bebb25fc4262f5b6b2ae8903454f7d406aff28d40c9ffca5157fe021701cd60ac1fbf7a7b24215578341
diff --git a/dev-util/gyp/gyp-20170904022846.ebuild b/dev-util/gyp/gyp-20170904022846.ebuild
index 01a8975bd428..1642a828af15 100644
--- a/dev-util/gyp/gyp-20170904022846.ebuild
+++ b/dev-util/gyp/gyp-20170904022846.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2019 Arfrever Frehtes Taifersar Arahesis
+# Copyright 2017-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/dev-util/gyp/gyp-99999999999999.ebuild b/dev-util/gyp/gyp-99999999999999.ebuild
index f427d6156ee0..062dcc113759 100644
--- a/dev-util/gyp/gyp-99999999999999.ebuild
+++ b/dev-util/gyp/gyp-99999999999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2019 Arfrever Frehtes Taifersar Arahesis
+# Copyright 2017-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index 9361e64984e0..8191d7e4e510 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,5 +1,3 @@
-DIST howdoi-1.1.14.tar.gz 8421 BLAKE2B 40689f3ca1ce487fd5278406115b70e51d82ce2ff2f8b1e60c02fad6f92adfcb532c3ce73c4126027a0812e21b599bf5f9d20e8d3c23d6dc4e541a877e1ba52d SHA512 348125e666d42b657ee493a405207238aab12cb4815da52de2bc3d0635a85476e942ed73b6eb75e7ac51e744f01ebe987dd45ecc69b1774f264a6bd9c4a2826e
 DIST howdoi-1.2.1.tar.gz 13112 BLAKE2B 33492547fab53085aebff295202e8ad88d41850503155b944f38382137d6ec8fbcd4f6050583b16c01c3701683ccf18c6929c525b5d8f34bf6f2ed9410668f36 SHA512 83af30118087105392ddb95b05d9e7442f5ee5df981faa9143770dedb8927c164a4f30f37ccd219a826340f0f8cd81fc5eb9a3b12e5d3956786294699b6e2f9b
-EBUILD howdoi-1.1.14.ebuild 587 BLAKE2B 7e5d3c964ad4516210b414ed59d2680deee1a400f91b29accfe9875e3c4b065e2894b61088784099fe9a2bd021985dbe0190525ce2159632b93c60b631c2cbce SHA512 933ec7bde90ad218f5fdea347fc111640ab8ed864ea75198caf0e013d06fb659c0ddc718da181df568e889bd8043957c6dd36f48ae62850da525c795dccbf992
-EBUILD howdoi-1.2.1.ebuild 617 BLAKE2B 53600303b61123640462d7355e214a49bf3729c5ee6e9bfb6a461cdd2f7c1aae9a7870f614363769e5ab1ce1331cacd72e4cabed38653ef21dac998c0c9d678b SHA512 05bd8303adc3e6198f81c3ae18a50a819f7426be414d96f48194e512b091c1e78987978830f29ebd3e461b6fb7fb9fadce279e6be4409c4ae18a56c1ee67c445
+EBUILD howdoi-1.2.1.ebuild 615 BLAKE2B ae1d440713d1d775ddeb19322b7a773855ef62860c3b40a00aed0e29db07ae32ad14c8967b667d060485a1299fffa6ae4464e8ed255ecdeadfbd510cf6f692d4 SHA512 7746494ba3cab173fae6582fb05f676f64e208ced613710afa797f665fd451673286b5b5941b4048e4c6eecde2cf91302a612a54cdc4d2d3c83874c411e86610
 MISC metadata.xml 343 BLAKE2B 34cc8c4f7372fc0492d8b328ccae1b94946bc5593d20a181d6e32d3fc8e79471f517eea7509cf32172ef55092d898ed65350167d465b22bf127f62fbab6dc1c5 SHA512 f83f432490f25508a138dfbce3a67a120937fa12fee712cbdda9302d238805f3bd18034cc52d473d28b990221bb73748c9305f31cdc9912aed91a79f86386efa
diff --git a/dev-util/howdoi/howdoi-1.1.14.ebuild b/dev-util/howdoi/howdoi-1.1.14.ebuild
deleted file mode 100644
index c24bb930931a..000000000000
--- a/dev-util/howdoi/howdoi-1.1.14.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyquery-1.4.0[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-cache[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/howdoi/howdoi-1.2.1.ebuild b/dev-util/howdoi/howdoi-1.2.1.ebuild
index e97bb424dc85..c9eaed1e6387 100644
--- a/dev-util/howdoi/howdoi-1.2.1.ebuild
+++ b/dev-util/howdoi/howdoi-1.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 70fc4d8eacdc..cbe4137fa479 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,6 +1,7 @@
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
+AUX intel-graphics-compiler-1.0.9-opencl-clang_solib_filename.patch 692 BLAKE2B f2f8f0cde38da19209edc6f4cb942e7b72ee48ed5ca342526d520c2023cefa5675da0548af3582d19c6d61dcd738e21046a177760163470fe05c550a60ecbe40 SHA512 9fc7756fde963a21d492c001f3f61e3e9a45b73b8bc8a985b2c3a51029514a6e92218aa3c01ae506400af3f13e126003f1d6934fe6edb6e1051830d5cfa9a7f2
 DIST intel-graphics-compiler-1.0.8.tar.gz 6428984 BLAKE2B 1835f86da24162af0f568794fd084c12cf8950601a74d3aaef928739d7ef942a23b2309713976b2fd67684d7360706155610ee7a80db0dbc217ff5b502b254d2 SHA512 43c54858fcc5ec5941d79ed34774077bcd5ece80d6d2bb28526b15ffe5237dddbcef2c13e4cc21faf35851174ed5a5b1af65db9bdd3281657e1e09456b761c18
 DIST intel-graphics-compiler-1.0.9.tar.gz 5684971 BLAKE2B c3a07773f1ee4ef53bae4af61a85e8ac60f3ddde3573fa853c12c887f94191b344b905bfb0d6ef7e489b2bbb05c01719981199fa85397c87f4ef74b0338bfffe SHA512 67c9efafab1cce4c34fb00cf9b20660c2107daeff27e3837a52c9f24405cb5c11c46366662692d47b4490584890cc5a5791de358196dcabc6e566e22b1aafd53
 EBUILD intel-graphics-compiler-1.0.8.ebuild 893 BLAKE2B fea45a9e25bdd28bdb4288a419f6db15d6afb41f369173b103b93cf8182f75e05bec4573bdfeae66ea0dca7cd5f77998fb1f6e057861ecf05884546f9ba78a78 SHA512 e29d150060a59fa88f3a0a52a40d6648cc30eb0ccdbd1d75440267f4895a7897ac9f3a66ae72b7e5ebcbad6fe3ba0d12c24609871e1ace692efdfcd92f22de97
-EBUILD intel-graphics-compiler-1.0.9.ebuild 858 BLAKE2B 2c7ec1b004ab7c42ba9454f673316c0ce9407a0609122b84fab1b0b7aca83c8a90d75595fb127d5a0965ce4e1111dbe80a84c38f38bc8754b1ec8b1174c0e726 SHA512 ce9900013a92232ee8794ce058a6e3e5fcdfc5e37eca22a69f38db25c6b661b634c5e259f8b21146406aa8a132e9ccc2d55d6cb37ed6ad6c7e16612ba06011ac
+EBUILD intel-graphics-compiler-1.0.9.ebuild 919 BLAKE2B 7f6060c5b9e9d7dacd6754416cb79500f876d817524a85fb5065c3528c5489dce0877fe197c1a642749ee928e2c6add46feefa8e6e10b21116c848366bc6c2f4 SHA512 158527565371f9d31709d6eecb3b76e16d221ee638172dc8eb3f87dcb03c4827d1b349c9c8133fc7b8e60544761cc2fa1fbf263391d3867741f59bff9fffbb50
 MISC metadata.xml 340 BLAKE2B 6c0e5d932084dffd300a1dc70b29eb0871dfe2187ed8591a5a2f8cba001bf681e908c58a6f9471f7b08842ff538365258305da91004ed63ff97314a07fda529f SHA512 d24016b4ae0ffb05be475f86bb8d72ab4a85475655f409b8826dcd69726e048aa048e321f26ac36f2f52aec40abbfa66a95354a711332df94dc3e57e6c396a0c
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-opencl-clang_solib_filename.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-opencl-clang_solib_filename.patch
new file mode 100644
index 000000000000..aef204e9055d
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-opencl-clang_solib_filename.patch
@@ -0,0 +1,14 @@
+--- a/IGC/BiFModule/CMakeLists.txt
++++ b/IGC/BiFModule/CMakeLists.txt
+@@ -158,11 +158,7 @@
+ 
+ if(UNIX)
+   if(NOT ${CCLANG_BUILD_INTREE_LLVM})
+-    if(${LLVM_VERSION_MINOR} EQUAL 0 AND ${LLVM_VERSION_PATCH} EQUAL 0)
+       set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${LLVM_VERSION_MAJOR}")
+-    else()
+-      set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}")
+-    endif()
+   endif()
+   if (NOT CCLANG_FROM_SYSTEM)
+     install(FILES $<TARGET_FILE:opencl-clang-lib> DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl)
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild
index 54d2ad4034cd..6ed0f9a62901 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild
@@ -22,6 +22,7 @@ LLVM_MAX_SLOT=8
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
+	"${FILESDIR}"/${PN}-1.0.9-opencl-clang_solib_filename.patch
 )
 
 S="${WORKDIR}"/${PN}-igc-${PV}
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 70aeed663c7e..6015bd487d4b 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,5 @@
-DIST kdev-php-5.3.2.tar.xz 1008036 BLAKE2B 33940afeeb7b8594f0dbf56e444ba05f9665c7e4c9bc1d55c9d6a5b85bd2e03a04db1b8f27d968d627e26cfa573a3da519bb1d0eb592dc784296c9db7ea1fad8 SHA512 d8649bca173eccc1aa6568715e5976beb762ad7a377adbdab8f55aad76176ca5c8d16477ec70fa231b5699105d2a827c2ffda1c4835419c670c561b4444605b4
 DIST kdev-php-5.3.3.tar.xz 1043652 BLAKE2B d181984e0c8c6b77502529dace0cb2b13afa417e98149a7caaf379fc5c27e64f7928c4232489a0e4b21af6500636a71b7217a56e500c367a579585dca6c447a9 SHA512 8a478e6170ed63ccd82822a5281abb63f70d959ae945b730d2d707efd104b0a3475a66ddb637f134d1eed90173342c1ecf42e7b15947b96c141e6228ef96a009
-EBUILD kdevelop-php-5.3.2.ebuild 1214 BLAKE2B 863956e8365f60c38dc4923eda487d4d6e0f964dd3aa7eba65c36260b6c178f0651dd8efa0e69e6b00344cfbcecab99e2f1f7fbc498d90b11b0ac614dfc50b80 SHA512 27e2c15f93c98cacb142ad9e610a99651533a351dffefd8c68cc27490a9c59ad173180e3cb0710e62357d2b6fe6673f259a6bde1a2b42e1458bb58bb673e3074
-EBUILD kdevelop-php-5.3.3.ebuild 1186 BLAKE2B ade7be5a06a6071b0a6ec5c99e894772687560c05d02df8af386d65b625f0e6ad26944bee9e3fe18628f68720b00dae0b607bd50418d228f4c915deae82924d3 SHA512 e42224c5e4d82bd2375efea26ea580c47ce975c06f7f06b77706e0e219e05904849d4aebae41c3df3329fba120276e7620562c538ef7c22e7a8bc56d3191d5a5
+DIST kdev-php-5.4.1.tar.xz 1042236 BLAKE2B 58c0e2c1d8cf0732bd4114e2c20c35076233ca1d1b6920de43abfd804f03468496596e2b061fcc8b9b8a0e9e7a10630a1f6b2f2271b33b702dc91852dfbccb48 SHA512 a6dc4447be0148956fa805a45a73bfd05311b08f6fb3beda486f2703753a1825de97b81f67ebe6e178acf5ad238f6d6708704c04ede3bdefad19ec36d467ff7a
+EBUILD kdevelop-php-5.3.3.ebuild 1184 BLAKE2B d0ba9ef4a008f121bd3254b7588868161cad6c0f6687d38928241eb08f70d0f6efad87871ba83bde7c41428983f1f6aa72dc36b7765ddfea10fb053d878d4214 SHA512 70939ab2e3b29b4370ef5b7916149f4a87aefd201110581b7c8821d25593cd602bf3f147a9ebc8e9366061886c1f15e8413c042f006afec146970eb68c752887
+EBUILD kdevelop-php-5.4.1.ebuild 1114 BLAKE2B 32e704a1c556050f08491c82c889c2a377ba96429b105d864165ccba91820bba9a8ea265a6a66445fe347ed0c0bd2cffb8bbd421a8e06b10bb1ffcf2720b56f1 SHA512 2ccf9b7a344cd092cabd90ed6876a5247f22786467efa779993d469d2b24f6638caf4b1dc7bb3d0a77e2e9cbbb1350fb08b8f46d195908c1d9db96a298a97c74
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.3.3.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.3.3.ebuild
index b4d5c4853d81..23b9ad37caad 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.3.3.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.3.3.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="PHP plugin for KDevelop"
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.3.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.4.1.ebuild
index d339104a6d8a..736a5e6971ab 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.3.2.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.4.1.ebuild
@@ -11,8 +11,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="PHP plugin for KDevelop"
@@ -37,11 +36,9 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	dev-util/kdevelop-pg-qt:5
-	dev-util/kdevelop:5
-"
-RDEPEND="${DEPEND}
-	!dev-util/kdevelop-php-docs
+	dev-util/kdevelop:5=
 "
+RDEPEND="${DEPEND}"
 
 # remaining tests fail for some, bug 668530
 RESTRICT+=" test"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index bbe3a6ca8d99..40e0eabcda46 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,5 @@
-DIST kdev-python-5.3.2.tar.xz 1074980 BLAKE2B de19a603d9c0fbf870b271b16d98b676ad9246edbc62f926c63ec66f51806c52fdec0284b016b291599b80d68faeb7eef80f4b5efc7e8f12f6362948b1df05c2 SHA512 95d8e0e94bfad70fabad75e362f5483db897ba56980251a76af48df863c7277746704c826692a6cec854e60c97f3ea9791b1e162b7ea2f357d469715d0a74672
 DIST kdev-python-5.3.3.tar.xz 1082448 BLAKE2B 000d0e54c5e2b5eb41c6be0f82d7b6ef476bed3175f367db11fdcebf2f7063b322ac0901059a2e17391904f2ac5cffdcb48d3015665d697e89aa6e0be1ae550e SHA512 4d388b20588b4032efd677e9f152be53739a4c5c5bb3fcf37b5289da418c47281b6a545ae5825f9674b90333e69f2949e6e9b4d6704010cbb878d2ce8b3ee384
-EBUILD kdevelop-python-5.3.2.ebuild 1122 BLAKE2B 06832b22adea00c8f98753dd9c05d5a43975b9118facfdece25a61eec6caeed77a9e555f92b76351f58f67f799d9dffc8b6b5c953eb105f50f5ce968886df5e4 SHA512 5246a39dc49dd41596a34bcc6327f28eef52fda72fde17c26a08c5b2fc2165bafa3d4864e93c67a6c2d0e93ec3be8d2472844734e9748fae1b768ffce688c364
-EBUILD kdevelop-python-5.3.3.ebuild 1124 BLAKE2B e37cecd3a7173dc1b347413b6e71e37c9c6ed56b3e2d2f5a868f948853e8bca6210085d25b5d18dcdc19cfbf3b34aabed77c831cdff1e740390afbe485764a55 SHA512 5438d59b346a6ea75fbf5b8bd11ef00637c0356690678f600efd027f5bdacad6b505621937b7e2c6fe9f1e1ea2896ce69abfd8dc3398f1a63a7fbb9cc221b0f4
+DIST kdev-python-5.4.1.tar.xz 1074132 BLAKE2B d2f21849e14ef9828085b4fa9fe8a9af85e71f59263be7295a76932801700730ec3bac147c287ed400515e0552ee79a5f48ae96398820f0000951abf82fc83c8 SHA512 156ad0af9fbd3e5845979abfa68329de4228edabe68e0765ebde2821289d2bb027d46623be2bc805cea6988450d594d94c1b497ce4ee1b8d86a88cd7ff1eebcc
+EBUILD kdevelop-python-5.3.3.ebuild 1122 BLAKE2B 06832b22adea00c8f98753dd9c05d5a43975b9118facfdece25a61eec6caeed77a9e555f92b76351f58f67f799d9dffc8b6b5c953eb105f50f5ce968886df5e4 SHA512 5246a39dc49dd41596a34bcc6327f28eef52fda72fde17c26a08c5b2fc2165bafa3d4864e93c67a6c2d0e93ec3be8d2472844734e9748fae1b768ffce688c364
+EBUILD kdevelop-python-5.4.1.ebuild 1052 BLAKE2B 29d75aa5c8909860d390700fdfe0b1c396fe26a29cfab43be02c9c1aa7310f9de439e3ba583fb0b631dbf69f205f4e0e76c527ef17e48ce1d03ba817541cb03b SHA512 8c4c3b2d162a7d5e6d1f6bf7d814e8d96be6a06f3024fc8b56539c94d582ef70dc5bfbed5755de90d3b3470b378dacae5a544010ae72dc461c0253957b033319
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.3.3.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.3.3.ebuild
index 0a046b765fe7..f9a306678f5b 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.3.3.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.3.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Python plugin for KDevelop"
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.3.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.1.ebuild
index f9a306678f5b..4329abd3e932 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.3.2.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.4.1.ebuild
@@ -9,8 +9,7 @@ PYTHON_COMPAT=( python3_{5,6,7} )
 inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Python plugin for KDevelop"
@@ -34,7 +33,7 @@ DEPEND="${PYTHON_DEPS}
 	$(add_frameworks_dep threadweaver)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	dev-util/kdevelop:5
+	dev-util/kdevelop:5=
 "
 RDEPEND="${DEPEND}
 	dev-python/pycodestyle[${PYTHON_USEDEP}]
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index d3f480c3fdf9..e6248891d995 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,5 @@
-DIST kdevelop-5.3.2.tar.xz 6851944 BLAKE2B b918cd0cb9b915227a442641a110db27387fd2e946c0411e40206a4a68990a9268a6c47c7f1da8a8f8a5c2690a1577c75fbbbb353d69ddfeed419e2c561aac4a SHA512 f0a8354a596a13dab0c5560d8308097918f5540b02d9a66a63155af00aa024aae9c01b455290ecafe705784a9c25afd24f7d936d1f817af1fb5b52d96e6dc596
 DIST kdevelop-5.3.3.tar.xz 6977420 BLAKE2B 8cccce2b7473551dc4ee9b9b06e8777e7f98869870ed7ee797b0e3a7c27f68d75b7af0f030dc9b0302a44ff246f69ec9125994cd72e6020e2778ac55f6d593fb SHA512 a089763045f02ef3167fab1f663503cc7a6e29cd8a42d3caa8b3a71fc1b2150162504bf4404ea070f73b3786a7389b6ee5af9ff922515445b57a0041b07e7d5d
-EBUILD kdevelop-5.3.2.ebuild 3829 BLAKE2B dff439b66ad1bbf2494e6a44d7f8508c65f5d3bfdd82afc6dc35b7c1e08904d8e04fd1b13dbe8901ad0a97fee6a0bc18f4b9c05b7867fe9e6b7cba18f8592aa0 SHA512 dbe186231393fd726aca839ce306e0f02d23a3b9498fa1b481159925e3aeb8f8e98261ba0d500bd8cde028d1202ee783a6dc00317c1d2d278b8af976408ab4c9
-EBUILD kdevelop-5.3.3.ebuild 3724 BLAKE2B 58bd4708dd3e4141f4fdcea1ce8fbc6aebcb393d997ba53f47bb1263fffa447ea1f05df461a58ccf23a8c8af6c96a85152443325c31faac2b17ab5fa90838d6a SHA512 10a8396cd09564b57ae2c130d87881d46dddaf7bd34aebd831c1323228bc62712c3d731e3d3eae8686dad28c1a6c5ae5003cdcac92084c2da1f10f2e9ac7299a
+DIST kdevelop-5.4.1.tar.xz 7006564 BLAKE2B 98e76daca0f124f0786a0cab5a3575548ad0d2e157c72ccbe2ebee2dc1f2fd98f6d7d803991b4c426e65d16c5feb41f818440443c00b9bcf472d9c42fbdbd2fd SHA512 096d6e1d93b4faff5988d92381bea9c31048cc686cb71c52c66d54249c8cdae50dce03f63b6cd2a6ee1f15898f619ab7307fad58281186fb6d410b2ace2041d0
+EBUILD kdevelop-5.3.3.ebuild 3743 BLAKE2B 8a6890151d7ae15823f0e30baa0c85e08f3dc1bae68dd199eb2969dc396afed40d1080535f487a54713660810e565bfe0c91488d17ab84ac2c687b05aeedd4a4 SHA512 068b4849fd58ab629b427c5f445f2c7ba933d4ab109d6a2fa83caa5e0401950ffd2e59fa234d1154891b3ae058102ca222197bd77fcd5224399ee31bf3a62913
+EBUILD kdevelop-5.4.1.ebuild 3841 BLAKE2B e8fa0d79c9fbee238100926098fc5c79d7f6a732f67772bf7721472a21694cdec2cc09bb64ac6f4b8c99f6d2afe886f866782e0398016778a8aef44e24a3a480 SHA512 91d50b6cf5f6e0391e104b5156ea0a9e919e720aa16972d98a5132573c466300a4c44a8998da6626c874c19c58dcc8495ca58b344a8a311c89f8a3791c7eb2f8
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.3.3.ebuild b/dev-util/kdevelop/kdevelop-5.3.3.ebuild
index b3bfe0c8d581..9f502160d9d4 100644
--- a/dev-util/kdevelop/kdevelop-5.3.3.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.3.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
@@ -83,6 +83,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kapptemplate)
 	$(add_kdeapps_dep kio-extras)
+	$(add_qt_dep qdbus)
 	dev-util/ninja
 	>=sys-devel/gdb-7.0[python]
 	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
diff --git a/dev-util/kdevelop/kdevelop-5.3.2.ebuild b/dev-util/kdevelop/kdevelop-5.4.1.ebuild
index 8a841a0d0f4d..6fae88586b63 100644
--- a/dev-util/kdevelop/kdevelop-5.3.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.4.1.ebuild
@@ -10,13 +10,14 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
+	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="
@@ -83,13 +84,13 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kapptemplate)
 	$(add_kdeapps_dep kio-extras)
+	$(add_qt_dep qdbus)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtquickcontrols2)
 	dev-util/ninja
 	>=sys-devel/gdb-7.0[python]
 	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
-	!dev-util/kdevelop-clang
-	!dev-util/kdevelop-cppcheck
-	!dev-util/kdevelop-qmake
-	!dev-util/kdevelop-qmljs
+	!dev-util/kdevelop-clang-tidy
 	!dev-util/kdevplatform
 "
 
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 17be11f2bb28..ac6f13823bd6 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,9 +4,9 @@ DIST lldb-8.0.1.src.tar.xz 19586288 BLAKE2B afb20a8303dcbdaf76ef1d78aa3165f87713
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
-EBUILD lldb-10.0.0.9999.ebuild 2680 BLAKE2B 8e16fd098feb205ad2b27e88d2f88263b6b532791f48cf6c4ececcccd09f1d0d591c167f56f0c0cd3dac1f355f05da699e966eb43f0f5288b1366e6c9613a122 SHA512 2e35c35d7e2fbb18ed8e607f3b5da09e678246f3459e3423f1997fe7419f87c8bf127dd75a256bfbc22a22f4e85fddaee5a1247ad90b72aa2003c2fe4d81de89
+EBUILD lldb-10.0.0.9999.ebuild 2712 BLAKE2B 6b0d5bed2bad575925e888236e82084a3388e28a9434ac711a1fbcd67fc94a040b3fd7d80788c2e6d55ce37fe3173c4bc0d710d05f7c7599215dce2d38cd0076 SHA512 afca689ce2424be93db8500c407efed77f98eb27b28f7d427c143d04395714d371c5fb8a2a7169315f06a3964390bb0ff3f8837d407326355e7d989bdac159cc
 EBUILD lldb-7.1.0.ebuild 3088 BLAKE2B 246fc131cd7b629ffe3e541c8f108f3f0ef63b28e68c887c503b2bf55987ccd4ec8dfc4a13763ff42a0a237487d2aee58cba7a72471d2f55359c0514e9f24cdf SHA512 52de6ecdfe24cea6f24f78f7d279ccce295189209b1d99a8bf6fb656f7f2a4c8284a03745f0bdf18bb061bd7eea82afe20d93b926e819b2bbd2f64f89e636db0
 EBUILD lldb-8.0.0.ebuild 3011 BLAKE2B c4d28d2f72f001ccfeb108732d073e6c8c52db8dcf7988f4ac282981bc7317c723cd6e4afa695fb072cb321b976a05869f03a8a9062bb06f80e4ebac11bc892a SHA512 86fbe8fb7402865ffb8410751325bcd71fa0d830c562855042fb2029da24026879df77b2f974139a2e3b49bf539a1ab789becaa8342b94f70038f5c60be92e4e
 EBUILD lldb-8.0.1.ebuild 3077 BLAKE2B af58b86667a4d76c8838a083d30af8f2fb77cfc0c2907067a56bc4253be96ee44e3748e7c9bf7c20914163cc78b86614dba045ef3284cf55c44511815627c980 SHA512 d2db4b4e6598f46230120b76b5e384b89f5ef346e385b723903023eff6ed97942c4588be3d0fc70ca1bbb7af6c981da1115fb9f2314fb5f01b0a58436db1a7dd
-EBUILD lldb-9.0.0.9999.ebuild 2705 BLAKE2B bd43de17ada2d47b3ca3f46b70eaa32bc2a2a4feba482ad4f4be396863d0eb295f5a903c2b79f48b6fd399753239eb034b4900eaf582879bf96ba33a4da3b813 SHA512 ccffe78a028560f402428b514dc707ca5b6b72e4dbb60f779e184912cbd40345484b2ba8f2739bd8c904622366554d1894e2f83db3bd4a102d0c0f4c23705903
+EBUILD lldb-9.0.0.9999.ebuild 2737 BLAKE2B a768532e7ff0e18e2ba779054f20bdc04da7571cf1ba66277734c5e11aed22c224763f4b61f2166c3014ea36b6ecd7f9cd5e56304e1c3aa50ada8be76e33a68a SHA512 c61ca46f688826fd96ab8284ec1ec86f861255efb0c401c680c9f4817ddd22d8e5e94889cb122762832e0db3fe4aea2b018837a08621d3a34b8bda72b7506326
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-10.0.0.9999.ebuild b/dev-util/lldb/lldb-10.0.0.9999.ebuild
index b28959dc3c26..5a0c6f7f6ed1 100644
--- a/dev-util/lldb/lldb-10.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild
@@ -17,7 +17,7 @@ SRC_URI=""
 EGIT_REPO_URI="https://git.llvm.org/git/lldb.git
 	https://github.com/llvm-mirror/lldb.git"
 
-LICENSE="UoI-NCSA"
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
 IUSE="libedit ncurses +python test"
diff --git a/dev-util/lldb/lldb-9.0.0.9999.ebuild b/dev-util/lldb/lldb-9.0.0.9999.ebuild
index 6c729010c452..0a3d3cede2c2 100644
--- a/dev-util/lldb/lldb-9.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-9.0.0.9999.ebuild
@@ -18,7 +18,7 @@ EGIT_REPO_URI="https://git.llvm.org/git/lldb.git
 	https://github.com/llvm-mirror/lldb.git"
 EGIT_BRANCH="release_90"
 
-LICENSE="UoI-NCSA"
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
 IUSE="libedit ncurses +python test"
diff --git a/dev-util/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index 8dcb3845c899..21cf988fd326 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -1,3 +1,3 @@
 DIST lxqt-build-tools-0.6.0.tar.xz 22520 BLAKE2B 99e8032e111f776708d0a84e65db6534f517e75803d2cf747618889dccc46e9d55caa0ba3c89c88d56143a69ced015df9f1eae68a34c7ea050c6f97aedcf0f33 SHA512 f95c47d40f26defa8bc4e13a0449428945c282cb5e2201610e9529bfd5154a438ee9dcc4f556bd76efe13b97533bbed2f49ab5c100225907781093094a692227
-EBUILD lxqt-build-tools-0.6.0.ebuild 510 BLAKE2B 64ef5ec87839112fed95be98f0aa6c197a34f2a9dcf69af2b37c8bbac6b7b5213f4a9a57efac1306f61836e749038f5b1b0c97a73d0c37ef1cfc5d0b5794edd3 SHA512 7343c08fd1d16bb6da81c67f6c714fd5bdbb22230d1e0e80a2b2618976531ff8fe9b7cc0b09a296bbbb310cd6fa0f40c74133bc378e4fc63bd4b8ee2b36daea4
+EBUILD lxqt-build-tools-0.6.0.ebuild 516 BLAKE2B 5958fc29fb51d05a42874230903cef632a6094176f371c53d9c072ad950f8fd3f634970f183cb23c54125c9c362b6d119302264aef400d8d52d57560f18610c7 SHA512 dba4af1c7090ca0cd8a887ac991749eeea9df3c68a0016186c91190c161ad9e55c6ca0adc40dcfa24a067a555d97fd41b85633db9c3ba31998e64cc9423fa14e
 MISC metadata.xml 322 BLAKE2B 8b119aeafbe57841b2e072a7a009dd20383a752d6cce052c5b2e6c98c2341baad6e74fbb8798ffbf5c17719a37ff4d25efda922fcc32bf851b82e520af69777b SHA512 ffd6f030759c5c9e6f2aa42550a0de265550a03872c7b11c12ac4429a7dd1c3cbdb7cb470238273a313e9fcddbc5072b7dc4909811c4ab7609c0acc2e385a948
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
index 93dd16cdff90..9efd9eafc847 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index a981f43d31f3..1d06b93d85aa 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -2,4 +2,5 @@ DIST mingw-w64-v5.0.4.tar.bz2 9163093 BLAKE2B fd039995c73690c12ddf1612d42edefbb5
 DIST mingw-w64-v6.0.0.tar.bz2 9045653 BLAKE2B 8a54dca2d06c92ab968a93240996d07ab3b1ed4652555a48b7581c477856d5784ed192c578d78186e171e400bd18b4de3c6cafbdd96109367ad13c37792015c1 SHA512 e3d3663e0cb33a16f90b1a33e81b5a30d26f7e34270b14e865c10068f2a2d32da9ef8cbbb0c3fed9c71429ae11c82152ff3b87d81558929b2a4993dc99cfc11e
 EBUILD mingw64-runtime-5.0.4.ebuild 2548 BLAKE2B 82805af12130881e40369c5c2074bd622f4ce19e3d1ca1b845d6f03bfe84c271b22ee55d1ba639827d67506262a05f917509df2d632b34cca141d62a02487539 SHA512 bc4fdf9844d0b09ac4045cd51529b14ecf9fe8bb4f2fa428d141bdcb6352a0b1912d471ac133b768dcd26c65c05d345594123fade22f525b8fd803b234b9250d
 EBUILD mingw64-runtime-6.0.0-r1.ebuild 2862 BLAKE2B b10758329649069509ca617a9b1159f480eb1b84c89bf9130004b2d1e089dcdb02ac6a896b376dd7486c6fc86c12468162f089377ba2fc5390549476957ef83c SHA512 4dc7a111aab0b5a01cb1559efe7ca4126b32f77e88852ff2940cfe23fb78ade8561653c3f9d08a1e0530e875227ab50f51d820c887737454491306fc29b12ca5
-MISC metadata.xml 563 BLAKE2B 84e56e99482d2f7bb1e1095d84915b42190ba74fe7242ffdce548c4249a40be17018a29911d32b9b09df8fc5e04d912dcfe6f473e5eb2478f55d317808b24f4b SHA512 27dca35a3b2d5444b712802c3099c595d9b9fda21f29b6b709222e5bb0aad78f353d0170500eb3b632b254935d35cf43fc43d4ecb61722b711799ca4d28211bd
+EBUILD mingw64-runtime-6.0.0-r2.ebuild 2903 BLAKE2B a9724a30a903a58e48916030c66e43d63c442bc6d75e955e692884804295bb4743feb36ffb906a9709026d57004c8a91677f52497558095933a10c965314431a SHA512 ef1747e6243e5f104d69452e56b16cc2e8c88dce1522acb5d07d6f063b67c8150eed77adb178701e78889b81f903376418595227bacd0d946eed950be89be6d8
+MISC metadata.xml 643 BLAKE2B a66741716a2729da314650e4435c616a0a3912cedcc142f23ce74b23c59e21b8a456697a7d38880c1b7d876909ba4b3617a0c72c9f054fcbcbe68841d76c5903 SHA512 fd9528a194bcda889d719ba7f4759414b86cc0d75d9790a9478c46e2abf62b01355e4e01b8e05b7accda0ff0dab94607182671f367cf600e47443b0d4a0bcd53
diff --git a/dev-util/mingw64-runtime/metadata.xml b/dev-util/mingw64-runtime/metadata.xml
index 1b348ca856b1..df0beeaf2e90 100644
--- a/dev-util/mingw64-runtime/metadata.xml
+++ b/dev-util/mingw64-runtime/metadata.xml
@@ -8,6 +8,7 @@
   <use>
     <flag name="idl">Install idl files.</flag>
     <flag name="libraries">Build extra libraries: mangle, pseh, winpthreads.</flag>
+    <flag name="secure-api">Expose secure API (*_s function) by default.</flag>
     <flag name="tools">Build extra tools: gendef, genidl.</flag>
   </use>
   <upstream>
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r2.ebuild
new file mode 100644
index 000000000000..9dc20f91b732
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+inherit autotools flag-o-matic eutils
+
+DESCRIPTION="Free Win64 runtime and import library definitions"
+HOMEPAGE="http://mingw-w64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# USE=libraries needs working stage2 compiler: bug #665512
+IUSE="headers-only idl libraries +secure-api tools"
+RESTRICT="strip"
+
+S="${WORKDIR}/mingw-w64-v${PV}"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use headers-only
+}
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+crt_with() {
+	just_headers && echo --without-$1 || echo --with-$1
+}
+crt_use_enable() {
+	just_headers && echo --without-$2 || use_enable "$@"
+}
+crt_use_with() {
+	just_headers && echo --without-$2 || use_with "$@"
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_configure() {
+	CHOST=${CTARGET} strip-unsupported-flags
+	# Normally mingw-64 does not use dynamic linker.
+	# But at configure time it uses $LDFLAGS.
+	# When default -Wl,--hash-style=gnu is passed
+	# __CTORS_LIST__ / __DTORS_LIST__ is mis-detected
+	# for target ld and binaries crash at shutdown.
+	filter-ldflags '-Wl,--hash-style=*'
+
+	if ! just_headers; then
+		mkdir "${WORKDIR}/headers"
+		pushd "${WORKDIR}/headers" > /dev/null
+		CHOST=${CTARGET} "${S}/configure" \
+			--prefix="${T}/tmproot" \
+			--with-headers \
+			--without-crt \
+			|| die
+		popd > /dev/null
+		append-cppflags "-I${T}/tmproot/include"
+	fi
+
+	# By default configure tries to set --sysroot=${prefix}. We disable
+	# this behaviour with --with-sysroot=no to use gcc's sysroot default.
+	# That way we can cross-build mingw64-runtime with cross-emerge.
+	CHOST=${CTARGET} econf \
+		--with-sysroot=no \
+		--prefix="${EPREFIX}"$(alt_prefix)/usr \
+		--with-headers \
+		--enable-sdk \
+		$(crt_with crt) \
+		$(crt_use_enable idl idl) \
+		$(crt_use_with libraries libraries) \
+		$(crt_use_with tools tools) \
+		$(use_enable secure-api) \
+		$(
+			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
+				&& echo --disable-lib32 --enable-lib64 \
+				|| echo --enable-lib32 --disable-lib64
+		)
+}
+
+src_compile() {
+	if ! just_headers; then
+		emake -C "${WORKDIR}/headers" install
+	fi
+	default
+}
+
+src_install() {
+	default
+
+	if is_crosscompile ; then
+		# gcc is configured to look at specific hard-coded paths for mingw #419601
+		dosym usr /usr/${CTARGET}/mingw
+		dosym usr /usr/${CTARGET}/${CTARGET}
+		dosym usr/include /usr/${CTARGET}/sys-include
+	fi
+
+	rm -rf "${ED}/usr/share"
+}
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index d340f5d22da8..89beb3c6e1ce 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -6,6 +6,6 @@ DIST ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz 213767 BLAKE2B bb6ab
 EBUILD ninja-1.8.2-r1.ebuild 2686 BLAKE2B f44659c2d721e985a35e2b6e6f0ea4db85bdf3a4800359648c77b5d45094760769d251e58945fbaa102426c6e6bdf78725a149e645dc61a225ccc44db7c00c2a SHA512 795f3c6ecc1f66beac5f413f226ba94c06d9f3bf9ab5e8a5c2b0797c352bbc783c80ccdedac2f85e6fd03016eb44e2256c6edd47585e81beac2adec0fcb9194c
 EBUILD ninja-1.8.2-r2.ebuild 2686 BLAKE2B ba47beca4c65d59cdd43dac4dd8f284f12c32f2958bddfc1f2d2ad02d52e8362f653648352769b307ae289a732487ebc0430b40c8bdd4b01cf5b228535104f79 SHA512 a4e8acb0a66ec663983939019f90356e40388a324db1973acece1dbd5945849682c32bec6a072c49d5ee0c6a4167a6c550cc4d2939b40639ad389bd48b4b3604
 EBUILD ninja-1.8.2.ebuild 2543 BLAKE2B 183c144ef094ce3947cbd1a174ab47153a9e062ffb50ffe9681c8c66cbda25537bffc8a3e4accc620b07157f027e4eb2931a97b9f50e761ff0d6aaad730ccf83 SHA512 889e48b42449522739881b2fb403be8421f5916a7aa0b61fb7a0f3dfd758dd3a28a636dbc4f5b3309ac0fdf2a2798721f08dc5a4bcf980b8cbf3f8cf5ef56bab
-EBUILD ninja-1.9.0.ebuild 2741 BLAKE2B 82a694e4800ca379f60347649fb69caca9ea5df58d749b02ea43860c7d6f7356fbec9c1dff0844fe5c23dc6c6e7f6760c8a5202c80d6902ca687695be47f5ddb SHA512 7dfa06212bf6155769d351018825213a7ab4a69d277a0254294aed7dd6a576711895cfd88c62f481e133f1682e1ede49170fb6056ecad6a9e2f29efffd68647e
-EBUILD ninja-9999.ebuild 2690 BLAKE2B eed07ccc1dc9e2796a0d7d63b51c2c0c7f77449a7d6d3ba89f21aa12530b1ac4dc7822c91d4600ff9ce00a6733ecf3e53a5958ce0829d9e64f6d3c1bee80340c SHA512 e2013a12b48150df097b11524fa0db0d205222679a5cce55c859ce7e8b3a7ff8802a19b687cb76bd8114631e9e65c93d964a1aa37a6a0660a4a540d4777c51dd
+EBUILD ninja-1.9.0.ebuild 2748 BLAKE2B 05c993001be9bcdb94ac5de726456fce04d4fcf1b6492c2ab90ffbb69f91695d0f0d9d291c0567f6762dc3610900422846b1218bc1d3d8e59810101aa8f5cbe0 SHA512 9e54810e995677453ed70435dd393fa8c4bd0dd29991fddab82d806d584bb0f2024faaf0fe9e9dd861f77c3aee1344bb8bc67fb230761082384de9d1846c9272
+EBUILD ninja-9999.ebuild 2697 BLAKE2B ccfe44f31f2341a11cec8da86e5e43da8ee7b996d8c45e4cf0cb3b5c6ce0b3e1764d36126b6fc0d9f1db761b9b739053b10ab51ace5d21699e9e755be40fa9eb SHA512 15145be6b5b23933d95f1f707b195538941a42046449f4125bd42878a2793b26bdd57b9fe7c5cd8ea44c7b98177dcf355496d816501077a1b0a984297c80ac51
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
index 0ebf722104f9..ba9df78face9 100644
--- a/dev-util/ninja/ninja-1.9.0.ebuild
+++ b/dev-util/ninja/ninja-1.9.0.ebuild
@@ -15,7 +15,7 @@ else
 	MY_P="ninja-${KITWARE_VERSION}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index fa77efecc27d..d2fd05a0b426 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -15,7 +15,7 @@ else
 	MY_P="ninja-${KITWARE_VERSION}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninka/Manifest b/dev-util/ninka/Manifest
index ddcc17ab1f70..76360534171f 100644
--- a/dev-util/ninka/Manifest
+++ b/dev-util/ninka/Manifest
@@ -1,5 +1,5 @@
 AUX ninka-2.0_pre1_p20170402-braces.patch 284 BLAKE2B a417f77193b086485ca5522cc14328c54ba52e1a0a8ae263c1d2880f5c6efa0629ed6c180675c844af9595ba977a453548400964b2cc09f70c758c90937f2c8c SHA512 76bfcd86036fccca00f2f5e145a52aa280fb129b7dccdcb6c2f1dcd591b35d964baef3f82116f7f2159394be227766ebaa15bce7e3177f8a15fbeda41c05be71
 AUX ninka-2.0_pre1_p20170402-makefile.patch 911 BLAKE2B 40157c2517b8959842a83d47d60f937a5da8d0c6da8ed3378fc186fe7a6b528d048b8f4227cc529b5862b72a489c7f3a5ce5280b7977dfe425e01518adb6db01 SHA512 4b9c604608446b49d308221757f986f8c9c901aacbd9c09dba1b26eecb6798e381782e49270f79ecbf4cff45d50c4dba99cc04b9fd9d428a9c8b66d7d74043aa
 DIST ninka-2.0_pre1_p20170402.tar.xz 136080 BLAKE2B 9c612dd3586681b1bb037d5c7271341fc652ca62d3e22ee29f330922d78e9a460e3bb2700f4216ea3fa564ed2e5c83a9c50cdea5db796851bbdc999b9f35658a SHA512 fc1c8f6e134c6c618852bc62b306c4e73fcd7443900f4d31d9abffe718e8b4fa7e3853631d0207f70e1223d00a72e976f4c3e7c8780a892113644ba5167f30a1
-EBUILD ninka-2.0_pre1_p20170402.ebuild 1112 BLAKE2B 6e0e0217108598a7ccdaf27469db6e4ecbe95361d737fb9fe2f2c38e0901864e530362f1742c9a661a018b0442d168f8392705079d735b44924cd178b869bb1d SHA512 c24e1c10bc810a7363a7dc9d5ffcca001bf9a73eb2c1041330b743acedc66fd8cc1aed67b73ce432d9446adcaa1d704751f5726a9c4c222df1203753f27d8dfb
+EBUILD ninka-2.0_pre1_p20170402.ebuild 1139 BLAKE2B 614d4fe61b80a102178ef4b5c70085cef5ee916a9f327eba12d7ee4988284ea6bafb5516b4aae94ded2c119b74cee2b71e8c0ccbe053b232151793c986832d21 SHA512 d75d06dcaae8789ff21f46bf5a2fa9faa19b2cb548f811f7f6dfff60988e7c56c01dd707cfb914ba630774f4026230581cd064baf140c6d730ff4183904515af
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild b/dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild
index 56bd4273a95d..cfab14f28ec1 100644
--- a/dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild
+++ b/dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-2+ myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="sqlite test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-perl/IO-CaptureOutput
 	dev-perl/Spreadsheet-WriteExcel
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 2c483cdff545..5f569d494f50 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -5,8 +5,8 @@ DIST linux-5.1.tar.xz 106244476 BLAKE2B ae3c63ced819737e34f8ec3a78138f87704a2f29
 DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
 DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
 DIST patch-5.1.15.xz 426292 BLAKE2B 45a90fd8faafce8bb52273494adfb3b16f6e6c31fa8fba3fa89c71622db6a9db4868ca1a805cd32344cb72cf4cf0049af9215fceec5274c6796a91081db51b6f SHA512 0b2e4436644da2699cf6fdfb38d80dd7156fac74c1d99bec718f74171fb91815e3de1d08b892effc0ae39080c90b569a2bd30c1c4665c6b3a156cbb8e4c2ba61
-EBUILD perf-4.14.33-r1.ebuild 5004 BLAKE2B e6083a996ea2d925b498a229d6e1da8ebd781cd032ae13abaf88692f7dd5672412887a658c5324580f0c7eca55c2045bb67aa639c31f04e4663521704c5764b5 SHA512 61cc606b45c4f2a839dfda8e02881885a45c659cdab0ceb3a30b433dfee4180b94b267ce1ba9218559cea862a9890067956dc84e00269b9bca3ed617e6490a8c
+EBUILD perf-4.14.33-r1.ebuild 5006 BLAKE2B 601f4025c6fd62fdebc9aafa7d1ec1128ae2670327683055ec14cc759418badab5371a7a433ef410c02bb184e2f2b820a8f593cfb638829986123f7c8f82175e SHA512 194ee54e648038eb93afadd2b440c6feca9d19547d46e173ed75a637db99467a7c7c4b1ae75e11cd5c1ddf53c077c3e1ce8a7e098986e90f9ee052c3e55d0984
 EBUILD perf-4.14.33.ebuild 4957 BLAKE2B 178c3e4dee18e132719f42cf83a209ac866dde793d69a3df3fd1a20585974dbc5a538d3d4dc5638fb20ff19ffae7eaf5a84d44b0b7f9b90ddf50a6794a57e71f SHA512 1c2346b9fd9c507185556e984b4976c55727290717d982b0fd2258e5d2d8dee015a62773de672afc9b7283afcec3820a20244911f44b5496c4bf53f78f34f695
-EBUILD perf-4.20.3.ebuild 5993 BLAKE2B 164d19a6c6a2eaf5ce671cd26243148cbc63ef0d02ef1f7578401072a254290c7830718aa66c88258ff19515e33b6bc1a891634d531a8576098de84c85e6086c SHA512 a88047211a7522fe30347d75b15ae54de4e6470d2842fd739193ccb915c5a25d3727cb52e9aee16b814c53f9756269db0f6833a5b8410adfa02da71caff139ae
-EBUILD perf-5.1.15.ebuild 6311 BLAKE2B 5a53ea15cad4a90737082e72f1fbb75877f42cb6937bd5fea620608fe1b92c7e504a1f7d08bc24af272f6ebdbfd2a865318f0e8a397ebb2a259e2fb63b018347 SHA512 99221d1aeda689f6c21dccba14eb069416859d2b850708866b8e03eb04b082efd976c314aa08cb79e88164a566446de8dc9942c26da1fa64275ba76f9c371851
+EBUILD perf-4.20.3.ebuild 5996 BLAKE2B e686a34c32165de5d83a6fe5e03131ac035b1109543f8c98213f9ea6c92a9d740befed22b5f963a1625bbca103d18b740223c48117ac8b93e5f288d6b779e225 SHA512 a07e343605b352a39e2ef29c6ebb52daa891fa99dccdc74d6fe2fec8f8faa0e20497f307e28ce85093675cd0a2ac86c3f0a74083cc79e3583b1f2134afd20691
+EBUILD perf-5.1.15.ebuild 6314 BLAKE2B bf3d8d8999c81b1efc27145c6742874377ef5273d7a6364606c49498c3038e0ed7385ca31177b81c019573cec62d600d68f7b42b184d2c68d51189f32c711890 SHA512 78e1914068316328444510eb7cbe8f7306b6d0a9ec6343df77d659b86ab5b442d893dff05e86828f9e8385c1d4736c94e80ae5bfd2b67cd9839e7c8bbfdaa095
 MISC metadata.xml 1245 BLAKE2B 78921a70a2d435eac57471863f5f8f50eaae16049c6085326cc91a82437b42ada7c3a5fa97124a01f5477b02e37fa03212eb65d9652a71b8c8886f99e2986d22 SHA512 99fcebf78438dd22f2ff35846fadd1280e25154dab4a4ab8bf9bc13d911c7450f92234ed2c39d9905d6b138a783af1e20896e0b09e9dd07813baf5da48234ea2
diff --git a/dev-util/perf/perf-4.14.33-r1.ebuild b/dev-util/perf/perf-4.14.33-r1.ebuild
index 6eb3fa30238f..62f2873092f0 100644
--- a/dev-util/perf/perf-4.14.33-r1.ebuild
+++ b/dev-util/perf/perf-4.14.33-r1.ebuild
@@ -163,8 +163,8 @@ src_install() {
 	perf_make -f Makefile.perf install DESTDIR="${D}"
 
 	if use gtk; then
-		mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
-			"${D}"/usr/libexec/perf-core || die
+		mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+			"${ED}"/usr/libexec/perf-core || die
 	fi
 
 	dodoc CREDITS
diff --git a/dev-util/perf/perf-4.20.3.ebuild b/dev-util/perf/perf-4.20.3.ebuild
index 5439d2b00ec3..04e3df46fcb0 100644
--- a/dev-util/perf/perf-4.20.3.ebuild
+++ b/dev-util/perf/perf-4.20.3.ebuild
@@ -198,11 +198,11 @@ src_test() {
 src_install() {
 	perf_make -f Makefile.perf install DESTDIR="${D}"
 
-	rm -rv "${D}"/usr/share/doc/perf-tip || die
+	rm -rv "${ED}"/usr/share/doc/perf-tip || die
 
 	if use gtk; then
-		mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
-			"${D}"/usr/libexec/perf-core || die
+		mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+			"${ED}"/usr/libexec/perf-core || die
 	fi
 
 	dodoc CREDITS
diff --git a/dev-util/perf/perf-5.1.15.ebuild b/dev-util/perf/perf-5.1.15.ebuild
index 269c7c597ef7..791892da875c 100644
--- a/dev-util/perf/perf-5.1.15.ebuild
+++ b/dev-util/perf/perf-5.1.15.ebuild
@@ -212,11 +212,11 @@ src_test() {
 src_install() {
 	perf_make -f Makefile.perf install DESTDIR="${D}"
 
-	rm -rv "${D}"/usr/share/doc/perf-tip || die
+	rm -rv "${ED}"/usr/share/doc/perf-tip || die
 
 	if use gtk; then
-		mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
-			"${D}"/usr/libexec/perf-core || die
+		mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+			"${ED}"/usr/libexec/perf-core || die
 	fi
 
 	dodoc CREDITS
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 898693122776..1bfe1f4d9abe 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,7 +1,13 @@
 AUX radare2-3.5.1-mount-free.patch 733 BLAKE2B bd5301947fab85f68e65e2ed69138df18cef42b1728804f09e4003cf6d633a744660aa89a60569e229928180e4fc3f82a1c5568cfbbc04042774062ad3e17f67 SHA512 d91e75f418c0b3e2e7f76a858b34cae81babaf27829b553d40c9e64d94bd74e2bd529bf43107ff648223648939172c9a98e1b6e0e12467ee474e2dc6c6ca5560
+AUX radare2-3.7.0-with-syscapstone-p1.patch 676 BLAKE2B 888e934d8cf9a14692aebb18ca22e18346b967f9f568dfcc0b3caa8f0b6c4cf9efbf773d07e7e0ddeb4af7b26201a94630a0aefb8031022791a2910c6f57ab42 SHA512 089d8b5f093bd1c884667a00e52f881074343ff8862165a8821094ecacc48522391457bf6393c07bb72a6d08d6791dd2759a3efeccdc5aa80341d6d38da4e42c
+AUX radare2-3.7.0-with-syscapstone-p2.patch 544 BLAKE2B cf29374334a81a7cd4e48951083fcc5f9240b4672b87454b013f859beb32120666fe79239bc0f76168668d471e7efec159503892782ac38246b873df61c69ba2 SHA512 4741d0f7f51e9efcfb6a313451c1ea1c8cdb003c5c160c4a717b16598ccbb2020e10e23b588a9d2c792abc98d23eb5567e5c1e92e31d287b3210a664e28bbb3e
 DIST radare2-3.5.1.tar.gz 7083677 BLAKE2B 3d84e79d4e20e031b6cfdbabcf80922f977328bf7da8c2871924f9520ff87252d4df18a1239793c70f4b800bb7d5c4aef923e63c93aa15d86ae685ddda205da2 SHA512 24c2a45ed539830dcb8dc1585c27e45515c70989132f500527db0ca6795027eaa82ea54d1cd7fc73ddc49641a73148be963ade1648e92b5336d2e86335e2497a
 DIST radare2-3.6.0.tar.gz 7339427 BLAKE2B 60ecd110ac4cafa38dd10f49321e984e98f189398f15196614fb096970cc2f24981ffbbd161fdd55621b65c45a8fb9f843f273bf245ac0ea2b4493981ab0477d SHA512 15c02b744892934bd0b4beeb146d8a0289244405214b62892d7e307cd42f6706aca16c1e02b6b2beb5b6869c5c5920cc291ffec8a690b5338c6973a5e1d7900e
+DIST radare2-3.7.0.tar.gz 7478494 BLAKE2B 547efda30a65783758b132f4b241039b83bb274904a1f69616e60ec83547b22da486e97df06a74cd82f855650dbc3802d31bf3cb00ebd12d956848efd4b6ff5e SHA512 8e4d1b89d0d1e717403ba0bc2ce47e2644d12303ed5391fe4b9efc11b86a0b9c9356fdea1caecabe16d88ded9577fe77c182225adf2fdbd63b2e48f9c9c9f52d
+DIST radare2-3.7.1.tar.gz 7481103 BLAKE2B 4bae07dad298a45704ee45740bc3376902dfa35631efc94874666ead0b9c3dbb407558f4c02283d0909970247bc7730754cad9c6b6859a23ab40f408eff9102e SHA512 972c137e20d73a4cc8001c6d3e3b0c68874ed4a837d2ec20f26bc164a5451dbd46264471adc93332eecadd86d8023579fa69b42fce0291f49979b451118c7673
 EBUILD radare2-3.5.1-r1.ebuild 1210 BLAKE2B 8bbc76b7d1097416f53e8d70c12e5460d1c2971ff2d3cbf05718be0397b014f9b456dfda8411048d48ccd28de37919a9e79e6d8970228c8a9de91ff993c73ecb SHA512 9b54f5aa235c1b693235833618e822a67790773cde3847a65216dd832ef29fba8a43db7ca770d5791f03c976fe5a8b11ab9f64c79ad374947af8b34d6e4bfb0b
 EBUILD radare2-3.6.0.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
+EBUILD radare2-3.7.0.ebuild 1220 BLAKE2B b47051fd9c3a4f0b819f86daaaecfbb95747cda74811c73d788ea055a611eb2e9248e6c80026b0f2a2958397a49b73e20f305b9cf5967522c89c26a35f32e322 SHA512 f423501872f7e672de464ad9f46d06f1fb07511c85939c015c37d89b1a44bcde0e934e324b47aadb446c6e5f8a8044fa73b751f234e1dddb64294a36e36efc84
+EBUILD radare2-3.7.1.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
 EBUILD radare2-9999.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
 MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
diff --git a/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p1.patch b/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p1.patch
new file mode 100644
index 000000000000..3f87d606bba4
--- /dev/null
+++ b/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p1.patch
@@ -0,0 +1,24 @@
+From 8b37ac49b609cc69b27a6b3b76fa9d8d819bae83 Mon Sep 17 00:00:00 2001
+From: pancake <pancake@nopcode.org>
+Date: Thu, 1 Aug 2019 05:23:56 +0200
+Subject: [PATCH] Add capstone dependency with the mk
+
+---
+ binr/rabin2/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/binr/rabin2/Makefile b/binr/rabin2/Makefile
+index 0ecb48629..33219020b 100644
+--- a/binr/rabin2/Makefile
++++ b/binr/rabin2/Makefile
+@@ -15,6 +15,6 @@ include ../../shlr/grub/deps.mk
+ include ../../shlr/bochs/deps.mk
+ include ../../shlr/qnx/deps.mk
+ include ../../shlr/ar/deps.mk
+-LINK+=../../shlr/capstone/libcapstone.a
++include ../../shlr/capstone.mk
+ 
+ LDFLAGS+=$(LINK)
+-- 
+2.22.0
+
diff --git a/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p2.patch b/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p2.patch
new file mode 100644
index 000000000000..1ebb74efb36d
--- /dev/null
+++ b/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p2.patch
@@ -0,0 +1,22 @@
+From 38a10d64fb33484f0e50c3d8f40a6c19c0ee37ec Mon Sep 17 00:00:00 2001
+From: Slava <slava@bacher09.org>
+Date: Sun, 4 Aug 2019 04:00:12 +0300
+Subject: [PATCH] Fix build with system capstone (--with-syscapstone) (#14753)
+
+---
+ shlr/capstone.mk | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/shlr/capstone.mk b/shlr/capstone.mk
+index b3cc42d24..f1a2de04d 100644
+--- a/shlr/capstone.mk
++++ b/shlr/capstone.mk
+@@ -1 +1,5 @@
++ifeq ($(USE_CAPSTONE),1)
++LINK+=${CAPSTONE_LDFLAGS}
++else
+ LINK+=$(SHLR)/capstone/libcapstone.a
++endif
+-- 
+2.22.0
+
diff --git a/dev-util/radare2/radare2-3.7.0.ebuild b/dev-util/radare2/radare2-3.7.0.ebuild
new file mode 100644
index 000000000000..5d70b601195f
--- /dev/null
+++ b/dev-util/radare2/radare2-3.7.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radare/radare2"
+else
+	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl libressl"
+
+RDEPEND="
+	dev-libs/capstone:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=("${FILESDIR}"/${PN}-3.7.0-with-syscapstone-p{1,2}.patch)
+
+src_configure() {
+	econf \
+		--without-libuv \
+		--with-syscapstone \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/zsh/site-functions
+	doins doc/zsh/_*
+
+	newbashcomp doc/bash_autocompletion.sh "${PN}"
+	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d $d ]]; then
+			rm -rfv "$d" || die "failed to delete '$d'"
+		fi
+	done
+}
diff --git a/dev-util/radare2/radare2-3.7.1.ebuild b/dev-util/radare2/radare2-3.7.1.ebuild
new file mode 100644
index 000000000000..0b3f4cfb432b
--- /dev/null
+++ b/dev-util/radare2/radare2-3.7.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radare/radare2"
+else
+	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl libressl"
+
+RDEPEND="
+	dev-libs/capstone:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--without-libuv \
+		--with-syscapstone \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/zsh/site-functions
+	doins doc/zsh/_*
+
+	newbashcomp doc/bash_autocompletion.sh "${PN}"
+	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d $d ]]; then
+			rm -rfv "$d" || die "failed to delete '$d'"
+		fi
+	done
+}
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 264c2710b2a3..27fff13f33bc 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1,3 +1,7 @@
 DIST re2c-1.1.1.tar.gz 5907416 BLAKE2B da2544573de0dbca94db8a8e2112de5549ffbbad91bdba187e95c9d8dd36537e099dbc2871b54d62630d91928cdaf384ab069e5e1624f8ff749c2e2743cff766 SHA512 a6fe73611103588043748340976f0e6d07169a6546cb80627c0ccd2ceac83f362dbbf371530361d893537fd95deb19503b2c73c41ed40efe7787210d6c757397
+DIST re2c-1.2.1.tar.xz 2059304 BLAKE2B b05c41112654cd4c7f15ad70229cde02efc4b04ffc63f964ab69e376964a8a952f2c617859b056998127ca9adfd72f7a16e673dd3134ab8244b14b84e023d510 SHA512 c90f45ae435968e950d2340b540269a042201f1f53d7ea067b6d3d9feec063f66559ba970d404d82bfa7b75b9a074328caaa62304d4d876af7c12740d100ef58
+DIST re2c-1.2.tar.xz 2064236 BLAKE2B ebc721de4fe1588a3043bb05298324b61214e074154ebc2adff19c6e5a3cc6a94314216a20020e88069d89768c31ae5c3f09b18176cd241d7aa10aa7b2daf183 SHA512 d029abc3493a26761eaa911cf73961f5b8ec2e00958c97740e73f568fc72b02b5f56d80e09657a95dcf2e7767f3e5085775bb78f0f5bc472d506682a3a7fc278
 EBUILD re2c-1.1.1.ebuild 785 BLAKE2B f63894d88ff4804ca63243c6482171e8b1054fa948a44482c4555c1025aaf2ec980895fbd02db902a2db4e00f577d4bf98d27d889c7401da8a2c53c297836d15 SHA512 e40b6779e0e039721d811a52d0093c1eca9a2398bda606e069cecdf2acf4a43ec255b14f00b8d228befde9572c0a1bcd18a6889b89cf865952c3e4cf330dbf44
+EBUILD re2c-1.2.1.ebuild 756 BLAKE2B 0a7a2466ffef6d5a224e05ff1f7f05dd6082ac9a26bf910ac336728f681de4d7db4b11c3aac0e6c5400a6f4fd2b8f7a1c6bbc990bc65606736cf2969600c1423 SHA512 2cd1f651d2cec2509430f491b2b110bf83f036a183671359e2fbbd6b431eea918d38bd2c37d48b356768e49dd3fce4d065ff5158120ea2c7e7481bf8fbc87092
+EBUILD re2c-1.2.ebuild 756 BLAKE2B 0a7a2466ffef6d5a224e05ff1f7f05dd6082ac9a26bf910ac336728f681de4d7db4b11c3aac0e6c5400a6f4fd2b8f7a1c6bbc990bc65606736cf2969600c1423 SHA512 2cd1f651d2cec2509430f491b2b110bf83f036a183671359e2fbbd6b431eea918d38bd2c37d48b356768e49dd3fce4d065ff5158120ea2c7e7481bf8fbc87092
 MISC metadata.xml 423 BLAKE2B 69ad12e8bd8cd2356e36736ab276efa0aadc2755f784fa4e7fe23ae4d4e7a27a06c8fcd4ee727f87847a7fdaf136d12e811a20345183d261d2b649724818f9f3 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9
diff --git a/dev-util/re2c/re2c-1.2.1.ebuild b/dev-util/re2c/re2c-1.2.1.ebuild
new file mode 100644
index 000000000000..20575ddeb6fd
--- /dev/null
+++ b/dev-util/re2c/re2c-1.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="tool for generating C-based recognizers from regular expressions"
+HOMEPAGE="http://re2c.org/"
+SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+src_configure() {
+	econf \
+		ac_cv_path_BISON="no" \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	docompress -x /usr/share/doc/${PF}/examples
+	dodoc -r README.md CHANGELOG examples
+}
diff --git a/dev-util/re2c/re2c-1.2.ebuild b/dev-util/re2c/re2c-1.2.ebuild
new file mode 100644
index 000000000000..20575ddeb6fd
--- /dev/null
+++ b/dev-util/re2c/re2c-1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="tool for generating C-based recognizers from regular expressions"
+HOMEPAGE="http://re2c.org/"
+SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+src_configure() {
+	econf \
+		ac_cv_path_BISON="no" \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	docompress -x /usr/share/doc/${PF}/examples
+	dodoc -r README.md CHANGELOG examples
+}
diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index 90aca59f0c77..f34cc617fb72 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,8 +1,8 @@
 DIST redo-0.31.tar.gz 105335 BLAKE2B 76171a4e7112c7478fcfe8d6f19ffb27660fa8566be3c2dded0026a993224731cdeb43c5cd7226b5537f69dc9de982e0dc9a95ade49809c93c81474879de8590 SHA512 c049a2eac7385813fe7ee8fb15f7b7de1fe1572071de91c8ebaca868d7b4ceec73d6433f1ba37b129ce7eda577c5823a5483ba69bf457cc3295d7fb9c23f42b2
 DIST redo-0.41.tar.gz 140177 BLAKE2B 13a73843064fc9fb4607426c1d4d6358b688ba30671d4b5e60428481489ff59060b2bb0b1473f0926702100d311fcaeb846a5898209e07f0d0867766fb951a93 SHA512 c7826e82776a323243dafe5b8011ac619dc0376c2b36524aa1ad23bac54f9d946f395e12a4ea943ee065847db4817afbc5101a703d59e1f90b812a6ef028427b
 DIST redo-0.42.tar.gz 194344 BLAKE2B ce17ba2bc8b6a074bfc5cae58cc99c1c41b2e8bab93a10f29d1178cb2071bd68ef5528529c320ee55063a4e3bce83705b486bc92992a9c0c18b65e7fec76fde5 SHA512 41b8417136f98d12edf3c62f027f2459ae3fb92f6c5464553d79c3a52344de57220a5c64b565118da0a99c1544eaa153a468ffcdcfbf7193c76c896bcd40e900
-EBUILD redo-0.31.ebuild 918 BLAKE2B ab6e9c3c0e9bb68bb23cd6171fdbb9f34787e7f648529c9f96ba8753cea215999620707a34236a80bc9c78de2bb61aa17a28991a28267e621aec84c5508fae99 SHA512 c7c652dabd307403f8748639dd4b6542b784c258964a9247c3e7a7b20ef91913ce32ed275c4981f385861182e0511edf7e7d54ae467407716bb1cd0091605055
-EBUILD redo-0.41.ebuild 923 BLAKE2B f6e13631931a38c159cf0e8341a422dd865878a5ac2abd4be9363ea1e3940972bd88d1fd26f12fbe4089e1a9b0c4cc0a57fcc50523a327ee1bdf3c1841d392ea SHA512 0b2fc82c7831774fa11ff3cf5f4425baf7e0fd3a711ac6d058901a9f1c7db0e71084c03308893d3fe01a1706461bba3dd3739b159bf40267c3a107ff8e0eb38f
-EBUILD redo-0.42.ebuild 947 BLAKE2B bab1b15e50c95163ca5c432db9c2b3f7d870a4532ad4851ce0f26b2c9a0fd427b53fe280fa251c16a3b10242ed1a16840a70fc36b10e3d0fbdd099eb9c2825a9 SHA512 999edc3ca620511e093aaf5e1bc7aeea571635a2f029c5f35d9fca232d7c59701e82212223e096bee61271ae7280c089b5192f310976e94b795160f87ea00bf0
-EBUILD redo-99999.ebuild 939 BLAKE2B 0f9c797263d37eb08332246d5d921e62cb165ad93cb7c39092490c52d2ff04fc8133ada02a065c8a0b5c38e98170e5662be8c0b351d90220c1021826a7dc20a4 SHA512 0c6acaed30f6afaa4362488ff3143ce7dbb51d80bc789845aaebe777d4057802e9bd257f341c8b73cab0c9924cd7cc474f307c3e48aada8c56d3de5d70f13678
+EBUILD redo-0.31.ebuild 995 BLAKE2B 72a133c595067f48172332b0277ac024a4058f18d8bf55bcabac23bfd3ca73b252049cc733fd0f76343d2586f152eb631632c2e849b826e29157483a82a539d5 SHA512 70f456c9cbc12a69adb8a3c4e418ea6de321f00c0a14cd908681a989dad14aac2caac18ca23c7c4ecaabf5a6bd9fef106cdba3b464929046be1594fde7d06a37
+EBUILD redo-0.41.ebuild 1000 BLAKE2B e7013f7f0985fc5c6d69ef5bb424fcdf86a720f13a50bf83cf40c6034a7533eb4e24f98e365311001f5b45c63b4e2af41ed663279457e4d80cb6b7dc692b6471 SHA512 3e25758b7d2e36bab5d225248c80077025348d000b25f488333cc4703759f718bbc02bb05d325c2d08cf6e536d614fea37cb74b168fa6af143de3557d574c72c
+EBUILD redo-0.42.ebuild 1000 BLAKE2B e7013f7f0985fc5c6d69ef5bb424fcdf86a720f13a50bf83cf40c6034a7533eb4e24f98e365311001f5b45c63b4e2af41ed663279457e4d80cb6b7dc692b6471 SHA512 3e25758b7d2e36bab5d225248c80077025348d000b25f488333cc4703759f718bbc02bb05d325c2d08cf6e536d614fea37cb74b168fa6af143de3557d574c72c
+EBUILD redo-99999.ebuild 992 BLAKE2B fc28366bcc74fcc7e5ba7968681be93535524ee2be30490bdd00b8c7821629c6faf07b215015192ff65b3b151eec3df4a1d51d068074754eea3be0f0d5c24f39 SHA512 d79fdce3442042bfc67c9151c075c44fe18f55cf33d4f028e69fe4708bc3cf6a0b91ddcf9d41a731c04257258ab7fc48561432c61ac6857003da45400c396a46
 MISC metadata.xml 351 BLAKE2B 4093a6abf023ec3d67b11cc94ed6ae14d735ae51748f05ed328f64c44885ba68b72927b4601503ce4d20747f34bdeff17adfa9514c6259c9590609cdcee85128 SHA512 38a2902d3f8370fe111c11b4622250c5c76b2f3d03eca795b0d2ceaec0679fec274b98cf2df726559469844c18de00ac84eed6b391992d1b5aec88ff51ec96b9
diff --git a/dev-util/redo/redo-0.31.ebuild b/dev-util/redo/redo-0.31.ebuild
index cc5f8333e277..50d08c2d1df5 100644
--- a/dev-util/redo/redo-0.31.ebuild
+++ b/dev-util/redo/redo-0.31.ebuild
@@ -13,9 +13,15 @@ SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
 BDEPEND="
 	dev-python/beautifulsoup[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	${BDEPEND}
 "
 S=${WORKDIR}/${PN}-${P}
 
diff --git a/dev-util/redo/redo-0.41.ebuild b/dev-util/redo/redo-0.41.ebuild
index 8cafff06ad92..a979123b762f 100644
--- a/dev-util/redo/redo-0.41.ebuild
+++ b/dev-util/redo/redo-0.41.ebuild
@@ -13,9 +13,15 @@ SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
 BDEPEND="
 	dev-python/beautifulsoup[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	${BDEPEND}
 "
 S=${WORKDIR}/${PN}-${P}
 
diff --git a/dev-util/redo/redo-0.42.ebuild b/dev-util/redo/redo-0.42.ebuild
index 9524b8fa26f6..a979123b762f 100644
--- a/dev-util/redo/redo-0.42.ebuild
+++ b/dev-util/redo/redo-0.42.ebuild
@@ -13,9 +13,12 @@ SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
 BDEPEND="
 	dev-python/beautifulsoup[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
 "
 RDEPEND="
 	${BDEPEND}
diff --git a/dev-util/redo/redo-99999.ebuild b/dev-util/redo/redo-99999.ebuild
index a5f8adf6f549..30c70257c019 100644
--- a/dev-util/redo/redo-99999.ebuild
+++ b/dev-util/redo/redo-99999.ebuild
@@ -13,9 +13,12 @@ EGIT_REPO_URI="${HOMEPAGE}"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
 BDEPEND="
 	dev-python/beautifulsoup[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
 "
 RDEPEND="
 	${BDEPEND}
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
new file mode 100644
index 000000000000..c7ffe94816eb
--- /dev/null
+++ b/dev-util/rocm-cmake/Manifest
@@ -0,0 +1,6 @@
+DIST rocm-cmake-0.2.tar.gz 12729 BLAKE2B 6380e077cdc0dcc8c40c487789bd4405a9104e0c55e68df0587c74ea140c329b28ef224bea0d9d529ddaca2c3b874e64be840f96191b8bae7d662de5854756b6 SHA512 b2ebd749fb99ac6dbeac005bb0de5ca57e12ae3590d560c0fd03371f2dd0fc6e7862e0bc96046b98b8248770852c6ee64dd349f22405e77d8a210884246213bd
+DIST rocm-cmake-2.7.0.tar.gz 13352 BLAKE2B 1dd37f9beed98d2120a42505ef7463de672db01c1213262202819ea4ee76678a3126b7ca52e8738717618247a93af680534262ce56b718f7dc4ebb7f62acd358 SHA512 d08d08ea53c7242fccce808189048d195b8edbaa2a8f0a0fac4267a232dddaadab791f0bf2fe0c975f050cdac095531a2cabcab55157b5405f250f74fa0a01cc
+EBUILD rocm-cmake-0.2.ebuild 700 BLAKE2B 4c4da1a130d2e18d7f00713fd24714c1ce28d44c15796c4d9bf1a854ebc4f54e5925d7be69a733dbd9db6e9d635e2087fdd57080b041f7b7029847de1a104d07 SHA512 9fab36b4226fe95da30d14d346adefd7cf75fc9e6f703872597b694cb231dddb2697f43a4508c8c5b6f01366212c8470073504d46f251bfcdbd6322a1090a639
+EBUILD rocm-cmake-2.7.0.ebuild 741 BLAKE2B ddb75c1be4c7334dba970676f392e207807836507968af8921dc224ea6d9b3c13e84225645f6a589efcd1a591fe602f6b1968a604d39afe35163f20d9ad105db SHA512 01ef6b384fc02a2792cc0963091b90556cb3d0ede1346fff2bde55dbace9c1398f53e0e035894e75c11547eecccd4403710d2ca38b6b1ebbb9677d12b52ca0c4
+EBUILD rocm-cmake-9999.ebuild 741 BLAKE2B ddb75c1be4c7334dba970676f392e207807836507968af8921dc224ea6d9b3c13e84225645f6a589efcd1a591fe602f6b1968a604d39afe35163f20d9ad105db SHA512 01ef6b384fc02a2792cc0963091b90556cb3d0ede1346fff2bde55dbace9c1398f53e0e035894e75c11547eecccd4403710d2ca38b6b1ebbb9677d12b52ca0c4
+MISC metadata.xml 468 BLAKE2B a05fff7df6fd53ff6793719b621d44ffec411b8c287a8fae36f6f07860cbbf819328bf579c8a0972d72fc6cbbdaee6dd628d4fadb9a2100e1fe1dc97911cb012 SHA512 2907497bd76b1a7f265c371fc55773a541647ec5c4ae42257a405bacc0b2839023a44b282719c0b9d4938e53eb55d5929679242219254db9ee728463d0b2a69b
diff --git a/dev-util/rocm-cmake/metadata.xml b/dev-util/rocm-cmake/metadata.xml
new file mode 100644
index 000000000000..a82bb12bfd85
--- /dev/null
+++ b/dev-util/rocm-cmake/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>candrews@gentoo.org</email>
+        <name>Craig Andrews</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">RadeonOpenCompute/rocm-cmake</remote-id>
+    </upstream>
+    <longdescription lang="en">
+        Radeon Open Compute CMake Modules
+    </longdescription>
+</pkgmetadata>
diff --git a/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild b/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild
new file mode 100644
index 000000000000..eee840d3674b
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="test"
+
+src_prepare() {
+	sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
+	cmake-utils_src_prepare
+}
diff --git a/dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild
new file mode 100644
index 000000000000..d6c02fff0fd4
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm-cmake-roc-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="test"
+
+src_prepare() {
+	sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
+	cmake-utils_src_prepare
+}
diff --git a/dev-util/rocm-cmake/rocm-cmake-9999.ebuild b/dev-util/rocm-cmake/rocm-cmake-9999.ebuild
new file mode 100644
index 000000000000..d6c02fff0fd4
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm-cmake-roc-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="test"
+
+src_prepare() {
+	sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
+	cmake-utils_src_prepare
+}
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
new file mode 100644
index 000000000000..342b79f9b920
--- /dev/null
+++ b/dev-util/rocminfo/Manifest
@@ -0,0 +1,4 @@
+AUX rocminfo-2.6.0-cmake-variables.patch 1107 BLAKE2B b613dee2b0b44cf4d31afbe3647ebc2c511903c5a6a6a0f74b6c5b419ab17f81b1d92f5802667bfce4444f839f3dedaea0785e2cdac14b7b49be6a9b97c12971 SHA512 59fcf341a381a1fc3c60c8f4f33050f6e31f0f29f53bb9abf2d0c2d0ed28c18f799ed49bf64ebe30a8e94c463aa88a735b1895df955c671f7e589350ea010ebe
+DIST rocminfo-2.6.0.tar.gz 12293 BLAKE2B b08725b45f48e78841da9d6e57bb19a441a423e20f853d16024c620914059abf3cb2e61c12ae6fdfdb85eb3e984d488ae9975ab3fd2fcc529ecb576c6816fc92 SHA512 e2dae7e2e02b674b3ad959a3dffdcd8f550842edfd0eac5866259a6a12de1a5f935afbdcb37845fa189d0937c41186f0eb8be08e7b346ddef959d5dd7b62dca7
+EBUILD rocminfo-2.6.0.ebuild 859 BLAKE2B 4e9d3a3472d368d74969ed7bfd5d269343a9612f0ee558d201d5ba24e033c9ad62ce8717abc282147c35dc01cef93e86770a89923ea8fe434bc569a6393be080 SHA512 c10a8cd4a853d7d343d907502c0064f6453cc876e6b34f6c63aec7a355f5114f598478f83d723dcc86d45c0e620b71d6e1d7bf18da429d8619fd0d699bdda88f
+MISC metadata.xml 475 BLAKE2B c1ca0f1d0ec94ae012d3a6c2e5b0a896de75fae32ab8af40d2d0e8747544c15f11ce76cc45bd429d4b5b3b3abde5c896fed362641abf995c4bf9f10077e6933d SHA512 f84d5a379fc07d3410bf6cf946c91056295dccad64f100be02959d94e39eaa47d4fcfed84ea2bd596b2ecccb4ad3267bd86cd76b50d938b235655220fcef1549
diff --git a/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch b/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch
new file mode 100644
index 000000000000..1678f5043273
--- /dev/null
+++ b/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch
@@ -0,0 +1,31 @@
+https://github.com/RadeonOpenCompute/rocminfo/pull/17
+
+From c9bfc4b3db029b8502f900cd9bb545a675ca0898 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Thu, 25 Jul 2019 17:59:51 -0400
+Subject: [PATCH] Use CACHE variables, allow overriding
+ ROCR_LIB_DIR/ROCR_INC_DIR
+
+CACHE variables allow for variables to be documented, and ROCR_LIB_DIR/ROCR_INC_DIR should be overridable as they'll have different values on different Linux distributions.
+---
+ CMakeLists.txt | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b5fa9dd..f8f430f 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,9 +43,10 @@ endif()
+ #
+ 
+ # Required Defines first:
+-
+-set(ROCR_INC_DIR ${ROCM_DIR}/include)
+-set(ROCR_LIB_DIR ${ROCM_DIR}/lib)
++set(ROCRTST_BLD_BITS CACHE "64" STRING "Either 32 or 64")
++set(ROCM_DIR CACHE PATH "Root for RocM install")
++set(ROCR_INC_DIR ${ROCM_DIR}/include CACHE PATH "Path for RocM includes")
++set(ROCR_LIB_DIR ${ROCM_DIR}/lib CACHE PATH "Path for RocM libraries")
+ #
+ # Determine ROCR Header files are present
+ #
diff --git a/dev-util/rocminfo/metadata.xml b/dev-util/rocminfo/metadata.xml
new file mode 100644
index 000000000000..c7439799c48a
--- /dev/null
+++ b/dev-util/rocminfo/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>candrews@gentoo.org</email>
+        <name>Craig Andrews</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">RadeonOpenCompute/rocminfo</remote-id>
+    </upstream>
+    <longdescription lang="en">
+        ROCm Application for Reporting System Info
+    </longdescription>
+</pkgmetadata>
diff --git a/dev-util/rocminfo/rocminfo-2.6.0.ebuild b/dev-util/rocminfo/rocminfo-2.6.0.ebuild
new file mode 100644
index 000000000000..31ca101fc69b
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-2.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocminfo-roc-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocr-runtime"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake-variables.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DROCM_DIR="${ESYSROOT}/usr"
+		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
+		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-util/rustfmt/Manifest b/dev-util/rustfmt/Manifest
deleted file mode 100644
index f88b06845a7d..000000000000
--- a/dev-util/rustfmt/Manifest
+++ /dev/null
@@ -1,47 +0,0 @@
-DIST aho-corasick-0.6.3.crate 24963 BLAKE2B 7d22a3501664a4324e43a20874fe4d2afcb1576d66f76bcfd894c0ea03b0daefd85e03e20196370dcb86d8c81067c3bc2202889349389c23b876d4b2bf8f2bbd SHA512 4d0d55d8a6657fe13009d66728b7417926325dd9ca4f7ad7cd5d40e59cf0a55b906cd109d724a0b385ee988526535fc64a467ded171419e452c5a8c90196ae45
-DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50fb2ed76984c1b58db225912db580f96c7954cbbf597036e9d743658364977ba24d0d7660312c3b8d38306d879 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0
-DIST diff-0.1.10.crate 7534 BLAKE2B 4dbb88e8b516de6441a1e1a090f0b58399c53bac8bddc212bcc2acd05613ddb81ebe689270aeca01b8395da02a5bdcf80ea9daa050c85d5835915ed4d901978d SHA512 1ba0f700ecd4f0598ed3d32e5f54f8df9d47b4a440c8a16ac99a45fd8401ef68acb6b743056fc769ba29f5c060745de7fec697aa1dff14f44c8f7c6bec74057b
-DIST dtoa-0.4.1.crate 73264 BLAKE2B 36698b6d78a1abc15fe36a9cfd545cf91c116d249b52b710bc098cd3857bef6ea1491e10c641c3e4fe8b6bb91c66b7623e22090ea182f2af61da6bcde1a8d032 SHA512 eb1be73a72f1b301371484aabfbffaf69692ad6baaeaace810d7bc8097a5084cca8cc37abf561b1371cb08fad04e07b24bb2149620a785387759813189682fda
-DIST env_logger-0.4.3.crate 10891 BLAKE2B acbe308cb75ad68f824dd8cbbef13a9bab3234f121952f16af274180ce87bbde6f6327bd98f0d2a4623fa7a4980b554ffecc9280b709df1323de149399537d6d SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246
-DIST extprim-1.2.2.crate 40910 BLAKE2B 92cf01e760fff5f1b8f880779c97a193bd338e9a4a4257d975082db873fa0a891f6bf700c629fcc57bbc4acb707a34c11da4273f640b9a527497325ba1cdaf4b SHA512 e14c5720c799b9822ce27fb000eb040b3aee41634c3a80a4ac275fd36575c777e0103b8572afc1d5c4ca9b08317b7620cace93fedb9363983617e8d8927cfba2
-DIST getopts-0.2.14.crate 16622 BLAKE2B 14dc08b56cc7d11bc58bfe952d2b3958c5b0054499f2a4bb7b7bcd100dbef5ab3c0fba4ac7f50b688512d71fd0a7eb27568c9f26023c451f0034883742ddeb45 SHA512 bb6101403b6d4ed6102dc84c69e95114c0f336924a3f45643a5a92ca82a2ad5ef6b0405e1975b84853831dcb7518b24d094a211a54cc2b46d32ff914e2f977bd
-DIST itoa-0.3.1.crate 73340 BLAKE2B b1cd133bf79f2c1ea7a38c5607a12cba1d8f707e65208e4d8e30448e0486320efb1933d4f19508a710b46803133bf98c33666d3406a2f52897d8544f8eabc611 SHA512 b6ade2740fefa2e437ad82a1b9ad7c284593f3525a6e746aa377e0d52b434f7f46a073df552c5ba9e9c47f1737f349654c38261c08ec762dfd9238a8d9c3d3ee
-DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST libc-0.2.23.crate 153939 BLAKE2B e89495dc4b9bb791bfe51e31a8047a20b74ffd585ddd81daec411c583d5d66b0c4fb2ecf13b19d2ef49a7023018df395f388681b1cb7f2f0449ffb4babe8a8ca SHA512 34620dc5ea9bb674a74a5b3d14844c098d38980efe4940538f31ab76e29dcfa6b9601a4747da7a8688758052ac416aa8dd693c752a3972a7bd66d9deebff2d72
-DIST log-0.3.8.crate 17756 BLAKE2B 1b06efd4625f9192e56629a5c8fd3072d876643ec5d42022e001d8c14139c56b7a2bbbaadeb5218a9ada6cd86aae26819dc4693eadb13ac1dd4ae93ac50554e8 SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7
-DIST memchr-1.0.1.crate 8221 BLAKE2B 2b3553c5da6bd6eef0cd716fa9e6856aac0a03a566d038e7b0d2c469e16b682ea985d293fa4d8f85cf34e120bce51732e9987061db396f0aaedafc900c13fd86 SHA512 70ee14fcba41cf896f563da48c8acc683f8cdf77c54cf9786d6a938bd14eca7bcc22c86d0d70a3cae56b2c2f9eeecad2950be759abf02fc98ef96a643af91be6
-DIST num-traits-0.1.39.crate 22618 BLAKE2B acacffc5ba41e2eeab0cb50f2746dba800fc5ebc4b9bb32000678eae117bf0e26d52b8225f71ac7c646bd7f5d8ab37615aad74086dc6ff4ea25e6e6fa141f024 SHA512 daf317fcd87807b2e295a4f748f1152f5a9b012bdada80204c97d33e3ef18c89432680db6f79ec655e585e0c38428c50ce5fbe7215f626af6f6f83eff47a364e
-DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
-DIST rand-0.3.15.crate 55312 BLAKE2B bde7d5bf10e153d793d0ce9711c6626dab545e1b42296c6c4f0f104bd316bccc51fad3d6321c504069360fba96a74d2af756c92db3859675295c33d0be46c660 SHA512 4c812b1f742adf94fe45c806fd66a360a2490e474db6cc1d13acf4101fd63072429f1b50aa84b51cc742c1624a871a588769f4c12faa775f6f275a028fe96633
-DIST regex-0.2.2.crate 193403 BLAKE2B d8b439c1544b7faf15fa073f9e759a1a4bdc905290da12d22526e00d22462e5b4d29fa928a88cd6a60902958b828539d04c65f9d8f2d00b3b75805dff9763afe SHA512 208b671d06b260e4a130718a86ced88ee7f183bd056461bc6d44a15a22260a9ee05a014682bdb8bb7ff674fd33ac4748687c7ebd847578c7fecc8efbbb1993b3
-DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02ed36dcd7e58eb8e3a16601f169652d45dc10657d400796fdb93be560ec6678e34315d9e94a05e9d0b11b476d8ae1a SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f
-DIST rustc_version-0.2.1.crate 9840 BLAKE2B 765402ed397f839f1766da11ac80464d2f3cbd150508dcf1336402eaede9c20052dda4f9baed6ad73192c7586a50147b53e6c45a8d534463731653c113cae85f SHA512 edec68b24e95a04c58a08c67b58dd044f28930a87ad04aff0c0c66ffb3f1e89ab07f2fb9fed5e2e8c6ca3b372225da347bc10bbcd13d62b4552ab15abfdce0f7
-DIST rustfmt-0.8.6.crate 110133 BLAKE2B 09d41e337179b534504fd9f9c259f07e90564c84bcb8810cdea1bc7b45fe4e10b85baf0b4f4dcb0c117876240f072c267a10449ec3ff8af0e765233394ec5141 SHA512 d7f8baba7b35a18ea21c6b0549bbfa4b2e2ff6bce681b4395ac5a08643f138a8de492455edb51d9ed1553cca19807a503b113b860f11359a33a339674ed9cb81
-DIST rustfmt-0.9.0.crate 109710 BLAKE2B 7e599de80cfe334ad30482abcca6ea4bb6a54088d8334a5f177013975bd4dd1ded8cb0bb422a0355866abfa7eb171ad3aa4977b11e821c0e8ed8d9d3ce2b7e3b SHA512 6a09091f27dedcb8e838ee4561ebf05dd23b2e368853b8494a3e14574cd47ce04da20a388963c885863f535a50d8e37f9880a6eaba35c5cc7677bde342f47bce
-DIST semver-0.6.0.crate 15598 BLAKE2B b46a0e8b782550a49174e461b447e617f0232d9df3bf2363273d4815452df5a587ba7534c843d7d68969166059704e1e8abd716623cfac5b42957b2eda55e14f SHA512 8b4dcad3c672ff8468a68fc19de2804e079af1a75406d71b996621021b5e05dc53fef972455fa9146c199493b71e2b80fe180e33ba4ccfb4dda10ba962a0a6bf
-DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.8.crate 59699 BLAKE2B f60a77b40d921e91b1e55f3c5f0ec7e1f05aca92f81c991a86c0d8c58d70451e291b94fad5237d23435b144bc0568062d8560c25cfd7ad0e984bc61383e366d9 SHA512 743ab9518935ba219faab7f61f3ce30d6e20c20145ed9ebe46df49e570e74063baace630eacaad2f3b7e9e0030b64faa428810701537a6e2a5224802bc55edc1
-DIST serde_derive-1.0.8.crate 24015 BLAKE2B d97f73055a5375d338fd078f2f55ca3db59c5c6212c9cc02817237ae964fba1076bc8e901f0d80285619568519745f9d55731ffacf3e4965aef80a662f61bc7f SHA512 685446ae6077ac8e730358d8676e9648ed0dca3638c16ab3b14ea0e6823f1743af1b41933ed2b8f4f5e497e8954c954c40dbbe8f8e6d66a0b0caf3cbe2612a3a
-DIST serde_derive_internals-0.15.1.crate 16441 BLAKE2B e1b82c9a0b8c08eddaafbaa3ca5c23aa1b11462e3e45912d2ee109a991206df5a65605739bf8365e3a29836c2fb0a551401bb090f5bf1418c5d6ed9d41c91bd6 SHA512 5599b3022f9a1f16566c4d86ae2f173373905ec318499ffe28a061e58494f786d0e6dff6ca962422bf6d773604b66f62b0de8e19cd39057456d50e923180a41c
-DIST serde_json-1.0.2.crate 55422 BLAKE2B 346d929bfebaf04b0afaebc9ac1c54119f2ce9b77e7163b474fe92669051bae12f0e2fff8ce9899219cc37032b4ea9f5dfc2fbdc022440246526ee11dedb71bd SHA512 ff0a3806b138cadace0ffd600ae695047e6e75655699054e8974160619ae5a00e8d306b85dadb0f08672d16934f43870627e5619af29fbf68497638eb133d4a5
-DIST strings-0.1.0.crate 14234 BLAKE2B a84f7136072e1e403cc3b1a18c29265ed04352e338b683d52fa3f2e2f546924ee71a11e87ed806153e58a6f25444402a1a88bb33c093cda1d98f74f131e4072c SHA512 ac7aac7456d74263bfca93443041517938ee59c4b807877e70d4abd2840387e54eac41fa8406a263e317109401d16df662306756c3d869757e2a48643310c214
-DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc30054f76536c1cf537b8fa0d990c78f86b1e5187392b31c5d7364ad5767ae96de5844e252c9c7c41ec962 SHA512 285bdc1f9b53fe791bd35b10a06fc106231c4eca908244f7ba7366a865452ec2dc8bbff275a52725d29c48d2065790ff6eb37c6eb9c1968aeb0af38c028d173e
-DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
-DIST syntex_errors-0.59.0.crate 29194 BLAKE2B 36c35e5e5ecfe433e756b75ce09e1753496186ec178c6bd44725b4676af201eab1e833cb083fe9092beb3a9bdaf2a244998f8a7bd503e4e48f6985e884f3b465 SHA512 ad6931e3a9d64400deba090e8f269eb81ede1582238fe3889b35404ae38c4f33fd767ba9bd69cea13c87585f40271d41c7df6cdd9ebf7e1401d321323f4fc442
-DIST syntex_pos-0.59.0.crate 19199 BLAKE2B 9181c16d570591e0b05f0e11c0de47636824f8f924ece677ecec08fbb1810d6440e9780d56c625fade6e9ed214370d58ccc18756f6cbb2c6dc3e030159dcb883 SHA512 af1af6b6311d8dfb713850b48e4b4f4b16cde7249822a8b62c255e4b3c70e88fd4a5b1cb0ef9394b7f9f2833ca406b8d5a4646dd1f59868987fe0fa9276264fd
-DIST syntex_syntax-0.59.0.crate 269946 BLAKE2B 5114590f0902ef14d1dc3bddf9f42b4326dcf0ed70c51c9ff3279a0c433dfe0eac5f671eea6e72c0bc2302577c80ef96a7989f3326b81c9e3673b8052faf1808 SHA512 08420148294c2840f92b10cc695d5a2c50a72501c1b191fc863637d62ac673bd68fd6f08826091a932b3cdef228b175f37ac98186b4c797f249b5a7a7804adb9
-DIST term-0.4.5.crate 37496 BLAKE2B 4b0b4deea60e446150ca89f8fcbff5ea38818482a5a995215c21f64d6fd5b4c97f3b2e61fd729e1e2e004b41ac0e4eb37e6e477b983c204d8bbd4990e455d875 SHA512 ffefb5d3611eedea8508611e6c27d9da32070f2e8ba998cbf060791ac36a2d58b310981c742f638967f0a0a7de70ca40b4b6fb093d3fb643b01cbf73f8e624dc
-DIST thread-id-3.1.0.crate 7195 BLAKE2B 8bed46dc27434635f5dfba629e56c2aa1ab0a74733d37b9e90339d70443471e95bbe59672525962143b85df60b6834e1a3cf98b071c07eab371419e09aa28512 SHA512 f24b2608cb476829d43b71aec0e12a12123a8943402755ec44f5eb4974e63ce7ff1d75f5046ddb533a08447c98758c226163e461c52413091d85f6267a19af13
-DIST thread_local-0.3.3.crate 10964 BLAKE2B 1cfdc1a83682243df8bd3fd75b00f174f6e07e7494f47f9b580704cde47c91650d2733fee331f8dc3209e6b1f199b26bd07aae02a3981c9769500ab791bea053 SHA512 19b4d445c2688898d149a05aec7c157f5c8cf48a60fa98b8890bc70ee8f391fc94d454ec218002063bbaaa715326957ab2dfda0537b782a2643e908b64e0f22d
-DIST toml-0.4.1.crate 54017 BLAKE2B 20fd8f0f8501adba0cfc504446d490da8d488efe218f54e8b9bda2e95d70b1a26d660fdfd512bd6344a2858e7a813edb10c26f366041171407db29abd1025654 SHA512 ad603d1011c253eda1366fdc9781a8d5f6c3792cde26cac2552e2aea2ab7e2a926257587362d5c11518e397a96d59a4c38b0418eaeb5c584c83a37850d488480
-DIST unicode-segmentation-1.2.0.crate 67562 BLAKE2B e294566ff0f0bbf8873c73c8f1103bce8d4d0fc8a03f41b299f88aeacecbcb44a3cf2ce95aab9682177a9e3f2e3db9cbd53403830c761724ee3654b9c328f862 SHA512 724fb05d4c02926a535a3380f0a718e5ca0b61c71173efccee6780e878b3e890f11e7941cd970c6c1763ac756f31fe338b0dba2ff31db2aad29670bd6e8b9bab
-DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091
-DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
-DIST unreachable-0.1.1.crate 1772 BLAKE2B 5d2400959e334d483f1b2a6accbc6641de33df02041d8c7ea23bb66cb0d34c9a911d70926f0849bd3004ff1683c3c212ab7877d6c3b9df535726ea81f7237a20 SHA512 81d7e8740630ef90341bed76f5be55c928c1f28cf46ef23431a7f610445cae884eea532df805784b2fa04034e831255a3102a29fe2c228b8c1c1afe15d01cca0
-DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
-DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
-DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
-EBUILD rustfmt-0.8.6.ebuild 1138 BLAKE2B 8a34a08085a3d0623808a06d8e38e0fe5eb4c4a8efba1eafb3b670baa890dd0d9ac35a318b86962690fdb70e001b3d726dddee73ceecc897ecd66d116398e99c SHA512 8d5682dc0a546b1309dea2855360a89c37c172c0bce80ac50e2b5e19534d04a5ec49f06fb53999e98d149d805c3c4c5a2e2d61286bb1437df9ae1a62570925a7
-EBUILD rustfmt-0.9.0.ebuild 1086 BLAKE2B 78dc685cb03d6a6705e34073e27c91a0383357b32e620d6ae0e472e63ea3685cef31ba95b2af8757c2f928dd50c2f60da70d2a3c2c0ed519492e12e94d7ae447 SHA512 18340fe9a0784eaa414d234993d438740008dd7f1515f684412dd26ed7bb9bf882aec86469b7f71e8e89465973fbd52b02032ece5aef9744cf296a171d270a56
-MISC metadata.xml 344 BLAKE2B 9ad68bd02a6cb23d8801af7d5a7f83ba655ea3fa2a566433d00e79c924db04a1963e4d37b5102671f24cfe2f44aa4408c975bb63c09de35c629b9e1cda1e2ada SHA512 aeced857d8f01a427d61171bd400db3503c524dde306580d4c92790fa4843e7a5ab3e8a4b0c429a626b87ae6575ed65eeb7913334faa219d6cae0c445cce7c04
diff --git a/dev-util/rustfmt/metadata.xml b/dev-util/rustfmt/metadata.xml
deleted file mode 100644
index 838e7b2c8423..000000000000
--- a/dev-util/rustfmt/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>rust@gentoo.org</email>
-    <name>Rust Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rust-lang-nursery/rustfmt</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/rustfmt/rustfmt-0.8.6.ebuild b/dev-util/rustfmt/rustfmt-0.8.6.ebuild
deleted file mode 100644
index 34cfca3fcc58..000000000000
--- a/dev-util/rustfmt/rustfmt-0.8.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.1.5
-
-EAPI=6
-
-CRATES="
-aho-corasick-0.6.3
-bitflags-0.9.1
-diff-0.1.10
-dtoa-0.4.1
-env_logger-0.4.3
-extprim-1.2.2
-getopts-0.2.14
-itoa-0.3.1
-kernel32-sys-0.2.2
-libc-0.2.23
-log-0.3.8
-memchr-1.0.1
-num-traits-0.1.39
-quote-0.3.15
-rand-0.3.15
-regex-0.2.2
-regex-syntax-0.4.1
-rustc_version-0.2.1
-rustfmt-0.8.6
-semver-0.6.0
-semver-parser-0.7.0
-serde-1.0.8
-serde_derive-1.0.8
-serde_derive_internals-0.15.1
-serde_json-1.0.2
-strings-0.1.0
-syn-0.11.11
-synom-0.11.3
-syntex_errors-0.59.0
-syntex_pos-0.59.0
-syntex_syntax-0.59.0
-term-0.4.5
-thread-id-3.1.0
-thread_local-0.3.3
-toml-0.4.1
-unicode-segmentation-1.2.0
-unicode-xid-0.0.4
-unicode-xid-0.1.0
-unreachable-0.1.1
-utf8-ranges-1.0.0
-void-1.0.2
-winapi-0.2.8
-winapi-build-0.1.1
-"
-
-inherit cargo
-
-DESCRIPTION="Tool to find and fix Rust formatting issues"
-HOMEPAGE="https://github.com/rust-lang-nursery/rustfmt"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/rust-1.8.0"
-RDEPEND=""
diff --git a/dev-util/rustfmt/rustfmt-0.9.0.ebuild b/dev-util/rustfmt/rustfmt-0.9.0.ebuild
deleted file mode 100644
index 3060ef0ed69e..000000000000
--- a/dev-util/rustfmt/rustfmt-0.9.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2017-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.1.5
-
-EAPI="7"
-
-CRATES="
-aho-corasick-0.6.3
-bitflags-0.9.1
-diff-0.1.10
-dtoa-0.4.1
-env_logger-0.4.3
-extprim-1.2.2
-getopts-0.2.14
-itoa-0.3.1
-kernel32-sys-0.2.2
-libc-0.2.23
-log-0.3.8
-memchr-1.0.1
-num-traits-0.1.39
-quote-0.3.15
-rand-0.3.15
-regex-0.2.2
-regex-syntax-0.4.1
-rustc_version-0.2.1
-rustfmt-0.9.0
-semver-0.6.0
-semver-parser-0.7.0
-serde-1.0.8
-serde_derive-1.0.8
-serde_derive_internals-0.15.1
-serde_json-1.0.2
-strings-0.1.0
-syn-0.11.11
-synom-0.11.3
-syntex_errors-0.59.0
-syntex_pos-0.59.0
-syntex_syntax-0.59.0
-term-0.4.5
-thread-id-3.1.0
-thread_local-0.3.3
-toml-0.4.1
-unicode-segmentation-1.2.0
-unicode-xid-0.0.4
-unicode-xid-0.1.0
-unreachable-0.1.1
-utf8-ranges-1.0.0
-void-1.0.2
-winapi-0.2.8
-winapi-build-0.1.1
-"
-
-inherit cargo
-
-DESCRIPTION="Tool to find and fix Rust formatting issues"
-HOMEPAGE="https://github.com/rust-lang-nursery/rustfmt"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-util/sasm/Manifest b/dev-util/sasm/Manifest
index c7f8761c5c31..07f4eff449dc 100644
--- a/dev-util/sasm/Manifest
+++ b/dev-util/sasm/Manifest
@@ -1,4 +1,6 @@
+AUX sasm-3.10.1-unbundle-qtsingleapplication.patch 441 BLAKE2B 433221ce1d28357dc3897916e11f0e42ae4bb95402c1da6b6abcfcdecf33ddfd1a727b87ab2bf933f96fbeda95137f70e31d02c8e731a7ab3da7a784f148dad3 SHA512 c04977ee0f651c8cd5f56c93c32668aeeeeac5ae3c1bcc909933a660afae149dd797bf23df159f15fe8374001a9dbdf78ca5c5f6b59034922a82e19ad16c037f
 DIST sasm-2.2.tar.gz 9117410 BLAKE2B f85d120469f11fd8cdb7ae9dcdc87464d8bc64db4f99cb2787c4f2adb6294288a7fd1dc071b53badb8153e8c8220a77964b102a234ad9ebc3b6a64d505c828dd SHA512 42d4af775d37d47bcf63fb70b9142e387e33cef5589002ff3e3cee926b5fca7e1508d640d1d5a175d48fc9fd041eb1f03304cad5ddc3c22a09ff29198650b513
+DIST sasm-3.10.1.tar.gz 22349749 BLAKE2B e1337d9ab1f62b0ccab31f202f5964ab2b355ab597cf08e65dd69f7a35f72187a36767d1bbbf339e3bf8330dffcd924682e464d0e8cdc13255723b2c5ed75747 SHA512 2a1410c996e3dac1179a2c8a0140b2180ccc9e461e4695a588c6a5db787a13de5ca9124d467561905e1d445d08bd044bd99831203faa6a740614bc6680ae10d1
 EBUILD sasm-2.2-r1.ebuild 749 BLAKE2B 336ff1f57eaf6fa9beef03f49b9b6082d45072e1e89927117e9d464a56edb6717e3cda8e72a02fbe9ebce398952c650ea7adca8afc9cbf29e718e2f3e688fd4c SHA512 7e049807b11fd7acbef12900decc451979818b413718e2935e6c28ec68ac7b0a70bfbe8316c407651bb66f336308157ba75ed77db0313b3ad45dbd81fcc6fddc
-EBUILD sasm-9999.ebuild 770 BLAKE2B c78133844ee317fbc57b7650359d56cf86ca102056b8241ced281450a8d755d9ab72b32aa2edf4901375bc634bac347041ecfa825fddec6e5b280fce4c26f10c SHA512 0dba9e85f0c9a638f82ef99f1a6deb4854c84f40ac2d8845f0d0dc155d22a84363af58a07e1ed4e32b9c797b1c4f4bb8ac0e35c77bbcccfc9c0718d62af59e27
+EBUILD sasm-3.10.1.ebuild 1173 BLAKE2B 78b77ce3d85ab9d4720dbf5c918e46ea1553c3f840e024e9d6cf6cc2ee8a83e305885beed42d00d03b7a577058e316eef0c19d4efd0fec4f5d847aacc7a7b3a4 SHA512 0f6aba843321330417639396ed709155d9e03ca9934b14251967a5c65e54f33db9efca0af1e0a6a1f5835ab740701c15d6b1b041262fd196470f577a96772149
 MISC metadata.xml 325 BLAKE2B 7fad0a2d1d4ab4f67758d702f18de025b6bf553e5f99ab43b6657ee9dbfcb858892ae5c4d6e37094b744b85fd70f1dd7f1b1e8e7ff142d86f9bf83190aa045c2 SHA512 8cb446410e74845234244cb121cf966f18ea1ce69796f6dc5c6c1d434952811e61c8b02aaeba24905578f8e8463e29269538b50768b30524af859419769b5a92
diff --git a/dev-util/sasm/files/sasm-3.10.1-unbundle-qtsingleapplication.patch b/dev-util/sasm/files/sasm-3.10.1-unbundle-qtsingleapplication.patch
new file mode 100644
index 000000000000..70b7e56682d2
--- /dev/null
+++ b/dev-util/sasm/files/sasm-3.10.1-unbundle-qtsingleapplication.patch
@@ -0,0 +1,19 @@
+--- a/SASM.pro	2018-10-08 22:09:33.000000000 +0300
++++ b/SASM.pro	2019-08-17 10:39:31.695020549 +0300
+@@ -18,6 +18,8 @@
+ BINDIR = $$PREFIX/bin
+ DATADIR = $$PREFIX/share
+ 
++CONFIG += qtsingleapplication
++
+ bsd {
+     binfile.files += sasm
+     binfile.files += BSD/bin/*
+@@ -47,7 +49,6 @@
+ INSTALLS += shortcutfiles
+ INSTALLS += docfiles
+ 
+-include(singleapplication/qtsingleapplication.pri)
+ 
+ SOURCES += main.cpp\
+         mainwindow.cpp \
diff --git a/dev-util/sasm/sasm-9999.ebuild b/dev-util/sasm/sasm-3.10.1.ebuild
index 61a911989dd0..90ca72d53168 100644
--- a/dev-util/sasm/sasm-9999.ebuild
+++ b/dev-util/sasm/sasm-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="Simple crossplatform IDE for NASM assembly language"
-HOMEPAGE="https://dman95.github.io/SASM/"
+HOMEPAGE="http://dman95.github.io/SASM/"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -23,10 +23,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+PATCHES=(
+	"${FILESDIR}"/${P}-unbundle-qtsingleapplication.patch
+)
+
 DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
+	dev-qt/qtsingleapplication
 	dev-qt/qtwidgets:5
 "
 REPEND="${DEPEND}
@@ -34,6 +38,19 @@ REPEND="${DEPEND}
 	sys-devel/gdb
 "
 
+# SASM repository contains precompiled binaries ¯\_(ツ)_/¯
+QA_PREBUILT="usr/bin/fasm usr/bin/listing"
+
+src_prepare() {
+	# To recompress it with gentoo tools
+	gunzip Linux/share/doc/sasm/changelog.gz || die
+	sed -e 's@changelog.gz@changelog@g' \
+		-e '/docfiles.path/s@doc/sasm@doc/'${PF}'@g' \
+		-i SASM.pro || die
+
+	default
+}
+
 src_configure() {
 	eqmake5
 }
diff --git a/dev-util/sccache/Manifest b/dev-util/sccache/Manifest
index 109971816ed7..423d53a05970 100644
--- a/dev-util/sccache/Manifest
+++ b/dev-util/sccache/Manifest
@@ -193,6 +193,7 @@ DIST ryu-0.2.7.crate 41382 BLAKE2B 267fc35f85a118384ff716f5e3d4045678f0addb74f1e
 DIST safemem-0.2.0.crate 6450 BLAKE2B 44598e47fa6185ec0890b4ba6d0e7b5f52f8892875741c3819559dfa61491736d4326fa1713916ca41d6daac72829ad31d0905f2e339a069a987d9715f340795 SHA512 71901f472668572e849504a8a830d4dd9a742729b0158d2c6865a5ad86e65cae8b5bb83707240ba03a7a74c610ace87f8b59bde68998d2bd66c19849aec4fc8a
 DIST safemem-0.3.0.crate 6947 BLAKE2B 1f3e86944eda42c890a5f5792b7e0a50fe6574b1cbb077b7f08aca7dfd33e26deb0fccb3aa96056de3d637d014658b682aa47b523f0efb1f8145af7bf34ce3a7 SHA512 c7d56204b29e9c0fcf925ccc43a2c910f6cd74d232c500b61996559a783ced3938cefa058128d72759e94edea683bb8922ac5ea631d16e31b58de093d6650b0f
 DIST same-file-0.1.3.crate 7078 BLAKE2B 175390d4c7cbe5b98b27b6d23adcef78beda50277f0035eb58d630591023fff92756e928d2089e915e166c5da6a8b1d5b3184e82576eab5145c1681d46b4e953 SHA512 2d3d03ab0dd4add93cd32e7ca43041d541bee41000fd8d98575a58cbd192fe4498234ab80baa3c4791de9f3d4214feae90f628fd655e3510ede61f757be3a82c
+DIST sccache-0.2.10.tar.gz 242187 BLAKE2B cbb6e7673cbecb855c2126f5e5938866097fc57f05e24c74538112b887071e87f63cae864982d7b153f862711b6014e33e1a7145e6d01300123f2031e01d128a SHA512 4f4c051e93d937bae42739d9030dddddde48af59d66c69256172ad660e8d6135c64a77421174b98d304ddff9949d33a04e84e05c255ceccc73cd9cab32663989
 DIST sccache-0.2.8.tar.gz 229658 BLAKE2B 95a9f7f3adf72dfc49e344de10e374e80e09d0d0ec91fa913da06f8c068a3e4632aecf30a3349ae02ebaa5d3984d5342258842656133fac77db33e0aaae7f75b SHA512 3469a50339892ca2495f5655a1bd9fcb21a60bd01384c6851789e806902d95d605a941b1a09e0172eef663bddbc7d32fba3afc9ec76bd2a27f32acb1b7b0a35f
 DIST sccache-0.2.9.tar.gz 239624 BLAKE2B a8b91e71512cf37c4d51fcfab8339345c8c4c6ab542422228f0b573220b2b5256d54c8347e36c54cbe39b6c3b5f7ecea3606b52564dc21af0a143bb2cf49f7aa SHA512 289109338913c935752e9bbcd45b7bf4ef48be03b5a7d92c93ac220b98f04338ff562030cf126f80bda8db41e83b1103e6c2bd55caaeef4d7804157f4f685080
 DIST schannel-0.1.14.crate 38833 BLAKE2B 8825f6325f65c5aa4031a2260c4c54ad2a65634d2ce349bf6c31fc10a76f539dfe58d4de1e04fe6e48e885fabf5f720f5b4e4625f4a511e96c7cfe9837c901fa SHA512 550623a87f01c3c6181dad44d44397f172aa07c1b262a78d6eb38ca0676d68bcb8f231970c4eac87e93286225e17acae09551b07128c43b576ea77caae18c0b7
@@ -279,6 +280,7 @@ DIST uuid-0.6.5.crate 26185 BLAKE2B 60e120be31fcfe5f3fffc7a89b394889d20ac2f7adea
 DIST uuid-0.7.1.crate 32775 BLAKE2B b5d5d558a3b9091dd9c938a8f493de1ba11bb805829881acde4fc7f97cd565d3a87cd793c36dcf0503a33961ad44cb08e25b9b64d76fc884b760a7120947f5e0 SHA512 6559d538ee7a0ec8ec01f86dfc650a46aea8c7dd7c828c3e6c907c252573ec088261726eade02b89fa626b1058a6a5b3f679f507a506cc75ef838c885194453d
 DIST vcpkg-0.2.6.crate 9866 BLAKE2B c9c6e1a52e54d6d4103e0b833d77cdd4b2463123a5a12d7c15922bf782c7d56f0055ed5dc9d2bd236a14fb0ed6612c7b691d8a31a98e34b48f84228e6c10a567 SHA512 55678e3cbb7b1bf80e2589df3fc580bb595576a5f24e515819906082ed081e47a546d6825bb92fae56ed0157407244e1b77af1677f0380f2fdd15cc54853675e
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST version-compare-0.0.8.crate 14852 BLAKE2B 45d979e5c6ca2391f0e55260a5fea7734437731115468d3fdca29ead7433e3440b15e0619610903654bca702dfc96558550752b54b1d87dcbb550bd19f3d1b40 SHA512 15a26fdbcce0a41c8a9b89347001d26f9e1b9d682ad24f7a1ec30b0dfd1fb67d4938e5f1d45c43b7558e6682727c73932795f08d86e6fc07afead6ef7c1c9114
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
@@ -296,6 +298,7 @@ DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbe
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c1f3980c65f26adbe177efaa6c93e0c6ecac4ee0687609a932c957efb11678c9176d44010eebee651fc84c SHA512 a89d34313c35ab02d6ea25675c99f9c9650dee40a76223d62941edda43b3d2db83ed223bada129625b3cf8487c293646ce9980afc6dba8888fa078d5aa035cab
 DIST zip-0.4.2.crate 25852 BLAKE2B ea5e0e32ec66bc0b5bc0f3cfec4c81aa1c8c9dbf714ba024b9d609c2fe9b2cb0b11f9f788e74eb03a1764cf819c51cff6a637ab0580b52031841c00785b9d010 SHA512 84bf51fb83db91d0f6151e7ed4fe59cfcac5dacaa4da58ab09e226a48b14287275f121cf6302b29c693dbcb16e720fbccce7d6d986364ad5d403715235ed98e4
+EBUILD sccache-0.2.10.ebuild 6394 BLAKE2B 2fa1b79a2be1df52ea221cebc80df0a1aafcdc57d94cd87fbb56845823cb1f252d0582003a1bd7bd40a4156befb4dbaffe6793edd8f1d5194fd1e60b9e54ed43 SHA512 152d04c8e9afd0858bc773c3a50bc5ecff8dbfbdd9c285976624e0d67efb16c2a5eb978322fb7ffcd625908a647ffd5352305406cf122654c7afe1109c7f9940
 EBUILD sccache-0.2.8-r2.ebuild 6419 BLAKE2B 9c0405202cc4146003c4852188b365689d25a2c23703131d9114bd2f83817d83d925c384916bce0c49077b0442ecf010f793dd48c1305f79cea49937f47b8c94 SHA512 3e1ab2fc36197abffed8a8e9d646055fe1e459e3659efa2954c82516fb4a3ddf2dc5ff6a6517f7c127a4d63189f96d424f9d2ea4e7f7edbd204d0e3103037acf
 EBUILD sccache-0.2.9.ebuild 6393 BLAKE2B d71659395cb9313b4c7ec1b1402b963b4950ed9d29fba63f99095d344fdf5d5474618c2165831660c19437a98b4e518b548de27bd34cec59f82cde6597a5286c SHA512 2d13edf303a22d84b6480008a099c15e5058d2e53a20b448dea1b06b2d9f2ccb57564035079765bb98b0919b5f05fa650cdbeef75c0a6803b47d8165b4ac0648
 MISC metadata.xml 1054 BLAKE2B 13d8f1062d23ea96ec26e52b27c8a3b4a47b3e3f48e06b2b4ae39bb068604556ecb76f3319fc2578babc10cd235ed0ab5a28722b9cbb0a776b8a35d60dead4ea SHA512 2f8a4161a99a060d4651f195eb459173f0e02bf3dd72371611b94408c8cb2f8e7537004a0b9d90cae461cc0ba8e1531a80823db6734cb8241ad57737fd50b5a5
diff --git a/dev-util/sccache/sccache-0.2.10.ebuild b/dev-util/sccache/sccache-0.2.10.ebuild
new file mode 100644
index 000000000000..09322dc521cc
--- /dev/null
+++ b/dev-util/sccache/sccache-0.2.10.ebuild
@@ -0,0 +1,358 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needs itoa-0.3.4 for tests
+CRATES="
+adler32-1.0.3
+aho-corasick-0.6.9
+ansi_term-0.11.0
+ar-0.6.1
+arc-swap-0.3.6
+arraydeque-0.4.3
+arrayvec-0.4.7
+ascii-0.8.7
+ascii-0.9.1
+assert_cmd-0.9.1
+atty-0.2.11
+backtrace-0.3.9
+backtrace-sys-0.1.24
+base64-0.9.3
+bincode-0.8.0
+bincode-1.0.1
+bitflags-0.9.1
+bitflags-1.0.4
+buf_redux-0.6.3
+bufstream-0.1.4
+build_const-0.2.1
+byteorder-1.2.7
+bytes-0.4.11
+case-0.1.0
+cc-1.0.25
+cfg-if-0.1.6
+chrono-0.4.6
+chunked_transfer-0.3.1
+clap-2.32.0
+cloudabi-0.0.3
+combine-3.6.3
+conhash-0.4.0
+core-foundation-0.2.3
+core-foundation-0.5.1
+core-foundation-sys-0.2.3
+core-foundation-sys-0.5.1
+counted-array-0.1.2
+crc-1.8.1
+crossbeam-deque-0.6.2
+crossbeam-epoch-0.6.1
+crossbeam-utils-0.5.0
+crossbeam-utils-0.6.1
+daemonize-0.3.0
+derive-error-0.0.3
+difference-2.0.0
+directories-1.0.2
+dtoa-0.4.3
+either-1.5.0
+encoding_rs-0.8.10
+env_logger-0.5.13
+error-chain-0.11.0
+error-chain-0.12.1
+escargot-0.3.1
+failure-0.1.3
+failure_derive-0.1.3
+filetime-0.1.15
+filetime-0.2.4
+flate2-1.0.5
+flate2-crc-0.1.1
+float-cmp-0.4.0
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.25
+futures-cpupool-0.1.8
+gcc-0.3.55
+getopts-0.2.18
+h2-0.1.13
+http-0.1.14
+httparse-1.3.3
+humantime-1.1.1
+hyper-0.11.27
+hyper-0.12.16
+hyper-tls-0.1.4
+hyper-tls-0.3.1
+hyperx-0.12.0
+idna-0.1.5
+indexmap-1.0.2
+iovec-0.1.2
+itertools-0.7.9
+itoa-0.3.4
+itoa-0.4.3
+jobserver-0.1.11
+jsonwebtoken-5.0.1
+kernel32-sys-0.2.2
+language-tags-0.2.2
+lazycell-1.2.0
+lazy_static-0.2.11
+lazy_static-1.2.0
+libc-0.2.44
+libflate-0.1.18
+libmount-0.1.11
+linked-hash-map-0.2.1
+local-encoding-0.2.0
+lock_api-0.1.5
+log-0.3.9
+log-0.4.6
+matches-0.1.8
+md5-0.3.8
+memcached-rs-0.3.0
+memchr-1.0.2
+memchr-2.1.1
+memoffset-0.2.1
+mime-0.2.6
+mime-0.3.12
+mime_guess-1.8.6
+mime_guess-2.0.0-alpha.6
+miniz_oxide-0.2.0
+miniz_oxide_c_api-0.2.0
+mio-0.6.16
+mio-named-pipes-0.1.6
+mio-uds-0.6.7
+miow-0.2.1
+miow-0.3.3
+msdos_time-0.1.6
+multipart-0.13.6
+native-tls-0.1.5
+native-tls-0.2.2
+net2-0.2.33
+nix-0.11.0
+nodrop-0.1.13
+normalize-line-endings-0.2.2
+number_prefix-0.2.8
+num_cpus-1.8.0
+num-integer-0.1.39
+num-traits-0.1.43
+num-traits-0.2.6
+openssl-0.10.15
+openssl-0.9.24
+openssl-probe-0.1.2
+openssl-sys-0.9.39
+owning_ref-0.4.0
+parking_lot-0.6.4
+parking_lot_core-0.3.1
+percent-encoding-1.0.1
+phf-0.7.23
+phf_codegen-0.7.23
+phf_generator-0.7.23
+phf_shared-0.7.23
+pkg-config-0.3.14
+podio-0.1.6
+predicates-0.9.1
+predicates-core-0.9.0
+predicates-tree-0.9.0
+proc-macro2-0.4.24
+pulldown-cmark-0.0.3
+quick-error-1.2.2
+quote-0.3.15
+quote-0.6.10
+rand-0.3.22
+rand-0.4.3
+rand-0.5.5
+rand-0.6.1
+rand_chacha-0.1.0
+rand_core-0.2.2
+rand_core-0.3.0
+rand_hc-0.1.0
+rand_isaac-0.1.0
+rand_pcg-0.1.1
+rand_xorshift-0.1.0
+redis-0.9.1
+redox_syscall-0.1.42
+redox_termios-0.1.1
+regex-1.0.6
+regex-syntax-0.6.3
+relay-0.1.1
+remove_dir_all-0.5.1
+reqwest-0.8.8
+reqwest-0.9.5
+retry-0.4.0
+ring-0.13.5
+rouille-2.2.0
+rustc-demangle-0.1.9
+rust-crypto-0.2.36
+rustc-serialize-0.3.24
+rustc_version-0.2.3
+ryu-0.2.7
+safemem-0.2.0
+safemem-0.3.0
+same-file-0.1.3
+schannel-0.1.14
+scoped-tls-0.1.2
+scopeguard-0.3.3
+security-framework-0.1.16
+security-framework-0.2.1
+security-framework-sys-0.1.16
+security-framework-sys-0.2.1
+selenium-rs-0.1.1
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.80
+serde_derive-1.0.80
+serde_json-1.0.33
+serde_urlencoded-0.5.4
+sha1-0.6.0
+signal-hook-0.1.6
+siphasher-0.2.3
+skeptic-0.4.0
+slab-0.4.1
+smallvec-0.6.6
+socket2-0.3.8
+stable_deref_trait-1.1.1
+string-0.1.2
+strip-ansi-escapes-0.1.0
+strsim-0.7.0
+syn-0.11.11
+syn-0.15.21
+synom-0.11.3
+synstructure-0.10.1
+syslog-4.0.1
+tar-0.4.20
+tempdir-0.3.7
+tempfile-3.0.4
+term-0.5.1
+termcolor-1.0.4
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.6
+threadpool-1.7.1
+time-0.1.40
+tiny_http-0.6.2
+tokio-0.1.13
+tokio-codec-0.1.1
+tokio-core-0.1.17
+tokio-current-thread-0.1.4
+tokio-executor-0.1.5
+tokio-fs-0.1.4
+tokio-io-0.1.10
+tokio-named-pipes-0.1.0
+tokio-process-0.2.3
+tokio-reactor-0.1.7
+tokio-serde-0.1.0
+tokio-serde-bincode-0.1.1
+tokio-service-0.1.0
+tokio-signal-0.2.7
+tokio-tcp-0.1.2
+tokio-threadpool-0.1.9
+tokio-timer-0.2.8
+tokio-tls-0.1.4
+tokio-udp-0.1.3
+tokio-uds-0.2.4
+toml-0.4.9
+treeline-0.1.0
+try-lock-0.1.0
+try-lock-0.2.2
+twoway-0.1.8
+ucd-util-0.1.3
+unicase-1.4.2
+unicase-2.2.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.7
+unicode-width-0.1.5
+unicode-xid-0.0.4
+unicode-xid-0.1.0
+unix_socket-0.5.0
+unreachable-1.0.0
+untrusted-0.6.2
+url-1.7.2
+utf8parse-0.1.1
+utf8-ranges-1.0.2
+uuid-0.6.5
+uuid-0.7.1
+vcpkg-0.2.6
+vec_map-0.8.1
+version_check-0.1.5
+version-compare-0.0.8
+void-1.0.2
+vte-0.3.3
+walkdir-1.0.7
+want-0.0.4
+want-0.0.6
+which-2.0.0
+winapi-0.2.8
+winapi-0.3.6
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.1
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.1
+ws2_32-sys-0.2.1
+xattr-0.2.2
+zip-0.4.2
+"
+
+inherit cargo eutils
+
+DESCRIPTION="ccache/distcc like tool with support for rust and cloud storage"
+HOMEPAGE="https://github.com/mozilla/sccache/"
+SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="azure dist-client dist-server gcs memcached redis s3"
+
+DEPEND="
+	dist-server? ( dev-libs/openssl:0= )
+	gcs? ( dev-libs/openssl:0= )
+"
+
+RDEPEND="${DEPEND}
+	dist-server? ( sys-apps/bubblewrap )
+"
+
+QA_FLAGS_IGNORED="usr/bin/sccache*"
+
+src_configure() {
+	myfeatures=(
+		$(usev azure)
+		$(usev dist-client)
+		$(usev dist-server)
+		$(usev gcs)
+		$(usev memcached)
+		$(usev redis)
+		$(usev s3)
+	)
+}
+
+src_compile(){
+	cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+}
+
+src_install() {
+	cargo_src_install --path=. ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+
+	keepdir /etc/sccache
+
+	einstalldocs
+	dodoc -r docs/.
+
+	if use dist-server; then
+		newinitd "${FILESDIR}"/server.initd-r1 sccache-server
+		newconfd "${FILESDIR}"/server.confd-r1 sccache-server
+
+		newinitd "${FILESDIR}"/scheduler.initd-r1 sccache-scheduler
+		newconfd "${FILESDIR}"/scheduler.confd-r1 sccache-scheduler
+	fi
+}
+
+src_test() {
+	cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+}
+
+pkg_postinst() {
+	ewarn "${PN} is experimental, please use with care"
+	use memcached && optfeature "memcached backend support" net-misc/memcached
+	use redis && optfeature "redis backend support" dev-db/redis
+}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 7a4cd8b7b224..7c1a63400e64 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -18,9 +18,14 @@ DIST scons-3.1.0-user.html 1133694 BLAKE2B b7a208668db2303e873f5e7f09b9ad92d5197
 DIST scons-3.1.0-user.pdf 2564059 BLAKE2B 989469fd21e8989acf8e7ca2cf2c72dc584a3e708743e357fc2bd55173dbf64d9e2795706bc585975e8d86c754e1e44947feedf5156fb2b66c9f5402a9a015c6 SHA512 a92c4590a06ef2f4872e06db6d20bad333c5983b43d258574847d36976522888d6424781f43142b44abf4f8abc6f501b9894c476a9d1497b260d42efd48d8e8b
 DIST scons-3.1.0.gh.tar.gz 5528270 BLAKE2B d56d02f7d4550af8df42b5c5f8fda02a92ad6aedabb44e69bd46cb4ecf0f0de6b86a8f1ea65e9c4e5e57430f47c9ec7f354d366e60569b4c414bb15d4e52cc84 SHA512 3894d17bca02b9aa5426c70d894b8ecfcf3db2b20254b848209c31d8413a8cd1c2a7b2a87ef9bcfe5555980beb2815f62cdbe185098a64ae8b3506c41c867463
 DIST scons-3.1.0.tar.gz 661528 BLAKE2B deb3b8b4d22ec705674be3e2f84bb35b4726d5f7c082a341d2319d471a3302fc89bfdadc7545f0f4cc0c321c67301b364bdb5723a1d10374eee636b486197092 SHA512 b2d61e364bcff29027a7ba70e2a74186ab136b00f147ff358701aaf68f47134e18e24c2a9cb1ff9ec0fb4fb73ffa21e04043157f2b5cd975aca7fc91c69385ee
+DIST scons-3.1.1-user.html 1134061 BLAKE2B de025ff73ecacec591c63b22bb3f934962a34fa16bec47a58972b97ba28f9a88254b419b4d2edeb2d920e70cf3e0c739df5357956c8586e5377afcd4125ba0a8 SHA512 bd00bcdcd01b192a42110ec65cdb906963af08f5bbc9d5e61624b5b5b1a667b115b099ce2ef71444a8998171a5544f4caecf3acec9715876d4e9e5baa581e60d
+DIST scons-3.1.1-user.pdf 2564248 BLAKE2B 702e57a9646779ff1aa077aa7ae7a815d004cda08166f948ef3b893a786c7ccf13e9d1f8621640573802acd0b6a7acaaf68ebea984d5922112a30c4457740bc4 SHA512 0c0f8e93e3bddd9dc0ec661f629f2995ec9375908b3b7bf2b67c9518571cb31754d13fca46fc1182019976e5c0a417832447692ff61f5ee4613b7f56c7891594
+DIST scons-3.1.1.gh.tar.gz 5528538 BLAKE2B cbb13a0ec9c5ade9b965592f012af5a3ab5253a3c30a049da499631ff58fc1201666209316d9fbcc8f0a715b194327f3cebe5a50fde01635fdb0304b8fbbb2f6 SHA512 3347a7ec5c6c7b596c0d51bb4a9654b971734736febe3834df0f40e7839e1f0578dafeae838d5ddd9f3319ac3d17b6790666fa1602c30480eba25122355179a5
+DIST scons-3.1.1.tar.gz 663878 BLAKE2B 095d5f45885ac12937066be247194e70d33e8f5dc0955e7d693c4b0d3a4b61e776bc1d64cd00ebc89d1e85a7992747b8f448255a76c1b6c2d9df8fa173967711 SHA512 2e80b45571679d8acc0554273538f56163488df5aa9007c7c9c3a6deb2698909ab05da8df91502ea287c0cc0ff0a98f226454f67fcfb7a943570f673f4bd8f54
 EBUILD scons-2.5.1.ebuild 1591 BLAKE2B 5a370c069a841b45cb9d7ec214c66312f5b3f9febcb953fd466662c5e70b866a1f48c70adacc7d9a43f11bcb8c07cb7d18a7f3dde80843460812742d982b108a SHA512 a08e399a4b43143f13b13d4731e839039dbc1b53482078b990d67f06c65a481f4eca889616fb5fccbc9fccd6c1703f307af5b8a010466039ec149eca5c7fa309
 EBUILD scons-3.0.4.ebuild 2115 BLAKE2B 87f1ed75b61212eb76233c2f3b91903a9e40c8214d164a0b2c72a86d32c80cfea76681176b333738ba577c4c73edd0d1474e1e10125caa85ddd19c070351b850 SHA512 71fe9496eebdf581b1b4ae793da2a3987ac900dfb50f62bf7e68bb1a3cc1f3539f4d226222e7b541be87fd661a0afb981c6ca65cb6c3e73c9ac34eba6294ec21
 EBUILD scons-3.0.5-r1.ebuild 2934 BLAKE2B da024a78f8779bb9acd0def27c39285145745553902af6df29ee0b88e9d70b164fc129cb548bab7ef0f6bad1b832c037bf26866f0af36941071756626e7a1d8d SHA512 09364d9f64c8003c7b363859f0bd99c1f1d084ba3c2b96ce6d973017f5b9a9e77c07529c66d5aaa29027bf4ae990a3c2451b5df3453923a3df0f05f063c24415
 EBUILD scons-3.0.5.ebuild 2112 BLAKE2B 17dc37551614e235adbf199ea6a7a1400f2fb2e5b6f0597598c898aab63d03ec45ca30d30d2efd163819c6d9f4f7dda7c0a9414752c7711728a47f4ada631c3f SHA512 e47023c29074d2dc3f3cd028be53a5e579274d607aceb6fd1060b5a4d9f595f662b2369d794763077025f2d69832c3fadd3f4bb348bb5fa01b5185ba50459fb0
 EBUILD scons-3.1.0.ebuild 2665 BLAKE2B 75bd542ba1d21f0bbeda322629e3d74b05e79c9862ebf61f138477952b0ffc7b1d43b5d49dce093c637b70417f4dd4644a3c233e4ec76ac9a0e005a1c034e54c SHA512 9773d952644741b475883a202482d54d2716d035bf3f2c440188af6bba6035c3ba5783d07b0ea1c1381d6149423819667922159a9c8acfb490ad5802896bce07
+EBUILD scons-3.1.1.ebuild 2665 BLAKE2B 75bd542ba1d21f0bbeda322629e3d74b05e79c9862ebf61f138477952b0ffc7b1d43b5d49dce093c637b70417f4dd4644a3c233e4ec76ac9a0e005a1c034e54c SHA512 9773d952644741b475883a202482d54d2716d035bf3f2c440188af6bba6035c3ba5783d07b0ea1c1381d6149423819667922159a9c8acfb490ad5802896bce07
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-3.1.1.ebuild b/dev-util/scons/scons-3.1.1.ebuild
new file mode 100644
index 000000000000..4da9718eabcf
--- /dev/null
+++ b/dev-util/scons/scons-3.1.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="http://www.scons.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? (
+		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
+	)
+	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/libxml2[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+S=${WORKDIR}/${P}/src
+
+PATCHES=(
+	# support env passthrough for Gentoo ebuilds
+	"${FILESDIR}"/scons-3.0.1-env-passthrough.patch
+	# respect CC, CXX, C*FLAGS, LDFLAGS by default
+	"${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch
+)
+
+src_unpack() {
+	# use the git directory structure, but put pregenerated release
+	# inside src/ subdirectory to make our life easier
+	if use test; then
+		unpack "${P}.gh.tar.gz"
+	else
+		mkdir -p "${P}"/src || die
+	fi
+
+	tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
+}
+
+src_prepare() {
+	# apply patches relatively to top directory
+	cd "${WORKDIR}/${P}" || die
+	distutils-r1_src_prepare
+
+	# remove half-broken, useless custom commands
+	# and fix manpage install location
+	sed -i -e '/cmdclass/,/},$/d' \
+		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
+}
+
+python_test() {
+	# set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
+	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
+	# unset some env variables to pass appropriate tests
+	unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+	cd "${WORKDIR}/${P}" || die
+	"${EPYTHON}" runtest.py -a --passed \
+		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		--builddir "${BUILD_DIR}/lib"
+
+	# runtest.py script returns "0" if all tests are passed
+	# and returns "2" if there are any tests with "no result"
+	# (i.e. in case if some tools are not installed or it's Windows specific tests)
+	[[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( {CHANGES,README,RELEASE}.txt )
+	distutils-r1_python_install_all
+	rm "${ED}/usr/bin/scons.bat" || die
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index f16fd54e3577..bf0111f327b7 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -2,8 +2,10 @@ DIST ShellCheck-0.4.6.tar.gz 116618 BLAKE2B 67cf8e882e95eaedfbb46e01656889e200b3
 DIST ShellCheck-0.4.7.tar.gz 126593 BLAKE2B cbb925c4760a3744381dbee293d5e28ce429a9c4244eb1fa5af71ad8ba2cbdd86a721bbc2b9202c7aecf4ad70025bacb13e696c4731cbfaba22511d773013d6b SHA512 bb9c79911701b3857d29fd63588115888f4d2b1d224066bb944ca00d29d973195ad1f4b1df8e2746fd0666f7438f46abc384f7f915c152f46fcd332163736792
 DIST ShellCheck-0.5.0.tar.gz 133265 BLAKE2B 703e3d994e6302d7bc6124ae064cbc5893c5119918a9a9b6cbda2c0415600b95545146061230b2e6ab07b6b2383a86b9bd3f153643c30c3f765a3424a1cd4bc0 SHA512 3b4b097f507c8910f5da1a739138511b9c30c156667c0887447043a7d0c3c371768953d7039803356f28e863266d3a34b5b1689889f3e524a3768e4d3223ce7c
 DIST ShellCheck-0.6.0.tar.gz 140211 BLAKE2B 5a103bd74e76905b64a882542d1f2bf5cac6b2ec94e9b0f55fdd052f5fd1fe17f9efc02ef9182e7e5965765b428b974bf94fa50d701396fef77bcbfe6185402e SHA512 51c2cc9cfd2f8a145095873f9b19d4fdd67a21eedab4ac2dbe5f43789fd0937a44bdc8480b2d0cceb5bc3802a8243dd3b701a07f1f6b5460291272ee453c7c5f
+DIST ShellCheck-0.7.0.tar.gz 163027 BLAKE2B 2d6348f21cb9598c0133cc1548f43727d56155883db83c38483b581b3565c67d5bf9d5333b6c39569dac1f07b19b21db1d62d83e675bb4aa9735725879aaf6e2 SHA512 88a0cb2a2879f597b832979fd934ee63e0f1ca256e5f9e7c51667744d09848817fdbe3988898f49226fc52ec27d92c314a9075995c3110ee10b24468cb60c657
 EBUILD shellcheck-0.4.6.ebuild 859 BLAKE2B 666e8057d0e035efe735dfb76c6c58f24dc8a8a651752646a843f096bcf8ffd3bb2b89b7f50d7b954b2b73ec7ddf46f808ea9f96dfed9fa1cb6efd9694afd093 SHA512 6bbeb59349d018d45f9606683c723809a84aae507b9bae3b913ef53c163314dfbd30cf6632b18839266089551f4f4b8bb29356850c72d5577f0bed2cc251d022
 EBUILD shellcheck-0.4.7.ebuild 861 BLAKE2B 36567203b1e8cf28594109bf34de03f9d8030e5c5829e7bd16921639f55a774b74d46f75e9876e457b09efbf935f6cc947cd89072d7fff83892f85c738973c6d SHA512 adafc1f025ee6f3c2c04626873d5ce06099f2130ab977dcf6b2b38e6610553ad9ee9c30888b3ceff45a59b70192cb13c6a03470932bf56f6bbddc666a5d9643f
 EBUILD shellcheck-0.5.0-r1.ebuild 926 BLAKE2B 87532d0d1a95dafc036ebeccd92c3fee9aa48b37dc6eaf60ddab0b2afa4a046006ee861c7d972c2e8127740161ff596fa06c972f41fce4a47a2a4caec2608a6e SHA512 2b3e2d8f164c29091f28247a0db505e12ee81cef2d3295df17c4431606601fa82c9ed3389592732a284ff68f7bedb2f41b6d1bc19b19cc6d16369df6630e09fa
 EBUILD shellcheck-0.6.0.ebuild 923 BLAKE2B b2064e8e8a7dee1a7a04522f75477e2fb01be248d51757b7c41f2a9ca96c71f79a49861109e5d7901c69707c4ba97780840ae691b47de6f6a33b843ef9e19f95 SHA512 a9cc09599bf55687e9b1e99d3b66a8c9700f46f239ef845db9a2d06a8475eccf603bb51588d9af89d94bca1ab5271c867ec54fc5588d158901d6129494d94ff6
+EBUILD shellcheck-0.7.0.ebuild 930 BLAKE2B f648e205a8948a6cf29db3cafe6943ac456744400cd6d2972f335efecf38eaf351708fd58f8ab60aa88fc816dee53bc32fe8f64d19b8dec55eac4822bf5395ca SHA512 f7e3bdae11ab89167d4911339ce5cca49a7fe2c815cc240fb5d6677f4bc9b6addcefcd2cefbfde0228d84b68a08cb89a1d40bcf5803bc9f95b5b91b9de4b75bb
 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
new file mode 100644
index 000000000000..cafe13dbaa67
--- /dev/null
+++ b/dev-util/shellcheck/shellcheck-0.7.0.ebuild
@@ -0,0 +1,40 @@
+# 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="mirror://hackage/packages/archive/${MY_PN}/${PV}/${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/sysdig/Manifest b/dev-util/sysdig/Manifest
index 04faedf739c7..cbfdc165a637 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,4 +1,6 @@
 AUX sysdig-0.26.0-build-fixes.patch 1545 BLAKE2B f182cf721180ee624deeefafff54a48fc4e5024cff00e26f178960d9f7a3d7e8a481dee028fe1dac789f77ec8ba772cc5da82c4d0ebc388f1aa711824d42a2d1 SHA512 2d34ab81da7d3a07e9c7116dc1d25e6db93b5faf2be2a4fe1710efba43293892255591284bc1d2c39953c4cf73ebcacb73b5626cc2d649a0505e351165c9b8d7
 DIST sysdig-0.26.1.tar.gz 892441 BLAKE2B 38302458c54a10719fadaf5e5bb6d29931a262550eaf44350543e99cd33e6a90889d81f49096d2f57fcc903bc9245a1f782b438a48613f9fc9f90273c46f0f39 SHA512 817573dd2945e20094c548a481205d7ae700e8242a12c75bcab41c52330fb6f508214d71f3d3ba4ecc86576e555c8c2a0c155921d61d29a5861bbf982600f6fb
+DIST sysdig-0.26.2.tar.gz 907496 BLAKE2B ce489d7c1a54aa2930599aa7141b1a3d4815c0395b4a444dea565334a1b39a36d339eb2bc9d0c2b3924e8c54f9c3adec6b31278017cfee955fe9ed9d3c29977f SHA512 1a2476060f43559ec89663377361d1fcaace7fe3aa3b472629dca78557e6d5868d8f5cfce3411c46804b501d6a56dcb074f6becf3d8e756b7f7fd943087cd3ae
 EBUILD sysdig-0.26.1.ebuild 1998 BLAKE2B 52ae3ad4e180a6640c613d6d5adba3e11d0485e7ee235f79eeadd19291e1291927fb6666c66555b0239d9015de9c56dcbca5f9a922a37422d155dd88e48f5097 SHA512 e6299a6be79367693680df3f2a5bc2555731ffad9dba8c333a1a4553120705a62be74127f0163c41343bf8b63d74c73d6b895a173812c57df394b64f1941368a
+EBUILD sysdig-0.26.2.ebuild 1822 BLAKE2B 409bec675d0a5449eb4f13b8779199eede799932526798c1efa8cf40a3df7405d9e2d6247d9364b8500241c7cef4e0c4409752a50046c764e91192b99a8a6dd3 SHA512 f88d540381670786a876a11dc6c783016073d3e02d8f704f50c1a58f3c05d490a48eba658576427b5c87a57985ac1e890ece85add3b4072dd89a216c8cef8342
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/sysdig-0.26.2.ebuild b/dev-util/sysdig/sysdig-0.26.2.ebuild
new file mode 100644
index 000000000000..2d4c0de2f51f
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.26.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MODULES_OPTIONAL_USE=modules
+inherit linux-mod bash-completion-r1 cmake-utils
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="https://www.sysdig.org/"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0
+	modules? ( || ( MIT GPL-2 ) )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +modules"
+
+RDEPEND="
+	app-misc/jq:0=
+	dev-cpp/tbb:0=
+	dev-lang/luajit:2=
+	>=dev-libs/jsoncpp-0.6_pre:0=
+	dev-libs/libb64:0=
+	dev-libs/protobuf:0=
+	net-dns/c-ares:0=
+	net-libs/grpc:0=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:0=
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	net-misc/curl:0="
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/os-headers"
+
+# needed for the kernel module
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
+
+pkg_pretend() {
+	linux-mod_pkg_setup
+}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-ggdb::' CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# we will use linux-mod for that
+		-DBUILD_DRIVER=OFF
+		# libscap examples are not installed or really useful
+		-DBUILD_LIBSCAP_EXAMPLES=OFF
+
+		# unbundle the deps
+		-DUSE_BUNDLED_DEPS=OFF
+	)
+
+	cmake-utils_src_configure
+
+	# setup linux-mod ugliness
+	MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver/src:)"
+	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
+	BUILD_TARGETS="all"
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	linux-mod_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	linux-mod_src_install
+
+	# remove sources
+	rm -r "${ED}"/usr/src || die
+
+	# move bashcomp to the proper location
+	dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
+	rm -r "${ED}"/usr/etc || die
+}
diff --git a/dev-util/uftrace/Manifest b/dev-util/uftrace/Manifest
index 774076513013..d3004b57c3c7 100644
--- a/dev-util/uftrace/Manifest
+++ b/dev-util/uftrace/Manifest
@@ -1,3 +1,3 @@
 DIST uftrace-0.9.3.tar.gz 1003880 BLAKE2B ae5e1c44412055ea59e85378877cf3c18f33e0c6ae3a904253b03587dae2c7cce4350f1480f499e645375b1b2502a51a8b8d44e9b7ff1ee588be7180c12b63f3 SHA512 671486a05da8c44400169f21426505266db89e94ef9483370dff8f465b673f70fba994174458f3033991ea0640225e13c639418380a6a580d24c302d42327382
-EBUILD uftrace-0.9.3.ebuild 712 BLAKE2B 836f16dd5694735c932701dde54e77fc8ddbff45fe0320058f4b5c9185b96b551c37f7549021d895a99ec71aef741d609972ad1565216bc5c233dfb58c2a2e51 SHA512 70b65c4cefec22afe141c3b9c70e9498a3e347a61ef5e42f321b224c72cf6bfcc5cddcac96ba6d275e7fef7324657b4a32865783e5acc517fa88d7357a584b19
+EBUILD uftrace-0.9.3.ebuild 748 BLAKE2B d76cd329331ec9e6a78ebc1a03f752ac97135578d91099f73148677ee36d8fe94deae62f4e5870189678c4904bcaee1b38a19a1b4fc162968eb58f03a228e9a4 SHA512 32cd013c948244f4ef143171be2ae2ace662125809fc11c8a72a72a2aeef4995cc08fbc275c500ed4559fd712c94c023121121ea1d5864c579cb63ce999fec21
 MISC metadata.xml 356 BLAKE2B cb0c4a184a36f1184494927f5cd72f945d9b7361cbf6ecde1d884197ec6b12c156566c8e61d635647637bb7924f9a3515d232cc6466b38bb463f13be769f88c4 SHA512 c9794b1bd56251df386da82b80d9d2979613f2f158cbb44fc478f8299da022193860cd7387d44f56ef5c14c747e5e276eb0f6db5864a6c78c8e689ddf5fe5643
diff --git a/dev-util/uftrace/uftrace-0.9.3.ebuild b/dev-util/uftrace/uftrace-0.9.3.ebuild
index 9520ab25fb8c..d48d238c8012 100644
--- a/dev-util/uftrace/uftrace-0.9.3.ebuild
+++ b/dev-util/uftrace/uftrace-0.9.3.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="capstone"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RESTRICT="test"
 
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index 12b779b88436..83f9b7019a2b 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-dev-tools-4.12.0.tar.bz2 309586 BLAKE2B 8ebcc8f133772eb39acba0b2f189a67751b9a2b4d36e5897003d56f6b88d3e97e89e0383b98c4b5ae684786d5aed3409a4b491fdbaa6e37bf8fc7447a33b8605 SHA512 60f90daaaac3eea355779ee1bb6a0cf24fb9e0ba70971c9c26ea681755de41560cfbca59a28241c2fd818031dc46e95c550424577451ceb7a42b1de0b0ff4a31
 DIST xfce4-dev-tools-4.13.0.tar.bz2 292066 BLAKE2B 3200bb73f135d4c82ef785269d26a34f3874e69188831c94574766080a26d7837ab3a05b88457397044b66c58cc78d1b136d3ee303ae3b78e7894fc91aac3c7c SHA512 ee1289044cda9d908b15b7c88c5911f785efec1fed4c4ff20d66d535078a652f827489ec8ce58467f44b185ccba887fd9b4cd55ea62dfc181ddc87ce74ed5618
+DIST xfce4-dev-tools-4.14.0.tar.bz2 292275 BLAKE2B 18f28394ded038a7bcf0e754ebb359464358df245903a0c4441df2845e57c9059de6e6775a90c0e6c3cde4936a847ddf26ae88ff61fe7612fc2626b00f1d56a7 SHA512 e22b139ff7516ec0e510f882cc6a9e8e8b2b7bd41093c8e67e5ef11eb6c2c2848637513369d652f7238f10b5005c5483a938d3348020b48a4c1fadadd6d635f8
 EBUILD xfce4-dev-tools-4.12.0-r1.ebuild 636 BLAKE2B 15bf5d8a506fdeceb514136f361e6acf9ad689f7f101a9e807142af2c47b52d873d6f4a012e7ef5e6084d502bb69f7a5edfbb53fe0b9943fae81370bf7dd6bae SHA512 916e923df35f61c3b4333411273241bc0b3ef74be4a9231ff247d6cde9b8ef87ebf4868b3e8d4711072e7cc4ba70757b802d71d181202046f0b65566bbc5acac
 EBUILD xfce4-dev-tools-4.13.0.ebuild 594 BLAKE2B 8fa747f943e3d79915c785d0cadaccfb3fb008582076e7e470c895a4249ec212eff1866ecfb131b5d4f626331ee4b4f2dbca528bd5f18dccbb6d5521ab516ba0 SHA512 0d2fed20a4ce7cb3673773726b0595c3ea74bdb164117d5b60f73b9bdc37ddadbbf36fb2fa57010a5809a22bfa6b7d6b1540082b9fbed0824310f9ef5dd91f9b
+EBUILD xfce4-dev-tools-4.14.0.ebuild 594 BLAKE2B 8fa747f943e3d79915c785d0cadaccfb3fb008582076e7e470c895a4249ec212eff1866ecfb131b5d4f626331ee4b4f2dbca528bd5f18dccbb6d5521ab516ba0 SHA512 0d2fed20a4ce7cb3673773726b0595c3ea74bdb164117d5b60f73b9bdc37ddadbbf36fb2fa57010a5809a22bfa6b7d6b1540082b9fbed0824310f9ef5dd91f9b
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
new file mode 100644
index 000000000000..2d5f6650e28b
--- /dev/null
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 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 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.42"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
commit	fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree	326613a08f25851c388715e205576a2e7d25dc4f /dev-util
parent	b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)