gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /dev-util
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
323 files changed, 2368 insertions, 1780 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index dc3d0d942e9d..3e55e21aeeff 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-ndk/Manifest b/dev-util/android-ndk/Manifest
index 6307b3beb98a..53378e7c31bd 100644
--- a/dev-util/android-ndk/Manifest
+++ b/dev-util/android-ndk/Manifest
@@ -30,13 +30,13 @@ DIST android-ndk64-r10b-linux-x86_64.tar.bz2 358835298 BLAKE2B 79ac6c56c24eb642b
 EBUILD android-ndk-10.ebuild 1797 BLAKE2B 6a26192283f6c6edca63ad4459f78a68b89c3bffbaa8d21e62dee7dcab0f639039c72fa45dd262f4a9631e66889ac11588034d52b3c8b84b96b82487bc75bcc5 SHA512 f23c6b1461f1f89c14d9d444f3d159209ba28f2245177539ee99f919ed7e148caf68689816d9facce93d4f5e82ac7d78b7323e720eeb1e7bbfbe398893e9aaba
 EBUILD android-ndk-10b.ebuild 1797 BLAKE2B 6a26192283f6c6edca63ad4459f78a68b89c3bffbaa8d21e62dee7dcab0f639039c72fa45dd262f4a9631e66889ac11588034d52b3c8b84b96b82487bc75bcc5 SHA512 f23c6b1461f1f89c14d9d444f3d159209ba28f2245177539ee99f919ed7e148caf68689816d9facce93d4f5e82ac7d78b7323e720eeb1e7bbfbe398893e9aaba
 EBUILD android-ndk-10d.ebuild 1609 BLAKE2B f38ad58f191799d48e85c418d7809e1c1a80af5e899d6c9fdf22fad45d9d85b3569d126358b9ec1e8aa22bc481ede8db1c174574cdf053d00c6b010ec74e5810 SHA512 7ec0274d7414eeeec873f63e94c02a6d8b07d781ab5f41312ab5c896668d3edf45640080783354595a7f82b95ffaced23e11f51946c267d907227bbfe1aba972
-EBUILD android-ndk-10e.ebuild 1759 BLAKE2B 35d5ec07dd932f0d940e501590b4bd12b92808f8a82e686e99aab7273a411a29d55d184f3f83572c454a495623318429c89dfedcca9e5496b0d4b2423831008f SHA512 51e76955bd965659d336ae2aada47a66f1a1b99e5e2c54b2965a1a0af539248cc0357a72e941199873b7d237074a809b3c32fea71f0dff23763797d134a8c620
-EBUILD android-ndk-11c-r1.ebuild 1651 BLAKE2B dd2a02240f641933b2b618126febfecda16247f54eb2ff478ad62efe098560c687bca4eb1027e46604f55a5a612ec0c4cdef8e21bf9f35feb5799aa0cc767c84 SHA512 1d4f89d748ea61224836ca805eeb34d1376f4d480a4973146208f8ee2b1e6d16632210ba625a66a30108a5f00c95cc0fe2501643946b33dff67a675f21c82ceb
-EBUILD android-ndk-11c.ebuild 1604 BLAKE2B f4b8b2a34966bce8997172ef04661bd5436e069dbebe8f88abfa86cdc2291b30aec651afe8ea5e3b5834a00b27ce70bf65fef6e04e6b9b9fe99dceab6b7e0132 SHA512 ab3b630bcb76638c93f81f1428eaea53718a861fbf3389c6b20e135aed494869818d9f9f4e6dcec33abb0f5c189a2ec0e2f97b0ba42454308fa7c950014dcd96
-EBUILD android-ndk-13b.ebuild 1651 BLAKE2B dd2a02240f641933b2b618126febfecda16247f54eb2ff478ad62efe098560c687bca4eb1027e46604f55a5a612ec0c4cdef8e21bf9f35feb5799aa0cc767c84 SHA512 1d4f89d748ea61224836ca805eeb34d1376f4d480a4973146208f8ee2b1e6d16632210ba625a66a30108a5f00c95cc0fe2501643946b33dff67a675f21c82ceb
-EBUILD android-ndk-14b.ebuild 1620 BLAKE2B f5b719425fc5d886e800891a5e17bdd42e9380ab22aba0890db80063b7c622c853361e9f30867eea18c59779d765ac1b28111fd78edeac904806e6872d03c6d2 SHA512 31d47a984f6c59b8eb8fc46331e55c604d3727eb2ac8796c9597994155cda11645dff63dd6a642ceb0fb7b10d5c307967f29329b10b5a193bd7511879ae74773
-EBUILD android-ndk-16b.ebuild 1620 BLAKE2B f5b719425fc5d886e800891a5e17bdd42e9380ab22aba0890db80063b7c622c853361e9f30867eea18c59779d765ac1b28111fd78edeac904806e6872d03c6d2 SHA512 31d47a984f6c59b8eb8fc46331e55c604d3727eb2ac8796c9597994155cda11645dff63dd6a642ceb0fb7b10d5c307967f29329b10b5a193bd7511879ae74773
-EBUILD android-ndk-18.ebuild 1580 BLAKE2B c054fe475357973f7c07ceaa79adda80661347eb8fd9b2932edb8fb402121149191e9e24d65875dc801f75a50aa6e1a3643e25b7a975c967230f6f33c1e9a8f3 SHA512 c0f07bb3249b3bbd8007f44fd0f5dbf1a1c9b081cc7fd6e5df5e5b381d04cd79c504e1f9e04c46b7074b087ac2a37ad05263c23d274bd0705215522252d7883e
+EBUILD android-ndk-10e.ebuild 1764 BLAKE2B 21366acf6129d6c5398d152d691f00458e472f753c938468eb4e09b413a928a484c54b24ad6c256f0df2435b1ef09242f5911aefd13fdd740fad5aea38440af7 SHA512 bef3475150f2e9df18b1c59511e3ee5bd4ddf2d44b13bb4fb9e400985e3d341d67dc01969e3c221ed5633b386e17fa4338c847aa0bcc0876c6c47722b632dbd9
+EBUILD android-ndk-11c-r1.ebuild 1656 BLAKE2B 702b84d098e8282aee3b354dd8846eb690c5545b01cb79a052c8d3ec04811ea8a5cc68f8216838ddcd9ead44d949d47a20314122e82b114839adf882614ac633 SHA512 d11a182dedc7437b4c9a05f76226b725f8f4555e32f8d474b247284a869614373c94a38793eac635ca6dd83fa0cefd596570b7b6bcbea667b7fd975fe4d09206
+EBUILD android-ndk-11c.ebuild 1609 BLAKE2B 89017fd82e4da27e65887839054b55a82a71fa6b92a9da6bc5cbafb1a3021ce6094438f42271f707c8cde931c8d29b4228f8aa44cbe5835553554232e8904efd SHA512 de1024930711675b5f9f7fa2abb06e7e13ec2d614fb5230590dbbac00efbfc91f09d5b1e145f4eeb48b800bfe64afe0044a5549e9ee6c7978a4972068886934a
+EBUILD android-ndk-13b.ebuild 1656 BLAKE2B 702b84d098e8282aee3b354dd8846eb690c5545b01cb79a052c8d3ec04811ea8a5cc68f8216838ddcd9ead44d949d47a20314122e82b114839adf882614ac633 SHA512 d11a182dedc7437b4c9a05f76226b725f8f4555e32f8d474b247284a869614373c94a38793eac635ca6dd83fa0cefd596570b7b6bcbea667b7fd975fe4d09206
+EBUILD android-ndk-14b.ebuild 1625 BLAKE2B b5dbbffe75041e39cc4cf06924b30e6027ee15890d264e9318b969de59c11db34ec405b633c80a093251935bfaf5ec772ea5a96e445d0a5d57d604d033d74abb SHA512 2a9086e9760eee0b99f90a1fb7a52de645c1c7a365046f21a2028256b1e14537d7ed67d334be5cc40418c67586300c6742d23a23d7c1b7bd93e156033ee07263
+EBUILD android-ndk-16b.ebuild 1625 BLAKE2B b5dbbffe75041e39cc4cf06924b30e6027ee15890d264e9318b969de59c11db34ec405b633c80a093251935bfaf5ec772ea5a96e445d0a5d57d604d033d74abb SHA512 2a9086e9760eee0b99f90a1fb7a52de645c1c7a365046f21a2028256b1e14537d7ed67d334be5cc40418c67586300c6742d23a23d7c1b7bd93e156033ee07263
+EBUILD android-ndk-18.ebuild 1585 BLAKE2B 39cb0799407a4c6eeb543953e91c72d85cd6690595ab60fe7c67185bff9787ddf905a69306ba2cc3eba63a48897c707eabd7642947bc013f7c5d9c997ff76909 SHA512 8e3e1e3f9da5f18d9583035d63953da7ab5b5b8fcb99ce96d2d0a21d4f6b3e1f016894d09bef69ae37cfb50b8bf7683311ea3e475e0c8c616b6297c6ea7c1c8f
 EBUILD android-ndk-9.ebuild 1801 BLAKE2B 3cc7b9c78df9a96ab3c6e06f313596de2a18b94612c559233610ce1e94ae97889bd51353244d4e45b2b80f5d66b62d2367eb7b811df31eabdd62d51c6aca0be2 SHA512 9894db5c7cee9f67d29bf3a7742baf9afaf3f0bca524bfaeb9a1d049a8449b79bc65ac93b20cf0f6edcbf48ea0ff492978f8014801d662673e1e95d691954ab0
 EBUILD android-ndk-9b.ebuild 1801 BLAKE2B 3cc7b9c78df9a96ab3c6e06f313596de2a18b94612c559233610ce1e94ae97889bd51353244d4e45b2b80f5d66b62d2367eb7b811df31eabdd62d51c6aca0be2 SHA512 9894db5c7cee9f67d29bf3a7742baf9afaf3f0bca524bfaeb9a1d049a8449b79bc65ac93b20cf0f6edcbf48ea0ff492978f8014801d662673e1e95d691954ab0
 EBUILD android-ndk-9c.ebuild 1569 BLAKE2B 260433e5147dd5f8d814a5bf63dc074644e276ad25481785fcfba87545c27230a21aed6f7ef09f004e22de7d47218e05d7c97e99cefdd1ce7e138cf696da492d SHA512 f353af0ad3e4ab5f467880960e5addcf60875c4091f9ca67ae9619bd13e640ae68fa8426033683945128b89b5917f3ef419ec519d3f1f2c934d2607bad77e248
diff --git a/dev-util/android-ndk/android-ndk-10e.ebuild b/dev-util/android-ndk/android-ndk-10e.ebuild
index c537897c4b24..964677aabb94 100644
--- a/dev-util/android-ndk/android-ndk-10e.ebuild
+++ b/dev-util/android-ndk/android-ndk-10e.ebuild
@@ -20,7 +20,7 @@ RESTRICT="mirror strip installsources test"
 DEPEND="app-arch/p7zip"
 RDEPEND=">=dev-util/android-sdk-update-manager-10
 	>=sys-devel/make-3.81
-	sys-libs/ncurses:5/5"
+	sys-libs/ncurses-compat:5"
 
 S="${WORKDIR}/${PN}-r${PV}"
 
diff --git a/dev-util/android-ndk/android-ndk-11c-r1.ebuild b/dev-util/android-ndk/android-ndk-11c-r1.ebuild
index aa6a667b9199..f429991a256b 100644
--- a/dev-util/android-ndk/android-ndk-11c-r1.ebuild
+++ b/dev-util/android-ndk/android-ndk-11c-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND=">=dev-util/android-sdk-update-manager-10
 	>=sys-devel/make-3.81
 	|| (
 		sys-libs/ncurses:0/5[tinfo]
-		sys-libs/ncurses:5/5[tinfo]
+		sys-libs/ncurses-compat:5[tinfo]
 	)"
 
 S="${WORKDIR}/${PN}-r${PV}"
diff --git a/dev-util/android-ndk/android-ndk-11c.ebuild b/dev-util/android-ndk/android-ndk-11c.ebuild
index d67efb2aa8c9..ec033ad0a73f 100644
--- a/dev-util/android-ndk/android-ndk-11c.ebuild
+++ b/dev-util/android-ndk/android-ndk-11c.ebuild
@@ -19,7 +19,7 @@ RESTRICT="mirror strip installsources test"
 DEPEND="app-arch/p7zip"
 RDEPEND=">=dev-util/android-sdk-update-manager-10
 	>=sys-devel/make-3.81
-	sys-libs/ncurses:5/5"
+	sys-libs/ncurses-compat:5"
 
 S="${WORKDIR}/${PN}-r${PV}"
 
diff --git a/dev-util/android-ndk/android-ndk-13b.ebuild b/dev-util/android-ndk/android-ndk-13b.ebuild
index aa6a667b9199..f429991a256b 100644
--- a/dev-util/android-ndk/android-ndk-13b.ebuild
+++ b/dev-util/android-ndk/android-ndk-13b.ebuild
@@ -21,7 +21,7 @@ RDEPEND=">=dev-util/android-sdk-update-manager-10
 	>=sys-devel/make-3.81
 	|| (
 		sys-libs/ncurses:0/5[tinfo]
-		sys-libs/ncurses:5/5[tinfo]
+		sys-libs/ncurses-compat:5[tinfo]
 	)"
 
 S="${WORKDIR}/${PN}-r${PV}"
diff --git a/dev-util/android-ndk/android-ndk-14b.ebuild b/dev-util/android-ndk/android-ndk-14b.ebuild
index 953c43a32b2c..88aa81dd7cf4 100644
--- a/dev-util/android-ndk/android-ndk-14b.ebuild
+++ b/dev-util/android-ndk/android-ndk-14b.ebuild
@@ -21,7 +21,7 @@ RDEPEND=">=dev-util/android-sdk-update-manager-10
 	>=sys-devel/make-3.81
 	|| (
 		sys-libs/ncurses:0/5[tinfo]
-		sys-libs/ncurses:5/5[tinfo]
+		sys-libs/ncurses-compat:5[tinfo]
 	)"
 
 S="${WORKDIR}/${PN}-r${PV}"
diff --git a/dev-util/android-ndk/android-ndk-16b.ebuild b/dev-util/android-ndk/android-ndk-16b.ebuild
index 953c43a32b2c..88aa81dd7cf4 100644
--- a/dev-util/android-ndk/android-ndk-16b.ebuild
+++ b/dev-util/android-ndk/android-ndk-16b.ebuild
@@ -21,7 +21,7 @@ RDEPEND=">=dev-util/android-sdk-update-manager-10
 	>=sys-devel/make-3.81
 	|| (
 		sys-libs/ncurses:0/5[tinfo]
-		sys-libs/ncurses:5/5[tinfo]
+		sys-libs/ncurses-compat:5[tinfo]
 	)"
 
 S="${WORKDIR}/${PN}-r${PV}"
diff --git a/dev-util/android-ndk/android-ndk-18.ebuild b/dev-util/android-ndk/android-ndk-18.ebuild
index f7ecdaee0c47..2ee6247899c4 100644
--- a/dev-util/android-ndk/android-ndk-18.ebuild
+++ b/dev-util/android-ndk/android-ndk-18.ebuild
@@ -19,7 +19,7 @@ RESTRICT="mirror strip installsources test"
 DEPEND="app-arch/p7zip"
 RDEPEND=">=dev-util/android-sdk-update-manager-10
 	>=sys-devel/make-3.81
-	sys-libs/ncurses:5/5[tinfo]"
+	sys-libs/ncurses-compat:5[tinfo]"
 
 S="${WORKDIR}/${PN}-r${PV}"
 
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 72a6e350a575..165458f097ea 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,6 +1,6 @@
 AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951225ac8d6019fbacb4d48472cc9e8915eb0e10fd569f6421f5daf541a82e96f494203336a9fa62f2afd14b654add82819d6971b22 SHA512 ab21686432190e47bdd8ad0cb4cb9cd0a6d9e89b7c376b589024fe04eebfc2c0f0d59d8c186921726f6960b896798ee69b147663f56f21501680938b03331832
 DIST android-studio-ide-183.5522156-linux.tar.gz 1087847976 BLAKE2B 6bff44f3d4dd5de1ce65ebc444c5b30d717b92ee34ccdfc268706f1ea07cc6c431ca6a42d361f89fdbe852f347b63afbfb9667acfd80980b869d244e5b957249 SHA512 2d9f10fc53c0d8036e413897c5003b07be106c5108a494d347b8c035b0e8155e13fcd487627b2b4910e918f41b1972b96cd078d09e3469eef2e18ce04a416b05
 DIST android-studio-ide-191.5791312-linux.tar.gz 765055716 BLAKE2B f0259adce0d3589a1c54ad16c1f745a10f4291ceb3554c9e6bb7433e6d57cb1fe6e1647df880b381172949a95cc908010977b87e3c34a868ccd00edfb3b7ba7c SHA512 39bc345e57fba7b49074f412db71bf1ecccc62cb2b23189149b8b1a72cbc159c285969708c8859def2d4a589cf8241b9a9cef2d93d72cf410554e469e66c20a6
-EBUILD android-studio-3.4.1.0.183.5522156.ebuild 3830 BLAKE2B 831f1991c2591c797838516608dfecf2ef73b923e9bb1b3436ea81e742f46019f59c1638247f1619bd751dffae057c4b3156e8e4e0b306e57b74e465e4686f5f SHA512 6a2408ebacbb96b3edac57d665bef8202d73f3f3f6a42a2cec89dc7557ce5cf94c1b35abd1e1fb9862522dc3c66a5216192be6446f8c874d3421b1b4e8e7ec6c
-EBUILD android-studio-3.5.0.21.191.5791312.ebuild 3662 BLAKE2B e597482d96d872a725753752995b09c23d4aad63d95f3fc86e5aaa2e85b4f0a9d9e30f8dd458e3cdbc2aeafa747053a1ffa69e17ab5342ccb6666c163ccede75 SHA512 c2e8ab0f00849c0171cb235468c76ec85d634648355ecb66481582be354b011e180aa19cd85a9f4d92897f7e9ad1fd7369e183db7df5c2c705a4f0e003bc0e89
+EBUILD android-studio-3.4.1.0.183.5522156.ebuild 3826 BLAKE2B 9021769173d13b280d186ae0508f100b219f5203b6e384bb9499ae6c64303945626ac84c6666ffec73c98173b47bdf89fab376684d6001176a92776bfeac3499 SHA512 39484240e0708a5ea4a1c5f9e0309a0dd42916ad4c7f41a53095131342d17bb7d4de97595aadbea37fcd80ef26b1578bb61de254d2a90e2f031003c6915489d3
+EBUILD android-studio-3.5.0.21.191.5791312.ebuild 3658 BLAKE2B 6aae0b97fefc7fb4ab69e2f2630c6dbf27f054f7a986c001b934e657768f51be4b29664a108b4ff2101ff001eeec7ea65be9df7bfafa8a8d36ca4c93f5ec7b02 SHA512 5a427c9d5cebf3ea2e3b2a767265d8ccb3e22717648243ab3805c884ca79709c6644b9633bbe056169f1c1802be5fa67713af188d6984962de82d7db59fc2477
 MISC metadata.xml 313 BLAKE2B 623366c889e8b0d9c33a56fd3ca96156208db355e1549bbf8040a6839a953a82459b3c87e5a0f16f1d67ede403ee5a9e1747c445e855434f25d0f03fe5a6c43a SHA512 1c3e18bd57e48e7f65791f8904bcdde910f1d97d83e781c7c3815df6127aaac9063614e0a11cf7762059f762c4696e2b89ca446ffb9e631a2c85ff2b350e972a
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 060c081b0e81..68d72ad521ee 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
@@ -54,7 +54,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/libpng-1.2.51
 	>=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/ncurses-compat:5[tinfo]
 	>=sys-libs/zlib-1.2.8-r1
 	>=x11-libs/libX11-1.6.2
 	>=x11-libs/libXau-1.0.7-r1
diff --git a/dev-util/android-studio/android-studio-3.5.0.21.191.5791312.ebuild b/dev-util/android-studio/android-studio-3.5.0.21.191.5791312.ebuild
index e76c9a4ef8b1..98fc3046cf05 100644
--- a/dev-util/android-studio/android-studio-3.5.0.21.191.5791312.ebuild
+++ b/dev-util/android-studio/android-studio-3.5.0.21.191.5791312.ebuild
@@ -53,7 +53,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/libpng-1.2.51
 	>=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/ncurses-compat:5[tinfo]
 	>=sys-libs/zlib-1.2.8-r1
 	>=x11-libs/libX11-1.6.2
 	>=x11-libs/libXau-1.0.7-r1
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index e03ecbe1b8c4..dbaaaba0d1e6 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,3 +1,3 @@
 DIST anjuta-3.28.0.tar.xz 6382736 BLAKE2B 8872736d80d0a09d35706ef69c0de56c84b9abf025f9552ae4b21b0b51c3ab8ad93f07dd1564601422890e92155cc7be80bae8de77106035621a54316608832b SHA512 c8de0b0debf0a511d6c50fe2582077a33c04290a045cce637c05c15df984cc3e8ee942c0c3a75bfd01c48e6c302d5424565c4e54fe6eb118c87a3590563505ef
-EBUILD anjuta-3.28.0-r1.ebuild 3919 BLAKE2B 9e3f6006eac5564ba10993aefb4e819657d3cb367dc732dfbe2cfab64d590b0471ebed6b0d56aea4061aa0dc5f58a10740fae1e808231609b5985ed019aa9d26 SHA512 ee471b71e40d15487106e515a5fd43d2330728a033d8cce29f6bd269b212abf15c5792205c325a0db45f36bea428209d6e201d45e66544f510b4272b3eaa0276
+EBUILD anjuta-3.28.0-r1.ebuild 3909 BLAKE2B 0667fa755bc539c507eac04270dd86b0aca17d4b6bacd7a28101b6c4ad0d0dbaea07917d7cf85ca1aa804782678d1ad474d569118549867a37fc2e6cea455846 SHA512 8cb9cbdf3b72d584aec671c95b40d5d83518c4238aa55f7fae0ccf4493ec21add988a7d7e8759e1cfb0f47c787cac3c0f5bd1cea1ad178db7d5dfc76b42ae199
 MISC metadata.xml 562 BLAKE2B 928b16bacff2417a1b50749486d2dcd656184b6cd7bce6f17e534d253ab2e1af854e18bf40f3188714e973b9c49f1b2691d031bdaef0ec73d9a4844c05b99218 SHA512 c452f34b8489e3faeb8c272282233341e22c958f04d750d54e07c487895aab8b03f4df096e1f07fdb7686a0295c770cb1fcf38fdca01f71730e991148013d82f
diff --git a/dev-util/anjuta/anjuta-3.28.0-r1.ebuild b/dev-util/anjuta/anjuta-3.28.0-r1.ebuild
index bd7857ff3ab1..379f5e06fda8 100644
--- a/dev-util/anjuta/anjuta-3.28.0-r1.ebuild
+++ b/dev-util/anjuta/anjuta-3.28.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 8e21510ec458..016a04df8033 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -2,12 +2,15 @@ AUX bcc-0.10.0-system-libbpf.patch 7201 BLAKE2B c2018dfc9709c6bbf3ea041eec9f731a
 AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f064c77da685cf75cc8c0ab0cad4d4b473f0eac0b1533ca8eb7e6159108d184d16db7a264b0ea9d30ccdc3d988d88bab28be7310d SHA512 6e5c20de22547410ffa566cb8226a47ee0e8c91183bc5b70eb22637a08fe55cfc96fde169ef3ab8d6e8d7c9e356c35e61b164b3ad675835d3ea8d5239a448979
 AUX bcc-0.9.0-system-libbpf.patch 3629 BLAKE2B e3fd70ccd29126bd2ac8582d8094ef0317dbc9dafc8924a05d994105573a6bd1bf382cbd3d6a0bb25390abc3b4ca3edc70293f4663337ccc203434ba380648dd SHA512 e7ca33a66ffbe4cb4b4bf169029d2325b4321018832803872a7fc7f1e99a75338e34bfe55a072f717d45f9759adf119ed5289f0febd45f81303c178999ef5dc7
 DIST bcc-0.10.0.tar.gz 2052430 BLAKE2B 562aa95d34ba329ce966bca3164af45fe6d78487e5f0d370a0a90c5d91af75b4adcc5aa1e6578bf598e55dc51394c5a218fc19e2b57b2f7241cc3fe1f3a4e513 SHA512 92ba0f57d22af610ac81661526fed8bec80d502bcbc8aa5048ba7c50911247c020832db23afdcf9b555b142cd387c228cf7baa0ddc94067165403e362227f235
+DIST bcc-0.11.0.tar.gz 2611511 BLAKE2B db12e10a3da11b1d3691ca5e0e036f56af4c5765d49e2edefc3e30bc90036a5f521d196db797e3725e618efa68ba2550848b3dc044015f6aea6b2da6ca2a34f5 SHA512 4854a5a15a89a8bd3a10daa6f0e831428316751280902cbdc74f3c6f78263ee1c58521ae9125804e72fec6482702818a5fec781436400640627e4b7c2fc189fb
 DIST bcc-0.6.0.tar.gz 1986593 BLAKE2B 514c2c781eb94d99560232d8050b5664ce3565622b236e78cd111be27b3482849965600a1d574f59243917672f00bb3cef65cab63103f6c4a5cf62024c683d9b SHA512 1a8edf6da22f3119a74cf43f03ec83b97ed2f6fc18828d750d8a695ac1451b6b3209e5d2cf48bc87f53fa9447e8813a018a58d31588d477e4aa364a2d0217e80
 DIST bcc-0.7.0.tar.gz 2009289 BLAKE2B 370b553521289d983d1165633e76a5e405250b9b09dbf3e78c127d232908e73facce06097ce4dbf0bbccda929b6715a9b7460affe123556087c8ca00b8d62c0b SHA512 ebe6c4cbecba2d587c69af71ddc8cb451b2b8e1d49ef887f291c813320c2c60d49357500fc2751d5b418df2be1d02763c385d89de6efa6e10f049c25acf01b4e
 DIST bcc-0.9.0-linux-5-bpf.patch.xz 28524 BLAKE2B f0369e50eabd7b1eb9a492b9652cd7647c7c7fda3b01db1e7f2bf716e76357d07d67193b31189b98309e26895ac3dd5c755d4cef6bc592e4674f40710c33539c SHA512 fc5b828a5826da2cf1e1a76758c635f5443d202aecbe3f269d78abcaa0117ad7658bea6c43e7b60e1ecc6bcc65bd19b100217758a1203d278ddb03c5837c43f1
 DIST bcc-0.9.0.tar.gz 2036984 BLAKE2B cebbeb57f06af90442d28be1633a54c198bf796786c4fcca3a83dea03bc76949f958dd24f7d85feb2e3402576410f965754f3d031076486b7d378493c56035e8 SHA512 373080181380ec3bcb13469e29ff1f792e924a2df00a614da4647ed54060ad216525dd0f49c5d0afba7946a6d2f4e3475af97250a33db825945af3d165294091
 DIST libbpf-0.0.3.tar.gz 127328 BLAKE2B eaa1be54f0a7fcc6fd41eb2adaad2f405f76db3bd7c7466a5484ead1cca5a9fe775e331838cd5645d7399cb5b1a5b2fcb3814fb45643660fd3f7d84b9986bae6 SHA512 ee489d968cd9a20a1f091dcd2696d3807ab0db2a001613684402de2c696391eea033f3bd961eaf1d0df95c1e15f4f0ccfb7003ff98c3f08f24a7e9a8db22cdad
+DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f90472e9593a9e9a93b08a00f0557d5a59fa841325b947e6f7b129232e7cd1fdc906f45de57b0dbe594548f1c2 SHA512 e42f6cc8f834f2d3cf9138d655bd3727ffffb2693850f7f6409ec4d536336bc5fa479a64eefc802a5915e333677eca843f8f1bd0132589bba10bdc89064eee0c
 EBUILD bcc-0.10.0.ebuild 1889 BLAKE2B 4083ff8d78dc4352eda14f27d269fa2cc847640a89d43553afcbf9a6d1df5c2c35bbe6dbdabd8bdd77034758bd580e9c1b8abd4b0b4dd949dc1e2f2d812b4398 SHA512 add2f25b8ff4e15ffb2e9b43247e4de405c857f1226dad3b56455e4c60e9971dee31c8681c2fabd560a7706310705e42b570ce8fdef954f5f2376c41dc07b4fc
+EBUILD bcc-0.11.0.ebuild 1890 BLAKE2B 20ea2a02282ab1b360a88430866df64f2d61717863db25efdcbd99e7174dbd5b65c8fae78c4a8d94d0b9cd6d5a23595ed181bfb55c55e37f69e3e45ea4f14fab SHA512 7f7fac9a3e85a06c18b1cb011cfd3ff4aef9a1995463ab3fed8146c410bae3a49e5e2f87117390e30e9c2f2af917912d9ee12cedfd455d505f5e79f425783e62
 EBUILD bcc-0.6.0.ebuild 1132 BLAKE2B 4f3fe126841b267c7ac676be765968163e350831a9dad18e9ecf923c6dc5fbbbcade831cce89c9d25d862174deaa512f5310a5a667ede2ee2cd356277ca38f2d SHA512 7359781a42c5470be2d67fed289c5aa45c1495a060e3e022d2e0b8a086b3b03bac422b85f8fd835e7dbe882d42829b24aee364e84c988ec744d2d45913873ca9
 EBUILD bcc-0.7.0.ebuild 1134 BLAKE2B a3a89ee433c77d182394f2cd4ab6200059430ef623d000f2e2f651a9c424bcd804414f19598fb1f192f0caf28aaffac3ed858973bb5c3f98e386b2167690fc20 SHA512 2f4ba8cb864ef80e5081d0f84092b0c2e1a2a31f522c3ee5ed8df134bd53023bfd8366e4e15e9c8ff5cd4f81897d28c08befa0ec7655f9d8696f574c9d9719e0
 EBUILD bcc-0.9.0-r1.ebuild 1677 BLAKE2B 6d2affa32b03f82c91071ff634e915093cd16baaf1fee9109c4ef4e63f24ae19d2827f954de09d86cf28ad2a3f34da54fb6da5472f3727deddf9d6043639df4f SHA512 076a60b122d350a2041c94fd29d23630e631c713611032aeb1525077c5c3b7ab138d065f4acced277f265e410284df52aeaa3678134f66cafaead924d4f1dc7c
diff --git a/dev-util/bcc/bcc-0.11.0.ebuild b/dev-util/bcc/bcc-0.11.0.ebuild
new file mode 100644
index 000000000000..b213c5e2737b
--- /dev/null
+++ b/dev-util/bcc/bcc-0.11.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit cmake-utils linux-info python-single-r1 python-utils-r1
+
+EGIT_COMMIT="v${PV}"
+LIBBPF_VER="0.0.5"
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+
+# This bundles libbpf, I tried to unbundle it, but I am not good enough
+# with cmake to do it. Patches accepted...
+SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/libbpf/libbpf/archive/v${LIBBPF_VER}.tar.gz -> libbpf-${LIBBPF_VER}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+luajit test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=sys-kernel/linux-headers-4.18
+	>=dev-libs/elfutils-0.166:=
+	sys-devel/clang:=
+	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+	luajit? ( dev-lang/luajit )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	test? (
+		|| (
+			net-misc/iputils[arping]
+			net-analyzer/arping
+		)
+		net-analyzer/netperf
+		net-misc/iperf:*
+	)"
+BDEPEND="dev-util/cmake
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
+
+PATCHES=(
+	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
+)
+
+# tests need root access
+RESTRICT="test"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+		~KPROBES"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	rmdir src/cc/libbpf || die
+	mv "${WORKDIR}"/libbpf-${LIBBPF_VER} src/cc/libbpf || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DREVISION=${PV%%_*}
+		$(usex luajit '-DWITH_LUAJIT=1' '' '' '')
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_fix_shebang "${ED}"
+}
diff --git a/dev-util/bless/Manifest b/dev-util/bless/Manifest
index 97502dd41d1a..e1bf577ac405 100644
--- a/dev-util/bless/Manifest
+++ b/dev-util/bless/Manifest
@@ -5,9 +5,5 @@ DIST bless-0.6.0.tar.gz 745694 BLAKE2B eb23edf3fd9c45b9848810ff022a7e9b7d760c224
 DIST bless-0.6.2.tar.gz 514695 BLAKE2B 2c9681e03992d42b20d0073e9107e5bd83d6f1699235b49fb6cf14fb5f9bc87e682e96b4f8bab2b45a3211515a8990e72b80922a62198c7ad603aeb5f3d3c406 SHA512 3fef715ed138323af50437ef8cda3d9f53987498042f1b4df2d9ce23f00dade68147cbdf28b85aed8b9c594fb5c43839c9dedbc14a994ad609fd4cedd89bfcf5
 EBUILD bless-0.6.0-r3.ebuild 1189 BLAKE2B b50dc35022a87a974a3f619f9f8eafb3034172dceebdaffb26ecc2955f4e1d5a51ffa02a21317dfe392ea5ef654e476de32c18da14ab922014cd576f9b78bf40 SHA512 2ff6ee1dab86eb242deffe88e36f30bba6584f7b4663728030872a2014b11c8433c45126c78d4bf5af24f6feae3b52dd9f2e39fe9042bd9c601777fa1fed54bc
 EBUILD bless-0.6.0-r4.ebuild 1188 BLAKE2B 97f0b498f789a511f4a24d57d23c18254561435cb5e197d94fe2e026e0047e1d7f18bc340a938bf57afa35c14682fb00b7f4c2375af8f61a0c8cceb678a99380 SHA512 652cf121dc16d0e4d745092de05a17f6c2f9adb34ffdc35800893a2ee038dc05a64ad93d66a30311f71cf1a7c2c0c70a5446756756f97a7e7a412091d63fc968
-<<<<<<< HEAD
-EBUILD bless-0.6.2.ebuild 1089 BLAKE2B 9f655705a567c69a2918ae0af95a2e3f7862eafa2a4d808606ad75c83dbb6ad69e3abdd34a72e9f8e74a119442905bab41b1648047ffdcc5568bf12407d77310 SHA512 480cc2c321892ee1d49325a4b2686c607a314dd347d3218ae7992fe9af770b3545f8af77bbdeb370166fbc2e4b11a21cc542b15121987e6406c652d36136ae0f
-=======
 EBUILD bless-0.6.2-r1.ebuild 1091 BLAKE2B a26ddc20916d8500116c05252dca058f4145eac973d27e697863984121b3d2f477eade47412deb48cdb918886e7bacb4654946bd6f0ec7c31eaedc5151b66c6f SHA512 def48401109372031c03507ffc869a995d82b93c293b8e10fd503f1d9e87ff00b6988c15a19f774793fe7be1983cc1a4ede0c79c5b894ba0dba9950fc093f5c3
->>>>>>> next
 MISC metadata.xml 242 BLAKE2B 896ec48a498764d193d9e3c54bfc07d07a6f95675e772ff73730bbdfb8cce43d2d1d99fbd0ee96a6c0ad3eab13e6a82bff55ce3a1e5a6883204fe8c5d5932f0f SHA512 c305f98db61dfe31ddc48084c932b6c45eee7a8cd664ebeade704135fb1da0978ace942a2a4d92d418ad4bdd22acd0685864cf0f4297660fc325cd3842e283e9
diff --git a/dev-util/bless/bless-0.6.2.ebuild b/dev-util/bless/bless-0.6.2.ebuild
deleted file mode 100644
index d2f0d9b79759..000000000000
--- a/dev-util/bless/bless-0.6.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 mono-env
-
-DESCRIPTION="GTK# Hex Editor"
-HOMEPAGE="https://github.com/afrantzis/Bless/"
-SRC_URI="https://github.com/afrantzis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-# EGIT_REPO_URI="https://github.com/afrantzis/bless/"
-# EGIT_COMMIT="v${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	>=dev-lang/mono-1.1.14
-	>=dev-dotnet/gtk-sharp-2.12.21
-"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	>=sys-devel/gettext-0.15
-	virtual/pkgconfig
-"
-
-# See bug 278162
-# Waiting on nunit ebuild entering the tree
-RESTRICT="test"
-
-pkg_setup() {
-	mono-env_pkg_setup
-}
-
-src_prepare() {
-	eautoreconf
-	# The autoreconf expects INSTALL to have been copied over by autoconf
-	touch "${S}/INSTALL"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-unix-specific \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${P}" || die "Unable to make documentation version-specific."
-}
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index de351e8d223b..6f9e5c597acb 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -12,7 +12,7 @@ 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
 DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
-EBUILD boost-build-1.65.0.ebuild 3913 BLAKE2B c809eedd69ea76b6a80347281be4448b2aa15ce8e8bb4ec4ba451b0d9cb9f24eb31635dc9c186f11a0a9ce40d1920f5d476daccb7a2b990966b48dec596a90cc SHA512 c396c03fc690189243d9883a8419f13de4f771acbf0a6294051d4b84211d2c9a45ac8021003dcd6ea43cee762ec722481f7cc265c8aba6d7729c4a4b716872e2
-EBUILD boost-build-1.70.0.ebuild 3887 BLAKE2B 753d36197c3e7552c82a86ccb10f441108a31b3b963fc17e3749aab68d8794dbbd020cb3d9a8037199727c338c22654c32e81cb5d1d8cbc4903a122abc30eee0 SHA512 1116d687410cd78fd720c6a7b2a2bcb562d9cbd560439cc40ddfc31bffc0bbffd612154f139334459817c6f2d245d883387d9fdb369158b995460c022f7ef222
-EBUILD boost-build-1.71.0.ebuild 3138 BLAKE2B 316afeebb9f3c2a307c2c3d541462567a220a6672c97446867ccc6062907d5a941981d147cfbc28fd33a951474ef82024cf4091d6a6fdf1ebe713bff15b15d9a SHA512 69f60daa3394cdcd49afc2d1f461db11e6a250b3ef3837980b23f2aec6f5cb87f5c5132b34641921e8c98895710eaacbaf2298d34a011168d97ebe2d82c1b3bc
+EBUILD boost-build-1.65.0.ebuild 3891 BLAKE2B c47be692e2688b4fc97ccd937e68779859b8f0fc32aabe080ffda307b3fdb04fd67309c204348165b277e19504562d7fe1046ca2295a9f6971e7170d45edd570 SHA512 440452088de9c406150f18dfae2a586c3039d16dac623a065d524b6b3587d6f83346906e3e0e1697bc735c53c55ae19414750c8ab3c61090e49cc1a344b6ae88
+EBUILD boost-build-1.70.0.ebuild 3865 BLAKE2B e815fe470d6bc8e7c4e1a08e4ed6425c41c720615077478385710084582f5fba5048626b925a8e89c274b429e81f5b2ba2e820bd4cea3624539ccd3a337fa351 SHA512 d121308dcfb95e2f2b696ba00ef4cbc1279b84cdd2925005ea9f6557ef9763d35874c4e718a8f51da80fb492b3ac24a2799d5f285098a76b7c039ce7d7508dd7
+EBUILD boost-build-1.71.0.ebuild 3116 BLAKE2B 8069482955916f23fbab461a21353682f7dc7cce179709e6b2bf29b67c20f38c0c27a2011acf8a3e86cf05191fffa2e69e3b130f8fe74f54812478a26f7c6444 SHA512 dcaa943b218bc683c849a0d1fcadc82edca578b2c102f701e8881509d5e5ce8760b301eec50f3af918104bb3a2ee2a7a1e739e95d5b9bc05efb8b8dc31056d15
 MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
diff --git a/dev-util/boost-build/boost-build-1.65.0.ebuild b/dev-util/boost-build/boost-build-1.65.0.ebuild
index 4b42b41f17ce..4c164c8d29cf 100644
--- a/dev-util/boost-build/boost-build-1.65.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.65.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples python test"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
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 fd6a1f8d2269..a1e13511ec84 100644
--- a/dev-util/boost-build/boost-build-1.70.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.70.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples python test"
 RESTRICT="test"
 
diff --git a/dev-util/boost-build/boost-build-1.71.0.ebuild b/dev-util/boost-build/boost-build-1.71.0.ebuild
index d41c9ef2006a..16494056062d 100644
--- a/dev-util/boost-build/boost-build-1.71.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.71.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples python test"
 RESTRICT="test"
 
diff --git a/dev-util/bsdiff/Manifest b/dev-util/bsdiff/Manifest
index c38b16eadaed..e68005ad809d 100644
--- a/dev-util/bsdiff/Manifest
+++ b/dev-util/bsdiff/Manifest
@@ -1,3 +1,3 @@
 DIST bsdiff-4.3.tar.gz 5740 BLAKE2B 869b957fac9de5977216b82ae46f5a291af4f64e8f4199b129b5e9963385e8f23d8593c307ddf953001fc54446ba66a0c57f9f9a841854afc3d32aee26fffc4e SHA512 bde46b393b74bcc9f05532ea4d45b12c104c4f182fdd49d4176aad5f02a2b357f435819f13a5a7ddefe27df0ca82980f06fad764094014a6d068622263e319c3
-EBUILD bsdiff-4.3-r3.ebuild 890 BLAKE2B 4de51485327c17c6c7ae043dc11734825a4e91176181ebbcf9e042e61c94c132b1ffd0789f5f4552537d9776d498314ee890f8bbde831ee3e13fe72caa69a899 SHA512 8e89472866b70c179613c81ce9c93e944436c5b350eb54561f6015b9e5300f06f49997cf2a414676a5919e16ae6752f4ce760845b874b0a035ad6525d78ef100
+EBUILD bsdiff-4.3-r3.ebuild 880 BLAKE2B cd78e2738f947d2b4c0b9350b531b8148f91129809950c520cbd988527ab4dab5542d4ecd6b3ec8735d19174b7264cda31eb3250fd943edf9db7e9f770a8bd01 SHA512 1dc38b42bab1a469c87190b66a942775e6e4c8abbedf4a22f36f9310b2d4f4afd0523d9ae6bf21fcaf9545167d54d8a3d1a59b8bdb49446d16090ee3510f8a2f
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/bsdiff/bsdiff-4.3-r3.ebuild b/dev-util/bsdiff/bsdiff-4.3-r3.ebuild
index 575d008b3073..887613e48e6c 100644
--- a/dev-util/bsdiff/bsdiff-4.3-r3.ebuild
+++ b/dev-util/bsdiff/bsdiff-4.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.daemonology.net/bsdiff/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="app-arch/bzip2"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/btyacc/Manifest b/dev-util/btyacc/Manifest
index 228b2db2d966..317f7ca61630 100644
--- a/dev-util/btyacc/Manifest
+++ b/dev-util/btyacc/Manifest
@@ -1,5 +1,5 @@
 AUX btyacc-3.0-includes.patch 175 BLAKE2B a0da73e29099239e97d8fd67edf2743720fc3e97946834319c249e9bb0dd1949c70b492d3ec3fffed32d992dddc7ed2cadbf7cb2280b7cc24c26b1f00854b46f SHA512 c0ba2cf5ca3575862a6c683cf5a9461cc7008e7c8662732ef64ba68f041e810aceb8f0f1b75becc8cd910c87c60dc830e8823b15986fedf345319bedb50e3dd4
 AUX btyacc-3.0-makefile.patch 535 BLAKE2B f5c7f893dcbe98c17dc74efc6310924518447ea4d719af3dc700daea72d0106e5217d69cfb82b498a81392c8f0a447c92afcfa10954f4b7418efa76de3382dc9 SHA512 54df54a45147a7ca5c76d0c6665a46210af170671ba04762e8de80c0269b0a1aa947c1be049aa8660f8b96d4ec204e639f2a810130676d69fc54fb28c929a190
 DIST btyacc-3-0.tar.gz 74770 BLAKE2B 298d6ba020a47a8d894044c464c12efd3ed94b878cd152f4287a35fc0a8ec490186b7603909691cbf036f425fa96316c6cda8b8270b07e3c5c0cd11777d5e62b SHA512 55312e3de7cc783e1386ea98c97464d8d40bb496ce2ce36c84cc559e4c6982fbac730e76b8d44c4a44565f545ac50fb75f802bd8a1b4c926b1fc1af1a0058ef4
-EBUILD btyacc-3.0-r3.ebuild 928 BLAKE2B d3f7855ba2de20e9b8ae0990dac3faea827e83ad4defdb48a002a47c8d2a6e6d2df480ee1b36a9b4be3d7fd7ed8627e165802339324a9ac4638d5c3324d6e933 SHA512 c998dd46a55d4311dc082ba140a778da81f05070afdb6fded5d9df49f692951762016d44c4cd3fdc79bc072a4d3cbd521a87e1923c516303e78f458022c95469
+EBUILD btyacc-3.0-r3.ebuild 916 BLAKE2B e8633bfee5cd45d4fc1066a97c77e53ca33590731c56c0e37e6d9e6c38cd325b524889e148025d03ca1be2a0db7c842823d2dbf5d5b31bd4d96905fe1c59b7d9 SHA512 032cf3f96caf2653ed51d79bbcc2e0bd0d9d25d85c04714bd8a820cd3cb95d38c39616e5e7b42b0d117309e3d557544b1a1eede317f1ed0d5c304bee09a3e6ca
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-util/btyacc/btyacc-3.0-r3.ebuild b/dev-util/btyacc/btyacc-3.0-r3.ebuild
index 2de9c25574c0..a313d2c58518 100644
--- a/dev-util/btyacc/btyacc-3.0-r3.ebuild
+++ b/dev-util/btyacc/btyacc-3.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.siber.com/btyacc/${MY_P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
 
 S="${WORKDIR}"
 
diff --git a/dev-util/cargo-ebuild/Manifest b/dev-util/cargo-ebuild/Manifest
new file mode 100644
index 000000000000..5a063d25830b
--- /dev/null
+++ b/dev-util/cargo-ebuild/Manifest
@@ -0,0 +1,140 @@
+DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
+DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
+DIST autocfg-0.1.6.crate 11439 BLAKE2B e0eb7a3176bb5ac27b8de466c5fcdfedb9ad32f4d2b52c0385550902d59d01c716a53179708bdeb250a91690edeb70ab81d91090ff0fd89a731dd365621aa496 SHA512 ac7dd73b7c6b8b54c4fc98c3e75210eb59d46ab3447fca533763bfebfa87dba5e947829e3ba56a8eb3403f6d317065b7d674da883741e619f3866b12267801fe
+DIST backtrace-0.3.38.crate 68133 BLAKE2B 75794901cf8d322cb642672eaab9403b00f802a917f04505d8a4df1466d340f92f1824cd0cd501d5f6017ff98cf17e4ad61ce32fce07b061fbcdaecce5ac0c55 SHA512 a962b8ffd435691bf229f6db6cc86a0e9fabec1dea589824a85f11ee77e2c36458cdebd68acc0624d45195df27a9fb6dace0afb98a9fddc0291bae93928345fe
+DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
+DIST bitflags-1.2.0.crate 16814 BLAKE2B 5b7aee7388b01cebf96651e979025e9bcac85f7324982055d7d805361f91da2b9489a07f00350133c8a58eaf70c5397e3561c15b3f2544aa8202bfdb852c145b SHA512 bd9e3797fb9b91e815308a5286439e7eedb285666c937184493cfce45ff1d4c10f505f29be3a6317add313a7fdc72a006682c1b3e1cc9fa05166f6c4ecaffcaa
+DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
+DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
+DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
+DIST bytesize-1.0.0.crate 7522 BLAKE2B cd4f9687753ec1ea4e7435f34b64afdf6e5534d33515d00c413da37081dea57eb76b2f3b8e001e65ca40908efccddcfa458ce1e3b5974aa79232567d9df7faff SHA512 a8837bc05efbf6faf55ce76cffb0f8ef2f47baad2f65875da246f4a8f1052af0fcd8f156950deac0e57e015183d740e0d8ced1e6da1aaecf03244ad370d926b8
+DIST c2-chacha-0.2.2.crate 13766 BLAKE2B 0b963b7a4ac64d71d75ab542a23585cd7bb99995b923c52edf99c49a76222978d0a96c020a5a1199c971133fc1f8629b562088b34fd283b7b5da7800848f85ab SHA512 d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14
+DIST cargo-0.37.0.crate 1016321 BLAKE2B 7b47599dba5ab5662a24412f496f94b10af4636678f6e5521cfbc603188a768697ab4667e387286cab4f15b16facc71e49035f015c41796aaff1f6889828da5f SHA512 8ec554818e58e9c80740ad5130e65318836059944a1dc2dd9bcc74b2a51e69ad3d66d99669c0f497110daf92bf5215db963504e492f416d0addc545916b554b3
+DIST cargo-ebuild-0.2.0.crate 19731 BLAKE2B c72df800403dff677fd686997cebaa9d4b96802f8d64c1247883e9a6ffd84eab3b17406af22bc2e471b400634ec1d3b806d261c8318164d84ae3e9d9aa98ea3d SHA512 1baa0a7e8bcd91b0e2bd89b89efe1bdba62e28900d1e681b346550ae4826f6776de2ee4fb4a27e748710ee7cbfdfe586daa07265a203917313d6eb144bebaac3
+DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
+DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e
+DIST core-foundation-0.6.4.crate 25233 BLAKE2B 720cb670e0ce589fcb75e583c3f70b54669407481f61b67bb5df1a5056f07c88f568f2adeb65188004424b26b623ac42b03d830239571c15f241216e55fd8dfa SHA512 5dce50f15aa48f38e1bf287fdd3c5276d8e5f1d64bcf29da7d8a68008414f6ee560a940040361eb2f4e65657ca4329958dbec8105cc6d3606ecfe9e71ccb7632
+DIST core-foundation-sys-0.6.2.crate 16204 BLAKE2B 32766d4b23a2b108777c57b2115cc718a0cdb42fcd2e3973a0adf944d326e0796a6953756c42140eb4e6e96a2609bfb41f84a54c59b4b840d7213f3c5dd4234e SHA512 bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07
+DIST crates-io-0.25.0.crate 8384 BLAKE2B 7c501851ee4c83632d64434355570c0add0a868247ce82b2235cab252050cb27000b9ba6199c3e9b8fd480f18404204b581dc31d1abc2f2d9cf9cdc42cceb20b SHA512 c431caae97a7522d3b398e0da46d471948e736702fe41caf73494be376c6ef87c196ae2bb6b00b30907c634a751cd36ebcab96ea3a3e437d9182537b090e2f4f
+DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
+DIST crossbeam-channel-0.3.9.crate 86771 BLAKE2B d0898ecfa5aaccd03ed714b657aee7a3279f4242516c2943073e75d23f23437f34bf63b465bdfef6567030c998e7b3c6bd4f5fe2e0ee4b50a03d8a15396a2090 SHA512 4cc876bab2bd8874cee4b96bc490e77778f10e99ab624ed7a8b73be94b59a40bcb340fdb81a1d14242f6a795557c9f8bcdcf17d6bf6829aff85c7c1e8bf00919
+DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
+DIST crypto-hash-0.3.4.crate 8102 BLAKE2B 8bcf39d195d40a2e6d899fa254c9f64e982d742fb304f4b271b75db305d5afa8ea5361c0b6adb23c0fbfd212f3c4601bc7476b4874eaac00a26c8a65b711b0ae SHA512 57d020650689c988859f51ec9252702a7e8510526364b00058b263f4decb249d7296811adf3b8c5e76f8aa744cd5e444aa198f3dfe134c98257b99cdeb824537
+DIST curl-0.4.25.crate 75171 BLAKE2B 8b9e10bd0690932dafbe49f825253ab4f0bfad79f7c32d093d31f831076de7a42d6f1944ff2352a71f3c6659203cf3fa5c050e864187e14ec70cc7d56490e52b SHA512 c42efa6bcb5989c4f3a91629d0a547448ccce7fc8556b802ed2bdd10941cae25bb1ad15cd914024f1fdb0d1799ac2345fdc649b985b86eb87074b2b80e7c80d3
+DIST curl-sys-0.4.23.crate 2935053 BLAKE2B a6230f0cec0d0d2ad59d0f29a1caeab178ddd8f1035a87fdb9979e41b873abe9e030b719c3b89004a620eeb562a212dfc7f90bab26dd81450609a2a95301a9e2 SHA512 67299a70b3e00a04e5de6370b2d2a04a8310ba6ba5d16f8072f47e4004430e2126759ce6fd746807904c3735c0e0775df55c23dddfd303fd47d73d66bc6e5f46
+DIST env_logger-0.6.2.crate 31078 BLAKE2B c799e1be558ce1c2800aa6d2ca8f6de21b3fba48742495cea56baa16463e598feb200cba39d6725b7f447d4610135f6393f5c7f835a520d423f30f21e812686c SHA512 ec90dc0cee99a743d4cdc772fa66a9c4e81793e452000bc1432fb47436b62c6a02c36c40ea48550db493df65c4eb37e8a6d6d3b4011f00648294d745a200dafa
+DIST failure-0.1.5.crate 36749 BLAKE2B 97fb948770c3325862f449d5eafc07cfb170924b4a0efdf4e6d8902411eae6cade898c953a6b51a955838c359c670c1778b3a189c3e70152fe97e687df38a805 SHA512 8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc
+DIST failure_derive-0.1.5.crate 4884 BLAKE2B f09bc82f9fb489950d886ed1276ffefe06e916389d034aa3b82521445829e7fcee102e1c03030df9cc55e4b1f14c933ab83faee8be910037d33f15d15ef9c86e SHA512 c1a6896d986c126c35045c40a85b8cb8dd8842b9bd06918246205f2e79349e1df5dcdbe408024a0f9693d628e17bbd750a733a0a5cc24de4162b08790222729a
+DIST filetime-0.2.7.crate 13469 BLAKE2B 6ec71f64de621b86c0ea46856fd9a7f364820916922f88611bc324696d5d34c73600ddaa204bd2119e29b0b38cdbbabc55aee669d87e9d77408dfdd844200a8d SHA512 410d45d9ad4d657da1d2cd16de58963f3096cf6e1978ffa4579b3696f0f4926cda303df7c4d02cfa8d71560518032750729a4184160a31229d590cbbec471d6a
+DIST flate2-1.0.12.crate 73844 BLAKE2B 46d0e592e68dae030c4e05aa073ac8940c8778e707b315b33f54eefabcbb2074f9843b784a98b4c7955a34d965482505ea0700e5ac04774b40473889fb335e3e SHA512 3247d6cca560ed4e7518a3b035e1745472f5ad98f049c764a16a4559b6dcf2a006acb613b57557556f917b529376ab0eea2d3c5ce0ea9e044b0fbae804dd3ecb
+DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
+DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50
+DIST fwdansi-1.0.1.crate 4658 BLAKE2B 9ff7630d03280a27d4c58e858391bb9fa0e51d4f8aab875e8b1ac6ceb5f97e0db27f46efeb8e380cefc0348cfc845a10c72cb97ab5ae8a287b84fcfca0773acd SHA512 171044bcb47a672f0d22014741e4509c571a20511ed8d9cbc26fd857b65979925e5f51affff1033c9899a6b5448a696f661e6ee617a349dc732edb02456b7098
+DIST getrandom-0.1.12.crate 23809 BLAKE2B 9669147c455bd03bd15f304eb7019b218cbc482af850ac3cb4378327de5afabd50826a686d51b00437d740ac4e3a0bfc761c54ed295806ac8b77ae6848742346 SHA512 0577f21f0ff01154453da92dd125c3bdea12a2bb2e7f5581add4306e28dfc448a0c084e9e64a0ef1da7baf8415965ea4ee32a5ef38d5af8ce4c6addab3cb0518
+DIST git2-0.8.0.crate 151568 BLAKE2B b4bf47247e7add92f8c96e4e8c2b1ade9d7db8e79b799ebae9e07f11870b0c660b4355a0581eef627ebeec2167a501a498e4a4bcbfe9ffa1895ca123086d2e73 SHA512 06270d9f1284796d1c56c4bcac7de477b4665f6c32b5d8ea2fe816d4ff72d662f67f3482349d5d2b055232d9f1619f6fb7afcc7fe0a9053df7133efd9fd342d7
+DIST git2-curl-0.9.0.crate 9290 BLAKE2B b90729fb3de5781f7d1ee180658be92a94fcde5b61991493703e7b60c34c0a730054f36ba49f42b9bd5d64d7bf9471f3f1e6e7eb5224d7f13eb928d3f6a0f981 SHA512 f43b1a9e62f53f96c4108975225ed4c0b214cb86cfe969ec399bc2483ae1eeec409d163fbbbcb78386208bcefcd26971f7a29537a29d37fdfd1051e02f0128ea
+DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
+DIST globset-0.4.4.crate 22369 BLAKE2B 7265cf19e3f7a8e710be40760098242fe156ddfa974a59aa29018c2c317876049dec21e70f8b416ea9a0d16c33754118c7f070dd0e50de70cf8cc10e484a6030 SHA512 b9da7f4d67d4269b0b3564d65904c9cca0db7df6d33255f6022eee614f0ad03f3dc6f9e52e52fca7461308d9f01dac1f3588baf87aef735c266561b1119f9985
+DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
+DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
+DIST home-0.3.4.crate 4167 BLAKE2B 8e71387f6063446aa565dcfc6f08f72e2e406681d413bae835393d31ce1f80d451928e3b434bdf569ba3ccde23e55be320f0081f2c2570c3e4e4069915dfc0a9 SHA512 0e6fa44f4464229e833f8ffa893fd84dcd0bff181c718adcbe5f202b76bd2e16044aa44e1828d4eb332fc71637a3e9ac432a048ad2c6e8f87c719e9e88d4a9b1
+DIST http-0.1.18.crate 101326 BLAKE2B fa8dcf6cb5dbafb5883dd27110cf583c4e656852170abba050568ced0241d4d62e0c299d9bcb50b707b495ed0ffbbf3688d7a5a5f29e6aac07657fdd0f279b58 SHA512 850145ca90272d5f474cc9998bdb173bd94a2a16cb08383815d30d9eb941b9fdb8b0d1a342a4c24bbf94d9e63336f4e10b2b95f5dcaeb26392efeef143cb0726
+DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
+DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
+DIST ignore-0.4.10.crate 49022 BLAKE2B 4e1fef531f800bf95bf1a601cb8f64d93ed46623217392368cd1f59fe6e353dae8e8e6d2a017c5b3bc89acf2a964eb682d30803f2d4ac3744935c4567d2675d1 SHA512 ef4b3f58bbdc3b5317a14244494ba9cad8e3d062f0c8e137dd2d33572dc8a06b20f59860aabafccb729dc682134aa4e2bdaea8c07b351aa73a8ebb00e361ceeb
+DIST im-rc-12.3.4.crate 124256 BLAKE2B 6ee5fe39142b8a6bb96c9a2f50206b67088377ecba753b92fde0211df409b82faeaa5a534016aa91a70aa5b93396af2247c2094d10a0dc136ad4319303e4a22c SHA512 bf85209dca389ec4681a53fec3d58a1f98f56a1821e916d95b152ed8a1eb7ca1fe704062c27a8af27c209da1bf84fda9f39f92202b4d810dac36ead4e225bce8
+DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
+DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
+DIST jobserver-0.1.17.crate 19563 BLAKE2B 369af1c6ea420f3be059e7dec5e59d3634dbe0c7bd30e2067bad0ab7702b1643841943f72d8d8624d9b9b208f7e7c1480d2d2dadbadbe52855a6c08316ee1298 SHA512 14578203a000efe2cd88e9de96af216b5aec50f02aa2f33a884119d2edbad02626c05eae6f203ef92032f7d6f9ca58f427a368f843bd379e9e35b585d04fa161
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
+DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
+DIST libgit2-sys-0.7.11.crate 1176919 BLAKE2B 9793a5131c805f8474c17d336514c480203938f51fcdb3d4e09bfc609e6599027a05436660077a526ddedbcab3c587a411fd9ec8d7dd921fb352ebb61e52eb1d SHA512 361aa7d75a029209f59c799e2f091f6ab8c0ba6a4677932537eea8e0198a36a2382327e8c5db98a2980f47b6a4baf07708720f128734081ac58e30d8721c3435
+DIST libnghttp2-sys-0.1.2.crate 2307177 BLAKE2B a76feb5a820f143691a954cf6d62938522408bca4c8c4bd346e4e4b25b43f1e26490a75acbb06971ec15dc1bb61efbc2f7ec95877d236facb99bc1006ea18147 SHA512 d82a0f5bed2dd43cbeb8c12b7fd0a7015bf99139ef1fbc9ed6b27bfcc72f3cb21b726cbd5083fede5cfee0d6a29c3e09b22240fde11c3d9b121342720897065e
+DIST libssh2-sys-0.2.12.crate 468388 BLAKE2B 83010257061fc04ac461aefde945583e94970715e8edca3e8346c085d6a8ebbff61e0fedad9b39d6d848fd0a19caebbb1e20d648537a4d0c8622962911d5caef SHA512 85503ce61fc7ceb5aef619091089b075d19f54c65315c41fa8b24d8a2dafb5ad99709e3ea7d014cf274d1af254ce8a1ce40b815df2aed1f218ca5832dfb2dfc5
+DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
+DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
+DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST miniz_oxide-0.3.3.crate 54561 BLAKE2B 79bfb64ee52a5cba786486d055cc742119db2957e484616d5cb487330406eb6401c92d03bf43dab5e97da5dee7f97c07b30a2bbff7f9bdae91726ee38121b3da SHA512 d8924c3a496136c0f1bc4a94befa8ebba72865c454296975cbce6e9269051e6894002dddad8027eb32ce650e1350ac3ddf75a655469cad5ee7b5484641c554ce
+DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d98099fe3042bd0480d63a0cdb54df1abd55827790996bdbdb61f241b7fad8d325cdd64891513876ae913d SHA512 f2b8c5f31bfa2d831f1a6c0aaa9e526dde3ef8a2ac363da5180592cdf7a30e9e0898de680692db00406a48f4ee068ec97e3d42787c807335f7d47faac9c563aa
+DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c50091f68feae9b4cc56d28919a51672794122ba23d51a26e6241fe94d36a0a6c843e460ef9c36b734fe474fcc5 SHA512 f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd
+DIST opener-0.4.1.crate 10634 BLAKE2B 74668ad804ee2d39b8b1c3ec3ff2e99b62a871bec8bf295a89db0cea421f3bf1127c2bb9d886ca527402a7d05dc7477f149929507bf19be069676d83f2d947f9 SHA512 7200f4d21a0ba5e0dca5d58368c3d172a73db36d1ceb3cc978c46140e1594343c638d291685b86f0c503c970c9ce95ec2800d6840fe745005eecd32bf326d46f
+DIST openssl-0.10.25.crate 185164 BLAKE2B 17cc67db6e4188d111f75f52fa03da910c86ae79d8211f6fa252d04c064ec90a1008efd2d69e0c8a54719d3d547a783bb6950c9bb0525840c31efe45bfe9c7b0 SHA512 db7a8af332c8db921cd07f778bb591a5d013d98848e1772cf5b9550562a5ae55e6459047f4b3263f813dc9a0b8f0bd302ad86dc620b71339bce3136f7daed029
+DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
+DIST openssl-sys-0.9.51.crate 45001 BLAKE2B e872039554c7e07e3303c1345ca91b246435c7bb37fb00b91f23d8718d5e18e857bccf46a488489ec142e73e535f3eda49f15bc74c555b48a69d62f3c24c57f3 SHA512 2d9041e03ab647507e2cfa71b8f76a1dd72c3d57455a0bde957f833f487129c20441651e5a31e3ba7bbbdf963e994a333a42cfe3f36ff1935a2ecdc813e04450
+DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
+DIST pkg-config-0.3.16.crate 14429 BLAKE2B f850910fd54891c39bb4187c5ea49997e0628858d7c1f579cea719b8a2c47beb907b3f6e72056c8d8eb037314f4c5a129280504a7c1e8c676fae48241ee6dfdd SHA512 13431f3f8cda05615c91be2fcb8eb2fba085b46df70c5dce773748ffc15f0b48a45858aa69c37c173ce6353b028851f94f03ded58649c641e66a1c1a65b60572
+DIST ppv-lite86-0.2.5.crate 20606 BLAKE2B aeded44b0a0fc59073d358b565c6241ce537a29967fe8f95eadc4cce420752e619023b0f813d1f157756dabc640351de61e7da9bd030c91a14b70d34e300a217 SHA512 281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243
+DIST proc-macro-error-0.2.6.crate 7963 BLAKE2B 702391b17acb0daaec650e39033e563683cf7ec7c6339402dd288807bbfbe534883bb1dbe9f79eca660cce2e1327d04c24786d78bc886061897da23da96776ae SHA512 7db38f6b5f7e0697c1d6a14de1d0e3d67670dfc1005f74a9993d9c4ec31a4d1165375735711edda2a35e92d6f03619f4e139ac9d5197014853c8333d879d665d
+DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
+DIST proc-macro2-1.0.5.crate 35430 BLAKE2B 3bb45a1659cf7352120e066f095da7f91343d17198c4af4d4b2600b78e5bc7900f7b3c1fa72b4c707e80c05f6b91155015dc72ca317932195f727c333d34ae41 SHA512 0fd9cb01781b7fca910e905c0cddd0deebb6a862d84286b694b78b7210a586ff497a211eabd27b80c3714b2019736206f88d9d97dc21f3dfffe49ca041f98783
+DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
+DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
+DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
+DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
+DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
+DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
+DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
+DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
+DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
+DIST rustc-workspace-hack-1.0.0.crate 774 BLAKE2B 521f71467c95554c8a87ab3e10623ea3516932fe4bc9ca95c835c06b8e0bf526291dede3a5e08df8222f365f4d326c4054a99ef0d37aa6fb5210e2a35d7599be SHA512 48e4774a272e717ea571f4c22606ffca78245723ebc3f15ae5d0b28c5d767df9e772b7e2d6c5c3505bb09bf28097aa83a34b182856bb9d74b3a00b292da45315
+DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
+DIST rustfix-0.4.6.crate 13488 BLAKE2B e2b2f54d4420966f4bf0b6c7cb8ee96ec1a4847295bdfd00a88a2f7f6bc00542e471fc6abb2dfb6fe1949ad0c2b9a5ae1911232a47f670de1792637c2dddb44c SHA512 76927c924025bcecd885a71e5f8802e6f44700afceac4acc67e0caa3e594ed6445879d92088cd4d01f8f1e00d8e09cdee9e2274a3a83ade9db24f0a67d04949d
+DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
+DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
+DIST schannel-0.1.16.crate 39153 BLAKE2B f06cb0dcb3d93ac1debf396b23faf5df2b87ce98732ccf5c0ef78af0c36fc9825f2b716f0a5772dc71cd2b2e6ecb477a81c2dbfb6bbd4f84bf3d1187dd7cf187 SHA512 11bb68e759e2ac0bb57a214e64d86fcc49903dc70f9e0582ac4bd0343e94da44d8d34d22649ffae41dc975b4390e7d10f3adcf79d9fe8c9fc95c747c58947b2b
+DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST serde-1.0.101.crate 73115 BLAKE2B 6b80a6e7f8965c412c6f5db62cf3782329818c59c43c9947ad9a33be56b334feb0fc0afae4722f368d708236e2763ee2b1e71b323b3e961880f99f2e178a82a6 SHA512 3b6e2f8fc965ae2055a8eea007b3aa47715fdbd653cd0af81ada557559316ca65d7f3c75c3c5db0841aabcb2d4336092d339258829df11716b10a0c14597c678
+DIST serde_derive-1.0.101.crate 49736 BLAKE2B 247c6284e362d9a31eee6c92b257fd70733669627628cbdc921dbecc384d1a328fc8a37a8f5b96a84498d5fb4514374760ccccfcee1f3e809d35da5677cf4932 SHA512 08a014ff70718db11c5e3b8420d2b31379c14004b55c4521149030a00c3a623a358c3442815e492a2cd28d6a32002aa1c828cae2b5366f82d68c1e342eba0417
+DIST serde_ignored-0.0.4.crate 9533 BLAKE2B 07d08459a3333fb30a9413a882169b5c5b49f26f58128dc8f0458c3e7e668948f3a84d3e5c4dff78905f51604f4f317d76f96c3a900da85d669c0c9065e6191d SHA512 29911d05145b33ddfdcd5c86d57af331262393cd445eb5c464df07f8853032a156b0b1be7b90b66666748e0383831272cb53252cad7778fdd3ea20f2a04e23b4
+DIST serde_json-1.0.41.crate 69870 BLAKE2B 328935ee765889b82cd88ac7eab921e279ea8ad41445a8344b194605e1571b30b6204add7dc4de1f87994d8162428eaf4d825e9744c9971349e8fee19507265f SHA512 63ac513a4813a65962d8f63476ce8e63ce71d1e6643da7443d774078e4a743835276c50c04ce535b2e43251383c537365581838a0bd5d4893a644e396eeec55b
+DIST shell-escape-0.1.4.crate 6764 BLAKE2B cbfaabec7c6b81b802ced02a33e463c39b2f27f004e0e97087adf5712f1ccf4f4405ea9d010afb49153292741aa1d51d985caea5a3c48a601dc4f25b66012135 SHA512 19cd5e79b2b610dbb26098182c1ed3a8a2cb93a88fc623c0a9e3ff719998d6bb1de632f79519905441a4e38275178dd5aebca8b9994efc24e19bac4ebe5d6329
+DIST sized-chunks-0.1.3.crate 22156 BLAKE2B 48edf5e404ab5967ab90d7cafda783d0bc9e3faa4040e815e6dc80f7041c667f0e109f6b43638ab6cbd9e41e7cae9a4d65b91fa36a4fc63aaa7963b1b0f5aa65 SHA512 613a306d7596846da858543c5eb34bcb52356e5ebefe77ebe36623f1bdd4579d18fea955c6ea07788dfaccfea013afa0c817f709afaaf01317362575370dda54
+DIST smallvec-0.6.10.crate 22064 BLAKE2B 41a7ccd12c9b7e1dfaf43a9cee22c60d160b35a08024554cf8d68b59498a6e3fcd0e8146815bb61a6e1727b209ec85813127ab8520f8ef47716913a6ce6cd952 SHA512 802b96283ac27ffa71ba17e8676c23f721cc1bd3b61df6f78a1c8ca9150d07e6d5db55651ba070f9202460019f59636871c1160e31038c6bf7ee21cdba8c5be4
+DIST socket2-0.3.11.crate 27725 BLAKE2B 75c2b2ba7ac8981bb7111bb7780fcaae03c670abcc5dd464c2121fe8d3c592fb19faa2b759ff8f8d9a60f954c6059ae600cbad5a6b4592a23888b5264d7e1d25 SHA512 6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST structopt-0.3.3.crate 40622 BLAKE2B 0960dbd15b9ae1258ea9f98c082c974eb8be6635f3c7366d3a382415947647e66658bad52faaa56eea42c2e06e8dae03f6d8906923f78b1d85c177bbf9424024 SHA512 8239f1db65401ac0d31589f362938fbbccbc10a930480e183cd0c503c10b75c5e3723e0d0686b84b3d3837d788627a48f7954b81ce5fed4c963d0fa2969496bf
+DIST structopt-derive-0.3.3.crate 16237 BLAKE2B 995fd46f6017802c957f5a7f23bf219cdffca8f9e34809c64ca00b8cb3087ef7e579d28ab01125dbce7c80ba95b9657564bb20d658fad9cffba2e8fda81bbeea SHA512 27df870ff020c2b115fc1fbe8a65d8ca9818d79c46ca24a588d0f1589bf62538430bbc63a9dc34832b4212895e7873c47fb4266fd502d6444cc8767add86da24
+DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
+DIST syn-1.0.5.crate 190286 BLAKE2B 7d5c813bb4cebbc104978181532a050b0a7f79963a539d69a253ebdb15a83c275a5d5b04dfbb66a426afec2c90a450ed7be595619a2b5a31b0725d904f5adb92 SHA512 4cc18966040b1f86916876aa5ad8029a126f7ab8db55408b3f4bc343dd82dc357899dd4a7afc514c65fd269245f8850f8f2834b08bc2ee6cf6774282f75feadc
+DIST synstructure-0.10.2.crate 17988 BLAKE2B 62bdc896819ba1f0820286dda3596e265dc7ebeda83595d89ad6baf584046242f774141b25ee4cd9b120bd7c392973a99d307abbe956b50eddbd05e9b7b7ce72 SHA512 48da0daf778cd18547e51a080f1e86149534527f20026601b21423c9f89cf6adb7a121b01dd9bb0b680403eb728a92e75242e5ae31a725ea5b1f19c5f47f0458
+DIST tar-0.4.26.crate 42689 BLAKE2B 174baa480caac4734282003b5277004d87ccf9d5519b0adc3a02ceb0831e053483eb4cb7d21170ba792e2a573748aaa9589a261ffa8050d8bf2bc36e86451e16 SHA512 83ee187b253347068121d04242a488ac44ca6da159c6f9029f3e063b04544b7fa3ed40fed7e251692ffd73553dd369edb413f52f3b3718396451ec916eba15ab
+DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
+DIST termcolor-1.0.5.crate 14526 BLAKE2B c799a73787fdc764ce634731c5cb7232a4696a88797aedad8d2bce72d9d193b099ed80240a03259dccffc5ac2df8b4acc8b60f916dce6ddf63913e2cf0eaec84 SHA512 d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
+DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
+DIST toml-0.5.3.crate 51654 BLAKE2B ba0b8af941edb4557bc06a24351420ef89619ab9115b85e3f6eb5eb327dc08496d02023a5e375e3546fe763db11f201fc576804eb291d423702ab81f7b7854ef SHA512 f3798afe9cbededee2c5d0cc2cd45a9a5b09004bc4d6f0e2863aa56a3aa377e9eb8fc2e4c557fe448afbec77bea5bb6953fe6ff59cb83389351ea207bd912458
+DIST typenum-1.11.2.crate 31853 BLAKE2B 1781840c29726a8df614fdcd620924b4cb5a11ad8b5af7c633e70b459b4cdcb9d6a7ccb02b08b78a0cfb3f73382d3ce9d93c56296f93ad588546aeb81a74540c SHA512 c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a
+DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-normalization-0.1.8.crate 71158 BLAKE2B c548a2bc537abc6d86bffb0828a366ff82b143dcb0ee01e2c21b3b7134fd5f818f3775db391d358f4ebcb906ff256e3d2228ab042066a3de9a6747be05b8effa SHA512 4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547
+DIST unicode-segmentation-1.3.0.crate 90567 BLAKE2B 2bfce62b981b6b8d41be760f0663c3301f974fa9c975e7859c6cac6778cecafa2ee5dbe2e4368959b4fc2f0dee3d93cdab236dde593665b76740d07009051cb2 SHA512 6f32a36c8c69e80b3aacfcf68cde088a34b88587e20de6e49a14b24941caa51a0031623941ef05e6d36e5c99f50472c9bb26d670b5396749bae8373ae4bc7d4c
+DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
+DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
+DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
+DIST url_serde-0.2.0.crate 3525 BLAKE2B 3beadf5f536b091ea54f8a1cf31553f2c9c51719a1d586ceed396363d26f1441c12a23bf8017cad4daca62a57b4f5b55b0b5d5577b4c61c1854f16a3d4554247 SHA512 9abf777f8ac1f369e8db826e35fd09a2a5f1685560027740a8388ce1c60de92da79b4d1b938f9bd082363396f5b7a742811feaf298b269b2f5e9465650ee827f
+DIST vcpkg-0.2.7.crate 11012 BLAKE2B 3d97c24c3ddafc4c5c56d54e682c828782d6900a10caa48552892c174e897c6b92d0477a2515df889c25297e43dc57538684cd761b8ff9f6855f6a6b748f4446 SHA512 d298d8a3de58138a4be622b3038949d29e92b83941765fc3e25539a3779451cb9deadceda9bdf46186700c01eb65bb1b5c03e3b3cf7a5fe1c48c06e1b1591a1b
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
+DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
+EBUILD cargo-ebuild-0.2.0.ebuild 2716 BLAKE2B fdf6361810e5cc695f0c3741f2d2f86dc3c7d7a1a8a138f3ede3beb1b34d2f395c441419d698dd537cabc83c4953bae1e924fc7b6fb73c8cafbda16ee820c5a8 SHA512 e42ab7fa4b328c50336ff9beb2f68b8ab077858630bc2ce713831cbfd49e76001fec9edfaa895d250aab87a6087fd13d284535837342f83fcbbc6f33b078450a
+MISC metadata.xml 331 BLAKE2B 1fafc9c1b14b8c365a91f02ff7941cffe5e7d97253f74160943a7fba64341f1399cd5daf1da8f3fd1d7a9dac3d0def483fbcaefd7c991ab64de7e4707e636f6c SHA512 e664485c069f1b2341376dee14c76e2ff99b2897837ef8242a9f76106ba4e4d5edc4e8a49b379dcb3848bd65560e68a0c881b005572d526f14234bbafd29dd14
diff --git a/dev-util/cargo-ebuild/cargo-ebuild-0.2.0.ebuild b/dev-util/cargo-ebuild/cargo-ebuild-0.2.0.ebuild
new file mode 100644
index 000000000000..2fedb507b4a1
--- /dev/null
+++ b/dev-util/cargo-ebuild/cargo-ebuild-0.2.0.ebuild
@@ -0,0 +1,161 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.2.0
+
+EAPI=7
+
+CRATES="
+adler32-1.0.4
+aho-corasick-0.7.6
+ansi_term-0.11.0
+atty-0.2.13
+autocfg-0.1.6
+backtrace-0.3.38
+backtrace-sys-0.1.31
+bitflags-1.2.0
+bstr-0.2.8
+byteorder-1.3.2
+bytes-0.4.12
+bytesize-1.0.0
+c2-chacha-0.2.2
+cargo-0.37.0
+cargo-ebuild-0.2.0
+cc-1.0.45
+cfg-if-0.1.10
+clap-2.33.0
+commoncrypto-0.2.0
+commoncrypto-sys-0.2.0
+core-foundation-0.6.4
+core-foundation-sys-0.6.2
+crates-io-0.25.0
+crc32fast-1.2.0
+crossbeam-channel-0.3.9
+crossbeam-utils-0.6.6
+crypto-hash-0.3.4
+curl-0.4.25
+curl-sys-0.4.23
+env_logger-0.6.2
+failure-0.1.5
+failure_derive-0.1.5
+filetime-0.2.7
+flate2-1.0.12
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fs2-0.4.3
+fwdansi-1.0.1
+getrandom-0.1.12
+git2-0.8.0
+git2-curl-0.9.0
+glob-0.3.0
+globset-0.4.4
+heck-0.3.1
+hex-0.3.2
+home-0.3.4
+http-0.1.18
+humantime-1.3.0
+idna-0.1.5
+ignore-0.4.10
+im-rc-12.3.4
+iovec-0.1.4
+itoa-0.4.4
+jobserver-0.1.17
+lazy_static-1.4.0
+lazycell-1.2.1
+libc-0.2.62
+libgit2-sys-0.7.11
+libnghttp2-sys-0.1.2
+libssh2-sys-0.2.12
+libz-sys-1.0.25
+log-0.4.8
+matches-0.1.8
+memchr-2.2.1
+miniz_oxide-0.3.3
+miow-0.3.3
+num_cpus-1.10.1
+opener-0.4.1
+openssl-0.10.25
+openssl-probe-0.1.2
+openssl-sys-0.9.51
+percent-encoding-1.0.1
+pkg-config-0.3.16
+ppv-lite86-0.2.5
+proc-macro-error-0.2.6
+proc-macro2-0.4.30
+proc-macro2-1.0.5
+quick-error-1.2.2
+quote-0.6.13
+quote-1.0.2
+rand-0.7.2
+rand_chacha-0.2.1
+rand_core-0.5.1
+rand_hc-0.2.0
+redox_syscall-0.1.56
+regex-1.3.1
+regex-syntax-0.6.12
+remove_dir_all-0.5.2
+rustc-demangle-0.1.16
+rustc-workspace-hack-1.0.0
+rustc_version-0.2.3
+rustfix-0.4.6
+ryu-1.0.0
+same-file-1.0.5
+schannel-0.1.16
+scopeguard-0.3.3
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.101
+serde_derive-1.0.101
+serde_ignored-0.0.4
+serde_json-1.0.41
+shell-escape-0.1.4
+sized-chunks-0.1.3
+smallvec-0.6.10
+socket2-0.3.11
+strsim-0.8.0
+structopt-0.3.3
+structopt-derive-0.3.3
+syn-0.15.44
+syn-1.0.5
+synstructure-0.10.2
+tar-0.4.26
+tempfile-3.1.0
+termcolor-1.0.5
+textwrap-0.11.0
+thread_local-0.3.6
+time-0.1.42
+toml-0.5.3
+typenum-1.11.2
+unicode-bidi-0.3.4
+unicode-normalization-0.1.8
+unicode-segmentation-1.3.0
+unicode-width-0.1.6
+unicode-xid-0.1.0
+unicode-xid-0.2.0
+url-1.7.2
+url_serde-0.2.0
+vcpkg-0.2.7
+vec_map-0.8.1
+walkdir-2.2.9
+wasi-0.7.0
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.2
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.2
+"
+
+inherit cargo
+
+DESCRIPTION="Generates an ebuild for a package using the in-tree eclasses."
+HOMEPAGE="https://github.com/cardoe/cargo-ebuild"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+RESTRICT="mirror"
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-util/cargo-ebuild/metadata.xml b/dev-util/cargo-ebuild/metadata.xml
new file mode 100644
index 000000000000..f4074b3f98aa
--- /dev/null
+++ b/dev-util/cargo-ebuild/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cardoe@gentoo.org</email>
+		<name>Doug Goldstein</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">cardeo/cargo-ebuild</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 7911431e6c50..1c8a13e25199 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,6 +1,6 @@
 DIST catalyst-3.0.5.tar.bz2 873286 BLAKE2B c4cafccb0dcee19d6b0dd30e57c99da81b3485342b6d5405cdbe2e2b59a4631f3223e7d13c5041783a7172361b4a1b69ee5ff68e29ee8bec2f76165acdc5686c SHA512 35cc16391100394f97af4cdfd14f9de2ab4532c97c213f43dd0be927766dc3892768be5aa899fc8919414743c9ea63b4489a2690437b3e7985951eb68c19d0a4
 DIST catalyst-3.0.6.tar.bz2 873468 BLAKE2B 146228e6a8eca293a93ab50661b1a3852fe587036d2d2ff9fde132ccb1f0642cbdd4332a13f912927ef8e7c5d8dea5bb738aa3327b559e18c7d31308a289a7fc SHA512 01de8405f48c698366cbb675e75ecbe6cfb5a7236d5b5a0f1f9bc6200b07c728fca41925b34177019b207d8ef2c1b688306a37b1571a7fd91138d31e81758bce
-EBUILD catalyst-3.0.5.ebuild 1895 BLAKE2B f4663a60dc96ca4073824942212dd667835590cec1c438de659e6251655411155bde2855c7fb47517366e04bd7ac50a0070578e1783b99c9602dfd84a917ac9e SHA512 771b85e3640689425a709c7cbd69bf81db2d42b49b6178592adec4107e803191eb1fb7e4fee8e25bb82728ecd95b55d2737631409298a4a410d7ac0789e146fe
-EBUILD catalyst-3.0.6.ebuild 1906 BLAKE2B 13c1e83fb4fabc66644fa5b82fc359866349a4864f1b4e3043ce344812a7d9828bc5bea5734582b34e34fff5cbe067591bd1a5cc7de9f1642701186c20091eff SHA512 79542ae9b5ffef341570dd5b0460f85692cf05c785a5dc97b26922f3139494f97e1d0b8f55ea2ed530df01b0e0d70aaeaaedf65898600da49948b4389f43d175
-EBUILD catalyst-9999.ebuild 1907 BLAKE2B 997e4453538efdf5bb87d27f5cca2b47025d211d7a3e3b1e8e8e5f66c19c12c06a9cefe55516327be248812b5a1df29026c29cbc0769f6620e06da3cea67a0eb SHA512 d90667ec0e6d1d9d4ad25dd00c8ae8a040e843af0de43cfd5edc1e23d4c8b654e6ccbf31209def8971688e47483700d8ec0d7eff08659079a2f964294ace968b
+EBUILD catalyst-3.0.5.ebuild 1885 BLAKE2B 293ea4371c2eb33f45bd40bb5984dea50e29f18c085f0e14411745f3bf2b8792e6f0bcee8889fb1f159d8d122adb8a417ae2891332bdce014750e04730f5efd5 SHA512 7308a22ba955fdadfebd6db46a3dba8e6980b1592969189bf03d3a01d4812a150c74589c190af27ede0102c5f65939b34fecea2b71badc5350a9693971b14fec
+EBUILD catalyst-3.0.6.ebuild 1896 BLAKE2B 560f65b5e87a7833741c3abcb624434dbd4e064983459e68a798dd49e6df83daf86615932759c2bf6bb35f023b3740a1c835bea99f165f5c3c797c69e0800494 SHA512 ff4952be8a36d496708da49e7dcbf9bf8bd2ed054203ec890be82aae23131fdb05dd69975e6fe97cc414c788321f412d4c392da3c8fded1e21c9b2cfd7ec9c06
+EBUILD catalyst-9999.ebuild 1897 BLAKE2B 141dfa371702236ee38e03e6ded540789c5634145212e94136c262c669310c623de6561da7e149289de380b7a955a6622a10a973c77fe35227aa6e23796cc6e3 SHA512 d0f293dc7eb1a408f29f492128fd182277d6204ab0b17ebe2643093c912f039487df2c1846ff330c0d0228255c9eac40121122e278b1c8bfc79820854b5aea92
 MISC metadata.xml 634 BLAKE2B 2616a9220096593cc1cb863a560101bb97a1672ad84093f951968ef0482950b6c72f8226e66a4e0d8bcc30dad6db9cb3511581f5d9e2f7cbf7c1ba9e7b30dd70 SHA512 ac7464e724232bf7a9211ab3c845b5b7ead26d8ff750a249c4e7646683926e4659581d3783b4e2de9b9324b8df71a6791221900629e633038a6f6aa1c8b59b25
diff --git a/dev-util/catalyst/catalyst-3.0.5.ebuild b/dev-util/catalyst/catalyst-3.0.5.ebuild
index 8369b04fcc0d..7da190c26fef 100644
--- a/dev-util/catalyst/catalyst-3.0.5.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.5.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_6,3_7} )
diff --git a/dev-util/catalyst/catalyst-3.0.6.ebuild b/dev-util/catalyst/catalyst-3.0.6.ebuild
index 15c75f926c40..a2ca1e9a4877 100644
--- a/dev-util/catalyst/catalyst-3.0.6.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.6.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python{3_6,3_7} )
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 25b4d5dcd3c9..9b191cbaf519 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python{3_6,3_7} )
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index 4a6c1cd35fe3..414884bce207 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -2,7 +2,7 @@ DIST catfish-1.4.10.tar.bz2 213951 BLAKE2B ff8f710d5f3b5d59e98bd6af9b1dd11499ea3
 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.10.ebuild 1089 BLAKE2B eecfd11133132625e85709f77c28e3d9ebad74b2061773369542f0e470532be320a1d25df825c5863ac89c1ca68023dd32b890f47c317f67d6b96416b9393f79 SHA512 9733034aac8ab0e60a4dd74684754a7f8e924fed1ff21c2559ff239848060760dfc54b368bb20aebddd021f2a1e479cb097aed8e1b7268800bcaa6f200e23edc
+EBUILD catfish-1.4.10.ebuild 1087 BLAKE2B 0d73240222f11debf0fb9547a1c3e3fea38d1f586e85c2ee8087b256946c68d4f1bf2e1fd2daff18d0fa041636e310f7938cd112fd744dddd297062289478fa1 SHA512 409b5b2dd6c76c58fcb11cffbdc475026fb30cd78fdb615454d9cc6ea6deee354dbf0afa13c4d586613b0922c9edce18f134c5a7b311c39ce6457cadfd49b421
 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
diff --git a/dev-util/catfish/catfish-1.4.10.ebuild b/dev-util/catfish/catfish-1.4.10.ebuild
index 8833b3e29740..a1d0b1e691ed 100644
--- a/dev-util/catfish/catfish-1.4.10.ebuild
+++ b/dev-util/catfish/catfish-1.4.10.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	dev-libs/gobject-introspection
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 0867d32ef2c8..971910f1ef7b 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -1,119 +1,47 @@
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST atty-0.2.10.crate 5962 BLAKE2B 36a2fe57eb500124f20464a7d67f86bc6270c2143f8273683011599adee180ee71fb0ea565c38171b9d471479d63041e4bbba4f713dfb92239b7d298e9d89e7e SHA512 76cbf960475073101d617bdaf12ed1e93dfdd96e22182674e1ec04c955fb1de2e3aa132345c50a1bebc579932d43c74c9aac64ae64107e98648a0f1f6562285b
 DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
-DIST autocfg-0.1.2.crate 10444 BLAKE2B 1e37c97d6d309a5250552fc4c38066ba004674af6e6d091f08b24f47475c11b2db4b0967ce55d2208b9e2ba080e2bcb4b4226acd0da9d4c15dd844827ea6f0b4 SHA512 0f692f4062d22be01c32af2ceb6ed3887a7d65843e1a6ec696fbaa46517d02e62d573055efe5da3a63847f05bc37b254bf2dd750738b528774f63352eacdabe4
 DIST autocfg-0.1.4.crate 10937 BLAKE2B 272fc9d216749941cb73d37d5233d1df4bde5abcf9a6e75ed928ee6493e9011922a06551dac1f6b1d0c34dce587c6ce1442ea62e88457c0cecf985e7a3d5e47e SHA512 811b68ea24a836980026abba12598b35359abdff5660e6e9d3cc65e3edbedcd10dffc208900af5d4c21e983e1218b5fb5499117c05ab60b3e4716f0529b231ce
-DIST bitflags-1.0.3.crate 13838 BLAKE2B d053495250ce43970d4dbca6ec7dd541e5f5ca6597f35b8ac7cae3230e80f95d8f056f3ea030c12dd02228b51184c8020f8d2ab5ee4da4dad88a97638ea3db41 SHA512 c1410967948a0c44c434bcf952c586166cea656f98532980156bce5eb68ea2966ad7457abd2e45e7444d346f47950aad9d6b4d6779486cddfbda70dee5716bd8
-DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
-DIST cbindgen-0.6.6.crate 82574 BLAKE2B ec3d2d03ea677acf89046d148447ea1108f4d0189878e9ffe4ceab273ea377cd489df27d9d6c589641dc614d0c8982fb19d2452d4ae88609adaa9a6aebf70baa SHA512 d51d17765d705424dead65e4240c52fe93da731d5ac1cc76fe79e2eb68a42c26a7de58b08149cccd6806ee5bb189df8c15c3a532a5f857a65c2fd69c656d7137
-DIST cbindgen-0.6.7.crate 84579 BLAKE2B 6307bc70346acd1340393c07460198666b7133d3cc21c0d02712a017458e3a228ff6dc6f3cfda8d560e5cc8eb6d9a15e52309099dc7deb151bf157ed6856ef6f SHA512 1a2a3f2055b0527b878b78834e6c802a171ed5f3494ff4819622f8244821d9a1b23d34d0c9370bee10a9f334cdbdfac43cb513f61bd49d57614f66825cd78030
-DIST cbindgen-0.7.1.crate 90623 BLAKE2B 4fa7e82ee15b89a7de678eedb6ff95c3ca36376aefc8496a6b728eddce075a2aff9076867adfc0b6104a3317fc1e205fa4399b773211944261f8495265eba574 SHA512 ee9856e07ea55c03f4a715497167a4714e3d1297c1f52da2fef507b44d93f258ca2eda8004befb3915a9cfd783b44e6768706de5efa3cac6f7a778bf8ccb4e76
-DIST cbindgen-0.8.2.crate 98747 BLAKE2B b400fa5df818760a48483883eae959de04433d1ec2d5f67bdba5c065e6bebc4f21424badd8c7598ad4aca5e1205230e79528ad9d0e1e736c2dd00745abdd058c SHA512 e4e6079170ba396f753603cd58c2a8c252e216e129cea6a0c4d82b399aea78f569d80345dbe69af509aadf207790b4d00b8f2edf500b36d54d9c095a65b9e792
-DIST cbindgen-0.8.7.crate 107774 BLAKE2B 55548bfe721ba049231318712ae392f49fcef98d328ad73a9d7af41df7c209dec1d4fcfbe0c4fe5d03abb9e14db961bfee25df79113c6f585eb5e15127161eea SHA512 0238fa87100f1792cbb2b2c977bdc13a9a8a3e916f841ee112f69335a8ecb2a9fc99d3a0ce5eda16c9eead7ccbe8e7b3b8248d4ceaa218bbea0ac9a6a20e805d
-DIST cbindgen-0.9.0.crate 125723 BLAKE2B d3eacaf7715dc7528d98c8356dc797d25a2617ef1561e0cfa7e63cbe378929243da25ffc78101d29fffbbf4e50c8008bac18b855d2a0af3ff9fc22a3b0dd18ab SHA512 134a748ec781dde54d7810d6f5f98a5a84784d4acdd13a4c13eb4ae67fc278ccd2b123eea56461a124e7aa17b99e0a5a20f39f06286ce259e6e3eb24c43f29ae
 DIST cbindgen-0.9.1.crate 129676 BLAKE2B 12315522938e941c4a53033f276f6065d6e19ba7cab3ce8aabb17b2ae5fe0c7231e51be33828434d6ca039d79c9414fe8d310a12b07ef1c544ed9b5d8cee74c6 SHA512 0e32563db42363dc82e8aca2f36bdafcdf0ec9156e7238937295c9369d306c2bfa590ea7a9afd61d8b915fc383bb7af8bbb78cde71f6ab30b0c576262c74232b
-DIST cfg-if-0.1.3.crate 7115 BLAKE2B 748cb334312efe8a1410a0dda75db94ea2e6a6915a6293cec35cdfc72f9491a6fde32691c53cbac20f705760725dcc766107a15a4bee41481beb724ea8588a6c SHA512 88537e4b53f5553fdee16c4949de0bb0fdf12576b9a1d197fc7edd00d41c47972d481227bb6311bec774099cde27195fe319f28f4385a4091f06849dceabd34d
-DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
-DIST clap-2.31.2.crate 194051 BLAKE2B 67ff210e200d387008fb5ddbb4b0a7961f568886a4df57b12b8aa1dd4c87b0408d11d9797980f3dadfbc9aa30bdf71586474a3d905d0d45eee13165692505bb8 SHA512 f43c3e2736a7fcd5c59ba4c80bcdb28fe436b85fe33ef74a53b76b7aab009d9315d2be007a52c1abdee2f754b118ab8132640e6e6954fd60017a17d0cc086127
-DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
-DIST dtoa-0.4.2.crate 14227 BLAKE2B 7edc0b203a58586aeea84326cce66105e21e3d7efcffab8b80fbd5576dc19a181304571d1edf932873ba05254a36f44bc81377fa4aa79d9bbfd6a90e75a33468 SHA512 a04410f8f67e846dbf3c72c0d15096e529c60174c6403931c9b8df67b41a59b8c06c675bc3222d0111f642d4153f7dd72c0631805d40386bded28695e38c7f0c
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
-DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
-DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
-DIST itoa-0.4.1.crate 10563 BLAKE2B dd8ba6399c4f9b307c296b83043cf4172463ab361c8edc11ec0486863ce0a7a1be968989e1676821a20de69c383c1aab55a9eb4a61d74d63710811e0463391d4 SHA512 f2efdad4fa250a1a453d3a956b478aebaa4cf0618f77da1f8206d3ef4e37b153a485de6a2873662acd0649fa9b8599cde8c99ed2096b7606166de90fb5ac77ee
-DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
-DIST libc-0.2.41.crate 333728 BLAKE2B 4b6d8a3ddedfbd01114878b14dcd7f4cdb663ab19c3f325d1785d9fc0c752634a7efe7777b3b14cac77ac5a2a3b8ae70a9e413006dafdcfe268b6e3c30bec8ab SHA512 6666f28673f765817dc6c989876a53031b117d281a6b148976b900ddeaa220fcb04c0e2bfe8b07d46f7e1b212e9c2fd7273b3300be548a3af0d2c9025bef7b26
-DIST libc-0.2.47.crate 351491 BLAKE2B 10ff90405b911c40478793cadc9a1962e14eb4d7b4ff758554a225bb87340989bbd6089441eaa2638db93782de7d0faba20f77a7e3569a52cec40ba55eb56c06 SHA512 f0eddcbe456b1ee2da22963585ff689ad44f0f8d70af33d9bec41a1ec5a1b3dee26fbeaa29786792cd44d020fc56461b44bbb2da962662377552fa562b2694f6
 DIST libc-0.2.58.crate 409031 BLAKE2B 81353f2e0962bdc3bca806a195c80b84f9c63c0a7184aad966f33ea073982045577eebb468bf379a7e342bac722b9df7052d25becd9f25c99923bc309ae75211 SHA512 9127ad9a94f75655740fc3a2278c7a17d5f03c4cd12c8833c1a1ecb7a860ec8581fbc969f5c2e23b8eecb9131d9d8271131ad6a675b785f18fb55d830bcc0491
-DIST log-0.4.1.crate 20731 BLAKE2B 5936919ddf0e218ca42d669b56271836e9eca61afa4145896a55970e5fb768196f18ac6f028caf8eaf505f5bb797700ca2f238970e1ad54edadea566efb6ca16 SHA512 a142f4d230cbe64a4efe2c46055722bf06e7af500c0f14d66f1d7d7fec99d552081ee9541d4a5b3aa5f46bc3be42f7702dff76132cc1eed7734234b2db37c0f0
 DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
 DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354
-DIST proc-macro2-0.3.8.crate 24412 BLAKE2B 42895039c67122199619256b567ea66f6e0b6a45d688440ae1211c8bb45bfb87e7a599f978b04414ddf78384df3147ff8faadcea662bff647256567ea6be565b SHA512 df6d48a5d9c2b7c3f071de3336343ac00c61427c74675512c457ce23d30879350fc995809154289fe9c2d08b7bc39a9137898f651bed8c3646695abfb8368a9d
-DIST proc-macro2-0.4.25.crate 31557 BLAKE2B df36d9c0f4e020d289341ec9e26cc3b4c8a5a5221e936834bdc707426e02c675ca38d6cc5dfee1a42f501619bf00a7cbc2dbd140ac523d1e99f47574ece76ff2 SHA512 e6bf37c4b990a3cc1629171c812ff145db35f1d179a40c4204857766ec4a517a7cc4342decc63026c6b891e0ff321b5fa8b5242459b6f80a9358572afc2650e1
-DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
-DIST proc-macro2-0.4.4.crate 28564 BLAKE2B 56935ff3b80d9c94f198a253de77fd7c8650ec75e62df100114bbeee633941570e4525a5dabfc92c370a8770be375d1ae0a83ecc09df10c4cfad2adc55ad501f SHA512 13b74a69277bd7674554414039e79dd0ae14f6e998a46e6e587cc17b6f2c97a6dbcbc459c827888510e5aff3b79d48b11f840bc21a28ff16c0eee8a51b784a86
 DIST proc-macro2-1.0.0.crate 34625 BLAKE2B c27040190bb06af8135c0fd85fc285abc3a672e629b43968573a95966ce8beb09b93dc9076e4e78da2434a2803b33c695f71ab6df07c7030432f9863d87ddfa7 SHA512 8b70b107ee0445eacae9a3f35b5c02649cbcc41550fdf109a4bf3248eab20568ad016ccde2274b406a4631605b8414d208187f5fd0090baa182df8aeb68a2727
-DIST quote-0.5.2.crate 14982 BLAKE2B 5600742b8da27015c0a461c04414dd61be208cad10a3a1212e43d7a2aa3a8fde947b700ca230f79d9d8c13da1742a7caf70810d4b6ebd6669b020513be00974c SHA512 66c0469bf1970164e87a4960791932ca06726c79bc522fe0bdfbd41ed23428e32448aa01a0f02066169c165364465eacbd19cdde47e96b4dba017a491842e6ac
-DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162
-DIST quote-0.6.12.crate 17541 BLAKE2B 0d09f5075358c8c7cee6503c55ad489a2ed4efa31dd0bb47c77a01b7bcb3ab4319cdcedaf5799cd25738c8f6a9f6256f91e509b60eb18ba99664693efbe45afc SHA512 5d58945b0c9b41e368458a1661ae7b2ceed2e3285d377088afe5fde38e1db945ab42326d096cd6d13d82f5f80fe73d204c5fbe3c7abdea149eb6d7ca7c5e6798
-DIST quote-0.6.3.crate 14154 BLAKE2B 16a31875577eefec9568e3b990ed17b0afa5af6ec936f0b8d1f05303b7e1dae1737677a86089a048cf51b602c71f4b3c7802ee40fb9caadf2e13fc0e6df134a8 SHA512 f2ff3cd617c69007c4f60961728c73a7ac7a2eaeb1d6da51218d2fbc9e85c06baeaccc9b82771a304bace04024479a192b88336546f96e17c6446ba85df94a10
 DIST quote-1.0.0.crate 23089 BLAKE2B 89bd0a0857da2c261f529ffce512ac55bcddc3d6aea7ec039a009df045709a15667e9f4869daa1187e1859eb489ee32302bdea1a0ca8010267ae7e892698f7dc SHA512 64db0b1690beb4f0a81dd77ccdf8e3f61b523674802ac657f0849b7ae653d8de41f279e55eb22c5f6080fc9787845cc6470b5486b35c3a0f44f019185db542e0
-DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
-DIST rand-0.6.4.crate 116260 BLAKE2B e16bde25b7493b0f77b897efb9281e31ff17636d0ce5c9c4bce47fd5cec79e6bd889880f371591f6eed9163ef49934ef4389c95d6a673172dc0f27c09e6abf1e SHA512 2b98ba7edce4b48833ca5d8c9cda25beb9f73fd22adb997afdfb10d5c59e9240537baebc2e7de1e0094716009f7fe2b657d1f4dcb4c778e492e49483a7e3ce8b
 DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
 DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
-DIST rand_core-0.2.1.crate 19262 BLAKE2B 6ab239b11f08b79f5319e0d278ec56985f4c91406f938c206f017f706508d73aa78ed3ef799ca7f20a9bf3ab860f76c5527bf14fb2464db914af3dac55ac0b64 SHA512 5e919f4229ee2e7d00f47f8bbbb7fd27e11f34aa5bd85a9d9e34d45af1601bdbe2507d9b0182b5af7a6eb4d93da3004d2708729f7e864b6c66ce9b3274fe1c64
-DIST rand_core-0.3.0.crate 20581 BLAKE2B fe46ab0ef5fe8f5f5695906336683350abd7aca246a537e2e4bc9fcf10686d39aaac259584f17c022200ec1139e01e817f71caf33933ad3f353baa10e6cd11ab SHA512 a476510ef936571e3351f42e0f1c615530732b7c66f41975fef10dc6b8f4d8536a6d8166bb90d6da2bb997108ee3e87f4d80884264b239680e6ffd3494dcb748
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
 DIST rand_core-0.4.0.crate 20326 BLAKE2B ff85118d2b5c793e3da37bd4d75032e2d73a87bbba0b4c0c07057c47c67b7e919e5c4458b4c929e3b55f53cd3ae6579be5d434369d307e962c00fb3272862937 SHA512 f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845
 DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
 DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e
 DIST rand_jitter-0.1.4.crate 18409 BLAKE2B f346f6856128218aad0e70e8b4b70a19f39b4b3161ae2199d893f6427ea1e2b7aed4024de311add4ea9a19de898f5b34668a4c7727c9e7b32325663eb6ddbf51 SHA512 fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a
-DIST rand_os-0.1.1.crate 18553 BLAKE2B 5b74bbce5ee3f20f7c92204c4b60f9450b3a19518356c70737c8dad9873da775c90b8786bc75f0fa166388f6bfc585240c56445a39603704df5e99a4c505e17a SHA512 a7ccc054fd4a60e868520af3fc15e6eb22e62411975923e4d968a4825a48cbf87238338cbf1336792d996da5cc2183ac465a6bf8094358f0e5fc56380ce16193
 DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
-DIST rand_pcg-0.1.1.crate 10881 BLAKE2B adafb2f28603e4c1ccced838b1946b4d0de94f7d11c85b1a0fdd69a1de3a7c3e1b3030af25b600441c08e2eb73595ff4bad195e5d2ef04f3fa2da5f9614e14f8 SHA512 5104d9a3352f631eb7775218fae6da430d0b26c500aa10a333baa0b1b3d4ff7ff6e8a0162cfe8f514382b0a9342a00e3d2ad6b0313047c5e0c324f3184cfa9e3
 DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c
 DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
-DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
-DIST redox_syscall-0.1.50.crate 15609 BLAKE2B 22c1542a025992694c37d426330a217e3936b95be5847b962151fe626975490434d463277056be53a128e815bc01a17e9f7b49718832fbee25648d5db6671743 SHA512 eb98bec77830bf2eeb0943bee2818f85881ace42e49122005195c65366596be3e886f592c3561288f253951b2768ac5b9e02f9f815961500a08176ba777b27a6
 DIST redox_syscall-0.1.54.crate 15668 BLAKE2B 2da177fdb698073829b29023e6cd0a2f422ad1cf1ac359b37d3f5cf4c12f6334eb241bd313fde0236afced49714af92469919d62119ad4ddc49448ab5d9a2589 SHA512 38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
-DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
 DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
-DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
-DIST ryu-0.2.7.crate 41382 BLAKE2B 267fc35f85a118384ff716f5e3d4045678f0addb74f1eb82e6d81bee2ecbb27472a8e31d9b279352496a622f040ad057ae2d132fba125be784d332d6bc818408 SHA512 94805952eabddc1c295b76e5b6d5b441748763b41d9371f3a2116c0bce6fa933767a3c1682a39d339d4430b86190c84e9421b5f3acd4d3274998d0d96bf229a4
 DIST ryu-0.2.8.crate 42798 BLAKE2B 393eba320c417af8d2cc23f5fc2874d7813fc3cd4804f7cba1d374f073f74bda4de8208544f30a5650d21cccad28611c8ab2bbdce15ba63b88d6b17100ac5ea7 SHA512 15a17fa06cb971847386013b7bc80e0483bb30f62062ac1e3200d588cb52771a7d34cdd74aba51de46341d303bd29065cf1f8cdcc17c23576cfadaefe63384b4
-DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
-DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.64.crate 71347 BLAKE2B 97f9a8103865f1eb2645cac613a808169a0c36da5f16e23959a736824f783c895fd71eaa07e711995404e36adec9b7f19db6e80ebdd400ce14dacd13f5e343b6 SHA512 6494787064f50a0c39b8d5328ea8ff961a97d7f0e4ab123b0a1e3fb43735f0dbd9721f60942c5797d9abfb9f2e79347345e0816d3783d8fb9138bb7d141abdb1
-DIST serde-1.0.84.crate 71614 BLAKE2B 42c45764bd6eab963c778320c41fec9212d683e6faf4f2ac75506c0ca415177d4cb21ea7191daef30c07ddb1e1078a52f9d9dbb29fbe81b50939f81a08136f27 SHA512 0e5800fdc7a0f37eed8dce491a17490f8c6e879b893ef3dadea68d26a64d0fc11574f73e062d77d3b2b863df33c42a99c41c2384c17a97a3e26007d6e0ed72eb
 DIST serde-1.0.93.crate 71702 BLAKE2B 3f6802999b67c660b602f0c05606b0853158bba16d321d7a28d14d37bdb7d102daf25472441e1f5a5f63617ed8cae7c8d02326775a92ad6b9deae87dba726d89 SHA512 ec7712ad54bae2d93524e49730e2707b20ef91c8aa05084c6bbbd17e3ca77532cc672b8ae8f3ace25fc72a109cdc06a4b3f74515b7afe35faff6887984ae9309
-DIST serde_derive-1.0.58.crate 45146 BLAKE2B 69b230d33072d7d7e9ae17f62872560a4b919436b6e33111827597c06b380e0e43d02fa4ffafa9ed8128d008bf065165e876090c4652827ffc3dc1603a5db8a8 SHA512 6eaa57861ede4b9bbc1e0bfc561917afaa133613c4279fddc17529c291f0fb1122e0443267de9498ddd4e45ca9d13e38d88aef00864b0505a05e06ca65bb8d80
-DIST serde_derive-1.0.84.crate 47924 BLAKE2B bdc22e69da0b1c725a74966b1eb31e13475a479534e830bb1440f980e9462dc9c746470ac87e3653b171717c2e241d3005dbcd562abed7fa1f7949d36fe4c3ab SHA512 817ab7d764ef1f7781f0f01627b3c2c96797f64ce62830ec7c520e94db05b6b7efa4589a394f5375ee30cb85af6bd7a17c50b51e77d4d927ccb247c87c16b2f3
-DIST serde_derive-1.0.93.crate 48827 BLAKE2B 7e6e2a3b2c91c77882658b4f194f05e120d47a3b27a964ebee093c15009d5932184b8afef68b5c5bd2d839e76ec0ab0c44e5ed7e39f99b4c2330eb2a49f4a793 SHA512 e9ba64c934eab1c2091697d36338ea6c47d0409b0097c87376fa6b05de21391aeb228e52b1c846894c37aee44550f4059c3ee9f58840d79d4ef5be4c61293f2b
 DIST serde_derive-1.0.99.crate 49786 BLAKE2B 1a8502b8c22053c54cae207dd283402a85a7eec630883de36df85d46bed4519d04c3b82baf660d4863324a3db9875ae62b9486383596487e9648533e05e685d2 SHA512 6b1b17207fb1e593bafc1162d84c6ced08e799aca9c07c32c399fb3c78662fab920ee35e99ea9462b21515b7c3d35e4e2a457cc0577dada51138f5e8a905dd9e
-DIST serde_json-1.0.19.crate 65039 BLAKE2B 86264040f32b0c94c1d43e55248612ec56b42406cf4501fb3288b80a5ed8a110eae47a1f2b053e2b497c92457c5bfee2ed0b5f86e9dbaabb1bd3953914dd06ec SHA512 03b760d0bfd8a49499107a4b43bb9f588b375c92cb85fd131642bd787734a8523a176dc10330329a3ad8c6d575c917a813fc513a4fb5890c11ade0d48c046165
-DIST serde_json-1.0.36.crate 68203 BLAKE2B ba6088de2f87af1f1685e0d037745ece9c4534043e748321644a111d9829034a7e972882270bc1cb8a78648a848c63e103cd7fad0c4ec618621d7ad9b970350e SHA512 08828b084d0b94c282c3e17a22f8882762f8e006bf41d5fb4a2a720eb3124f7fbd3d5c87b543bd8551813a40108105ff69824a420b4f6836d2bb9fd164100b9c
 DIST serde_json-1.0.39.crate 69621 BLAKE2B 9eaa881f9a16d1895d2bc6f3aff3d6febd155d6ceff3c383968d0520d0f28dfa6fa57f2edd10c02eeb8448e2d87287d2cc04ee99f2c0bf96a60970c49aca14a9 SHA512 7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036
-DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST syn-0.13.11.crate 134240 BLAKE2B 6661d1ea3cb20a3bd4650b95324a201fbe143d31733eb8910ce126b0983043fb569d2250875996588831a6112fe45976d4a103e9ee6e373a1374644ac33fd420 SHA512 e14192e7bdc91d5bffbfc1e7091a46c340b4f5a9a6336b9cc12c78c328f9feaa432b4261346431fac1b5a11f93e122f1e902f1fae0927f9df6b5294e0abc3fa5
-DIST syn-0.14.1.crate 133459 BLAKE2B 303abdde61afa57594db2b8882c86237f64b15582ea38e681a9b9234b0ab18bed183862178bec132d5ceef5d40a63d37a2fd872f16a509d7f6043b3eb27ef8a3 SHA512 408c785e6c6f7f63134a22c383f54ed8ab45d0521e1ddaba9204b21d1e0e56242e153377bd3ff67467816d581c91ecf663cbb814b1d6549a961e01f20b331482
-DIST syn-0.15.23.crate 145369 BLAKE2B f66939982ee09090f2baf1cc4522615e6975d4350c7c65b3b0a3568cd3b3aef04231f6c23b818333107af784780366cafe7d726f03f346ed227c1db6cca522c1 SHA512 d447ec08199d36e289ea303ee8e871e13e002a4d67c396187ef56eb16b69cf21d64becd24fd8d2f7a1c826685f7b6df747903e7eb8cc5c334ee0528998597128
-DIST syn-0.15.26.crate 145493 BLAKE2B ede140e0184464e765413aa4875a07ab9329de60eba6aa46253d2880032b84a56348060396ffec8a5d81a2aa22c6a6eca73c425778ead21c1c55ffb657cf3718 SHA512 947d70dff83ffd33fda806597d54e572555b54c1600e357df919165fdc7141c6f9762b37f25f9b850e8a7775c33b6df3fc93f3eff12b36b059e696ad90619baa
-DIST syn-0.15.38.crate 152593 BLAKE2B 970555dae87016d4440502bad9b45d7be14d390b08ac4916f0ed7a66f24c8e6f58cd7889ef2a3febc77a99671a08c6c1380f622d076341c5e4682a2a3ef3c919 SHA512 e460d6b67e3237e8e88292e2fd170ef16f6b0e30b1c7c11b8177f36c86b083ca1de2727e75f183d2708f6839138aa73865e7944a822c2d85783a79caf3fa2e6c
 DIST syn-1.0.1.crate 189474 BLAKE2B 0d2319f149c9430787e5cf2eca01a93b5b642a1e968ec3f328c3b8e79a2b11e5d16fe9da57fcee8c06d9446f3eec6d7e82705a44ee27006b6e5d4577b8aa1c72 SHA512 10ec59186b0090f4a7302ad9504ab78c0a396ce7087b7e75502f12a1c6ba02700455a7f0910f2abfb45dc0c9b59de112a170772f4da11ac8d094a701bbbe754f
-DIST tempfile-3.0.3.crate 20806 BLAKE2B 0eaabedcb1f68dddafa72a454f82e6b1de6f8cceb8af3cb52f459e8775e3df1ada5b51120ecd9f52bb6f6da3fc3e698da339bc7e39d12497fa9f7efc418b018e SHA512 2bcc90ba3eed8a830b33de169419e222c16f9e0209734cdcf919422fdb504b29fc75f30dff7243bf19eb81cca12c80c94b80a622be8bac7b847242a58595873a
-DIST tempfile-3.0.5.crate 23272 BLAKE2B 17cdc6f157fd246441f66fc46c7fbac8d3718144c69405577f9cfdf14333366330d75e62e033a7c91c2dfbb43700d5e59b96d6b011a26e95afb2f3996809cddc SHA512 f1055454383996de7a79a08f31c85b0d957f277e297a70d85b2faeb6a85e4c12348ca8ba7cae44ec1398d6d02b2d725dbd4eda68a064db66594024b407c6e306
 DIST tempfile-3.0.8.crate 24549 BLAKE2B 839b7637add53e91b232246739b21a60c28bd54704b65da889bc92733fd117d9aa46289c44d94974c9c24d7d532c97a4ad7c64617e1df8bec21671ecd16419e4 SHA512 88f5bb3ac88b192b9f106d5902ac7563114b901df8c36cbb7f2eb7dccd631e19093cd1ec6aa82e4b833f35ab265072e81f3205773654c263555bee22a78abc00
-DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST termion-1.5.3.crate 22080 BLAKE2B ed62ecffb9deef39682422a9bc97a8c3be63487613b7a950f8e5984a077090f4f93022bc217d0ab16a76c8ad8d15ad12c45b81ec52d343793ba3914002029d68 SHA512 1cbe60f97d5f8b95e6a57ec9b7cfcf37459bc8dbcf8424b055f04b2ecdaf069e1bb52222364a2f380dc3f63039fe3823d424228af1c212a8b3790b7dd55d5deb
-DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
-DIST toml-0.4.10.crate 47534 BLAKE2B 853aee7f7d9261d2d0daa755e6c158e2b3a173a6e9d8d96cd0d78d75f2ecb1eea341cb8be8b3df9ef1ec34129b77e4f45b4aa849e8c33e6a1f07a3f832993a4f SHA512 15bc40159478207d204e46ff2459dd3146d8f5508f07399f310ec8266190df8a1375e860fc8a7b3fb372b01e9d0f65eaecdc1b896ac2a921070ce76fde82f160
-DIST toml-0.4.6.crate 40203 BLAKE2B 7b26566bd7a94cfb7907867d84cf097ad44158fe59086af82e059b0eb3dea3934831d61db11bd3cd6b2fb8a909e02b6f369d93eeb09dfcc1cba4859a793c5907 SHA512 659a243957649c987a509ad3b410d37ff7b16fb8e0ca5a1de183ea017e5dd63b88dd2f9770f386b739486bea28250c9853020d29b194994a7c22c5b78490ae95
 DIST toml-0.5.1.crate 51029 BLAKE2B 790097610e420241ded7a4bba3e66a6f7f7856e2e3f4f738e4edd764bbb6b5b3a0cfa10c1e1a9210ef0bb55ff67be47f3bdc129063d135daaa16d731d06fafc4 SHA512 4b8b9212934b8a8bf8f09fc9c63219f3bd8d21a1bc5ec4f4208fa833743951ddb53cb99b5fa27b9b59d2223cc74a7274d6eb196255e44650bb633e24b2529073
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
-DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
-DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f48b9d80bd3da8bc25d6c53e12e98d45e50eff17d08c20099fb92ebcf5ed50928ea2e0873df20461f30b9a5a SHA512 4636ceea813181de46c0bb2f837982936a69376e2b3a58d541a982a494ab4e5b52f3baf820f714a81a2e742def2bf07a2d8313e31b45e51dc7e4d350a5b24579
-DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD cbindgen-0.6.6.ebuild 952 BLAKE2B 5916e4bbb6e7d1b42be8d7488d1ed5a2ab078ff89a6449e0a0520f68bf3d05e30001b58a52080cd510b4cd0c75d48228bc47722c21188b2e7ea92eec3766a8ab SHA512 666ce07daa9f3e120fcedb67705a803ac43770d2f7c7915f7690f99c62fa8183ff16222b9ad58c0681c6fa86ab0689d02f2f615ef6fec10fde7e65a1fcd4a0bd
-EBUILD cbindgen-0.6.7.ebuild 952 BLAKE2B 25e4bdcde7e4b0987b0f03a838c4bb3d6c01b58b4438c856764bbed32ee8cf5057530551d6c4a857ae9ee8a9f316b43db7f35d7ab1a5f07daeb98d3b1c0961cf SHA512 cf11bac47b5c4313b5ce328f1229eb14b9dff879ac887be66f607ff3969797f46bb1eac60b69df7ccd50074251dbacf96e598dd939db69d623d74e6af27c5bc2
-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 1107 BLAKE2B 52c4bc8a893c828aee841f3cf46e93afa9fda0b0d991055545bfe830966c1a8a3f9541eecbb372235cc1e45073317dd8e6bc80527662b94415db0055e74a9ce5 SHA512 23106fb9ee3553c701235ae596fd890d0ac2bd560a2285677fc70ed4e58fd7a2cebbb4fc3a394a681b03fd9d8f965e0ac325fd1b00a5e224e27a3f5991e69822
-EBUILD cbindgen-0.9.1.ebuild 1100 BLAKE2B f8b37e2e595f60cb3fb6f7b05d8aa8ceffd2335b043a0eb30cfbdec556f68914cbf04a227b451a5f444abce09847bfe241925a08d4efe0b5e29bb0ec816ddf2d SHA512 60269c6cef4d82415d1258dbbdef6b97133c8c22986d62389f8aa7943854daa439126f7efe0aff74e3d72e8fe9d85f40df074daf0e413622a8489215dd262ba2
+EBUILD cbindgen-0.9.1.ebuild 1066 BLAKE2B f05be22bea4bd71886453873ae59e65b9bf52f48471320392e2eafd213b0192f37e937293889209b02fc0962646d38f05e66eecd334d10868a8ba6171460e22d SHA512 f6b020956a81a975faad827b90d25d95d65e420e1b1b234623e26136a6e1602e851883dbaf492b09f5bf431c4ca78c5b82a30d5b0ed2b44d0e07c07737262ebc
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.6.6.ebuild b/dev-util/cbindgen/cbindgen-0.6.6.ebuild
deleted file mode 100644
index 9a903be75348..000000000000
--- a/dev-util/cbindgen/cbindgen-0.6.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2017-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CRATES="
-ansi_term-0.11.0
-atty-0.2.10
-bitflags-1.0.3
-cbindgen-0.6.6
-cfg-if-0.1.3
-clap-2.31.2
-cloudabi-0.0.3
-dtoa-0.4.2
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-itoa-0.4.1
-libc-0.2.41
-log-0.4.1
-proc-macro2-0.3.8
-proc-macro2-0.4.4
-quote-0.5.2
-quote-0.6.3
-rand-0.5.5
-rand_core-0.2.1
-redox_syscall-0.1.40
-redox_termios-0.1.1
-remove_dir_all-0.5.1
-serde-1.0.64
-serde_derive-1.0.58
-serde_json-1.0.19
-strsim-0.7.0
-syn-0.13.11
-syn-0.14.1
-tempfile-3.0.3
-termion-1.5.1
-textwrap-0.9.0
-toml-0.4.6
-unicode-width-0.1.5
-unicode-xid-0.1.0
-vec_map-0.8.1
-winapi-0.3.4
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="A tool for generating C bindings to Rust code"
-HOMEPAGE="https://github.com/eqrion/cbindgen/"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-util/cbindgen/cbindgen-0.6.7.ebuild b/dev-util/cbindgen/cbindgen-0.6.7.ebuild
deleted file mode 100644
index 6d32a1efcf57..000000000000
--- a/dev-util/cbindgen/cbindgen-0.6.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2017-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CRATES="
-ansi_term-0.11.0
-atty-0.2.10
-bitflags-1.0.3
-cbindgen-0.6.7
-cfg-if-0.1.3
-clap-2.31.2
-cloudabi-0.0.3
-dtoa-0.4.2
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-itoa-0.4.1
-libc-0.2.41
-log-0.4.1
-proc-macro2-0.3.8
-proc-macro2-0.4.4
-quote-0.5.2
-quote-0.6.3
-rand-0.5.5
-rand_core-0.2.1
-redox_syscall-0.1.40
-redox_termios-0.1.1
-remove_dir_all-0.5.1
-serde-1.0.64
-serde_derive-1.0.58
-serde_json-1.0.19
-strsim-0.7.0
-syn-0.13.11
-syn-0.14.1
-tempfile-3.0.3
-termion-1.5.1
-textwrap-0.9.0
-toml-0.4.6
-unicode-width-0.1.5
-unicode-xid-0.1.0
-vec_map-0.8.1
-winapi-0.3.4
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="A tool for generating C bindings to Rust code"
-HOMEPAGE="https://github.com/eqrion/cbindgen/"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-util/cbindgen/cbindgen-0.7.1.ebuild b/dev-util/cbindgen/cbindgen-0.7.1.ebuild
deleted file mode 100644
index a970e9c866d9..000000000000
--- a/dev-util/cbindgen/cbindgen-0.7.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2017-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CRATES="
-ansi_term-0.11.0
-atty-0.2.10
-bitflags-1.0.3
-cbindgen-0.7.1
-cfg-if-0.1.3
-clap-2.31.2
-cloudabi-0.0.3
-dtoa-0.4.2
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-itoa-0.4.1
-libc-0.2.41
-log-0.4.1
-proc-macro2-0.3.8
-proc-macro2-0.4.4
-quote-0.5.2
-quote-0.6.3
-rand-0.5.5
-rand_core-0.2.1
-redox_syscall-0.1.40
-redox_termios-0.1.1
-remove_dir_all-0.5.1
-serde-1.0.64
-serde_derive-1.0.58
-serde_json-1.0.19
-strsim-0.7.0
-syn-0.13.11
-syn-0.15.23
-tempfile-3.0.3
-termion-1.5.1
-textwrap-0.9.0
-toml-0.4.6
-unicode-width-0.1.5
-unicode-xid-0.1.0
-vec_map-0.8.1
-winapi-0.3.4
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="A tool for generating C bindings to Rust code"
-HOMEPAGE="https://github.com/eqrion/cbindgen/"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND=">=virtual/cargo-1.30.0"
diff --git a/dev-util/cbindgen/cbindgen-0.8.2.ebuild b/dev-util/cbindgen/cbindgen-0.8.2.ebuild
deleted file mode 100644
index 023a5a8dc20f..000000000000
--- a/dev-util/cbindgen/cbindgen-0.8.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2017-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CRATES="
-ansi_term-0.11.0
-atty-0.2.11
-autocfg-0.1.2
-bitflags-1.0.4
-cbindgen-0.8.2
-cfg-if-0.1.6
-clap-2.32.0
-cloudabi-0.0.3
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-itoa-0.4.3
-libc-0.2.47
-log-0.4.6
-proc-macro2-0.4.25
-quote-0.6.10
-rand-0.6.4
-rand_chacha-0.1.1
-rand_core-0.3.0
-rand_hc-0.1.0
-rand_isaac-0.1.1
-rand_os-0.1.1
-rand_pcg-0.1.1
-rand_xorshift-0.1.1
-rdrand-0.4.0
-redox_syscall-0.1.50
-redox_termios-0.1.1
-remove_dir_all-0.5.1
-rustc_version-0.2.3
-ryu-0.2.7
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.84
-serde_derive-1.0.84
-serde_json-1.0.36
-strsim-0.7.0
-syn-0.15.26
-tempfile-3.0.5
-termion-1.5.1
-textwrap-0.10.0
-toml-0.4.10
-unicode-width-0.1.5
-unicode-xid-0.1.0
-vec_map-0.8.1
-winapi-0.3.6
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="A tool for generating C bindings to Rust code"
-HOMEPAGE="https://github.com/eqrion/cbindgen/"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND=">=virtual/cargo-1.30.0"
diff --git a/dev-util/cbindgen/cbindgen-0.8.7.ebuild b/dev-util/cbindgen/cbindgen-0.8.7.ebuild
deleted file mode 100644
index 378207aaa152..000000000000
--- a/dev-util/cbindgen/cbindgen-0.8.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2017-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CRATES="
-ansi_term-0.11.0
-atty-0.2.11
-autocfg-0.1.2
-bitflags-1.0.4
-cbindgen-0.8.7
-cfg-if-0.1.6
-clap-2.32.0
-cloudabi-0.0.3
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-itoa-0.4.3
-libc-0.2.47
-log-0.4.6
-proc-macro2-0.4.25
-quote-0.6.10
-rand-0.6.4
-rand_chacha-0.1.1
-rand_core-0.3.0
-rand_hc-0.1.0
-rand_isaac-0.1.1
-rand_os-0.1.1
-rand_pcg-0.1.1
-rand_xorshift-0.1.1
-rdrand-0.4.0
-redox_syscall-0.1.50
-redox_termios-0.1.1
-remove_dir_all-0.5.1
-rustc_version-0.2.3
-ryu-0.2.7
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.84
-serde_derive-1.0.84
-serde_json-1.0.36
-strsim-0.7.0
-syn-0.15.26
-tempfile-3.0.5
-termion-1.5.1
-textwrap-0.10.0
-toml-0.4.10
-unicode-width-0.1.5
-unicode-xid-0.1.0
-vec_map-0.8.1
-winapi-0.3.6
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="A tool for generating C bindings to Rust code"
-HOMEPAGE="https://github.com/eqrion/cbindgen/"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND=">=virtual/cargo-1.30.0"
diff --git a/dev-util/cbindgen/cbindgen-0.9.0.ebuild b/dev-util/cbindgen/cbindgen-0.9.0.ebuild
deleted file mode 100644
index 56405284ac6d..000000000000
--- a/dev-util/cbindgen/cbindgen-0.9.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2017-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CRATES="
-ansi_term-0.11.0
-atty-0.2.11
-autocfg-0.1.4
-bitflags-1.1.0
-cbindgen-0.9.0
-cfg-if-0.1.9
-clap-2.33.0
-cloudabi-0.0.3
-fuchsia-cprng-0.1.1
-itoa-0.4.4
-libc-0.2.58
-log-0.4.6
-numtoa-0.1.0
-proc-macro2-0.4.30
-quote-0.6.12
-rand-0.6.5
-rand_chacha-0.1.1
-rand_core-0.3.1
-rand_core-0.4.0
-rand_hc-0.1.0
-rand_isaac-0.1.1
-rand_jitter-0.1.4
-rand_os-0.1.3
-rand_pcg-0.1.2
-rand_xorshift-0.1.1
-rdrand-0.4.0
-redox_syscall-0.1.54
-redox_termios-0.1.1
-remove_dir_all-0.5.2
-ryu-0.2.8
-serde-1.0.93
-serde_derive-1.0.93
-serde_json-1.0.39
-strsim-0.8.0
-syn-0.15.38
-tempfile-3.0.8
-termion-1.5.3
-textwrap-0.11.0
-toml-0.5.1
-unicode-width-0.1.5
-unicode-xid-0.1.0
-vec_map-0.8.1
-winapi-0.3.7
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="A tool for generating C bindings to Rust code"
-HOMEPAGE="https://github.com/eqrion/cbindgen/"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-BDEPEND=">=virtual/cargo-1.30.0"
diff --git a/dev-util/cbindgen/cbindgen-0.9.1.ebuild b/dev-util/cbindgen/cbindgen-0.9.1.ebuild
index fa7d6c1634b0..7f6f363e2e0c 100644
--- a/dev-util/cbindgen/cbindgen-0.9.1.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.9.1.ebuild
@@ -59,5 +59,3 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-BDEPEND=">=virtual/cargo-1.30.0"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index a9f7f465efe7..370497c0c8ce 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -7,8 +7,8 @@ DIST ccache-3.7.1.tar.xz 349276 BLAKE2B 4f36ccb378b614668777d8be32dd343a0e59e368
 DIST ccache-3.7.2.tar.xz 351168 BLAKE2B 6e5c8847f961bd5aa2cf325e582ece9e8bfb9c015fe3dcb01c8ca1e1834fdfb82a351ec49e203721486817df58c6aebf28e0af011f470fb739d5016f72191654 SHA512 3290f0609c27a2f063e632392be01ef163273115700f87a6d2954fcfd52fcc14bf66fc147ecbd2b692258317e113bf8be9f7efdf377560e2e8d9dd67cef58147
 DIST ccache-3.7.3.tar.xz 351416 BLAKE2B f825eea87e89246edecbbc0b02cd0f67bbb0e9eb082a4f0c3d9aadca14a20e2d8e9af5f2c067d78393ea92c11878a11423402160210f3f79a3135d345225e0ad SHA512 74e6dd9558273af74aaf085d932955e8ded3d9f7d7b316172109af8f703f00a75fcc27187469d9cb5ba8654bcad12e406bede77cfcacbc0a752d5ca42e52c628
 DIST ccache-3.7.4.tar.xz 351576 BLAKE2B fa2a9c051ff3f9c0550c6301e8d6c9e0eb7ac68687a30a6e8c1ee794ecd6b62925fdc940d493a9fb22d9094c5f2a0f3b2788c6291430ca532661ea6ddef45456 SHA512 cc382f37f7efb30a64f6fc2b136ef7424fe51795a778dbb18dde7c9e80636515f242f51c3ef3231f74d154e65ed9e815abf8241eb1a8f4e0b4fe4f533ea27146
-EBUILD ccache-3.7.1.ebuild 2136 BLAKE2B c9e243c7cabac39716581c38271779a706f95a20d35cb40c3bef1d6b3768260fe5abcc05a35a43b34017e3ad5637758f27a386ff0b9cddf6be6751fe3a9fb50b SHA512 77335fd55a5fc9166a21a6b94a272107c97cb5b8b74bef26b3cc69a50f62a2c4f04673dba3f9dda1784c962effc2934be25fd5fe838ca5523c59a3131e1fddd2
-EBUILD ccache-3.7.2.ebuild 2136 BLAKE2B c9e243c7cabac39716581c38271779a706f95a20d35cb40c3bef1d6b3768260fe5abcc05a35a43b34017e3ad5637758f27a386ff0b9cddf6be6751fe3a9fb50b SHA512 77335fd55a5fc9166a21a6b94a272107c97cb5b8b74bef26b3cc69a50f62a2c4f04673dba3f9dda1784c962effc2934be25fd5fe838ca5523c59a3131e1fddd2
-EBUILD ccache-3.7.3.ebuild 2036 BLAKE2B d9a00991a72a8ccf1ea4f218edd246c39dd780ffa1b435e6f311d2c7f029b3bc8a000971d1c7b05d86dafdfd63e2bd9bc66dedf1e0e32a9223b123669521bb5f SHA512 50c39ce2528656d7eae8ec9089ab1d2fa3cb33c72802c441ac14caabe23234dbaa1facd7b7569b2d95f86fb83771caf614caf002a7a78b90f211fdf5c3767c71
-EBUILD ccache-3.7.4.ebuild 2219 BLAKE2B 88d9c491f7fd7f177b1e170b1e79365838e05ee1b84ac236360ea650e0c584bc2311788a3ef9d94267cef3ef6e1469d04eb1f6abf8baf18429c45f958ba4c14e SHA512 f2e6c2b87b789c8a8e7c5801033bd9224af44e72365bf9ae352fdccb1b0bb9542a5ca64299fc5a2c416c2a233137e32f3adf9d4766e495492fae912d66f311b4
+EBUILD ccache-3.7.1.ebuild 2124 BLAKE2B c61c9962801505c448c7e3a547f229414962f166d5d15637f454ab78b7947484f0b55ea08bab7514eeca2b7e1b7c3b8e946a106ad5a25c3d6fef613cab3443e6 SHA512 cea7f8af0eaf881926aafb8a7c12c359eb51a226b4e29ec20c37f233d09dd0bceb0ef27b7dd0354289c2b6b0e3b5ce70e46530a6abbe4c4f1882a4a0879386cd
+EBUILD ccache-3.7.2.ebuild 2124 BLAKE2B c61c9962801505c448c7e3a547f229414962f166d5d15637f454ab78b7947484f0b55ea08bab7514eeca2b7e1b7c3b8e946a106ad5a25c3d6fef613cab3443e6 SHA512 cea7f8af0eaf881926aafb8a7c12c359eb51a226b4e29ec20c37f233d09dd0bceb0ef27b7dd0354289c2b6b0e3b5ce70e46530a6abbe4c4f1882a4a0879386cd
+EBUILD ccache-3.7.3.ebuild 2024 BLAKE2B 3445c5ee59412701d5b02ccab41f475caa70d157b02c76ea02465a662317cfba3bbd3e0563011d1fdd56cc29893b87f236380f5fc88bced67ce0d60363852c95 SHA512 f5a4e763254bcec13b6a715c57484153526a119476723f2c9d1cecf9e2d6e4eee5449983b48b0473558eebabaf033f40ed76827f6245619f916e8bad93236e60
+EBUILD ccache-3.7.4.ebuild 2207 BLAKE2B 00f468b17f0531f0ae2d3130027c0b8a9851ab2650076e708c9125f2a83af90301748a37005373b080d09931fa0de6ebd1eb8f1a95231fbf11c6f1d50286640e SHA512 e40eedd3ccf2f031902360d43b0d86a51140195acb5c19dad1e70f52aeab75759270d43263b0d60631be9b5475c72015d025a8e5dfe94d3c81f47faf90dddda3
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.1.ebuild b/dev-util/ccache/ccache-3.7.1.ebuild
index 7e0c22e120ad..b8fa403d10c2 100644
--- a/dev-util/ccache/ccache-3.7.1.ebuild
+++ b/dev-util/ccache/ccache-3.7.1.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"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.2.ebuild b/dev-util/ccache/ccache-3.7.2.ebuild
index 7e0c22e120ad..b8fa403d10c2 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"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.3.ebuild b/dev-util/ccache/ccache-3.7.3.ebuild
index f3a519ee73c5..f50e43657b3a 100644
--- a/dev-util/ccache/ccache-3.7.3.ebuild
+++ b/dev-util/ccache/ccache-3.7.3.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"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.4.ebuild b/dev-util/ccache/ccache-3.7.4.ebuild
index 084b27b64c6f..998d395a3b2d 100644
--- a/dev-util/ccache/ccache-3.7.4.ebuild
+++ b/dev-util/ccache/ccache-3.7.4.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"
 IUSE="test"
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest
index 2bd6c90eb9a0..e10b231938cc 100644
--- a/dev-util/cgdb/Manifest
+++ b/dev-util/cgdb/Manifest
@@ -1,6 +1,6 @@
 DIST cgdb-0.6.8.tar.gz 435115 BLAKE2B 31efcd8740dc0a0354c8d655cd7b77b18b25842dc39d1de42a92917305879394b425d7a7b0e555b368fc6a67f535fe9244c3fedeec9105c3622ace313b24c8c8 SHA512 ef3d94820bb5a37a8d7fbac48c8d144e0ac73c4f5a9d25bea33f2c4390080bb2dbdc5e7e21a5ef8a4980515cc48d80f140f7cf1f90eebac3f8bf1cc6168585ea
 DIST cgdb-0.7.0.tar.gz 319980 BLAKE2B bfc62f9214f6726e5df081119e85ccdeaea9a2310a9bb7a1746525ab998ea94ec1181efd3a1986ec0d33103c2f2b888e4d93c4ddaa4a996db4e47b0173c3b67c SHA512 83aeb919e96cd0981d8fe5cdd257df3e8d8bfbceea720ea66c1773b28c9f0ecb0e303e0585206c55242bc4438d505e328d43b4991c6ddc4e4202e048558c30d9
-EBUILD cgdb-0.6.8.ebuild 878 BLAKE2B 3f645a5f31c9a450a2426c4060d1cfa6041f5a3249565bf1baf0490f8e3894a17317c8ba0c88d0754c795f6ab072a667ab606a046a56b9449f5c01a6f660d026 SHA512 ef2ec446e1a58ebdc3e66d2097af59d8afbc573fdb8ca98da9a0bab71d6ad755ab0832f1d1028bc4d3148f68326a4d054242d7293ce73f54f128d80bb0f955ed
-EBUILD cgdb-0.7.0-r1.ebuild 1334 BLAKE2B 24a7d37bbd9e055e105ee98ee4a982e5c1d38a61d60af61f70790fd3c4b50ec28d7fb33776d9b7bbd4d5b10b93e80f79bc6a223093cad1e92547255aae55f63a SHA512 6a9177d86a0a247d20f15621b3ac6b93c1f836fb004080f4c9e27222705c385318b96cfe23299e6f272a74530f2b0661a721f1960b8ca9f007a407c003a8d9ff
-EBUILD cgdb-9999.ebuild 1334 BLAKE2B 24a7d37bbd9e055e105ee98ee4a982e5c1d38a61d60af61f70790fd3c4b50ec28d7fb33776d9b7bbd4d5b10b93e80f79bc6a223093cad1e92547255aae55f63a SHA512 6a9177d86a0a247d20f15621b3ac6b93c1f836fb004080f4c9e27222705c385318b96cfe23299e6f272a74530f2b0661a721f1960b8ca9f007a407c003a8d9ff
+EBUILD cgdb-0.6.8.ebuild 868 BLAKE2B 17d5b2d6d2fae2c79f647ac66417c31374d1d0a986fca95c889a90bd335c15d71ae45e76228af746fed4719818c78ea3ed24ca43a83bd1783fb040728dd1b4de SHA512 443556df6c778ce5eb6b18817e64d4d469d772493f5da1a26344266852255a82416e4212690921b0c2bfe2e335b25ed50d43741c6f8b8c5342960739b882562c
+EBUILD cgdb-0.7.0-r1.ebuild 1324 BLAKE2B 163953065b2feb745414cc6a36b0e46b7269f75dd750d4efbed6d8045c23d43cdc998e3bf4325313a11483d8b9045c48a058350b8c0283a7737f46b9eb5a195b SHA512 d10c7a58b3288b7120d5ce210f979bff96c336ad681f8762951fa513cf4f848540885a028af817ce8e501f7309a9796694d2b8723bd09e1251ba36e571ed30f5
+EBUILD cgdb-9999.ebuild 1324 BLAKE2B 163953065b2feb745414cc6a36b0e46b7269f75dd750d4efbed6d8045c23d43cdc998e3bf4325313a11483d8b9045c48a058350b8c0283a7737f46b9eb5a195b SHA512 d10c7a58b3288b7120d5ce210f979bff96c336ad681f8762951fa513cf4f848540885a028af817ce8e501f7309a9796694d2b8723bd09e1251ba36e571ed30f5
 MISC metadata.xml 490 BLAKE2B 9eaa4ae0475e04d725f775f49d5bf57d7d0a00b53cfa1c0e67868d0127121f640ac304aef1c8d0c120666c03e815ab928b217800b2bf92e1bcbec9ed81a3519f SHA512 77ac0f28241716628619178ae93599276f8fd6051b7f00c5ef7fdfcd0a651cdd465dfde6de052156c8407d6a162a2a21199260001e06dd80e6eec8200bc11097
diff --git a/dev-util/cgdb/cgdb-0.6.8.ebuild b/dev-util/cgdb/cgdb-0.6.8.ebuild
index a34ddbb21ba7..bc82ce66ea22 100644
--- a/dev-util/cgdb/cgdb-0.6.8.ebuild
+++ b/dev-util/cgdb/cgdb-0.6.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 		git@github.com:cgdb/cgdb.git"
 else
 	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 inherit multilib-minimal
 
diff --git a/dev-util/cgdb/cgdb-0.7.0-r1.ebuild b/dev-util/cgdb/cgdb-0.7.0-r1.ebuild
index b4fe338de7f7..846d5c8597bd 100644
--- a/dev-util/cgdb/cgdb-0.7.0-r1.ebuild
+++ b/dev-util/cgdb/cgdb-0.7.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 		git@github.com:cgdb/cgdb.git"
 else
 	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 inherit multilib-minimal
 
diff --git a/dev-util/cgdb/cgdb-9999.ebuild b/dev-util/cgdb/cgdb-9999.ebuild
index b4fe338de7f7..846d5c8597bd 100644
--- a/dev-util/cgdb/cgdb-9999.ebuild
+++ b/dev-util/cgdb/cgdb-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 		git@github.com:cgdb/cgdb.git"
 else
 	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 inherit multilib-minimal
 
diff --git a/dev-util/cgvg/Manifest b/dev-util/cgvg/Manifest
index 89ce84ed1a99..82b84f21f32c 100644
--- a/dev-util/cgvg/Manifest
+++ b/dev-util/cgvg/Manifest
@@ -1,3 +1,3 @@
 DIST cgvg-1.6.3.tar.gz 42130 BLAKE2B e272a42cbc2c5edf08459273eb9f71036ec1afde4d20bb39593028eaf40026b83707b327ef8892a39b1e6f0f399dff3b52f9ff023e9092e26439d1e935da99d5 SHA512 9aeebd0952fc6a99ebeca54bbc54f9ff8858baed3b6c16ae391c033ba6ec6c411e34da88e25ec1208c8f0c536a47424ef09af15bf650485d54921b33c652e0ab
-EBUILD cgvg-1.6.3.ebuild 424 BLAKE2B 14165382e79cf4f22c987ed3109c5d05ef72af4201fbb7955b3197285f2f5b7beea9df5d3765cc290e11d2c428aff1989a834e043183826904bb906132575275 SHA512 7ed1eeff0411f0b9492e983dee2740875e45b426fe96b79f457deb43747a38b41baa8fc3154fb5f005dbbb8ac1fa9ed47e8902425d54a8ed5a5916c9292ef0dc
+EBUILD cgvg-1.6.3.ebuild 414 BLAKE2B df9982dcc43da21e337dacc4eeed51072831ce8a5a7dd7759c3fc849b410192cc8e593ec8037e71192f84ac8538b91ac4cf900b7f191f8452cc93786041181e0 SHA512 7a7d69f9b5fca3ff911a726c6ad7a9e7e40806622bc8659fd21140b969b8b38a859aecb8b38c04975ecb9c4d961ac374bcd01f2c743ba5e4fd09d6d6a76ffaa3
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/cgvg/cgvg-1.6.3.ebuild b/dev-util/cgvg/cgvg-1.6.3.ebuild
index de3f1d265025..c055da97ee52 100644
--- a/dev-util/cgvg/cgvg-1.6.3.ebuild
+++ b/dev-util/cgvg/cgvg-1.6.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://uzix.org/cgvg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 
 RDEPEND="dev-lang/perl"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 6da6921bf1aa..f06902dc61dc 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,7 +1,3 @@
-DIST clion-2019.2.1.tar.gz 493159056 BLAKE2B 8264befab42af1a73f9332a9a1bbfc91e9bf09108b0a544d18296feafd200f6c0013be768a5f7dfba29da689903945d81e54b95291d0952c2336be98b0f6357f SHA512 ed96df5872f0c3d911df15b3d00e045df5726d0d4d70225ace2b41b2e8e7ab3c04f22a8f00e9232472853a5ff5baa62b8b2363fbb6d68ba785a74e34c05d4abc
-<<<<<<< HEAD
-EBUILD clion-2019.2.1.ebuild 1985 BLAKE2B 79f06071c573c312dd787c8974e342e0a9ec4d107199d8305e72a851724c0f9a39e6a9f555ce183da3bb74fc05182536123403f111e584bda72d9915c479d3bf SHA512 b7972ab43f90af2d74e4b8b2c588b0964944b4ac1765b12edf7becd0d224a80602751695d6b1903b02fd83fa52e0802d749fbc3cea35a1b87920ca40a8742642
-=======
-EBUILD clion-2019.2.1.ebuild 2203 BLAKE2B 279893c2e510655704089a220241d03445e09f58625e8a2650aa80a210fbe3d5902806d12ed75c58b65b078b22a51388abf66761e7779cae93372de3f569b49a SHA512 67786d2f16055693e41b80d48cad734b19f852bd9b68690d923c1a26384fefa9b92873769fd6881bc4f5e13a6b90271423213c54cb37fa3d35a1c5bcebff64de
->>>>>>> next
+DIST clion-2019.2.3.tar.gz 495323742 BLAKE2B b4747a4805ec7d8776e3c52c4f94a2d12c1156eff9c0a65e5e275bed269f472d3e8d410e2ef41b2e1504408cf7dfe3f2b8ccee06c5cdba4c8664ad5e7a1873fd SHA512 34599a92b9522cbc6bee6505a26d24b9d4ac727100b2b30414199ac3ec03f73d81c5811f66b35ad51e846eb6fcf66651c522207bb5f471adbf5c5e25d5e7d7d5
+EBUILD clion-2019.2.3.ebuild 2203 BLAKE2B 279893c2e510655704089a220241d03445e09f58625e8a2650aa80a210fbe3d5902806d12ed75c58b65b078b22a51388abf66761e7779cae93372de3f569b49a SHA512 67786d2f16055693e41b80d48cad734b19f852bd9b68690d923c1a26384fefa9b92873769fd6881bc4f5e13a6b90271423213c54cb37fa3d35a1c5bcebff64de
 MISC metadata.xml 557 BLAKE2B 39fdc63d65191a426d3a51303810cfe941fe4f11f36c650c8538e2035ac1a93f42aa537f23d9384ac5a0f6db90a2e1658f35618918d692940832926fe830d5eb SHA512 a9e80ae43985b3921ea1b3a292da275c49cf8d7a965573e55a116fb2efc6e108a111de64fb6f21c21ec3f3ce3c7d0e960c79909e5699d9903db0a6eb92d64871
diff --git a/dev-util/clion/clion-2019.2.1.ebuild b/dev-util/clion/clion-2019.2.3.ebuild
index b3360455dab5..fbe93d313de5 100644
--- a/dev-util/clion/clion-2019.2.1.ebuild
+++ b/dev-util/clion/clion-2019.2.3.ebuild
@@ -9,11 +9,13 @@ DESCRIPTION="A complete toolset for C and C++ development"
 HOMEPAGE="https://www.jetbrains.com/clion"
 SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+	Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0
+	EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM
+	LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror splitdebug"
+RESTRICT="bindist mirror splitdebug"
 IUSE="custom-jdk"
 
 # RDEPENDS may cause false positives in repoman.
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index a305b7e7923d..5a5c2347cdcd 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -15,10 +15,14 @@ AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
-DIST cmake-3.15.2.tar.gz 9269449 BLAKE2B 539a1dede60741f5159fef72f6a7fdd7dd4fd457fab73d33f01b042adee7b5179b2b620ece0556f1612745f911ffe6cd714efb18a4663ac67ed6a20e09feb233 SHA512 154494fe4c8673c3b17a6f1823c55f06fbb35d7ea048b63a5c3e3157108f222693cf1606c879a3cf425edea686dfe19e27974b338e5d281ec118b1a51c632ccc
+DIST cmake-3.14.7.tar.gz 8861587 BLAKE2B c1aa136fde8cd22592f15318a8ad7c37ef6e8895df3e097362077e8e1bf2125ba8f1a431a11ec40e7ab0d9e818452460f516aafac46cef4cc3b184bea12dbb09 SHA512 2f0e37cab2bde521452a30fffebf24429cea8a68c675f6970b0ea46dae5743fb80c0fe1d3ad174d226d968ac0760ecd33710232740a9b4b2f071df9e648cfec4
 DIST cmake-3.15.3.tar.gz 9270184 BLAKE2B bdca3d45d603d9f40584e54102fedd736dae9eadb3ccaaf9bdb2e071da57eff5201dab390ba651772fb5f78fdd7683a86ac721a8b8273936782559a95be0167d SHA512 7d0abf2f7c661c6b555a7e93a2fce5ab5610c653b0aa4949bed6e97bfbe6523fd0665f67115d3944d3729cbe07ae3aaf780ee673b06dd80f90018cec8a999658
-EBUILD cmake-3.13.5.ebuild 6215 BLAKE2B cfb13f69a7987ff65183910288f70cb3b0a10532af213fc9567ddf722f9aa5042235daa2fe093610b55b6b8f0c94937e452894edb7c54a2ddbe55ae053003238 SHA512 dddf1c391c2c9787f731acbc894e907118b83fcc1cffbb943338bb56a035b9220c7b4316ffb5bd4c411f6d0ac2b2631ed940a0760b0c7a5419fd49dfc8c58427
-EBUILD cmake-3.14.6.ebuild 6242 BLAKE2B f60aecf31afb3a1d18dcc73eb49a725692bbd2429398b05f9b241d82f9842b93aeece44624a50b8406355ff82bf2484bbae55ec863987b82d1e27d04e58b1d58 SHA512 22317c7a34fb11df8eedf9251520db7a956eb44306aa5c7c2d950de1aa0b2844043a84ede7122ea38fe144fea2f52760ac097b84063b1f2f5b8885c858d29c81
-EBUILD cmake-3.15.2.ebuild 6253 BLAKE2B 4dc2e38854b99aa6b8aa80b8a044fa1e02211b9a7fb50c8f8f9161220e2313c4bc7af5d2af47f9c166ae85101313898f39603fa3bc73ad1159cda1398e012704 SHA512 9916b5c93b0a80ca38731d40a9d8d1538c4ec37563e8dcb2e9eea3ca622c09bbe119ec51a44ed3e74cc7c9d8bf27e1e46c7b0d49a2a15decf7d3ea4aa0ea010f
-EBUILD cmake-3.15.3.ebuild 6253 BLAKE2B 4dc2e38854b99aa6b8aa80b8a044fa1e02211b9a7fb50c8f8f9161220e2313c4bc7af5d2af47f9c166ae85101313898f39603fa3bc73ad1159cda1398e012704 SHA512 9916b5c93b0a80ca38731d40a9d8d1538c4ec37563e8dcb2e9eea3ca622c09bbe119ec51a44ed3e74cc7c9d8bf27e1e46c7b0d49a2a15decf7d3ea4aa0ea010f
+DIST cmake-3.15.4.tar.gz 9270648 BLAKE2B b1c46ce76a549c78caa5c95be38fdbdcca685b1fade0a1687971d3b1cbb10953ec62b12401f67c389b096c87a6fa895ff339e1646e449472df76660b76e7d1ed SHA512 4058b89d35d243146f4f521356d483a850cbade316b60cf896c90da5d6b6504bc35224c0702fa525d90fe97a5311c7a895466e5eb2edb4cd4306a3cc45182650
+DIST cmake-3.16.0-rc1.tar.gz 9097643 BLAKE2B 979bd9a659a84348d261600536b876c7bfc255b37e3dc1a87b03759d47cfa1871c2c0e22e1fd75bca8e614906f8e029b4cdd590e48c4b5c98bb34a1ebc99000c SHA512 82dd74ca1f3ceacc1ea0e078a95effbae2f680903c7a730ea8491499f788b7e3b6fb3b899a471dfb251ac70df8c2a0d486a445b13ae95cb41e5411b6afc250b4
+EBUILD cmake-3.13.5.ebuild 6193 BLAKE2B a1e0034672cce72bf6d7cd3c777143c70f22fc6ab7952a47107b58a45124c05ccafb4285a7a7626789327b46c0947db22cce3b7ad58ba97b56bd70acb706ea09 SHA512 55014b5288ba9a8265dfebe63e46b8dcae7c1c49c298990b04577e5c0b0f81a91f471f3c4da800ce30210edeabead5dfe80e72f88961a5f70e013335a7c8cbf5
+EBUILD cmake-3.14.6.ebuild 6220 BLAKE2B 85ad1940ec047b3d370cc2e9cf05bbf8c0aab108cec4e767872038ec562fbd1b18e1ae96f42ba74a43e8b11999c6eb870ce08ebdfc47a2a9b566d4d6b9363ef0 SHA512 63e0932812432530823e50292a71d19fa7c4483cb032a14578cbf5795977d09ed276c44192d3965b881f0f4b7f91a8edb1b31d65159c08a62c2aa94b6cc9461d
+EBUILD cmake-3.14.7.ebuild 6231 BLAKE2B 8259dea7e638d21f3c33a0427830ccb21ccac271585f90b14039c5a41164cbe8e9364c29daa3f8a3abd94cc0837157543bdc08c38b74b4833a7844de3eeeb9b0 SHA512 c18e2cbaeecd74a28241b475cc1ccf6a943e59be9b7dcbe990a8fd0c0200a2e67eb9fb3ee912cbd0cb91e2895dfdd8d3e04cc4231c3942ff9553c13331da8f66
+EBUILD cmake-3.15.3.ebuild 6231 BLAKE2B 2eb1b6cd2ee3856a485f1e1669a9f18969faeb4434269448ae0b307da69afe6d31f6665e0819e448e8d03c4c56aa095b2b828eadaa54dfb875a4f771d543c73d SHA512 e867ee946c492230f354570023f7d4530b462adbe0e70340e4ea91f9269ab5f1b278ddfc05912504c418ae79b457e8f8c5862d92ae8fdaee96f1e56375fb435e
+EBUILD cmake-3.15.4.ebuild 6231 BLAKE2B 2eb1b6cd2ee3856a485f1e1669a9f18969faeb4434269448ae0b307da69afe6d31f6665e0819e448e8d03c4c56aa095b2b828eadaa54dfb875a4f771d543c73d SHA512 e867ee946c492230f354570023f7d4530b462adbe0e70340e4ea91f9269ab5f1b278ddfc05912504c418ae79b457e8f8c5862d92ae8fdaee96f1e56375fb435e
+EBUILD cmake-3.16.0_rc1.ebuild 6231 BLAKE2B 2eb1b6cd2ee3856a485f1e1669a9f18969faeb4434269448ae0b307da69afe6d31f6665e0819e448e8d03c4c56aa095b2b828eadaa54dfb875a4f771d543c73d SHA512 e867ee946c492230f354570023f7d4530b462adbe0e70340e4ea91f9269ab5f1b278ddfc05912504c418ae79b457e8f8c5862d92ae8fdaee96f1e56375fb435e
 MISC metadata.xml 372 BLAKE2B de2835a1f98bccd88e343ab7c058b40df0e9aa4afe938770d67a6e764ac85926b369b6d9ac4851d5deec3954436d3cb8a112b5543ac1debf74205f05641ed2ee SHA512 6c457abaf6c174d6d14b77af47c4fb65b26873cbb7a5a4fbafc558ff4c5c7c6cb0200c0f69e7a492007af4b402baeaf54177f6755c3e6da0ace149eb9bcfe69a
diff --git a/dev-util/cmake/cmake-3.13.5.ebuild b/dev-util/cmake/cmake-3.13.5.ebuild
index 0b3968ce18a0..fdf53e57156e 100644
--- a/dev-util/cmake/cmake-3.13.5.ebuild
+++ b/dev-util/cmake/cmake-3.13.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.14.6.ebuild b/dev-util/cmake/cmake-3.14.6.ebuild
index 01f4a37c8333..c615e9c4e108 100644
--- a/dev-util/cmake/cmake-3.14.6.ebuild
+++ b/dev-util/cmake/cmake-3.14.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt5 test"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.14.7.ebuild b/dev-util/cmake/cmake-3.14.7.ebuild
new file mode 100644
index 000000000000..a257b9298462
--- /dev/null
+++ b/dev-util/cmake/cmake-3.14.7.ebuild
@@ -0,0 +1,226 @@
+# 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-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.3.ebuild b/dev-util/cmake/cmake-3.15.3.ebuild
index 06184a6bfe5f..8379ddfb9330 100644
--- a/dev-util/cmake/cmake-3.15.3.ebuild
+++ b/dev-util/cmake/cmake-3.15.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt5 test"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.15.2.ebuild b/dev-util/cmake/cmake-3.15.4.ebuild
index 06184a6bfe5f..8379ddfb9330 100644
--- a/dev-util/cmake/cmake-3.15.2.ebuild
+++ b/dev-util/cmake/cmake-3.15.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt5 test"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.16.0_rc1.ebuild b/dev-util/cmake/cmake-3.16.0_rc1.ebuild
new file mode 100644
index 000000000000..8379ddfb9330
--- /dev/null
+++ b/dev-util/cmake/cmake-3.16.0_rc1.ebuild
@@ -0,0 +1,226 @@
+# 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-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.15.0_rc2-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/cmdtest/Manifest b/dev-util/cmdtest/Manifest
index 270b78c730e3..728c93314506 100644
--- a/dev-util/cmdtest/Manifest
+++ b/dev-util/cmdtest/Manifest
@@ -1,5 +1,5 @@
 DIST cmdtest-0.32.tar.gz 48945 BLAKE2B 64c09a0f7dd66644d8ce785d633af2cc62ce0cba1a636cf18e650fdf0268987ad647509e17ed2c614b48164f9e9fbd6dcb64d6fa0a47ec6dcf24d82b69732857 SHA512 1d6d49f63067cd0343b0123eaa84326042a6382abccb624015ab5517809a11ad149f75fc48cdea87b608d4b8778903fe1a9e68b7942a45a6498bdf7e3dbe3216
 DIST cmdtest_0.30.orig.tar.xz 38508 BLAKE2B 7a27ed4930decdfbc49e922af9724ddba2daabc5af51faa6cafea1ca10dbf5137aa74ad9780156ff13f16e4c22fe5dba43401e22c6c2a7cabbd39d4139f4f515 SHA512 cbdebe175f09a99218d8ce0f2d1e49019f70b7f3ba112e2650e5a58e36a6f1d1b641c9aed5212e12023e956f999ef9cdba27aea7af9211f35a41874147a402af
-EBUILD cmdtest-0.30.ebuild 742 BLAKE2B 3bef02a65fbcbdf67c82d159b8831bf3bc4c8bf551486d17a2338c3e2e7cac0ed18720d4f5004b5f78084d00851668b80323f891fd5264d29f13de7b1a7eaf9a SHA512 b0575454949dc9de6322384e493abd539569c67891bc3b4b5fae3a19f8d3cfd45de4c0947a6dbb3525bdddc40c44720490ba6afe064be7c5c4695aedb024fb41
-EBUILD cmdtest-0.32.ebuild 731 BLAKE2B 62b99940b89b7f13507ac7fd67ccf49d332b0cdcba65ca615ebf32ef5fb3208bad99ad689a8ec93fab144cdbf6603ad8b8168c80c5b7a0dcad3aa5e978858b19 SHA512 f14586806c859a1f484baed560856c0300a9e22c3b5f2991cfe6dbcb22de0470424e7411d58dc8b6952a6152b28307d2d246bf778c110caa420f29218ea67731
+EBUILD cmdtest-0.30.ebuild 730 BLAKE2B 78a1bf7c8efcce4e7bf3ed269edb4480194aeb922297be6c28f0715bafbcc017da729a34198be13926de2383bce19ddd5b0a00db397ff39b977ee59c62412845 SHA512 91f157ec5fe7c2bd1c6c211423c1596fb8cd281d44acd6654606b12d577e278f2366beed7f413db7b340f42e05ff3b1792c8bf8299aec1f8217e39a6c07036a3
+EBUILD cmdtest-0.32.ebuild 719 BLAKE2B 1ccec7123871cec54aa519000d31054f6954f3c3342c0a66f447b026368067a5d768a8717831402b27cdc63100e14b8ac023710a33162da391a03efab2f21fa6 SHA512 a77722935edbd5bff02908f6a588cd22d27e1dbd6f135e8ad62a996fe7ddd14f547b76835112a33d6db68498a1b561f0a5901dc33116172c63fab56ca2c8aafc
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/cmdtest/cmdtest-0.30.ebuild b/dev-util/cmdtest/cmdtest-0.30.ebuild
index 696c8fe9d193..ae906d234378 100644
--- a/dev-util/cmdtest/cmdtest-0.30.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.30.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.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 ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	dev-python/cliapp[${PYTHON_USEDEP}]
diff --git a/dev-util/cmdtest/cmdtest-0.32.ebuild b/dev-util/cmdtest/cmdtest-0.32.ebuild
index 225429335076..4d98e4868f45 100644
--- a/dev-util/cmdtest/cmdtest-0.32.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.32.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"
 
 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 DEPEND="
 	dev-python/cliapp[${PYTHON_USEDEP}]
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index c2ed88e1dbe6..e6958373da24 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,3 +1,3 @@
 DIST cmocka-1.1.5.tar.xz 81004 BLAKE2B 5625dc293ad481c654848f3de806ef88d1b651192c2461e52b54bf9d443b5e2ea5d2a685ab85b044685f57e5723ade6c4c17e38624f59c4eab240cb4feeaab1e SHA512 cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd
-EBUILD cmocka-1.1.5.ebuild 1077 BLAKE2B a4652b1e7ed6b908c56f7f1a294d6727252461474cc0386bcc06724b0f06b0f28855cb701009ded4219e53cca33e77a19f36c718f9619cba235094f6b58f62c2 SHA512 bd95ff6a720238bc68b74de56d12516b352c616c3e930e2c814a70bd4857d06ae281dd2568b002da863b4a5832e4fc66fc83b40dc509ca8d3d4e6c1523261b0d
+EBUILD cmocka-1.1.5.ebuild 1055 BLAKE2B 8a597b4a1b02871ba9095e9243064cb666e207728331aa4fefd4e7ca7a425d602e65452e01ead67e264d9bee28ea4ae4f853b69d5cf5acdb0b3e6cabf89da273 SHA512 996d173ee9f8776e06f6ee926b631c709acf5ee41b85c50852e571bc98812ec7fb7a1b608f9d80412c4f4dc48a028e17de1ae92894d3c39cae376e7bcb5fcad7
 MISC metadata.xml 378 BLAKE2B 45998331c3a8c91f6f4a59e075b5c89b462fd304c27d87efc5e312fd7403464e874ff71c21adb44feb5727aa6daf766f469da5d22fff02fe4d15d2c3459187aa SHA512 210dcc099911d24e9918e244a76020da52df9384983d3941c2e4b61449e3c1fa780d6ebc42e38c963b714b61c8284ad58cdf52c85269a342d30d5f2e4b605ff6
diff --git a/dev-util/cmocka/cmocka-1.1.5.ebuild b/dev-util/cmocka/cmocka-1.1.5.ebuild
index d547545d0bc9..9fac25f3f3b1 100644
--- a/dev-util/cmocka/cmocka-1.1.5.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
 
 BDEPEND="
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 7fda679c3427..3c64d58a6587 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -2,9 +2,9 @@ AUX codeblocks-17.12-nodebug.diff 611 BLAKE2B 03de6a604b0971e7b91702fd9a1f66aee6
 DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224 SHA512 78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
 DIST codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz 3712 BLAKE2B 4a5f75c18b365030a08196dcb2808d8f42d8adf9442552d372cb3923629d9d5b74c98c77557f0af46965bb875543cc6f221a5197fa2b4dba12409225c6cc61d9 SHA512 b216f2659b8ce2a22fd2f9af456af71328b40428510b75f0bb36cec4695d28bbd3133b7385614a84862c2ab5c560d314cc8153ddab09019410e179f5d337669b
 DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b SHA512 f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
-EBUILD codeblocks-17.12-r1.ebuild 2168 BLAKE2B 09145374c37590aee4838ea1255d1c83b123bc9d230e5f666c76e71622fa5041ca88ace4fcf651f717402b12d5447572045651d6b765d6b683e2cb2e2ad33ea4 SHA512 40a006c43b9dc309961b19769802114f5c8e46efe3e0e956a0c6ab7231b5700cfdf9e9cd43af46d0f9f9a7c57663cf3df4df682c9588da084d594d3ea33e7060
-EBUILD codeblocks-17.12-r300.ebuild 2014 BLAKE2B 6b99be334575d995d4537c192b90785c3628a6ee0c377957519d200ae7a931bea5e0ebd2cabed7d0fde9808bea95795d0fbd85c3417999197800db57c70be329 SHA512 a6bcd96a13095c3e31357d94cdd76fba0f7161120261750edbffd81b243b9323f089bb91a4929f317e79fde85c7579ef72fe5dcbd241a0cc7eef6dd385599b83
-EBUILD codeblocks-17.12-r301.ebuild 2173 BLAKE2B d4626ed172b0205e9d6efcb256eebc8d7e148346762ca206ad1b6cceef19e819a6c3849b40541915415ab2e96c0283ef75e092c3839b25535cac2501bbcc9a92 SHA512 e476b514275ed881bff370c342acd47ec9f612ed84fb0d796cd983b441a0b72ff772415495e35d660fcdeca56e39dae65753fefbce2a85ed2679a28c5ac05070
-EBUILD codeblocks-17.12.ebuild 2009 BLAKE2B a2266b73e5b75e95173240f01929146cb81d9313c570589899142c4631660bf214384fdbb73522bca1bf33d7a40cc0217eb5beb78d1b1998bf2e483ace970bdb SHA512 43d790abbd465566cf5aa18ca86133e7835c51643a570d23b43ac8df74e74a764079077e1e40c1a7b5d30c19d28cf4f9377f6b689f5618bac4e9e8539b57d132
+EBUILD codeblocks-17.12-r1.ebuild 2158 BLAKE2B 7a7aa1b17655b4727a1a105dc4c13c2bab3332ce0db027d5417f214f608976e1c17ced1d5374c1055e1ffceb8700f92d2444ee8317c5c34be3324947e815dfb7 SHA512 a71101d41db629227d75a12c9e6802c8329e7c895e14ce3e0c5aac3b780cf2eabd12a1209b7fa3fb424f600c8812bb50c622aa478a27aedc2a4049b58f6549c3
+EBUILD codeblocks-17.12-r300.ebuild 2004 BLAKE2B 6b6b47b35498949282efa068e70c235fa52611580f69d26cdcd483e8fe3c15093921152dd7c2d70a506491efedb1886b44282cbdad8594343c529e1273062029 SHA512 b10b5befad57a1bfc68a27af1eb326a2091600648bb53fb266ac271511ec04bd8005c47a097ba89f486c7f5f260e9e7d38074cb7f3ec9edbad22666ed94ba5b7
+EBUILD codeblocks-17.12-r301.ebuild 2163 BLAKE2B 822425d9a63bc762af6c5527e2f243635b1e4f0a4c322c9fa589d58d118b1fc418c93cd2ced66b3fe943226b68fa3135e91127bcde52d4927b23518b02906769 SHA512 94622088db5b572892eb5c9daa65da7ce4895aae124c5625e5d0efd395426f451a4dfcef4926abf3b80d687a82cdaacb7e291c20e193498c5cf94347dfd32672
+EBUILD codeblocks-17.12.ebuild 1999 BLAKE2B dc09e29a6d21d530388de93ee093ae50da7406a45fba83a021be19f3fbe7ef587bf039b7a9f380d8edf7ff0ffbd4fc3ab09117837978de687bd7b34476478cc7 SHA512 d331f33150e3054fed50b18c78e105fa76e73022a220a8cabd651e63e076fceff80ef1d3997d112f327f8252b1088f3cb3f5c7240d8609dbcc028f9c83c5cacd
 EBUILD codeblocks-9999.ebuild 1632 BLAKE2B 7b595b20cb9bb49870c01ced1e8b5602ceaedcf4e4461bf9a1fcacc8d9a270e49f84c7bf28b735ac6304852a2576e58d70a129c55a1fc5cb626db969c278c91f SHA512 a4e0032db0edd1a4da5d370d60f733aa79624dba2c4fcf3742e1d898b05cf5d70f467f2d7e24337daa0e8427a4814a1859f9349fec42ca9d2cb4c6883e5a85a2
 MISC metadata.xml 675 BLAKE2B db56c15590a97e891e387377cafcb743716d9c84f6adaaf43e3885993842e5456086ef1a59a6579fd5058d5d964cf49b34b7993d56cb5a2e78611a4e9edd0618 SHA512 459846c3e46109fb82d0f37d016fea29e3f69cbf8d03ae2ed2aa0beff443e4206082d9f2e53afc6cdac6862f76037dc652f2dc544d6b9bdf15f2de09d863c735
diff --git a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
index 33bc6b02fc6b..07ab74227eac 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz"
diff --git a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
index 3b627ef7a238..7c6e5b47787d 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C++ IDE"
 HOMEPAGE="http://www.codeblocks.org/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz"
 
 # USE="fortran" enables FortranProject plugin (v1.5)
diff --git a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
index faf2dc26b2cf..090c2ad4eb0c 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz"
diff --git a/dev-util/codeblocks/codeblocks-17.12.ebuild b/dev-util/codeblocks/codeblocks-17.12.ebuild
index ed606b14c4af..c83617929435 100644
--- a/dev-util/codeblocks/codeblocks-17.12.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C++ IDE"
 HOMEPAGE="http://www.codeblocks.org/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz"
 
 # USE="fortran" enables FortranProject plugin (v1.5)
diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
index 52ba4cbee899..688f83cdde2c 100644
--- a/dev-util/cppunit/Manifest
+++ b/dev-util/cppunit/Manifest
@@ -1,4 +1,4 @@
 DIST cppunit-1.14.0.tar.gz 959716 BLAKE2B 581e3b73d6d152c249005ddf267100443e6c9cba12c52c43e9d6f81096b9cd13c3686fa2f73ebaf28c31193e41dbfd5d919dfb0143b190881345da65a5b7f86d SHA512 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e
-EBUILD cppunit-1.14.0.ebuild 1722 BLAKE2B ea258759c776266c6db28b138f60b31c60c628be29ccbb23afbe6dea75c0137d8c43f12742f0df12516e0016d5c62979c7170d975337b6b27cb3d4e7871b139a SHA512 713f4a0b7ed0c565744af7512cc0772976b1dbba81b46cb2aebe230a6497f5e75ed59f5d518de6578150e6d54e62392f43bffa5c554ef84b1c0d815989313097
-EBUILD cppunit-9999.ebuild 1736 BLAKE2B 5bde8ba9a2298f612f2396f3f3de5893ebf5ae7868eb74e1ab78bfe9e8d739560d97f9d3d10c8abc4a216f768360ad307490ac008566161037a231e99089818a SHA512 38b35d01aa20d7e1c28832403a002b174ba44b656b5ba0f400972907b10bef5e94cc88292dd442aa2c59881e46fb0b8c98bad5d8cbaec93b29a3b7b38cfd6afb
+EBUILD cppunit-1.14.0.ebuild 1700 BLAKE2B 3d627a9b6a9dc8c73e0e173f09203ada5fbcaf1395c6711991e5a3eb6725e448d8d166138401aa39153d08cff70d09977bd55cb3a95484b92610b482102d5b55 SHA512 2017cb0697943683c6e64136d7375a181380de4abbd04bce60ed147a19e0814636885af140a2b82ea4ebf5cf1944b1ef85d2e8099d1071f597e81a0a5d9c642e
+EBUILD cppunit-9999.ebuild 1714 BLAKE2B 2d0395554a9ee2c68ff268ba98e33795bbfc9d8a0dd272f82c2477e3ac40840ff49aaf9aaab6d0006886a4a4f01a0f03f8fb771ac30d38d96ddb2095e7aba84c SHA512 6b8c7539bdf13f614797f5a1fecd15efcafaada6b36cbd2eddeafa7a05cfb95fbc47532027f72aea267b52efa356c21adf1ec192feb93e96d5593534fa16843e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cppunit/cppunit-1.14.0.ebuild b/dev-util/cppunit/cppunit-1.14.0.ebuild
index 448262ad3b36..9f2e5561ac64 100644
--- a/dev-util/cppunit/cppunit-1.14.0.ebuild
+++ b/dev-util/cppunit/cppunit-1.14.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} = 9999 ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-util/cppunit/cppunit-9999.ebuild b/dev-util/cppunit/cppunit-9999.ebuild
index 6df8af21bf91..67412215d5fa 100644
--- a/dev-util/cppunit/cppunit-9999.ebuild
+++ b/dev-util/cppunit/cppunit-9999.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} = 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-util/cproto/Manifest b/dev-util/cproto/Manifest
index 82f12b7bfd32..502b9a327651 100644
--- a/dev-util/cproto/Manifest
+++ b/dev-util/cproto/Manifest
@@ -1,5 +1,3 @@
-DIST cproto-4.7e.tgz 145919 BLAKE2B 97e3b3bf3b282299d177bf2ea8548f91f8dc6432671b93187d91fc00ca02807f5d3a370cc563cbb46fa163f23fe5ff034d9e148e6621eaf87f7e9658e925c6fc SHA512 c9a1da8e19d85600109127e2de079cff5e66e51f0f3220f9a69e72e720ed6d745ef456b3a645bbb4755073c6ce59411d0137d9012da545736e92380f41c83985
 DIST cproto-4.7o.tgz 168915 BLAKE2B a79d22014140531c263d0b389c50c263b13bf2e9bd2142da54ec712ec13f122539d92fbc3e40a52d52802e17e5b96a39c73e0ea3dd3c189e0e4563cf7b3feea3 SHA512 9a731be8bfa3f0da9c8a7c04a1c9bcf5ca52897325fa868306c35d818fc54348f83d93e2b2d792a2f682f935fb42d928d2828b1ff7fe3287a1806852e180a9f3
-EBUILD cproto-4.7e.ebuild 542 BLAKE2B 88bd34ba3005ba8ed8fd0104d122552596994018b3e20fefcc9eadab392bf5ecf5bc25c7265c1c04481f3d0f2000bc4b3ecad6e35030f44a597c990f90c19916 SHA512 701f6ab97500c8813e2b96f482c92560adebf0733b7e163f1a581d2cb2c9981e81c299da4a4b774004efdfc294fb7558f16b97e46581abebf16e407a5aeeabb0
-EBUILD cproto-4.7o.ebuild 426 BLAKE2B 669c88244f414fb4388a0a75406a36400fc0c24597a72cdc0cd3c93ba418b36bd561fa19db22cb0529b8bafcfb9f9c8a3b3a020e2ee94ec7b6edfc4452144e20 SHA512 efb9369b7f44f2f801e1a687f6b6a07dea5ddf5d7aa5feb6c7ec8424a8912cc7e924d3e5c3f9274a66a761455ff7ff3e0589e361bdfadaa3b6eb5f9c03697894
+EBUILD cproto-4.7o.ebuild 423 BLAKE2B d205460265c89b02a212690d0a47be727127e263194d6b11edca1b1a345eaf105b912a8bae86a1ed9df3d3b73f22bfc72000b542fe3e729a5f84e7b71c847e9e SHA512 e0ad6a095b508bf6a7ec7f5665be0401571e8e3ae774117e0ab610a1199c8b1a545a8cd8270efdc573190d2db6e3764f1fbd30028dfa3b47e0b10f5d7697d358
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cproto/cproto-4.7e.ebuild b/dev-util/cproto/cproto-4.7e.ebuild
deleted file mode 100644
index afd959a583b6..000000000000
--- a/dev-util/cproto/cproto-4.7e.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Generate C function prototypes from C source code"
-HOMEPAGE="https://invisible-island.net/cproto/"
-SRC_URI="ftp://ftp.invisible-island.net/cproto//${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="sys-devel/flex
-	virtual/yacc"
-RDEPEND=""
-
-S=${WORKDIR}/${P/./_}
-
-src_install() {
-	dobin cproto || die
-	doman cproto.1
-	dodoc README CHANGES
-}
diff --git a/dev-util/cproto/cproto-4.7o.ebuild b/dev-util/cproto/cproto-4.7o.ebuild
index 891098774172..4820a05be91c 100644
--- a/dev-util/cproto/cproto-4.7o.ebuild
+++ b/dev-util/cproto/cproto-4.7o.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.invisible-island.net/cproto//${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="sys-devel/flex
 	virtual/yacc"
diff --git a/dev-util/cpuinfo-collection/Manifest b/dev-util/cpuinfo-collection/Manifest
index a6b748223c12..d7c1c39de18e 100644
--- a/dev-util/cpuinfo-collection/Manifest
+++ b/dev-util/cpuinfo-collection/Manifest
@@ -1,5 +1,3 @@
-DIST test_proc-04January2007.tar.gz 28831 BLAKE2B 1d405fb971eb0a4958a6127fadd9535ba24529b88d63e22ee726b6296ef5bf77f20e739b4c9475f8f20879950ed9fdb85a53f19dd7f14b91613b51b3a8403407 SHA512 6ff9f42c0847ef897069a7b36ad184b05ac022d1db5ab581e87d2992ee2a511218ef2019a0a94aadb91038e2b99e530618b0b6a380b0aa36f4178620e6719922
 DIST test_proc-14November2010.tar.gz 95697 BLAKE2B 476cf9784d3718ca27f030bc85ca1f526db43cc740ae77fb7cd4b45fad13ead8645ab9a17fec1216d54da8390e04205960c543cf4205f9f6677afe38dafd054c SHA512 2f3b80d9b705b76911487b7349300b45622a3a49b9a3c2036d96220738e7fd525114b2523cc589b03d0fdf85ca4d35c28076ff193d1eb620d71765919058fdc6
-EBUILD cpuinfo-collection-20070104.ebuild 558 BLAKE2B 5949deb685d52180a0a082fe90dfc66196a287a8d320c97cf152cf6f40987d14663a892c00a7ee4a8d172119da564337b5ac1caeeb47a5d5244ecb2242908575 SHA512 cabde97b357707de00f6545b1ebb7d10cea3212f279791a5cca81f19a877060a893420bd2be5d1aac0415872089d7d4304423fb4210345d36d9023ede6d37fdd
-EBUILD cpuinfo-collection-20101114.ebuild 569 BLAKE2B 6d6ce7d7ecc561c103e0f0142413581db70b85064002f5e5aed9cf5b6c058a3f77223616e84502202b901bc341ffb619a90f3148ffe260fd631a10872474368b SHA512 ffb9aab99d69680dc2df9b5ff9148b92bd4beec3b795f5186eae5d544cb0557f5caf436057d8b34e0b14cb8fb0fc4f6efdd53efa15bce41cf4ead28a73be300d
+EBUILD cpuinfo-collection-20101114.ebuild 554 BLAKE2B c73e63d49e25b0d12c52556d7363d72019d10fda2847f6e682ed8009a51ac18866be8a391382b810b9599be86fab88f93ec826c9022236dceccca908b1223ed8 SHA512 917f53439da6b0a879c351e00b69db2b40c3984f6ce66d8dbc4f32baf03e6c435aaf65d4de504b81b35c378046cb2ed5e7124b9da67450d1d086c779f16e9305
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20070104.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20070104.ebuild
deleted file mode 100644
index 2355333bcff1..000000000000
--- a/dev-util/cpuinfo-collection/cpuinfo-collection-20070104.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P=test_proc-${PV:6:2}January${PV:0:4}
-DESCRIPTION="huge collection of /proc/cpuinfo files"
-HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
-SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /usr/share/cpuinfo
-	doins -r * || die
-}
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
index 6f6a5bd6334c..56b58f428226 100644
--- a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
+++ b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-util/cram/Manifest b/dev-util/cram/Manifest
index c329100b1306..920398a05bfc 100644
--- a/dev-util/cram/Manifest
+++ b/dev-util/cram/Manifest
@@ -1,3 +1,3 @@
 DIST cram-0.7.tar.gz 33527 BLAKE2B 4c89f98a550bef0c7d92e4b15c466690c1be7d829257b6469340d5c40415466b755989ce1b4ad4ce479587c91d64467dfb42f468c5817e9a09163c111da11e58 SHA512 9fa57e504abac8fd15bf5ff4a74405cb7acd10fd4c797adee87052a4f1c4e975bbc0f4219afd9485358b2c2939b48b3ffe538ae2abc6eea71e0ba8b458d50103
-EBUILD cram-0.7.ebuild 576 BLAKE2B 01a0b489f7a207404ea359a00e7f9a09dc2ac284d83d53c51082d0075c482d35225e98e2c86f880ff23df27fb9d66f3586a829e641fdb9cf0f43f8ef2dc65522 SHA512 fac841287897266f20bc3a23882cfb6660c8cea95e482fbcb0b2e25fc6843211aad54fd1e0c8c6bafc61cc3035f70577c56ecf51c0cf00bccfa7544630cb1700
+EBUILD cram-0.7.ebuild 554 BLAKE2B 2a85b1a1fd62410e354953065db097b1bf44cfcd132e2434e1448b6d5dd0283597419d5f9bb415adc6f2a84e96f39d499839f11d58098a0540b756b646edec43 SHA512 a86d7bb68dd986786595b4742d48f537d9228b7d154965f755e7df80a0fb62fab4672fce33112818cca83b21105e5dcef2540bd73d696891d5cb740f29b0f892
 MISC metadata.xml 613 BLAKE2B 4e970afed6540c9f375c79858c297326994950a3498b51fde64aff6bf4262e6d73f1c77ef5ca621be1ac4fab79b2e4bde73e914869726a6d8665d291f854aea2 SHA512 6dffd4dc26817f9ff558ab98deb4b0097fbdfd0394291969b817d2edf1caf108d46d0188919d77e54942a35689c564f2948d627e30e5fc6acb403e8d7f6998d9
diff --git a/dev-util/cram/cram-0.7.ebuild b/dev-util/cram/cram-0.7.ebuild
index 80888de3e6c4..668951c86188 100644
--- a/dev-util/cram/cram-0.7.ebuild
+++ b/dev-util/cram/cram-0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
 
 python_test() {
 	distutils_install_for_testing
diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
index d0cc79557eb1..ffd55c47c962 100644
--- a/dev-util/cscope/Manifest
+++ b/dev-util/cscope/Manifest
@@ -3,7 +3,7 @@ AUX cscope-15.6-darwin.patch 288 BLAKE2B 3426d3f3dcdd67764b8f3ee63bbf1ea6c457231
 AUX cscope-15.7a-ocs-sysdir.patch 582 BLAKE2B f9144657cb8d584f4d504481b986f68322d1a08b408e4f623db0ed3e22474895f4f8464e297a90e635a3dd3e71cb06f79b092a82ab8876d0ed308b71fa0d2812 SHA512 aa296d8839da73b6838c450dfabc9782940a2f9c9cfba2f738993c777c1d4096688d79205ccec58dbf931b2faf45a4c3850ddbd894c7b7e616d18a0014cacfdb
 DIST cscope-15.8a.tar.gz 601232 BLAKE2B 8c67311059a055af775ba3d42942a557b54c0214751d8756e6a5c19a7a271824004e72c533614015ddcb0ffa4c768f99eb736d441dc8467c5be4824cebf5c15e SHA512 bedba69820eca86420f6c975d1f267de67a457b182a3fe49720a2ae5ea48759c5b5b8db06ed5ffd85173ddf4a0f12ca722e87200dea4a2da7d43c8c711b00318
 DIST cscope-15.9.tar.gz 613948 BLAKE2B 66c0c85d0db810e8cd5a286925eeb1026fa4a9e9c3a5a9decd1412188fca43f831949c231acca428b5eeb476662b7ce9f81defcda81759c18027655535b855be SHA512 f3b95da5eb5c036cd39215785990c7cce7ce7b8eda4b18e60792e70d01ffb63809ce32ace310a9aefd88e6761c1609039ccfab0e8e49f81730bc1630babbcb80
-EBUILD cscope-15.8a-r1.ebuild 1388 BLAKE2B 41c1a647a086729d21b1321d64d86e8684c8cf204f632c6c8ccff268af4ab8a22d49cc59f9598d4814479f8fcd6ab30e7a997002f63ecef625c5bb80c68ed9d1 SHA512 b9d1b76bb68f5352fbd21b3668c518708e5ccc0580d9052ba556874d6bec06961d900bf06191e88870d741a408886fb4ae5efc9d3f974448ea6d26cd569ef0ca
-EBUILD cscope-15.8a-r2.ebuild 1601 BLAKE2B 21d72755f774fc5bd2ca5767dbb34753c5f330c16138edc16df5e4c85f8bbdfb7f45680ae4c0450df3c84de2b384e89e79797b34acc1b4d49915c8d16c77606a SHA512 80dca153c05cfa98f2bcefd5901a977ac4492815b51a2f05ac31cebe32154b82a86d09e90c563cb96b0d63f9e3e45be4245d585412d77b53e32e4c02bc274d7a
-EBUILD cscope-15.9.ebuild 1568 BLAKE2B 06e37dcf00e1a172f69c5ef4af6971f87be527275676493ed921ff728b5ff69377034606a1932719f7f5b750993baccec9c1495c57b6dcba4b26e37787b8c979 SHA512 f746a90dcdb20d1d1e9581091745d72d4782cbc125508d83589de399b0cdfa850a5bf2b6426d61090407a7591a5e9e2cdc875f3d551ce4225ff044966647ad5c
+EBUILD cscope-15.8a-r1.ebuild 1366 BLAKE2B 3277a9a401ab14be42a18f9a54d6c430415f956ce0d08bc99f9469d753a8ba118367543edff62d32d3cc882ffe147bff69de13f26f29b194538f3b029348c02f SHA512 0d57232b2f9cc820784c6a7b8cab7ef7043a5e3e74a2cf3b2ddba4e80176a4a456122004ad32fd8194137761db9f785055567e1b6f98c79a95f44d2f8d170f59
+EBUILD cscope-15.8a-r2.ebuild 1579 BLAKE2B 68a8724a6e1e25873ca191521dbf194faae503f67773bba610e8694eb8961ffb76888b4fbe6848c69f4a27e718f19526fd356ccb140d0b074b740133c5e37c7f SHA512 adf4460cca1bbdac433f7fb86a87b79029993df9b26f1e68070410202a2c48d8f7d02003af25c3f67a6bb40f1d81ad781288770a2e7a1b02b05984ea0dae8229
+EBUILD cscope-15.9.ebuild 1546 BLAKE2B 4bd91bec2dde1a21d626d2ed5d3bb01450bce39b59d544b73d11eb765fc3273780134f3ef35013a0415e4f43a46d10bb68fef333205a23c4b618a05e9c56e3e8 SHA512 48cd9fb2c89f45336662debd59e10f860363f3823529cc0966eb319e2112afd348206e56c9d2b18941a5cdec03fad2c61b1ae645a6f388daeda4eb4a8b00e53c
 MISC metadata.xml 1086 BLAKE2B 9fecf3d723e58a1235e3ae94b6a009c16cf91ecf0b27c32de7d8a8f96308e41908b9f2881083acfbf329685cce188b8ee0fb864333d566bc915e1ca2d572ac3f SHA512 a8ebddecfe959cb05a992749f12183baba41950b39e197bd1db0528969dd4e1814dc159555b2e24d85249373da4b60bf05a7d86aac2d7b8969d6d2bed2ab59e1
diff --git a/dev-util/cscope/cscope-15.8a-r1.ebuild b/dev-util/cscope/cscope-15.8a-r1.ebuild
index 597e787b4abc..5af4bb8a570d 100644
--- a/dev-util/cscope/cscope-15.8a-r1.ebuild
+++ b/dev-util/cscope/cscope-15.8a-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/cscope/cscope-15.8a-r2.ebuild b/dev-util/cscope/cscope-15.8a-r2.ebuild
index cc6a6c15981e..8a7367f84848 100644
--- a/dev-util/cscope/cscope-15.8a-r2.ebuild
+++ b/dev-util/cscope/cscope-15.8a-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/cscope/cscope-15.9.ebuild b/dev-util/cscope/cscope-15.9.ebuild
index 474296df61bc..43bbd64bf2f2 100644
--- a/dev-util/cscope/cscope-15.9.ebuild
+++ b/dev-util/cscope/cscope-15.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/csup/Manifest b/dev-util/csup/Manifest
index 853b89c2578d..e6036a6d5091 100644
--- a/dev-util/csup/Manifest
+++ b/dev-util/csup/Manifest
@@ -1,4 +1,4 @@
 AUX csup-20060318-respectflags.patch 1374 BLAKE2B 45f3e110cc6607cf12962daf4d0a00ae831d1b91253c3a7b44be32f5523932a77eec86cdcd8f484d18461df6f4862fdb88cb28c5d8806bb4502968605f5897ff SHA512 e112fd37dae7f037e7700579ab59e8611b5f09f0d8351bd2c909e22e393b05f697a51348fab79ba95d31e28b727e62b4a4ce2f8dc22402ac16efcfa4204a1d8b
 DIST csup-snap-20060318.tgz 78968 BLAKE2B 9d257e5af438ed784402e427714fc652c5daa403f5cb2240147df5e8c68d2f81eee43da1242b80c82d6bbda3c5534e14c0d6e27ba57442d5b6c34ef1d69ed397 SHA512 60e40f6f903df81b1667af31397978ce99d33b6849dd2476232b325415a391e6840a29e70af85b928a3c7beea55cf3064d3b48d61b9c20c2280dc3f675adcd5a
-EBUILD csup-20060318-r1.ebuild 754 BLAKE2B df091d48f5382631f821da4633af208a8fcc250f13e6e19c420c1f514f17e755f949995c22dbb4daa99e50325be471b8f244346e0b7943eb048b449f573f2263 SHA512 c2257a971cac2266d2b4b197b0d1f08071613c4828eb86a0ec89061765c1c4cf76c75b2f06ff894f1f8c4375299b76566381f2acaedcca3c31be9f800af52852
-MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
+EBUILD csup-20060318-r1.ebuild 744 BLAKE2B f48a683b8f42b8f1f893e819566d92c820397be840bfad2d5b5fa3879e36cacaf667658ff461a93aeff91b493e9925a98973ac5d446bea51ad88ad9dad85f26d SHA512 73fa45d01a2989a2e5abee4ad36e4964fe3843fbb45dceaaa1fc8f3cc024029a352e09c400ff752301879ff3766fbfd93244c3e90ecb621bd9e572d6f0f34a39
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/csup/csup-20060318-r1.ebuild b/dev-util/csup/csup-20060318-r1.ebuild
index 4bd23eb5dced..dcfafb87ba8e 100644
--- a/dev-util/csup/csup-20060318-r1.ebuild
+++ b/dev-util/csup/csup-20060318-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mu.org/~mux/csup-snap-${PV}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="
 	sys-libs/zlib:0=
diff --git a/dev-util/csup/metadata.xml b/dev-util/csup/metadata.xml
index a00f3aeb1f81..6f49eba8f496 100644
--- a/dev-util/csup/metadata.xml
+++ b/dev-util/csup/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>bsd@gentoo.org</email>
-	<name>BSD Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index dc0ec82c0d69..d69669b6cca0 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,4 +1,4 @@
 AUX ctags-20161028-automagic-deps.patch 2079 BLAKE2B 25950330e80d81baefa4be9d2cdf9fec5d147ba667522667fb7833f4dba37d91c83cc5033967d2d544b66562ea26634a8b8c2f292f23536ed7690b8d0f3d22ea SHA512 cb9639f7d17bcaedc720774ece7386608b39a91e44cc0aa9cd4359894a5fb06ae29a03b21bc913a110864161f8df623b82477e0d23265bdee88d13aba6c88535
 DIST ctags-20190331.tar.gz 1537104 BLAKE2B 354ddf48cdc9421e70d9d37ec7251e51f7f78564dc4f6236d12e2e18519369c39c22585830fd301b7eff4898d550b824776541198b8c4a31425711776b14fde4 SHA512 414faef7628ecaa66fcd5f172781a32194e1d58637dded1f7e55c138239ad777796bb1510bd447af3ad8243b7178e6f4859139305b0c0efe298182408f34524c
-EBUILD ctags-20190331.ebuild 1848 BLAKE2B d2b01ed973651e1dcdbfae252345e8c409d9b4da5b18c2897120f4157ec81ab2e7d1ab92a529d4cf9d78a522aba1dcedc42e55da95c76e3a3c81f3284441c253 SHA512 13369b78c8a18599b36b49ce9e880a978d8336641fe20bf591bd9fc3c36f67e8de2d3fe90d903ec2cf81e2a6a9205c99e674856b4af38f7a67661ef54fca75d6
+EBUILD ctags-20190331.ebuild 1826 BLAKE2B dce9a0eceb703bd698c8d396c066df4942781615e1923e994a6fb8e1f6d9076c207decf5e548c7b19a2bfa492e8597e4efb840f7a3799bc1689bb5d74e312aa5 SHA512 fb2521ec8f3f0cf82ebb15f6e648a5d90a71fec24f7f3ff165fb222a199b9ca4fcecf2b96bbd585296eaf1a3369015f823ed14698f2249774379c1f18d0d7d23
 MISC metadata.xml 583 BLAKE2B 32e6225369d82b7aae04a238a314eb77911a38c2d670d4058260b75ced482199b343d1b5d7496bc3a6711b71a429b7205057ab66ed8369083b2533be5a7e0648 SHA512 df8ae31fbbb4546f21c3c06110bc6630f392cbbd937e2ccc3c504e08835e56ac2e7d8156686755217140906cc806001a18627778af0e09d753e50c9a47de28b5
diff --git a/dev-util/ctags/ctags-20190331.ebuild b/dev-util/ctags/ctags-20190331.ebuild
index 163fe14340ef..ac69fa87a8a9 100644
--- a/dev-util/ctags/ctags-20190331.ebuild
+++ b/dev-util/ctags/ctags-20190331.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/universal-ctags/ctags/archive/${COMMITHASH}.tar.gz -
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="json xml yaml"
 
 CDEPEND="
diff --git a/dev-util/cunit/Manifest b/dev-util/cunit/Manifest
index 3990c73ac91e..82890893ac1d 100644
--- a/dev-util/cunit/Manifest
+++ b/dev-util/cunit/Manifest
@@ -1,3 +1,3 @@
 DIST CUnit-2.1-3.tar.bz2 514500 BLAKE2B 919ff3345c06de44662deb3c43700dc14f3c6b0b1557e162f1f527b782874082bc866b3bbc3fd18869b975d7a0a6b4730eab87ed36847249ff8fa5cbede27797 SHA512 547b417109332446dfab8fda17bf4ccd2da841dc93f824dc90a20635bcf1fb80fb2176500d8a0906940f3f3d3e2f77b2d70a71090c9ab84ad9af43f3582bc487
-EBUILD cunit-2.1_p3.ebuild 1377 BLAKE2B 07df95b8f5e43db718580afee144a777649842fa027faa18bfa0aaaf180aa2656affa67204d8e34a5c4c6922dc64beedb7dc2e5270e8976ff7540e03cf403bc2 SHA512 de98381fcf87f9c7cd5af54300f83278b25484ddf747216005cc7db841ba9fa624997345e09b327414cc80d5c2c66f36c6d83cba832eca00e818d2cce4d9df21
+EBUILD cunit-2.1_p3.ebuild 1365 BLAKE2B e127d963ab2811abffcf9f5523b2d9ceecd8caeffba62fda0d563ede2e1892fd19dc0c280514616dac5271d1a609afdea683c2a3548d38e0cacc32e883ac92a1 SHA512 e572ce2b71f3ab2f374c8ca5b2bd19b6b85e7833e65f6cf6e153499f75bcdbb7a4f2dc545ba79214248d624b19adadfe60edb90956b638fdbd45f91c6415a008
 MISC metadata.xml 242 BLAKE2B c9bc0f1e188dab4f0b4f1027441888c15919ad52adb639905a71471645438c94957a45ec043038fc19a829a6ec6b236eeb026560728dc231e5aeb484a467177a SHA512 3171a680f18023cbeeb73331a33942ddf076e0b8abc2c40284e4a4cb1803ad7264f8e38ffaf182d1f38ba28ad60e65a0ddf96c66a60e0f9a935aa941c49df87d
diff --git a/dev-util/cunit/cunit-2.1_p3.ebuild b/dev-util/cunit/cunit-2.1_p3.ebuild
index 87f0bae2828c..9c9fb0639ae1 100644
--- a/dev-util/cunit/cunit-2.1_p3.ebuild
+++ b/dev-util/cunit/cunit-2.1_p3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://cunit.sourceforge.net"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ncurses static-libs"
 
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 47d64e2dbcfc..4f9a5b49942a 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -3,6 +3,7 @@ AUX cutter-1.6-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba657
 AUX cutter-1.7-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba6578b2c889d851b06aad0fa7dccf7872010452c0b3d2bd0c1952835cf2d20e05e767d154634e5f21f139eea4f7154950ec6 SHA512 f0e3e6874a3dbcf88176676135896830ed57830066205cf380d13d9c2ba1495af63adcfa4cf55e4e10256d30b95a09948e9f1bc519b4717f7ba5e55090415264
 AUX cutter-1.7.4-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba6578b2c889d851b06aad0fa7dccf7872010452c0b3d2bd0c1952835cf2d20e05e767d154634e5f21f139eea4f7154950ec6 SHA512 f0e3e6874a3dbcf88176676135896830ed57830066205cf380d13d9c2ba1495af63adcfa4cf55e4e10256d30b95a09948e9f1bc519b4717f7ba5e55090415264
 AUX cutter-1.8.0-python3-config.patch 1133 BLAKE2B ec9af0be413e7ce04dbdffe68e58e8aab5ba69e588d69aee85b93e13bacafebda27aa3eb4b0859e26b7043b1c8d56fd86353930278e624503cff770cfb052f0a SHA512 67a749d3763050b684740a7039150e675a72fd7f32395d7b00e393477be6a920f432e7ee75285a0035cbc110cb6fff7e15f41ac6ebb9f623245c6ab0c76b2202
+AUX cutter-1.9.0-python3-config.patch 1133 BLAKE2B ec9af0be413e7ce04dbdffe68e58e8aab5ba69e588d69aee85b93e13bacafebda27aa3eb4b0859e26b7043b1c8d56fd86353930278e624503cff770cfb052f0a SHA512 67a749d3763050b684740a7039150e675a72fd7f32395d7b00e393477be6a920f432e7ee75285a0035cbc110cb6fff7e15f41ac6ebb9f623245c6ab0c76b2202
 DIST cutter-1.0.tar.gz 614826 BLAKE2B 8f75343e57bf986d80dde3dc3ceb59675d28854744d8cc5fac783514e9c200595990d4860ee45db6544537d4f367df5b62a034e298bf273e44302edfa1647c84 SHA512 af6be59be7871d21d4f665e8ecb7f8224d99ccf7d62793e989ccd780ee521641c6ec0d941b46bb82770f5d44e5c0ef2efc29f9be303385e8e757e62a54bf53b1
 DIST cutter-1.4.tar.gz 1067162 BLAKE2B 2f7eceffcfb3c542695e03ec72de1c99451f8278e91f50abc2e87542efbd2cc73d5a52b0e5303b9cea751edf91bc71b63295edd5b32d1b2b9ed3a1443cfc92e7 SHA512 54caec67e57f2ff3908942c1ebd1e909c65204c6f31d0ec95e31f46e03364f309898006b93555ba81287c0d74faf407272226e5ec65b3148ecde8feec11ca3be
 DIST cutter-1.6.tar.gz 1083427 BLAKE2B d51b88f2b9dd2655ef58d7075086959ec3ed59ed4b21db81a792ee165deda523a4e59378c954d0f2aa5b0af25d67329ed2119c004edc402c9b593a3b230a6fd9 SHA512 83aaadfbaccdaa514606408868c050e22d0a80a749b98a9f6df929467a16e69b0d454b25ce1cf53e35ebbfb74e9b39e2bd390057488c9bb3992a442ca306c2f1
@@ -10,6 +11,7 @@ DIST cutter-1.7.4.tar.gz 1182307 BLAKE2B 7b80c99654c430c7d694b658c5757a0f75463f0
 DIST cutter-1.7.tar.gz 1099734 BLAKE2B 200621a902fabee66ebb6e02cc0efb7a705320c6071db5ce64adee0717977a72056bb5ef3ea8f8cad05488c7f031da7c24bbfc2986bb780f111f0a3a5b7a5b0e SHA512 52eea3017ebe02dee4f4e2f7109486ef2b833359959f7058fff49b4462dbc551e6d25cf31da934c9dc8489dad68ad2a3ba8b12fa60789852d13e8d3cb225a1b8
 DIST cutter-1.8.0.tar.gz 1431831 BLAKE2B 8fd54238acb83f5747679e520b40981fbffa4a19b8f96231fed1fee904cacee6cb02e5c483cfa8d00d0ced526cf6238e1a3a3a7353304fb603267fe7047822c2 SHA512 f88b581720ca969a1c34b671f31c8084bc588d5c7c3b1975d2012ac04abba953eaf87f28b72cc9ef608d14d8281aa92502efa965378fa89a9c174b049a9fca7e
 DIST cutter-1.8.2.tar.gz 1527164 BLAKE2B 49ad9d208d77332c87acb2ed389d854ed8866bd561e89582266effd448bd3f1260f2e8d91ebc2fcbb7beb40aec39e460bc7a327021a4339db157af5a809cbc19 SHA512 16cb6a158882f17435e4c146b021a7ddb61a331efcb53e5a29e3598f399e71b59003473fa5a07cc0769148e67b02dbf955051bbb5ceb4df69b4cf1805b85f4cc
+DIST cutter-1.9.0.tar.gz 1548575 BLAKE2B 810b6d9f3b203f79711e38b26b60f545fd65f96e5b7d7638538c074ab7dbe83104d79b11f6b552d16e4a30236c5965ed377ad7d9c71cb8fce0a1d9d13076cd54 SHA512 f9b68469320e0e54562612cba21632f69dfe1e0bb1f21d05d7f0a083208e11f2e1a0ab338f8db43fb324aa8538b6f93d566eda13283d5b96ab1127c2d846b388
 EBUILD cutter-1.0.ebuild 637 BLAKE2B a7ee78a5d5f0f988ca10b0f7af3a5d5f63d433eea111358953599db557bd4cdbb656858619aaeb53293faf2749f8cb4540670ee590e6e3a9ec373a98f099da64 SHA512 71f8a88e2ac7b0d3215cbb32c3cc3c3b9d433010deb6755d5fcabfee26e1440948eb33c658374a2070c1e5f844099c715f461935da410d3fbdf2daf2be181a88
 EBUILD cutter-1.4.ebuild 1009 BLAKE2B a0056eeecee4e95a9b9e6332b9d8ddd9007ff569d93c473257ebc59bcc3a80a9a6bae8dc996f50ba355b8e29298d1a9c6c158402f77f4056bfca6674875135ba SHA512 9b78868d333fd97fc424e3eaa46d136098298f79860db68898dbad3841353dc81dbd513a312431f16d536c3273c968a5317f6bf58250f9f9ae792b9643ad659a
 EBUILD cutter-1.6.ebuild 1009 BLAKE2B b511368dcafb04f330ba2a9212cc5a2ce451f6ac69efc4b02dd789f63c326536af8a1b2339c2a17c50a2f47fa41f80bf5465ceced2c3880a90e482fcca372137 SHA512 3ec586afa2c3c9b040acb05e54a37b767dcf35fe0e9fe840befb0d8cd7221d2c6f91d994ce3006fb0d45666c29d79c47fdd0d3c4a3160aaf4661de077c00b903
@@ -17,4 +19,5 @@ EBUILD cutter-1.7.4.ebuild 1177 BLAKE2B d692a0279ecfe0dec8e7b6d13c0ca45e0ed3b8ba
 EBUILD cutter-1.7.ebuild 1180 BLAKE2B 298213403869122e505d67cb655aa5604be2c51e8ff8370e5ddda46157c4ce4c549237c96412c7435a90096d7d78f0c9346dc2c6cab4fec66f4b6a1d2ed122c9 SHA512 ea4eedb00a260567cf62853d3452b368d0c84fcd889c00ed67c224450fee010ab0096b1f2dbad03376791ea2908fac2accf024865fead13861c1f2609c97e829
 EBUILD cutter-1.8.0.ebuild 1315 BLAKE2B 39b58b6706349f3ab3df854eb700ae7818d38f65a63651ab469c0ac8f54cab99f82ace36e15869210935c62a5d735b0f65dd1388ba4303fee518e648d3189cf9 SHA512 8072da1f6ec027c390e8a1938e7b0bcdfe984e4ce62ccba46c5c063f0270135f05d37a1baadda37193862835d8e9f6cb18f826162477d384ce54501bb17ae09a
 EBUILD cutter-1.8.2.ebuild 1245 BLAKE2B a34d1b452f7fcadc22021dd4e1c5c5de55bf4ba0634bc2216f971e6bc7d299226e31a5caf07f4929d581eefb6eafce382297ee6631c665dc939d1c26300e9b66 SHA512 a8adece880ff5a6fd550d2ef0f18cd2bb1ad8f82d182643bdf61888f672101c9032eb14216e42c501f5d2db1d715f3bd2bf83c8a69e890470347c5cfa8fe98c5
+EBUILD cutter-1.9.0.ebuild 1245 BLAKE2B 680d680a6f462d2949b3f8a0bddc81e1518762d1dde458f71f1ccb44e3c1fc0dc18336d104791d3e8c4b3c86e581de6df9f1f5b89acb381ec0f4eb7d66efab39 SHA512 ccdc780dda57a3715a8c3e289add837ed03d3b18977a388591b3bfbf045108f36988ee6f6e7c424d7442061f1586e7a9080d0539f95745320d9c50024475f07d
 MISC metadata.xml 687 BLAKE2B 5b8a5f4de7ba5d53d9aa63fa173c39cc590af4700bae0fb950ae79c89c78c90e1ecef29ddae7fac2882bb5281ac4535c5c78d9192fdb0fee96f52b564bb8d362 SHA512 9a7255a0a0d560adc6569a5776bea0a0acefb3b2735ccf082fc599b03c50ccc40a3ddf98058031c01ae0bd5966ec569efb75c3fd982895854fe0bc2c26dea96b
diff --git a/dev-util/cutter/cutter-1.9.0.ebuild b/dev-util/cutter/cutter-1.9.0.ebuild
new file mode 100644
index 000000000000..052885e5c900
--- /dev/null
+++ b/dev-util/cutter/cutter-1.9.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit qmake-utils xdg-utils python-single-r1
+
+DESCRIPTION="A Qt and C++ GUI for radare2 reverse engineering framework"
+HOMEPAGE="https://www.radare.org"
+SRC_URI="https://github.com/radareorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jupyter webengine"
+REQUIRED_USE="webengine? ( jupyter )
+	${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/qtcore-5.9.1:5
+	>=dev-qt/qtgui-5.9.1:5
+	>=dev-qt/qtsvg-5.9.1:5
+	>=dev-qt/qtwidgets-5.9.1:5
+	dev-qt/qtnetwork:5
+	>=dev-util/radare2-3.8.0
+	jupyter? ( dev-python/jupyter )
+	webengine? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] )
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.0-python3-config.patch"
+)
+
+src_configure() {
+	local myqmakeargs=(
+		CUTTER_ENABLE_JUPYTER=$(usex jupyter true false)
+		CUTTER_ENABLE_QTWEBENGINE=$(usex webengine true false)
+		CUTTER_ENABLE_PYTHON=true
+		PREFIX=\'${EPREFIX}/usr\'
+	)
+
+	eqmake5 "${myqmakeargs[@]}" src
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-util/cutter/files/cutter-1.9.0-python3-config.patch b/dev-util/cutter/files/cutter-1.9.0-python3-config.patch
new file mode 100644
index 000000000000..e2ab05564721
--- /dev/null
+++ b/dev-util/cutter/files/cutter-1.9.0-python3-config.patch
@@ -0,0 +1,31 @@
+diff -Naur cutter-1.8.0-orig/src/Cutter.pro cutter-1.8.0/src/Cutter.pro
+--- cutter-1.8.0-orig/src/Cutter.pro	2019-03-27 12:14:42.436446303 -0400
++++ cutter-1.8.0/src/Cutter.pro	2019-03-27 12:16:26.971448895 -0400
+@@ -118,10 +118,6 @@
+ # Libraries
+ include(lib_radare2.pri)
+ 
+-!win32 {
+-    CONFIG += link_pkgconfig
+-}
+-
+ CUTTER_ENABLE_PYTHON {
+     win32 {
+         PYTHON_EXECUTABLE = $$system("where python", lines)
+@@ -140,10 +136,13 @@
+             LIBS += -F$$PYTHON_FRAMEWORK_DIR -framework Python
+             DEFINES += MACOS_PYTHON_FRAMEWORK_BUNDLED
+         } else {
+-            !packagesExist(python3) {
+-                error("ERROR: Python 3 could not be found. Make sure it is available to pkg-config.")
++            system(type python3-config) {
++                LIBS += $$system(python3-config --libs)
++                TMP = $$system(python3-config --includes)
++                INCLUDEPATH += $$replace(TMP, "-I", "")
++            } else {
++                error("ERROR: Python 3 could not be found. Make sure it is available to python3-config.")
+             }
+-            PKGCONFIG += python3
+         }
+     }
+ 
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 690c767763a7..f3f51bed57f0 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,4 +1,6 @@
 DIST debootstrap_1.0.115.tar.gz 75691 BLAKE2B ef2ddd8b76d7eafdf5be50e3cbb99725066562bc4a717ab42b436dcab3e5e3a2148c9e6eeaf7b6135e4bde836ee01101e7158ebc0472c08329ae0152d0845b8b SHA512 635e4feb1fb2bc247968127dc86bf0956243c8058f99e66ede177da84f0258cfc2de51873f347c099217b07e679527aeac08e7263d31b4112fb0708edb3deeb9
+DIST debootstrap_1.0.116.tar.gz 75723 BLAKE2B 3a48e0a51dcd6066af26d036df17e36bb901d7099dfa9521ca86cc1d2d70b8326ad068dd86130de1a2b686a44391d8fd0bcfb78f24cd558777b487f8bdbde699 SHA512 59ba44ecfa7c6bc3d81a814fe66a87223fa4bde24bd986f75875fe9077355a5f4268d822347f99402d4146e81b270a06f21111fb977729f4326bb5b8e017583c
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
 EBUILD debootstrap-1.0.115.ebuild 1170 BLAKE2B 8ce1a0ce29d8a1a930348fa5ec8fb078868514eb478398c4dc7197f3d6b78f7682963783da86b3e2f5fd74a81534b72783c9ae3e7287a1a512c378e43aba3731 SHA512 a08ccf79356784effd1b02369dbd582369fb05c3dbb1b0ec932ebd38295dd3aafd2d65b88fb1997c60d40833aa34b7d84f02258737582968b98c2d3975d21957
+EBUILD debootstrap-1.0.116.ebuild 1179 BLAKE2B e668240a1e791eeac1ae105cd9f23a5b41be0232488364dd84bf719f5fa359d1e0feaff80ce0222a4a7af8bf5863a363bbff9d6f3a53f3d37d85241d41e30b1b SHA512 eb12d2206e869c0e88501317c41e6fe8b98c374de2b1facc345b8244778bc7d771424fadbe2a2fcfca1f8dd21562ea880c98e79acb0e49e5eb5254e6c0762b0d
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.116.ebuild b/dev-util/debootstrap/debootstrap-1.0.116.ebuild
new file mode 100644
index 000000000000..8214beb8d505
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.116.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+	mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+DOCS=( TODO debian/changelog )
+
+src_unpack() {
+	unpack ${PN}_${PV}.tar.gz
+	cp "${DISTDIR}"/devices.tar.gz "${S}"
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring (--keyring=K), please"
+		elog "install app-crypt/gnupg"
+	fi
+
+	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
+		elog "To check Release files from Debian or Ubuntu, please install"
+		elog " app-crypt/debian-archive-keyring or"
+		elog " app-crypt/ubuntu-keyring as required"
+	fi
+}
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index a8e4db2dadc4..3aa3466c5d02 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,3 +1,5 @@
 DIST rpm-4.14.2.tar.bz2 4151934 BLAKE2B eb7e32dd736a195f2e5effc184ee8f2c700dcaf80477574c2112b6c96504d86a67c81e611f82ea35ce244e95fad339bd262eb51c35ada5eeffa8d306b6938cb7 SHA512 22e309e8be936e6070430cedd6f5ea0c3871db4c6aadd0d567a9c418796c178c8dd45d44920d7eaa66681790cc2821347affe471cb215d7a490fe7947fbf291c
+DIST rpm-4.15.0.tar.bz2 4205632 BLAKE2B 3e9701582e82d4164a21374df78c7a9ab3ca4f9aeafc13706fd0aa27782a34d2a732d7ae9659589abc9f9b8a48ce5c2cdbbea72c46768f1baba28ded26817e5b SHA512 bca9cc9ef0ad53fa5cd257c29a0a0b9447956afe4024835f5416b13926bc8bbaf8aacd481e721b4a28983bc57f98b75b91750d39dd72de4876efa9d6db53a26c
 EBUILD debugedit-4.14.2-r2.ebuild 1725 BLAKE2B 7897371964b247c6076d629b6ae6f01473c41d71356c1447bd6f991449320ccda71b6f86b42a3c82c491efec20d2ebf2e4ad559940ce748f4e40f3cd4dac86d9 SHA512 4e36e020e4aada2c378466818763c5b49d888f76627692bf40074ac154678225e77921627ccb2b398026603dfef403548657c1f0068508e309207f41ab097f79
+EBUILD debugedit-4.15.0.ebuild 1763 BLAKE2B 01c3fe20932754926cb903010601a06f9cc332cf6e7d7a3059d8db0f6250dac667106b049a496f0597eee66d4f0d6a775caf0388afe352bdcf4ea4c406ed64fb SHA512 c07b6a694c717a0f09db50784b28209654929a3cad740b27e6e01e8bdb8be9706d0310e7836f3ffe0042109c8ef9464ef39ab2db9e0a94124de094a6604f9688
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.15.0.ebuild b/dev-util/debugedit/debugedit-4.15.0.ebuild
new file mode 100644
index 000000000000..7a6ec67dddc6
--- /dev/null
+++ b/dev-util/debugedit/debugedit-4.15.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MY_P=rpm-${PV}
+DESCRIPTION="Stand-alone debugedit from RPM"
+HOMEPAGE="https://rpm.org
+	https://github.com/rpm-software-management/rpm"
+SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	sys-libs/zlib:=
+	>=dev-libs/popt-1.7
+	>=dev-libs/elfutils-0.176-r1
+	dev-libs/nss
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	eapply_user
+
+	# cheat it into believing we're bundling db
+	mkdir -p db/dist || die
+	touch db/dist/configure || die
+	chmod +x db/dist/configure || die
+	echo 'install:' > db3/Makefile || die
+
+	# TODO: why do we need to do this?
+	mkdir rpm || die
+	find -name '*.h' -exec cp {} rpm/ ';' || die
+}
+
+src_configure() {
+	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
+	local myconf=(
+		# force linking to static librpmio
+		--disable-shared
+
+		# disable linking compression libraries
+		ac_cv_header_bzlib_h=no
+		ac_cv_header_lzma_h=no
+		--disable-zstd
+
+		# fake some libraries we don't use
+		ac_cv_header_magic_h=yes
+		ac_cv_lib_magic_magic_open=yes
+
+		# use nss as crypto provider
+		--with-crypto=nss
+
+		# disable other stuff irrelevant to debugedit
+		--disable-bdb
+		--disable-nls
+		--disable-plugins
+		--disable-python
+		--without-acl
+		--without-archive
+		--without-cap
+		--without-external-db
+		--without-hackingdocs
+		--without-lua
+		--without-selinux
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake -C misc
+	emake -C rpmio
+	emake debugedit
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	dobin debugedit
+}
diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
index c26ecbb8c490..3fc6c937baa6 100644
--- a/dev-util/dejagnu/Manifest
+++ b/dev-util/dejagnu/Manifest
@@ -1,3 +1,3 @@
 DIST dejagnu-1.6.tar.gz 523969 BLAKE2B 1cc9498aacd681570cd8d8834cd2fe0594bb49e6664cfe934b824dba0bd4a6766f977de6a1dc4596095a11d68844873f5687000423f4928f0432981023d26451 SHA512 a494dd5cde8d275b397116049c93e183f5f1731d63660ee8d2f4263b099fc5be7fbddde927fab3ccd5f000c43d50242f94bbb4d95497b915ea53be418bc145bc
-EBUILD dejagnu-1.6.ebuild 738 BLAKE2B e52c1762cf7d66709755db3770edefa67a7c25a1387d3fb07ea3ce4f6adc49979a300eef95473f9b498673f3f5f76eddbc43cc495de4c1543861feb59b70a0a4 SHA512 d8d0f278b80c5442f985db7f16ac8422602e4024d4ec110b1cde26f1e0e42d9b7eb218046f523ba32e49052b42a9b5e3c088b55e799c9fa16aa9600c4d0dae41
+EBUILD dejagnu-1.6.ebuild 716 BLAKE2B 4208edb2897ca3185ccf416b63376008fa2bdaf2c045b16a0251838d5ce2d2dc2d54b5b0d3505ce1056870d0ea110cfdea693c80b908979c8f3b17403e06bb0e SHA512 8d55673a83616b67df83f46c13a5cc769d8703e9b742ed6cc1bebe6692a6d6bdfa0e2e1e28f3e4fa515f7ecce52131f7c5cf507ee473bb0acd65e34e45c4f092
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-util/dejagnu/dejagnu-1.6.ebuild b/dev-util/dejagnu/dejagnu-1.6.ebuild
index cda4fd543ab8..c0275052316c 100644
--- a/dev-util/dejagnu/dejagnu-1.6.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/tcl
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 770330283514..4e2b563a579f 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 1300 BLAKE2B 3e2c3ccde3cb9fd4058c109b0c5f73b898e6e0e9d403fa5ea520b63092d277c7a0b33359c232737378df88f703d1e8b12cfcdfd91eda9e13d1d5dd175367c929 SHA512 fdfa1d93d2b05afb08ff503df9faf26fea8b4e586fd9723d01ccb47fe52781942f6e6154fb44f4078257a64049f9fd2ae4b3614fc5f6a9fb2bea7ef69a72499d
-EBUILD desktop-file-utils-0.24.ebuild 1309 BLAKE2B 609df4aebad904f4f2d6f634abe4d0ccfd304f272aaea1167f44b3adb72089e13817450b5b687a8259c0f38b754e2880b28fb42a9cf9f6b7e039cdb543b2f896 SHA512 d515e7eb089887d2193a3ba6e677521c7fbd522b2cd1201e873f64645c44133b46fb557926678aa9bcd2d3fb31d3d592515ee2dda271373cf68c830ea9ebc019
+EBUILD desktop-file-utils-0.23.ebuild 1278 BLAKE2B 339f003d86658d055d84eea90216795c233a52709e11fa39441ffb6e635c8c3312395d4781a13e38b2d692f21e491481b249af542f6d5c0c8d893c9d168cd966 SHA512 c49bf596a2e77d4b7c1aba127834bcd8e73300d49478ecf5fcbaabee51b20b5c9b5711b8940b599526b50159cd15df1551307a559c55a4143de2cf52ca2c6ce1
+EBUILD desktop-file-utils-0.24.ebuild 1287 BLAKE2B e1913f2ef8fb7c69f949aa9d58edbc3038d1b9804f2dcadd245c7f74625e3eb1f98fb58d693c4cd87e7f59f5541c3fe84d3a57a2de16fa8f8f96683962c0018e SHA512 328e2ed90d83b6bd92c52701fdf469b5f8be5e4b7fef967cd5e203a36acc4ee2c9ff5e22d391cf68caa999978a37629a26f3b7b6cb2abc57be378d28a382da58
 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 e3606f624473..ee934c0aec31 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 ~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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
index ea5cfbc8ebf8..709be3da1778 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.24.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 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index ac07d9d46b7c..069d57f06ca4 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,5 +1,5 @@
 DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
 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.20190808.ebuild 1276 BLAKE2B 1cbe7f171a6536cbd9fb454dec409e023b1d9b2bfb788cdf63cfaf779f718944f2a6f16c87e7fb3f8882afa5a39f556e6a64b8d661835482d26281eab7997a1e SHA512 bee75c253b382b622db52b32e762685314b35fbe9b0af4b43a7ba4ba7a7ae8ccaf7d72909fcc0efb7c856f89319c59fec8010c7cf12095ac7c9f132648d01d09
+EBUILD dialog-1.3.20170131.ebuild 1255 BLAKE2B 831df9d13a2c298df0d1ce33df37e8afb19591cf414acd63ba69416fb8d64378ab5393f830700e4ac668866e15da8dcbd04f4a3f7195f4af6ed7ac59dc1e3e81 SHA512 7a0ffdd7014294752073462b59b1e0ff7fd0c4f3e35f7b92cadd434f623f7139b4f64d3438d8a7b4c4d37d470b6b788ac270d2101535e765746cc353a979e38f
+EBUILD dialog-1.3.20190808.ebuild 1254 BLAKE2B 4671e591866891cc9ca7e80433fd019c87487b8da40021c021090a046f4bef8fcdaac6fb95591395ecd02425c6da9fcf02560ed644f9a4cb3e4b1c860c8c82c6 SHA512 099f91e936ab8b5cdfebb43f6b54682a96cf43da25ecb08783cbd902f8ee71c307c9f31f6988127fc8a000858924192778b7d813f238dfe6036d345ddac3bf6b
 MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20170131.ebuild b/dev-util/dialog/dialog-1.3.20170131.ebuild
index 6584c3579105..8c4006ed28f5 100644
--- a/dev-util/dialog/dialog-1.3.20170131.ebuild
+++ b/dev-util/dialog/dialog-1.3.20170131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0/14"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/dialog/dialog-1.3.20190808.ebuild b/dev-util/dialog/dialog-1.3.20190808.ebuild
index 021642f25719..2177a5cb1e96 100644
--- a/dev-util/dialog/dialog-1.3.20190808.ebuild
+++ b/dev-util/dialog/dialog-1.3.20190808.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/diffball/Manifest b/dev-util/diffball/Manifest
index cbbd64fbf2a0..c01fcffdd835 100644
--- a/dev-util/diffball/Manifest
+++ b/dev-util/diffball/Manifest
@@ -1,3 +1,3 @@
 DIST diffball-1.0.1.tar.bz2 387787 BLAKE2B e46dbf32b2ec9bece106ca90a6ae46bdfde8b83a5fd41e67f15c4bd25d7015327b4738ce3bfba71c92fd2baa94a5d3bc507dd0fad2b3451447a39a7fe058002e SHA512 1e01fff8bf7d993c828f195d974b7df1cd4fb056e9a51f9533bc8e01666a55e0d9467c799a005f58d7b4369bbf88fc9b716d0fb68ead6171d349e3c874bddb8c
-EBUILD diffball-1.0.1.ebuild 863 BLAKE2B b793bbebdc8a2ab06b63f45790ef26afc13ed853cd21fd169996c7ddcb84824d4620fe46f02f3f7e620750c926608b10545fd47389d895b47e69c4d15aaae04d SHA512 dcb5093683bec099b2e82545f7860bbbca6d8dc8b4a8a19f79479a703d7a0003564512633eac02d6c7a90e8f944a20a68bcf2501b3f8700c184beb2469f17a12
+EBUILD diffball-1.0.1.ebuild 850 BLAKE2B 02535a55320b2cb6831801d8bc4d12675659d10db9909984b88ab5cf605c9d4735ce3198e5579a17cb6cddc444f331a9e230d4ec59d9468b72999c983296295f SHA512 0df7a66f7f67f5d7115c272787f73322767434a4ccbd47cef8e8519acc92c476c23fa98f5c74a11d10142435754cf12daa35ab2ac41a9136f09c1d49e12a5a6f
 MISC metadata.xml 397 BLAKE2B 08a0d58404fdad1f2d187d5f6f51a061c5b1b24e83ffc3b59b54b223305c8da2f9082d8c961d6bb4ad13f2bb659cf265677d6d1fb7b70fd560add8e64d011f34 SHA512 4375382936f9f3f05349b4d648134251ed463ec7f74d3af2c48b1045999e1c69f9131853efb613d171b17e3ac8d7b17ec56a8088518bd6ef1aa442bd7f287bb8
diff --git a/dev-util/diffball/diffball-1.0.1.ebuild b/dev-util/diffball/diffball-1.0.1.ebuild
index 52aa5e99dd09..fbb4ea67d723 100644
--- a/dev-util/diffball/diffball-1.0.1.ebuild
+++ b/dev-util/diffball/diffball-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
diff --git a/dev-util/diffstat/Manifest b/dev-util/diffstat/Manifest
index 655688fb85f4..33eaa985fcbd 100644
--- a/dev-util/diffstat/Manifest
+++ b/dev-util/diffstat/Manifest
@@ -1,5 +1,5 @@
 DIST diffstat-1.60.tgz 255922 BLAKE2B 325be7c283580066cd5c2665078320d33f9a97761a641ce53e7a53200cfdd0d047adb3bec527a5c8489320a685bd43979066465886fefd7ce5a29926c43dd95b SHA512 6cbcff7dfe6d51583d59d2c9dfe4cb958202491ca3c4b1096616380564a1842065434d30858c55c3ddcfc76cd07b58dfc4c4cb6cfdcf6346af60998170f51bd2
 DIST diffstat-1.61.tgz 257242 BLAKE2B 8506944255991f3fb093c77e04d1c19e75cce5deffe7ade19f6917c9775e00d02cc8013fcd88440a9d116b66859ffebb0d1c92755ca0ebcca465dd0595fe4bd2 SHA512 48166e1241904b955c0f5543b1f11724a1a91516fcba5ad0603441d985728de3e0fca5f5212704dd0fc9a9e5062788b1b34062869137fd851932233d4abad114
-EBUILD diffstat-1.60.ebuild 603 BLAKE2B 0b6336087524d39f4fc139734238e236a54c9f952b00ea01aaafaebf37144296cb453022019c9de0d3a57736e37fd4cc7db3be9114f2bb01208b14522fb5b5f5 SHA512 05f1b9e6c712aef48e86007a1ff059e6bfc7db45d0ed2714ca32bb852216d93edd08c709dea737872f6ad50eb0f7fa93f3900a1a8f3385e94936d79b04b8800e
-EBUILD diffstat-1.61.ebuild 476 BLAKE2B 9a57ba415f5a338f4c4c69b2e6bde145e3eeda76cc1245886a672c417e6a767fb51808e2fbcac8d72633b1477e2be28d6ea2cce5b59cc5bb8fa47423cb11a202 SHA512 adedfaa3c6e22c00afd84afcc3f6141e4ac26efd4ab3f73fe1f992ea78e26ff9a7b2d38e63456069a8e88f99b643e8ae2f0d4ae82386e2d6b398729d0325ccf9
+EBUILD diffstat-1.60.ebuild 593 BLAKE2B 463e0d361226e6c5c87afda492218ee2a75fd08bd9b28a21d834d24248ebdc5fc9b35fd87f3d7f5806a8df29d117f31ae0f90812b3f3af316bb06000d09aaa50 SHA512 7070d0efd7f66ef0a7618d3e4eb623cb0c792ce4a5a7b02e913b8354f285359c9d8c40a04fe7c75d2299f143665f936fca23633ffaf97256f7c8dbcd47ec5609
+EBUILD diffstat-1.61.ebuild 466 BLAKE2B d746d080641ba2d19a7e0d82a45df147acc753741036e4719861850c3049f3591150ece544135868ac89efcbb62e9afece89113b8781ce1a7f1e5c3f128d31c3 SHA512 3c88b73434aadaadbd665709febdf0ed4eb9ecab0f9f850b6ff76a6ed2d6893803f71c3d629ef664197b363451deeb951c0bb873b5429f0ec23bcef8f3abb4f8
 MISC metadata.xml 370 BLAKE2B da80af289cfaf95658c9a1b5ddde6229fff88a2f98550303c5617d94e65ab99cc11f295d077a25bbb4305f1c0f3933cedbca22e2072089930291aae68f231197 SHA512 f9979216cd41510953e4ad5ea2f7f6081fe730907ca15b0e48106079c0c44ca0fcd9fcaf3fc47aa11e0bd57135ab9dab0828148a37e51de5984612fd028521c6
diff --git a/dev-util/diffstat/diffstat-1.60.ebuild b/dev-util/diffstat/diffstat-1.60.ebuild
index de0a11a90895..a8dc8901cf0d 100644
--- a/dev-util/diffstat/diffstat-1.60.ebuild
+++ b/dev-util/diffstat/diffstat-1.60.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_configure() {
diff --git a/dev-util/diffstat/diffstat-1.61.ebuild b/dev-util/diffstat/diffstat-1.61.ebuild
index eb958d03c0b8..2d5941e2e68c 100644
--- a/dev-util/diffstat/diffstat-1.61.ebuild
+++ b/dev-util/diffstat/diffstat-1.61.ebuild
@@ -9,5 +9,5 @@ SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-util/distro-info-data/Manifest b/dev-util/distro-info-data/Manifest
index a0b030453386..8ea97b876c35 100644
--- a/dev-util/distro-info-data/Manifest
+++ b/dev-util/distro-info-data/Manifest
@@ -1,5 +1,7 @@
 DIST distro-info-data_0.29.tar.xz 6004 BLAKE2B 5b59d444fac259634c9ca7349a8b93c7167fe839971d4761bf133ae8adbd866a41c14af79ee2f149259da8b8ee5e193a2b1b09165b6ad29cafea31c968470e4f SHA512 1c06ce8e0fef12a499623a0c48147c9e99352946c9bdc89a810b413179cff0df43bcd87f839dc200277f3ef8498a34077987121093390551bcf2eb1822da9f2f
 DIST distro-info-data_0.32.tar.xz 6216 BLAKE2B 627a4ada570fbf01bfd18386a7dc9c83280667674a5c52c363222167f32dcde725649c9eecf979d58c7eb155458b41a8ac77e4d7eb0c908975886e5e95f75d8c SHA512 3bbf79104c4b20d7ee02a83c4ea7852c65e7c7b2870d1f237df67d985fd2d52ea75292d80c5fc10af7ea69c89145f2e52670663b759f74a159e0f8c51ef545fd
+DIST distro-info-data_0.42.tar.xz 6888 BLAKE2B 3f08700046149e7e1a4f94a06f6c8abb93c94a1c0c72bfced497801b2e8081ac14f39a889322b6f0e25e776b3cda36da9066723ca2963b588b588c20ff23bd6f SHA512 e49c54eaf2451f32124c5df6d2b49183bbdc5b9bdb958605e5e055138e0fa67c5033dfaab46620121e7e3d1cc5cbb807f9fed809a59c31cf3501c1ebc7131c8b
 EBUILD distro-info-data-0.29.ebuild 429 BLAKE2B 4db3f1370a5e2b3f81a36f9f971d3ef0b3f8f63caa731e06d76321655ce28345cb087761b700c039fc4ae86fc683982dfd39e7c7ea341ba2cd3272b635a94e3e SHA512 afcfea1a2a5bfdf74dc35205a191a3bc634223083243a56cbb3857132dd93aefa4d35e4ba8a5d641f3448dae18bef4262d8c71a721cee8bcc155458ed8db5793
 EBUILD distro-info-data-0.32.ebuild 453 BLAKE2B 0b6cf9f11a85750901eb7258fd07a444092e6e440f3002a91b916eff73c5450c5af33b4d095dc60cb402478f4d7ca3c47ebe458e9bdd08c72b1f8f0096316302 SHA512 385aedcdaeab786b4ecb1532aff7624d94566b434e88e86401453c14264e7f0f3a316acf82af958b5bbf1cbc81d8fc2350a290375fede3863f4af8a8d51dd867
+EBUILD distro-info-data-0.42.ebuild 450 BLAKE2B 6ba108d0f609c16b747dfdadf82de919c6c9c67f0f6daa90d99fb7cf7af53b79fcc3fbb7e8614518a50bfa298ab08cdf38709c726bbf6e058efb765758c483ba SHA512 87868518ce018f4d78b9e1a11bbc170e34b49a544202af761f8cdaef63e31329274fdb4c79fea79b438d0c07f43b25feb38b2662604464b3d8c82b8908960c84
 MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
diff --git a/dev-util/distro-info-data/distro-info-data-0.42.ebuild b/dev-util/distro-info-data/distro-info-data-0.42.ebuild
new file mode 100644
index 000000000000..4f6c1b01a195
--- /dev/null
+++ b/dev-util/distro-info-data/distro-info-data-0.42.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Information about the Debian distributions' releases (data files)"
+HOMEPAGE="https://debian.org/"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Package provides only csv data and test script
+# written in python
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}"
diff --git a/dev-util/distro-info/Manifest b/dev-util/distro-info/Manifest
index e2f58f1c2c55..7084b5128b3b 100644
--- a/dev-util/distro-info/Manifest
+++ b/dev-util/distro-info/Manifest
@@ -1,3 +1,5 @@
 DIST distro-info_0.14.tar.xz 26460 BLAKE2B eb34e31514f7acfd283ae9405132884ccae31b77d6cf7af3a8a341ac349d589cbd5d7828e763911fc490d6504edae4c90551b3d3cc3518eec1f47ab1dcc6ac60 SHA512 aa0055f21523e30fc7e9c94c92f87cbd05fc5d082ddc109d092e94dabafac7533ced984197797252eb698232b3d8f512b3c345ed6abef0ae074bf2770224955e
+DIST distro-info_0.22.tar.xz 29104 BLAKE2B 88eab833ea34de9e62f858e1fb9acfb94efb60114d2213b8bbb77a440c114dbac70a1707d1469113c1a98ea94d953ffa36480c132c294fd8e22b816a444b25e1 SHA512 b9d97e469b9173651c1816f39cc2315622b46f1579cbaba29c417a51417425e90a45283e83c7efee35db78621df08997f5395c8c1b0259f69e5cd91dee65793f
 EBUILD distro-info-0.14.ebuild 1915 BLAKE2B c9e3756cc5fddefb9323b86d37bec849dfb9009469001d8993280096115d33499a166999ee5ff2fed1c6002e8483638eb53fa7bcc17a81ac3d7b8faba60f7a64 SHA512 826420545318624a6d296944a2f51742e9151a0c49b9e9b69a969b8d63cf610fb45a142cb28bc3030e0398d8c11de0fbd065440153b0fbbeecaaba93c4543420
+EBUILD distro-info-0.22.ebuild 1949 BLAKE2B 0eb878daef459b89a2e048ba5bac2ae319eea1bb0bda08c68aed32abbb54a4dc8bd4e213cb14cad496fb00db5fe838369114d3743968123f0d7c6630765088ee SHA512 6d6825064119cb8a1f1fd476356fb7f44a8112858f57fbbd9d916bca91c1b9c7ce3cc0f18b8fcbf9e870537fa0d99c5a0ec19b376c5026e4afd932e539f9a5c9
 MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
diff --git a/dev-util/distro-info/distro-info-0.22.ebuild b/dev-util/distro-info/distro-info-0.22.ebuild
new file mode 100644
index 000000000000..5eb8469e6df8
--- /dev/null
+++ b/dev-util/distro-info/distro-info-0.22.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+DISTUTILS_OPTIONAL=true
+
+inherit distutils-r1
+
+DESCRIPTION="Provides information about the Debian distributions' releases"
+HOMEPAGE="https://debian.org"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="dev-lang/perl:=
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${COMMON_DEPEND}
+	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+	test? (
+		dev-util/shunit2
+		dev-python/pylint[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${COMMON_DEPEND}
+	dev-util/distro-info-data"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+
+	# 1. Gentoo do not provides dpkg vendor information
+	# 2. Strip *FLAGS
+	# 3. Strip predefined CFLAGS
+	# 4. Point to correct perl's vendorlib
+	# 5. Remove python tests - python eclass will be used instead
+	sed -e "/cd python && python/d" \
+		-e "/VENDOR/d" \
+		-e "/dpkg-buildflags/d" \
+		-e "s/-g -O2//g" \
+		-e "s:\$(PREFIX)/share/perl5/Debian:\$(PERL_VENDORLIB)/Debian:g" \
+		-e "/pyversions/d" \
+		-i "${S}"/Makefile || die
+}
+
+src_configure() {
+	default
+
+	if use python; then
+		pushd ./python > /dev/null || die
+		distutils-r1_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd ./python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	emake PERL_VENDORLIB=$(perl -e 'require Config; print "$Config::Config{'vendorlib'}\n";') \
+		DESTDIR="${D}" install
+
+	if use python; then
+		pushd ./python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+	fi
+}
+
+src_test() {
+	TZ=UTC default
+
+	if use python; then
+		python_test() {
+			esetup.py test
+		}
+
+		pushd ./python > /dev/null || die
+		distutils-r1_src_test
+		popd > /dev/null || die
+	fi
+}
diff --git a/dev-util/dput-ng/Manifest b/dev-util/dput-ng/Manifest
index df773f3f9183..5dc56fb87a23 100644
--- a/dev-util/dput-ng/Manifest
+++ b/dev-util/dput-ng/Manifest
@@ -1,3 +1,5 @@
 DIST dput-ng_1.10.tar.xz 82608 BLAKE2B e7b3769490ec0bf4de4f763380e9a50fd2c76778c2864a4ba45eb754f2dc4aa896e556ad86939f9bf003a68b1e185b51507dd0a015453dfb39965c63beab4964 SHA512 4a883350e7a0b47c121b752d1e0ab1470924319ef895f55742fc4d8f8a0cb3a0ab4ae18d54495ebc9229b0cbf18fa375848fcdcd2431ee1f66bff6433b9a3b08
+DIST dput-ng_1.28.tar.xz 85276 BLAKE2B d205d15aad1b81dcf2cc0b765c9724b21add32df39102b63502d99e5da73aa95efdf66e94f6226105ab2ae97a4bf8c43963784f3ddf2d03217ab5023a7a98f22 SHA512 cfd4a6143b33f29eb32b88972a204ab7a6c2f062299c76167434322ae5d6d2cf8654c5b4d1e96db90dbffe372a04e2a7691694ecf46787c7743dd9ac2b7b317e
 EBUILD dput-ng-1.10.ebuild 1715 BLAKE2B faa98615ae8c62f3acd13b8240de04ddbc8640c87ba042bc3e9e9fed5e9a6a1243811993758b24d328ab7256b0bb968a208530cf17bc7ebc81a7f31721666da5 SHA512 77c5f94d12b1f7c61d214ef6630e8ea226fdf6cf6b1a0c94fd9b2c9d8205269881722ef85b3a00083e74d85fc9c9e5f9bf8c98c6dd1e3299ed9762f5e1050626
+EBUILD dput-ng-1.28.ebuild 1792 BLAKE2B 4e0c5a0ac7a2a98126b9b35242de2b4d2b020a62f8a534c9b47e7c95f18ce8a3c0170582d5af0c0486a225d31a848c15da9f76854a3fdd9bf707b2d90ca0f02d SHA512 0a2f346524f8f31c857374d0afd26fd8b3710e680f26d7f0c1935da05831b8245d0aeb8a6c35b068a9f70defcd377fd9f9923104cd01147e57ffa1697d7a821b
 MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
diff --git a/dev-util/dput-ng/dput-ng-1.28.ebuild b/dev-util/dput-ng/dput-ng-1.28.ebuild
new file mode 100644
index 000000000000..9840d82797b8
--- /dev/null
+++ b/dev-util/dput-ng/dput-ng-1.28.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Next generation Debian package upload tool"
+HOMEPAGE="https://people.debian.org/~paultag/dput-ng/"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/python-debian[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-util/distro-info[python,${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/python-debian[${PYTHON_USEDEP}]
+		dev-util/debhelper
+	)"
+
+# Requires missing build-essential package
+RESTRICT="test"
+
+src_compile() {
+	distutils-r1_src_compile
+
+	mkdir man || die
+	for file in docs/man/*.man; do
+		a2x --doctype manpage --format manpage -D man \
+			"${file}" || die
+	done
+}
+
+src_install() {
+	local DPUT_BINARIES=( dcut dirt dput )
+	local DPUT_ETC=( metas profiles )
+	local DPUT_SHARE=(
+		codenames
+		commands
+		hooks
+		interfaces
+		schemas
+		uploaders
+	)
+
+	distutils-r1_src_install
+
+	for binary in ${DPUT_BINARIES[@]}; do
+		dobin bin/"${binary}"
+	done
+	python_fix_shebang "${D}"/usr/bin
+
+	insinto /etc/dput.d
+	for dir in ${DPUT_ETC[@]}; do
+		doins -r skel/"${dir}"
+	done
+
+	insinto /usr/share/"${PN}"
+	for dir in ${DPUT_SHARE[@]}; do
+		doins -r skel/"${dir}"
+	done
+
+	# doman incorrectly treats "cf" in dput.cf.5 as a lang code
+	doman -i18n="" man/*
+
+	newbashcomp debian/dcut-completion dcut
+	newbashcomp debian/dput-completion dput
+}
+
+python_test() {
+	# test_configs.py failing
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=824652
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-util/duma/Manifest b/dev-util/duma/Manifest
index 1c964aaf7c13..9efbb768488e 100644
--- a/dev-util/duma/Manifest
+++ b/dev-util/duma/Manifest
@@ -1,7 +1,5 @@
 AUX duma-2.5.15-gcc6.patch 599 BLAKE2B 7fa6c2d42b9c1191e40854aae2bfee236b0c9f9e5360f8c59a32d9b4a89c1a5351812dadce8943848478751ce49db30d5374251a759fa5af9ce28420be64ddbe SHA512 9577e34e97b6f63654a8fa5b6ad26f54733cdd758a2a96b99c2771f9593436501b09ade40e8b20ff61da033e64c635a29b4884a6e4ea3b62fa9a4c12587cf947
 DIST duma-2.5.15-GNUmakefile.patch.bz2 4618 BLAKE2B 506127ce1f8f3d01d0443ab1240c585aa734bf3756ae632ccec8ff88f33fc0ffc5113705d5c3c31c14bf52a2cf3c82132669c2c14d24f0c6df17b8e802c8ef40 SHA512 6d83294897a60c6d0ebac388c8f791adc6a199b2c9838497bcfff39502262014c8437a331e08e3526568d3ef755a7dfdc2557771bdae89c58cd5f714eae70df2
-DIST duma_2_5_13.tar.gz 233157 BLAKE2B 233e9dda882ce380af65311adf21052fdf9d023c654aa50a156f79aafba25d1e2db116bffaa9b39232bf0d0c1ace248505ceaf24a1f7a3f24c4d2f34a7bf5ec0 SHA512 da0f46a697f95cbb17d0dbb3135df779ac347fd9e63c1578d2d732300d5288958d02b5a271e84292a8279c1ebc3dc153f896cbeca916cf18aba8e54788671288
 DIST duma_2_5_15.tar.gz 240479 BLAKE2B c79f47ba418e22a65a2ad2d4cbff796c2a620ec5f36743d543fe1260e61ec700c648033ac3c91e71be3f3e1129a1c12e9f83a91277244962cfbd494d9588d681 SHA512 0e2abdb08cfbaf9fd0a6be348c831a83ac4ee86d2297dcd1c4d625ddb4b2c1c73eef05e2b895e291d5b8076b1baea559c89d475f30e409210df4ab69b71b6345
-EBUILD duma-2.5.13.ebuild 2156 BLAKE2B e080af45afcce44b77019025b628f1779c7a2ead3971220eecd45bb948d1310fae8fd3937dd905b6d44b3f5dc6655506e168983fcb1e76ee429bd4f3aa211868 SHA512 e65d893ac599e030e229941c66f50a4a145a8dd13aa848f8a4aac1a66193fc76a54184e1f287f4bcf68aa965d970778dbe42427a9559cc377e70160d316ef729
 EBUILD duma-2.5.15-r2.ebuild 2242 BLAKE2B f995afe5c9881c45ccaf50ef1a5371bb5c8347578c5ad32e9e0d75b92c456bef23895145fba2a194a39151352f5cc028bb03ced90d1b04d8d80002d0a2517f89 SHA512 4691aeae4fb436653248344174b052eb26c41e7cc9c9eac35bb6b913a077b8513261764308286dd6e629e1c02f914083ae1f78db6337a78cd354a4a5d5048abf
 MISC metadata.xml 600 BLAKE2B ad3ed230f64bc5ead8d50bf7f8949e783ad95f90efbd5bbf8a8a39e6a4a7876d3a4371a5116096d53ba24866accdb6498c816f87da40885f9f7359921bcdeff0 SHA512 f849e5c61d27430f2c7de1f86ac9f12b8424571703e08661bccb0415743bf2e88aea981e72a5b1c287c949c6634e975c5e3f9882b9a29171389bed998c352f08
diff --git a/dev-util/duma/duma-2.5.13.ebuild b/dev-util/duma/duma-2.5.13.ebuild
deleted file mode 100644
index 8b98e3cc5459..000000000000
--- a/dev-util/duma/duma-2.5.13.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils flag-o-matic multilib toolchain-funcs versionator
-
-MY_P="${PN}_$(replace_all_version_separators '_')"
-
-DESCRIPTION="DUMA (Detect Unintended Memory Access) is a memory debugging library"
-HOMEPAGE="http://duma.sourceforge.net/"
-
-SRC_URI="mirror://sourceforge/duma/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-shells/bash"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	#DUMA_OPTIONS="-DDUMA_LIB_NO_LEAKDETECTION"
-	DUMA_OPTIONS="-DDUMA_USE_FRAMENO"
-	if [ -n "${DUMA_OPTIONS}" ]; then
-	    ewarn ""
-	    elog "Custom build options are ${DUMA_OPTIONS}."
-	else
-	    ewarn ""
-	    elog "Custom build options are not set!"
-	fi
-	elog "See the package Makefile for for more options (also installed"
-	elog "with package docs as Makefile.duma)."
-	ewarn ""
-}
-
-src_unpack(){
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s:(prefix)/lib:(prefix)/$(get_libdir):g" Makefile
-	sed -i -e "s:share/doc/duma:share/doc/${P}:g" Makefile
-}
-
-src_compile(){
-	replace-flags O? O0
-	append-flags -Wall -Wextra -U_FORTIFY_SOURCE
-	tc-export AR CC CXX LD RANLIB
-
-	use amd64 && export DUMA_ALIGNMENT=16
-
-	make CPPFLAGS="${DUMA_OPTIONS}" reconfig || die "make reconfig failed"
-	emake CFLAGS="${CFLAGS}" CC=$(tc-getCC) || die "make failed"
-}
-
-src_test() {
-	ewarn "Control-C now if you want to disable tests..."
-	epause 5
-
-	cd "${S}"
-	use amd64 && export DUMA_ALIGNMENT=16
-	make CFLAGS="${DUMA_OPTIONS} ${CFLAGS}" \
-	    CC=$(tc-getCC) test || die "make test failed"
-
-	elog ""
-	ewarn "Check output above to verify all tests have passed.  Both"
-	ewarn "static and dynamic confidence tests should say PASSED."
-	elog ""
-}
-
-src_install(){
-	# make install fails nicely here on the first file...
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc CHANGELOG TODO
-	# All the good comments on duma build options are in the Makefile
-	newdoc Makefile Makefile.duma
-
-	if use examples; then
-	    insinto /usr/share/doc/${P}/examples
-	    doins example[1-6].cpp
-	    doins example_makes/ex6/Makefile
-	fi
-}
diff --git a/dev-util/elfkickers/Manifest b/dev-util/elfkickers/Manifest
index 91305b445894..69faf501937c 100644
--- a/dev-util/elfkickers/Manifest
+++ b/dev-util/elfkickers/Manifest
@@ -5,6 +5,6 @@ AUX elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch 3246 BLAKE2B d8e476486df9ca8178a
 AUX respect-CFLAGS-LDFLAGS.patch 3237 BLAKE2B 084f594a98b7ad36edd87fbd0f841cb4858370d90f495df2bede43c0b0b87e41a775eed4dbef18f43152f75b3953dd8837f16ea3420a3943e71dc2b4a8dbe581 SHA512 85b1dd45111e7171701c4ef81e3aa23fbd5088c50cce890cf1d27c4de3560311f215bd43e3b0295e9c7917b07dca5c3431c2a705bbef80c0d90fd409ccebe664
 DIST ELFkickers-3.0a.tar.gz 100112 BLAKE2B 3fad92a6fd0cb285d8df2d529f95eccd7df8382925520989a3096354170535e02c890f5d5b4f6ae5a520750afe2477625371ee71f1bfc5d6b35d752749c7dc5a SHA512 c90a763e5b60069f9cb67fd5c114da753184ff466c3db1dd9a44e86de9408a4384a3ac00a8c67191ca9a6556fd0db11058542361e987710f9b5bedabaec2717c
 DIST ELFkickers-3.1.tar.gz 101406 BLAKE2B 8de2c27904909ede753b94cebe87789b27f02f98ce54342031330579a7ae021585117be4b61d8c7895c9c6a2c9b33f398cde9be1070ccbe24e51669db59bba73 SHA512 a0b1ba6cdb23b12f41b81cac1960b15cc2a4418cef48923900b668fa5132ce428bab16b1780698864fdf0c374762d57f471fc124d231f8de143be172c757000b
-EBUILD elfkickers-3.0a.ebuild 864 BLAKE2B d6284ed6c47c8ced0370f2f8a6aa9599a529e3b4c20a480a04dd9cd345bf469aa17989428d63d006d1894f7028e11576d24bec5da77e4c190c57f30490ca9884 SHA512 cda14dadbe6dadfeb44f9df4955c118c19ba9ccb66941e1653a95615ae812d22fecb8aaff8e7472fb8a246e194f238717b1512ff83aac1a7348bb684436b968c
-EBUILD elfkickers-3.1.ebuild 870 BLAKE2B 69651cd29c0800bddc94ebae1f2a04d1271f798885426b16faf6378ee815c377444264ad5c5e23ff378da2f1459b54b23a7e02d1c752b0144643121feef01066 SHA512 ebf1a110c5eaff0479afe381f7d9b1c5c4b9405446b3bb5b839ac76e1d68799ce16115af0a7ea33a40711c585d5ec039665586b3744a51e67e3e9d82ac506f98
+EBUILD elfkickers-3.0a.ebuild 854 BLAKE2B 87ea0954bad0072c614536e7204257f712386e7d781840ddd4915dcc3c59d5f2ca9a1388cde5f9beff5d219ddca655679f485df004d19cd5bdda4c708e1e2e14 SHA512 4e968c172e00596d9dff3759eaaa586fbb8433410e6e168cc0307d4ede8325d2a138e9c68409e1febe2af46e8985a0b94e98b869514c16f713a1cca29a6ddb0a
+EBUILD elfkickers-3.1.ebuild 860 BLAKE2B b0616b47b9e7835086343353751d34e1011f802e91baba0bf5764ae8eda2f9efdc0fe7c3f3a489fd86fbcda592deed853525b52b71e84cf18c15da33750422bc SHA512 3937a872c90386df5d2ba51762a51857fe05f8d08dab674415430f607eea501e886c0f9ade03b04d4ce5bc901af21c09152927b8a751701a3804b5924201cfbc
 MISC metadata.xml 657 BLAKE2B 81a73ead5e1fee87a15c34c14135154148a9bf3449d8d7160bc18427edab55caf7d1916943bc8bc0e42f402031d8753c5102f504e191904f21b37996de36d24a SHA512 4519d4c439e25c4c70dabe91740ea572f084f4756cbf471f346d4bf0c85226f7254fbc9744ba32bd168885b238950d01de99bcd1baa7f24939b94daba41750a7
diff --git a/dev-util/elfkickers/elfkickers-3.0a.ebuild b/dev-util/elfkickers/elfkickers-3.0a.ebuild
index 7e9fab33ac24..f23d0b5fe818 100644
--- a/dev-util/elfkickers/elfkickers-3.0a.ebuild
+++ b/dev-util/elfkickers/elfkickers-3.0a.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~mips sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~hppa ~mips sparc x86"
 IUSE="doc"
 
 DEPEND="app-misc/pax-utils"
diff --git a/dev-util/elfkickers/elfkickers-3.1.ebuild b/dev-util/elfkickers/elfkickers-3.1.ebuild
index 0fd4830cc4eb..25bd020329bb 100644
--- a/dev-util/elfkickers/elfkickers-3.1.ebuild
+++ b/dev-util/elfkickers/elfkickers-3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~sparc ~x86"
 IUSE="doc"
 
 DEPEND="app-misc/pax-utils"
diff --git a/dev-util/fix-la-relink-command/Manifest b/dev-util/fix-la-relink-command/Manifest
index 108b9abad5bc..0e4a197e70d6 100644
--- a/dev-util/fix-la-relink-command/Manifest
+++ b/dev-util/fix-la-relink-command/Manifest
@@ -1,3 +1,3 @@
 DIST fix-la-relink-command-0.1.1.tar.xz 5072 BLAKE2B 6307e92fe27612fab088d54ec74809450dc1cac6a6ed86a4779b758c0cbd058239c9bb9151579d408efa354b32b82e5b1dc4bfd65cdacc8abf1ad2bcb84eca26 SHA512 3b3f7f467f932d7737ec1d2cc7d2a71c65d34da4fde3451d6ac8d3545adf564cb2b5c352d89bc580f5f9c19352bfa8eccbecf2eb7bf8b968579d4e4e3bd901bd
-EBUILD fix-la-relink-command-0.1.1.ebuild 731 BLAKE2B d669d7075fee17e6709d18e951d9554cb5a47db302ea18aa544dda075e4991c7e7040944a39865cd3438e07da5b79038dededcef8a9db47072113358655b1b05 SHA512 9dc41b08fa2ea486de6162425b59c6fc4fd402db2effd5dfbbd59e1d1370d0ea69aa360648ab2d9c37fbdd3f226b2bb5b86a7659e4c4ec0de888a5de59aa2ebd
+EBUILD fix-la-relink-command-0.1.1.ebuild 709 BLAKE2B 3281304276bf48d7317787c897986d54042da19ac36aed2e3b40cd2d7d426b752672d0361e8ba6583b1d418e7eb33754097fea9b84484f6f96d2cc56ca45bba6 SHA512 30d2cc5ee6883bb4fb5ea95ab8a746b4540593efcf4368e06733bf8ba1c2b5c9491601c10d64403540cd0de364115b5e353537e128f255fd485bb4f079692737
 MISC metadata.xml 247 BLAKE2B c244172cf21ef0085614acb7d2006a342cbb76f77b22de463ab9d9bd1fd8d034ca3c1c8c26aaa4277fecc17d3406d25fa4531d33b58c351ced84020f9df11588 SHA512 4263d2fe40531a2b7495e54d9bbd15557b1f8510a5926f07b1a5ad4446c6dd04f099b5f990483006e6327d7e673f752b4fe63cea60691ab7a3d8722e0f9a82c4
diff --git a/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild b/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
index 1a33b2b88318..aed86719c6a6 100644
--- a/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
+++ b/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 18e240ad4892..01cdecdd4863 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -3,7 +3,7 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154
 DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
 DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
-EBUILD gdbus-codegen-2.58.3.ebuild 2122 BLAKE2B 7a07be31d76197c0d4472e5e36a141944df7a6f0aa28bef8e41e8324821eec7ec8b4279be123532ffbe4b46b65f7fbfbde1638c623ba10fe535739c5bc64ef60 SHA512 3d3b02b4fdbcd3000e7778a37bc6d1c647fbb9dba7a4b097b4d921472af379bea326aff1f3c0bf21711d9cd9c9cf5e9cba1f60a4a3c2840ba38eaeb3ee494ac1
-EBUILD gdbus-codegen-2.60.6.ebuild 2045 BLAKE2B 6a97ad7b8cce50ec8da4009da2836fa234099b2133180bc5ae2f10aeba8a2fc46a275c2ae7a640454aee9268e5d3607c0e14655cc3783bb822082aa5651c64b7 SHA512 39862fa01ce7112ed1300a8c270810bb2364a12006e480230e855a396df14d3e5fa65ffffb65b336c489785fdb1b4dcfa1735dee362b5e979767ad63890e72a7
-EBUILD gdbus-codegen-2.60.7.ebuild 2054 BLAKE2B 98c1af744514e90c1d868cca51bb8bfee22f0b42075836614ef148ed15a0ea83da32c9f1b98cbd252e094e1f59156c5e13411f446af19ff9daa5ef52be5723c3 SHA512 afa27bc27c59b4e355f1c7c8aef4045b68c7ef26b47cceec89366cde559db3771c0844d37de5306843b6d70eb8202bea520278ecab46f5e31e1c9f9580d3e821
+EBUILD gdbus-codegen-2.58.3.ebuild 2100 BLAKE2B f3612833b3d9207aff1929876ead74021bb1aec3742d079cba20ff2ce696144b89746f287e862dc99728de8bce3932b0f6905c04f4073dd9b4ae861b10a38c9a SHA512 62e1c60a23d9bd0136f6bfb1d70edacbd3c8bf7ebf12a3af8686483286e34e51be38b247555a32e403269adc430d97805c0b2278836184633cdacd28680c9686
+EBUILD gdbus-codegen-2.60.6.ebuild 2023 BLAKE2B 483690e8bc49ee4b5700e0311170c091e5b65b73bd4afadd04db2669cae4af17400a67c5c0bf132c2a5010ab29a13a9fa01ddf2255b3336146f703aa9678bbe1 SHA512 113f0739890015b52977da8d02595708ee444b54439d34b8bbbcbe487596787f769208889ac73070776c0766a040e35de677b682afce707abd4ca4a11031b5ef
+EBUILD gdbus-codegen-2.60.7.ebuild 2032 BLAKE2B 466670a91938b1148560486120374cb90e8d1c0a271ba87626cac27e9ed5ba1870eac2504f0c054d66eac1853426c4dd91cb86735725dea60b70f07f21392e72 SHA512 5ae0a20a96311794179a3ffbd43d15261085d522bfa73a336ebfb92202795a3cf82ae771bd41c7efd09285211507c655f2efa15aaac08b338c3cab396285aa84
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild
index 417a3a50238f..f69342240401 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
index c895e11b3db4..9a2ffb6630c1 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
index 04ecd71de65e..e7deb95baca5 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 534647ab6d20..4b78ec80e2c0 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,7 +1,9 @@
 DIST geany-plugins-1.30.tar.gz 4469990 BLAKE2B 3cb8434765667814dc95227a82bdf204b2f918c951de8d5d9b56549c3fc343e1fe1c3e225d9f907da6b3227440dbdad09d0318d2738c213640a4629e9f7b42fe SHA512 11dc44215aaa369831c249ef84b5dd0ee7eecdfbbf4707fc6165d78201e9e755447463c171ac6c8b2bc70df28a97b23762073ab9b31f7c33285d4728089da807
 DIST geany-plugins-1.34.tar.gz 4640059 BLAKE2B f6a2e001db42e348c129b503fd969f142fecbaa06a10bd220d348f70e6af087a0a856a403bdf866f65fdff02889fa03a2f3a662be3efad0a17401266ab883bcf SHA512 31d25e9b0946b7feeae40b81c4e0c177568cc161c24bfa1c8271dda1c15a44e86f5de9b5992a4acde6cfafe2924a1cc22e95c7b6fb253e8a358931fa5f8ecca3
 DIST geany-plugins-1.35.tar.gz 4656963 BLAKE2B c7c96c7bbd1d17083f75a90eaa741277626db8aeb693cb78d3fcca57136923c58eba1755cc55263d431ff7a992e22b365f91be5e424b4f02eb25299ae3d3cd93 SHA512 9fedb4237096d939919fa40c39a7d19debb19211260a2797b5566c555052dcd8bf9a31a694d057f1dcded794bc75883d0007f8dd9427e3d899434fbf0e8a8e9f
+DIST geany-plugins-1.36.tar.gz 4693634 BLAKE2B a7c319a77cb92a55a0a53063ab75d9375f7d2a0e419eb3e0acd063b8fda4b4d9798c103ce53b80090c73bd86804c58f815aaf8d0eecc0d7fbf7ad1c8470cb9b5 SHA512 b3e58b42432d17c27289fa20d10b833a2d7f5d8c72b51abe5b1ebdabcb952b18e0984b15ef6ac9753102d839f3174f28798269e1e94bf032bdaa189e98d72b2d
 EBUILD geany-plugins-1.30.ebuild 3438 BLAKE2B a0cf586e95195375680bbde21c7de798fabd3ad944c9a7934ace91285a267436938b8bf158af9a6da5d55caa3b5c258218c0f5f3c44170a0c7384bc447cec0be SHA512 ab7193e7c89b6824c33d489e8bf0b6098b814c9bff52987af9c4ca5eb059902102f94e659b90e4ba1748f9242d7fbb3a3564bd88d0826c36f4b4a3807083eb99
 EBUILD geany-plugins-1.34.ebuild 3354 BLAKE2B e33f1e116cb417bf67bb56ae1abc50d0c8b2ca5ffd8b5d5742ee7da694df13609164af3287585035e00e374fdce0c3c4fed99aeca4a5b7d8388a54d97e693b49 SHA512 4076e2f23e030932d937dbdfc5fba307d19b052cc0e936611051fe26d8efb70929ace9741b401c9576cd912792aa4163ba9a981da0a35e852c414ff67921101e
 EBUILD geany-plugins-1.35.ebuild 3318 BLAKE2B fa8b8919b8fafdb570e6dcc0fd951b5051fba7f3f02afd02f1fef4798edbba2f44e9e26df59569d877123f3cd4e2125ee6a91b0573001bf73a1f317393a07849 SHA512 8556d21fc5f1130c3ba4f98d1300232a1638c9874548b4787bc139997e07009f316d8ca682f01efbf185e72c8c838b28ce33b00f24c2f23d603cf82e5aadd21c
-MISC metadata.xml 1591 BLAKE2B 33b24731bacbd726ff66b7c8915504c7cd74970d3d59a64f7de32c285d0674a272bae2f35798df90aacacc4c35e05ffc155ddb58d1d7f77f17e48d213dcd4f3e SHA512 b305d755827f8e73df732bead1ebc8af4d93a03958bac3e3b00c6cbcf2335caa51f83619779567b3744e76390b8aaefa71cd6487a3f77b54050963bc61e0ecf7
+EBUILD geany-plugins-1.36.ebuild 3383 BLAKE2B f81233e98fcdb8e00b2a99152b9c7241d270dfc00db71578361916fc7256173063c683597413262ed4b3cc5c9ce024d9b58d362f5fe193e1dd6146ebbc49c644 SHA512 40bf5d9dfa2ba2608a8279f904f760718108af3798e1cf060d3b659b31a7c5e590f8fc5945114628180db17375cb29814e43ffc58fd6d484a6c5902c316fd58e
+MISC metadata.xml 1647 BLAKE2B b46873a3918b3506a6331aecf522f78467c4ab88e3d9f1b3caa300afbb83986f377d193ed2da43246eacb3ea104396989569f3e8ea663ee766c580d6b96abac5 SHA512 0030c7fb50c9ed0da05c34ef122762c86a5b9f8345403e80cd2cdff0447a62980608ca7ee484520eb097907bc6d9dfe4b390b0d4888775e3b4125d3ccd198d94
diff --git a/dev-util/geany-plugins/geany-plugins-1.36.ebuild b/dev-util/geany-plugins/geany-plugins-1.36.ebuild
new file mode 100644
index 000000000000..e6b5ae9dc7fb
--- /dev/null
+++ b/dev-util/geany-plugins/geany-plugins-1.36.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vala
+
+DESCRIPTION="A collection of different plugins for Geany"
+HOMEPAGE="https://plugins.geany.org"
+SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+
+IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup workbench"
+REQUIRED_USE="
+	gtk3? ( !multiterm !python )
+	!gtk3? ( !markdown )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-util/geany-1.35[gtk3=]
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	ctags? ( dev-util/ctags )
+	debugger? (
+		gtk3? ( x11-libs/vte:2.91 )
+		!gtk3? ( x11-libs/vte:0 )
+		)
+	enchant? ( app-text/enchant )
+	git? ( dev-libs/libgit2:= )
+	gpg? ( app-crypt/gpgme:1= )
+	gtkspell? (
+		gtk3? ( app-text/gtkspell:3= )
+		!gtk3? ( app-text/gtkspell:2 )
+		)
+	lua? ( dev-lang/lua:0= )
+	markdown? (
+		app-text/discount
+		net-libs/webkit-gtk:4
+		)
+	multiterm? (
+		$(vala_depend)
+		>=x11-libs/vte-0.28:0
+		)
+	pretty-printer? ( dev-libs/libxml2:2 )
+	python? (
+		dev-python/pygtk[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+		)
+	scope? (
+		gtk3? ( x11-libs/vte:2.91 )
+		!gtk3? ( x11-libs/vte:0 )
+		)
+	soup? ( net-libs/libsoup:2.4 )
+	workbench? ( dev-libs/libgit2:= )
+"
+RDEPEND="${DEPEND}
+	scope? ( sys-devel/gdb )
+"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	use multiterm && vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-cppcheck
+		--disable-extra-c-warnings
+		$(use_enable nls)
+		--enable-utilslib
+		# Plugins
+		--enable-addons
+		--enable-autoclose
+		--enable-automark
+		--enable-codenav
+		--enable-commander
+		--enable-defineformat
+		--enable-geanyextrasel
+		--enable-geanyinsertnum
+		--enable-geanymacro
+		--enable-geanyminiscript
+		--enable-geanynumberedbookmarks
+		--enable-geanyprj
+		--enable-geanyvc $(use_enable gtkspell)
+		--enable-keyrecord
+		--enable-latex
+		--enable-lineoperations
+		--enable-lipsum
+		--enable-overview
+		--enable-pairtaghighlighter
+		--enable-pohelper
+		--enable-projectorganizer
+		--enable-sendmail
+		--enable-shiftcolumn
+		--enable-tableconvert
+		--enable-treebrowser
+		--enable-vimode
+		--enable-xmlsnippets
+		$(use_enable debugger)
+		$(use_enable ctags geanyctags)
+		$(use_enable !gtk3 geanydoc)
+		$(use_enable lua geanylua)
+		$(use_enable gpg geanypg)
+		$(use_enable python geanypy)
+		$(use_enable soup geniuspaste)
+		$(use_enable git gitchangebar)
+		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
+		$(use_enable multiterm)
+		$(use_enable pretty-printer)
+		$(use_enable scope)
+		$(use_enable enchant spellcheck)
+		# Having updatechecker… when you’re using a package manager?
+		$(use_enable soup updatechecker)
+		$(use_enable workbench)
+		# GeanyGenDoc requires ctpl which isn’t yet in portage
+		--disable-geanygendoc
+		# Require obsolete and vulnerable webkit-gtk versions
+		--disable-devhelp
+		--disable-webhelper
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	# make installs all translations if LINGUAS is empty
+	if [[ -z "${LINGUAS-x}" ]]; then
+		rm -r "${ED}/usr/share/locale/" || die
+	fi
+}
diff --git a/dev-util/geany-plugins/metadata.xml b/dev-util/geany-plugins/metadata.xml
index aeeda37fe23e..682ca11a03c8 100644
--- a/dev-util/geany-plugins/metadata.xml
+++ b/dev-util/geany-plugins/metadata.xml
@@ -26,5 +26,6 @@
 		<flag name="pretty-printer">Enable pretty-printer plugin</flag>
 		<flag name="scope">Enable the scope plugin which is a graphical GDB front-end</flag>
 		<flag name="soup">Enable updatechecker and geniuspaste plugins which require <pkg>net-libs/libsoup</pkg></flag>
+		<flag name="workbench">Enable workbench plugin</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 442b81a7f2b6..9712aca56bae 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,8 +1,10 @@
 DIST geany-1.30.1.tar.bz2 4352154 BLAKE2B 6efceb21e07aba3b0698196543746e926d6a73ef5d5f560467eee18a7b9ade4ce0ce37808176922b3399ea8a72b2f281af313a9f57aa325e1a9cb964f0f1c34e SHA512 55fb446b0c517ccee4d2f3023334b96a336788422a4dc41207a4f290c5d4b88df1eefa4b7f6fddf0567224f890ae7bea396306a935512f17e01682034f7200e3
 DIST geany-1.34.1.tar.bz2 4474211 BLAKE2B 25c9b3f752b0b19582120ea342d8029f811040ef433adb065aec028f0bcc0909ea1b0005445bae70a53cbb2b1d3bfe0c2dd9d9c25c5e3f89bcdedebc0a392301 SHA512 3e075b23b22682324e4a56046d238d9d0087d095a6157b98c342fbe40a2bfa7118f72cfe1f414d110fff1411e4cc9c33fff800e0a2e32f9f0e5fd7b6fb560c9a
 DIST geany-1.35.tar.bz2 4593705 BLAKE2B 1d411da04a82987abccb33385d3b50025078b68dc2cc4accfb7822000a786b97f613a35864fde2389d0525b9547972d0e56699b75aae40686f0ad7e6e2beb4a6 SHA512 9ae2f168b1b5e9fa9029a32f5d1e9b591e50ea4e79041760524a4389572400c6f8f56f1fd6973299f152f9fd653cf3d52ca50136f0bbdbc15d3395bcf7388ccf
-EBUILD geany-1.30.1.ebuild 1572 BLAKE2B 76511c81bddcb43513af0f8c4203137988e12641d1c426ff54aadca90dc3a300224a234d0d6f290687a4e93ee71fd2db9ee5b845eaa27014d32416eea7960fdc SHA512 5598cf20f2a491d24791ff1166457d8dde9aa967170d5140fbc4fac600ae668e1aeb8e26eba147752364fbb7104535003dbe2276d8fe3ec6cb808314813e45c2
-EBUILD geany-1.34.1.ebuild 1761 BLAKE2B a505b602d4a87225b58e47e8836f0c661bed0767cec33b29cd351582c7f0c2518fc80a0a642ce8678f3b3d9c565c6d71374ea97e528d5ca5fe73f53eef78314d SHA512 8fb31c0d0c468bbff814526138c07ee6702e06c40a5c7639f391675553daf901cea1e14f08738ac3a03116a0dad8ba775e6f2417058eec3e91268d79a61324f4
-EBUILD geany-1.35.ebuild 1726 BLAKE2B 032a836e7c4c2f29f6e2220627e21457dc42469293e041946b2ab669013d894d9d179cd8121e677a9f4e80674d6bc380e0be6b88a5be9913e4fd089b9eb95713 SHA512 0273728a66b6a4429d216cbfbd07124419a77a897533817b91b4df8037196cea680da1fb31911055c6f57e1b045743c8e1e5671569651afc03c61da02996993a
-EBUILD geany-9999.ebuild 1726 BLAKE2B 032a836e7c4c2f29f6e2220627e21457dc42469293e041946b2ab669013d894d9d179cd8121e677a9f4e80674d6bc380e0be6b88a5be9913e4fd089b9eb95713 SHA512 0273728a66b6a4429d216cbfbd07124419a77a897533817b91b4df8037196cea680da1fb31911055c6f57e1b045743c8e1e5671569651afc03c61da02996993a
+DIST geany-1.36.tar.bz2 4644521 BLAKE2B 80eeceee31a49e9728a358904ad40e353d3407a22492340e6aa9a82091d32fa004f4494d3ae027732174e7cf7f6fae620b511680e06e58c5b71dd259125900c4 SHA512 15005772b64e8321d7fa8552363df425eb25e9d7b0760c561c8fb3f34d7acae2bf25da8e04fda38a2a1b64cc31ff613b7ff2786d432ff014050c138c7473c810
+EBUILD geany-1.30.1.ebuild 1562 BLAKE2B c2df6ed87dc009a743022b751c01dacbf9d71a13ab365f5d880d959a61501feb91a7584d2e0e99fb30d2ddf6d7813879b43e378da5762b2917658ee41e859faa SHA512 ea58946bbe21fafc79acb47599a12fbdd5c8d069b5f78292570ac9b9ac0088f08db8d5a3f4c0a019678f185c117702464b39f553b2d97744457c439dd0a1fc39
+EBUILD geany-1.34.1.ebuild 1751 BLAKE2B ec272871621dd59d71a33da420ecfe60930c642b16f0d224405fb7cf80bee2b12012f25da2152383abd0f6fb56f682c8f65f7d176d330eebbf17d84f47073ce2 SHA512 e4782ad4dd2235aca5379f2c92f09c523a74a20ff1ad3767673b10a3ee8d3526e9f51a7fb32bb27b6d2997d81c522bd491bdd79f464fdc35e270afb2d5605afa
+EBUILD geany-1.35.ebuild 1716 BLAKE2B fdd725de6e6346cc85fc021f289bc717b5d1a665b260a42c64e9fe9e31a2821242fc19e83f1fa69bc63f84fa468e8957aff2fc584bf94c168dc52fb74dc09961 SHA512 476b8e0d3083da8677dcf63453ed369a6a3f40ee83847873d06f238549d6a50ee5e1a4c00cfa8649661cdfb2f30de70d7e6b563d455a713cef8aba75c90fd643
+EBUILD geany-1.36.ebuild 1728 BLAKE2B c45634623adc46c21598b59812a3cc5ffe20dd2edb5a19a766bbc57c96a9fa197076c4be5ce6b3263b3f6b64f9cf73161e0ad660058e6610501b3c188bf6bd1d SHA512 d96e54bf3236d66f7bf1883739be215a532078975c2ba1b395335448f3fdb9feb379d98dcccd28343f08e69b42701805284ed434f27a7b4afba91b913af71ead
+EBUILD geany-9999.ebuild 1716 BLAKE2B fdd725de6e6346cc85fc021f289bc717b5d1a665b260a42c64e9fe9e31a2821242fc19e83f1fa69bc63f84fa468e8957aff2fc584bf94c168dc52fb74dc09961 SHA512 476b8e0d3083da8677dcf63453ed369a6a3f40ee83847873d06f238549d6a50ee5e1a4c00cfa8649661cdfb2f30de70d7e6b563d455a713cef8aba75c90fd643
 MISC metadata.xml 1978 BLAKE2B 04d6567b9c02f927e912c8d35bdea73c8015dcc4a6c7f47d91b50086c619e2e25a472170f46a4d1053cb942a33d66f85da1e837bc7f4397678534702cef964fd SHA512 f070310d9266a11c4b91c4f644534f3ff9d7538c2d97e6daa009d403cb2c8aae2856ed51646315906a51399b6e51a1f32fbd12f5ab616b597c4fc7c97c5f5152
diff --git a/dev-util/geany/geany-1.30.1.ebuild b/dev-util/geany/geany-1.30.1.ebuild
index bf2f886d080a..011757a46796 100644
--- a/dev-util/geany/geany-1.30.1.ebuild
+++ b/dev-util/geany/geany-1.30.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.geany.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+ HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gtk3 +vte"
 
 RDEPEND=">=dev-libs/glib-2.32:2
diff --git a/dev-util/geany/geany-1.34.1.ebuild b/dev-util/geany/geany-1.34.1.ebuild
index 04d361cf4ef7..7b58fc075ade 100644
--- a/dev-util/geany/geany-1.34.1.ebuild
+++ b/dev-util/geany/geany-1.34.1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/geany/geany.git"
 else
 	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
diff --git a/dev-util/geany/geany-1.35.ebuild b/dev-util/geany/geany-1.35.ebuild
index 9d0c528efc2b..93548e681af7 100644
--- a/dev-util/geany/geany-1.35.ebuild
+++ b/dev-util/geany/geany-1.35.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" = 9999* ]] ; then
 else
 	[[ "${PV}" == *_pre* ]] && inherit autotools
 	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
diff --git a/dev-util/geany/geany-1.36.ebuild b/dev-util/geany/geany-1.36.ebuild
new file mode 100644
index 000000000000..1f26201787ef
--- /dev/null
+++ b/dev-util/geany/geany-1.36.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# eutils required for strip-linguas
+inherit eutils xdg
+
+LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko ku lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
+NOSHORTLANGS="en_GB zh_CN zh_TW"
+
+DESCRIPTION="GTK+ based fast and lightweight IDE"
+HOMEPAGE="https://www.geany.org"
+if [[ "${PV}" = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/geany/geany.git"
+else
+	[[ "${PV}" == *_pre* ]] && inherit autotools
+	SRC_URI="https://download.geany.org/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-2+ HPND"
+SLOT="0"
+
+IUSE="+gtk3 +vte"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=dev-libs/glib-2.32:2
+	!gtk3? (
+		>=x11-libs/gtk+-2.24:2
+		vte? ( x11-libs/vte:0 )
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3
+		vte? ( x11-libs/vte:2.91 )
+	)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext"
+
+pkg_setup() {
+	strip-linguas ${LANGS}
+}
+
+src_prepare() {
+	xdg_src_prepare #588570
+
+	# Syntax highlighting for Portage
+	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
+		data/filetype_extensions.conf || die
+
+	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-html-docs
+		--disable-dependency-tracking
+		--disable-pdf-docs
+		$(use_enable gtk3)
+		$(use_enable vte)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/dev-util/geany/geany-9999.ebuild b/dev-util/geany/geany-9999.ebuild
index 9d0c528efc2b..93548e681af7 100644
--- a/dev-util/geany/geany-9999.ebuild
+++ b/dev-util/geany/geany-9999.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" = 9999* ]] ; then
 else
 	[[ "${PV}" == *_pre* ]] && inherit autotools
 	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 0bc470d10af3..153db249f014 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,6 +1,6 @@
 AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
 DIST glade-3.20.4.tar.xz 3534860 BLAKE2B f502e863f9acbd6580c043ff82dffb84ea8fdb833c0b6fdb8bbeeb7a7056a79416f1140472d23e0cdb14ed3bd06e17fca93ea663af690451001909aa4abfe478 SHA512 3da7781f74fa80e21336e49b9b36cf73b88ec9cf6f66a5c0e5d48ebc3382d87f5eb981b924704f04dfa4931e5691928a20c7cc73cca5b5f3a32e2348d6b87802
 DIST glade-3.22.1.tar.xz 3592952 BLAKE2B 53f769198a093ff5d4dc98bb4ea98c6e5195933caf24247a99db980312ae3398fca3abbd640d08c02e8fb5f8647ee3e4b18e65073b1500e9017ee0586993a331 SHA512 e1bdc49b89bc5010c0abf6357dbae05c921182655b2ee5a4b161af6adfd596cfbcd495c9851ba956abbf3d6156616a6c0e94640cd72cee11551ca388674ac908
-EBUILD glade-3.20.4.ebuild 2386 BLAKE2B 8f4d42898dfe18c870f0ea90442c0ab98d43ea75299ce210a80b7527157a0f8e1bda0527c22f51c4832f6c42b6539e5294e112f822a2a94b156ac089313384fe SHA512 3cccd8c8e69e26ea881565673ed6883a68f00d11d5aa72386ca123f0c982ecac4af509359c1512517457b54c52aa5b58caac09116b6fc1c7592833ce34b348b9
-EBUILD glade-3.22.1.ebuild 2327 BLAKE2B fa1d8630fb343b82b008bf36d879d216a03cd70a38abaee1669246130343cfeb24e04e51a97d94a70a4a38678c99c756c0ff81c6135014d071e18ac607700e98 SHA512 a3dcd76d6bd6f4109089f1ec251465d4fbe18c661cb7265832f24c31c78b2c97e92306f9a932f1dc8862250e103fbaab36a632b9d31a753eb6775ad63885e058
+EBUILD glade-3.20.4.ebuild 2364 BLAKE2B 3f79522f7bc39a0e9d5c17ef2a72c7ce6632e7ec52662f5d0926b59a69def65aa86eec6fc9109e02ca2c7728137d30c40cd8036b9836f94e157f69c0f4232a26 SHA512 8f1f747eff2dc7936488625ea0e183114907d25576b7190e511bfb4cb20c8a079bede015f246aea06b3612231451922c6ef91d2e6ef454c2adfdfd90d4a892c8
+EBUILD glade-3.22.1.ebuild 2304 BLAKE2B b66c99c271a251ca4d103bd4de878bbc54b79c72aab5929216377dc4f83054008e6746e9bb5440ccbc264d168eeb7b1422e775ad0f10363b3e40d98fec5c5c10 SHA512 c6e9507afdca1643a0340abf3c6cd5015221e271ddb48983ac0686971b8c3739a023f2ccedf579eb0f77875d9abdcc38fcf3540b3fb2fcc12ba6c726efe2e113
 MISC metadata.xml 358 BLAKE2B 33f3b46ab877b311931205095fb2b357fe7fe2da8820944d32e8a16f2dbcf99033f95a17f4cefa4aa6d0f731c72d0f65683a8cc3b947ebf09d084f92e796f887 SHA512 8840ebde12f26a2caf856e75f3f706e3c9a7a7a771d0deeae99ca6b16f4bbeaf119bae7776a8a0bef8b7422f52ebd6498a8b5e862af4548886249386dcb44480
diff --git a/dev-util/glade/glade-3.20.4.ebuild b/dev-util/glade/glade-3.20.4.ebuild
index d3714066465f..5b936fab5d77 100644
--- a/dev-util/glade/glade-3.20.4.ebuild
+++ b/dev-util/glade/glade-3.20.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86"
 
 IUSE="debug +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glade/glade-3.22.1.ebuild b/dev-util/glade/glade-3.22.1.ebuild
index 776b0dd5da56..102316d8da78 100644
--- a/dev-util/glade/glade-3.22.1.ebuild
+++ b/dev-util/glade/glade-3.22.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86"
 
 IUSE="debug +introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index ae847f4320b8..cae9c9f2f3f1 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,7 +1,7 @@
 DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
 DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
-EBUILD glib-utils-2.58.3.ebuild 2407 BLAKE2B df14fadeb6dece6527b3c6fcc9a851dc662b2ff59842c83c3ca57007575575e80176bb42b6d6e0f02e9dc4598c7c0605c5bc0855427bb48dfd8417b9c2847582 SHA512 4d57615eee2d86c75b33f4c8be6a8076ca0be894dea5e5e3f2858346b87ad4c2545fc9c639f8f8f68c4816bf147ec73e1c38a243588c9a4cf72c5cc3db0fc880
-EBUILD glib-utils-2.60.6.ebuild 2420 BLAKE2B f148412fbbf883148792b920fa50454a04d88b703e0793e0682f1534b287d48830ef9dddb8a6d2280d9dadc9a553f6cc30db396deb9b7355ae96450f67d0c626 SHA512 6c4509669f5ad74c345cc60ed5b612004513167d78d468fbb75cc7a2315604bacb5d1ceb90df48a6809ca67f297914c137367b30eef226f9a2727fcba4679a24
-EBUILD glib-utils-2.60.7.ebuild 2429 BLAKE2B 43565d10ebccf632edfb09b0ede6aef02b3f4330d12d415c72b54e88d11d9f2e524c1bc4c92b0bb9565700159f477baebfd8f15c10f3d5f1f849f68fb0f449b7 SHA512 d75f3ac2ca4dfe56482fe602b47c9eb300500d31563f05d74c8fa5c8e5724e6d96e5ab3232785cdf3940ccaa01a191ee79fdebc8edae10c79f2ad00d46f06339
+EBUILD glib-utils-2.58.3.ebuild 2385 BLAKE2B 8e384416b6e2119c4dca9b43a72a5778127f9d705306a27c9e09b38c35c742c129a46b574c8f6c0b173f95ac48ab3274a5d538c4ce7c2f51b3491a89a891d914 SHA512 a5debf07931401ec1c20e103d919f62e8d80d3225b1a75dc30eb1542d74ddddbb6e3ceb18887a47f1c19947e392c12824e357f7b478e7503fafc481f4a74dcb7
+EBUILD glib-utils-2.60.6.ebuild 2398 BLAKE2B 3feec9ae0648cff7599c3b26849025e55594e2c7fb922674527d0c3d71454df8ebe0f01138d276d38014512e526201c3201541ae9116acf87f0ab51ec6ebb8cc SHA512 d93c774a609c8fcb709cd8f2a5c0897f82b1eb9e9f488ea4ad0da3cc893ad58f131d9a3af0ea1fa7d7d08acf8c69fc468ea619665f6d3853a088a5f668df374f
+EBUILD glib-utils-2.60.7.ebuild 2407 BLAKE2B 47935f8d05d09331248cc0d8aa267a81c769a8b2f8eb735e2be681f0cfb7c5b8363a28a0c5463d27b107d16a4b3f3a780521fcbad2d2453daf7f1cf20ae8590d SHA512 7160a802dd7f3c27045a291175bb2e379c802c49ae6cf4932f19d7509a35f0d214809e2cd478ab92c8af67b8f063e8ef929af049ce0dfd4c34bd53054a7ecc27
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.58.3.ebuild b/dev-util/glib-utils/glib-utils-2.58.3.ebuild
index 926042295816..9aefe611d8af 100644
--- a/dev-util/glib-utils/glib-utils-2.58.3.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.58.3.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.60.6.ebuild b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
index a80b63063dd6..60315e256a4d 100644
--- a/dev-util/glib-utils/glib-utils-2.60.6.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.60.7.ebuild b/dev-util/glib-utils/glib-utils-2.60.7.ebuild
index d181aae83011..bdeaa203d4f1 100644
--- a/dev-util/glib-utils/glib-utils-2.60.7.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.60.7.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest
index 5482eacea6ad..606c1b1a982f 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -2,6 +2,6 @@ AUX 50gtags-gentoo.el 183 BLAKE2B 242ceb0370227a6c0f1ee23477aa3798e0e8580e59849a
 AUX global-6.2.9-tinfo.patch 2047 BLAKE2B b88b65679f9b6ed0b96ca236c1918c3238baf99bdff8c7a45f85f982923d82341f23fc961cc4d61ee9269900b48e2d726ab57482e9635b035cf621e27da0f72e SHA512 f5d83716ba2fde29ad5765665d00b4d2a5b4c8d6351cd6ca9d8c375a6c953f795811e156c0cdb28549837c72abbe2c2bef9ad4cb419e7043115c50858b831698
 DIST global-6.3.1.tar.gz 1369634 BLAKE2B 8d93222ccbb4a45c0b9f114cd84b342b3f6ab99f7e0bbc18bfe00912ecd53f606be9d32fce1570e027009fd1fbe4752f03dd19c183dfda438d67a329808a6b45 SHA512 83becd6cda06f8da17ea0c701bb135523ff48cec73b233d24566387d11a35c0b42f410b62753838e2b364a5a485cac033b4aef1159cc6f4cdeca4a7b6c5bb4d6
 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
+EBUILD global-6.3.1.ebuild 1607 BLAKE2B 993a8c497cf7f06def3f8fa181c389ab4efc8aa0c4b75206521a45f1ca7d53e5305451fd0f2289f29e5b2f5e25ca54cd8911ab4e97c990c304b7b6b8f4f67466 SHA512 30b33ba83e1c98ff0b01b07707bc5d566ff746612b7403ab3f7e4bf64f256cbfbe15377a0de959e31aa1ab4907ca60ce77d80a0a735a8962b117a57fa34724f8
+EBUILD global-6.5.7.ebuild 1623 BLAKE2B 46d2ded4fd370550f2c588a15133875eae403b1e2f75b2f2ab4d7b14246daa1bfceaf38056374031967c9bdd87c2a269af6bbdf4f61526a19136984e6452985f SHA512 02043ad24c6cff23db1edf6cdd538b4b06b426384eb8c2c3e802694971f37e8e8dfccd13c3f597dff0df9d77df04076fcec1bcc795fe04812956ff318487cc34
 MISC metadata.xml 398 BLAKE2B fb266f584dfc0e682d13870da7bbb4bbb46027cea3101b196b48d033766d627c723928f9a2f4ac4c8c6159a8ea147810b82fcec9ceb4981dc5491e54ef367c17 SHA512 89b426c4682fa885cedc1755f4720f1a003f9bc2dac725667ae45e098edebf627897830c911762f7d8856fc66cafb1c60d0f315173ddbbebada0d05ca6d8d5e8
diff --git a/dev-util/global/global-6.3.1.ebuild b/dev-util/global/global-6.3.1.ebuild
index eb062c9e9b89..01ef75d4b4e6 100644
--- a/dev-util/global/global-6.3.1.ebuild
+++ b/dev-util/global/global-6.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc emacs vim"
 
 RDEPEND="|| ( dev-libs/libltdl:0 sys-devel/libtool:2 )
diff --git a/dev-util/global/global-6.5.7.ebuild b/dev-util/global/global-6.5.7.ebuild
index 3d6e4cfa2ed2..196d3ce0b9c6 100644
--- a/dev-util/global/global-6.5.7.ebuild
+++ b/dev-util/global/global-6.5.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc emacs vim"
 
 RDEPEND="
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index 9c1d9b243d43..37dd5210b8a8 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,5 +1,5 @@
 DIST gperftools-2.6.2.tar.gz 911744 BLAKE2B e5798a2f0f2973f02bccabb2550a9df54319e505fc715795cd836ced631b29bfd8e6f8ddf3c7f6dceb0f166523bb0fa55564b1cbc896c8cd8cfd475263c07c39 SHA512 20c3460f806c6425d54e8d1020f15bc8940aacd7bf1367b03a116fb873bbd6c1e1fbb75df1d0ca341eaec813552fec394327175115ea8442a4b7a1ef17f0df2f
 DIST gperftools-2.7.tar.gz 916919 BLAKE2B c48882df45415110c1ec39298e84ec9384f6a82851d95e92435649d2b253b9fb8e29664b474e45881599abf3781731c47ead0b6c454c33be9a207a6a2401a97c SHA512 9aa39689bc18603123204f024ab6dc96099b70a3d304e31ef0cc1e9893cc77bd14ee6eb420e597d40e81e487a2a45e77cf1965873646d056fd4b7bee22a4b0bb
-EBUILD google-perftools-2.6.2.ebuild 2313 BLAKE2B 76778b92beab5a0c5c9bcca957551ab891e64dfb47db73eb296fffde41608b9c031e6f20f6d480202865e0776f844bf10b046a2cf4d6d7a656afd05be064245e SHA512 dd7328c32fdf020bfbbd35e074f12b43d7d8fb3cb59aadb430d2c0119be6bb08bb2fd7a22c62314b477aad6edff92e6a42c686d203fd9abceb0e3cd8587073db
-EBUILD google-perftools-2.7.ebuild 2353 BLAKE2B 20cf4d3c719658c6172fb116966932cd976fd8d008f0fa50a1a1d1ff4c91050c9d9bdc733fe231189af292ef7a0b53ef6f2c169ae989471533ad68916773a9a9 SHA512 ef93ac049915cb17ac6857b309532c6fb5117ea1bf088d2569bd9cca8b2551102d36d88fa2a5e7eef9541c4e3b8b10804658977a1f5e2cd7f449439ba378c0af
+EBUILD google-perftools-2.6.2.ebuild 2303 BLAKE2B fb9f08f296cd95edd01b3bbd0eb3642877ee9e8083f52b5e5dd82b91e03b59707acc6b92843d8ec2c78e1c8f58664da94fd75bb37507a8a9db8936b2100eab48 SHA512 35b0cbc3e106fcb4154717651a5a141603b04eb65def57b5533ae08163b0ae571d20787c95a66911b30861f55e67b4fd29ba019556cc4cc781ac373d91cf8fe5
+EBUILD google-perftools-2.7.ebuild 2343 BLAKE2B 2ac1afb7bb9dc3c678aaa17fa41f4c74d49bf9e8cb672583ba3351dd2472012c416ce01376741af484f13c968f59f5e85645d3ea7aa7c8a415f3d425ea7d2ac0 SHA512 f5d85886fff58bee279bd60d924c02aba6d861d2f36860e884cde0323cef8c99f2fcac8d1116a95602ae8178a2594f85738bb31ef96f4e7be98cd49bff61a7fa
 MISC metadata.xml 921 BLAKE2B 71a3db16b3a5a561ee677caf593ff5c45c01bf1cd449da8782e430ffce02b8661c4a011643192f12329ce164ce0148ee206bef85bf55503aae1161067b8e88ca SHA512 e8198e40382ece3675dd43a1878af9cf189d492bc79f246547423b37426981ab2ab624c6d69bc7d57e8a7bdb1f8f4eee32efb1b7d70ecac159dc2a939e480efb
diff --git a/dev-util/google-perftools/google-perftools-2.6.2.ebuild b/dev-util/google-perftools/google-perftools-2.6.2.ebuild
index cdbf549f9647..f330adcf4e2b 100644
--- a/dev-util/google-perftools/google-perftools-2.6.2.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.6.2.ebuild
@@ -17,7 +17,7 @@ SLOT="0/4"
 # linux x86/amd64/ppc/ppc64/arm
 # OSX ppc/amd64
 # AIX ppc/ppc64
-KEYWORDS="-* amd64 arm ~arm64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="-* amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="largepages +debug minimal optimisememory test static-libs"
 
 DEPEND="sys-libs/libunwind"
diff --git a/dev-util/google-perftools/google-perftools-2.7.ebuild b/dev-util/google-perftools/google-perftools-2.7.ebuild
index 86e8f749665f..b28f8923d384 100644
--- a/dev-util/google-perftools/google-perftools-2.7.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.7.ebuild
@@ -17,7 +17,7 @@ SLOT="0/4"
 # linux x86/amd64/ppc/ppc64/arm
 # OSX ppc/amd64
 # AIX ppc/ppc64
-KEYWORDS="-* ~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="-* ~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="largepages +debug minimal optimisememory test static-libs"
 
diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest
index 04ebdb8eb076..6c78fa05e0e8 100644
--- a/dev-util/gperf/Manifest
+++ b/dev-util/gperf/Manifest
@@ -1,5 +1,5 @@
 DIST gperf-3.0.4.tar.gz 983500 BLAKE2B b83bb45fb88143f2847405efd769472c5b3ea9277af88568bf8860ae653563ff3c23a9705651eac50949fdfad3efd957856f712f7810b21cc6dd32dcf40adb12 SHA512 24a65ac93c9d640670b015a76378eb7e0f167bec685d03f7dc68005d5a6d693d98b2189f7a0ab5bb9e5dc700de7d417c215230f9dbe062ba119240a8da535dad
 DIST gperf-3.1.tar.gz 1215925 BLAKE2B bc4c54ade3f7dce484714d77cb5759dcc02b7a607d7b1aff6bdbcd06ee4c83e9449038a7217d5f25bcbef058ba56e1fce9383b9599de005154e5a9b566ac9c69 SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4
-EBUILD gperf-3.0.4.ebuild 744 BLAKE2B 69c5df156acb2113d3daf39bba3f2b0c1405f8c756652a407740ce184959badf9195642517d4cc7924985cc05d4da35223d54a749d1d39f9c7d8f927f863c24e SHA512 58a8925be516b002495b70878ab9db28f36a9ab470e9cd40b4868261781889d4b0336b79b30edddeac34b0756aa67afccf681e78b7581d8721dd85929e2d709f
-EBUILD gperf-3.1.ebuild 749 BLAKE2B 18ad781842607bb6f5305e9fe8bd1c9c06f44bb279851dadd52a0b8e625cba659769f41f3b9abb96a54bfa438dab8392f6c5c69ee927e6cab8203e8db1d87e52 SHA512 4ab46066345ac6c0f5fe2039681e71776fa66372a204262ad4bb4fc597e8d846f5baca241d57ea4465c8355b50b3b5a7c798608a9900ee284384e6c0d23e593f
+EBUILD gperf-3.0.4.ebuild 722 BLAKE2B 9288351f11b504674852afe9956d4e2fdc8e58576f109980ef3d9eb498214309c86ff89ad06475c62840b523e5986020e8facf817e43d95fe4d92d36c8d4e584 SHA512 7e9e61c076dbaa666f9e3c7c196b1fd156339df8501279512bc454256ef429b70ff6fd977883a8909e0be90776f8974c4b3137a2b3e2868d11747bf7bafa572c
+EBUILD gperf-3.1.ebuild 727 BLAKE2B 3559dc4a03f9e332b17cab20fa46575784f9d5e44fb9418199c618ff3357b50194fc45aa46c3e4ebda971fa5490c4001ccff7702b8cc1d169e87e813f8b2647b SHA512 e2f3807f52c87784f282758355e5adcb5df5b8c4ecaf6d72c54fd089248e67fcaaea98551af1e59ef5bec0e6aeb9dc09f8de738c83cdfd8e7572380ea5a6cffe
 MISC metadata.xml 219 BLAKE2B 0f485ab3a0acbd2d5cf0a8b2014662a56862057721a4bc34494c2dca52f97bba8d54994461ef33bc965d3470d3e733fec71ed60e9aa4f1b5c565c048d60865d8 SHA512 a1cca99a7d8d8ea9893e7147264184a1605ddbd61ba07971df5a2bd54d6d74ecec39145faa2b303132a31db8fa61484b9224a2748bff4da638b63f930bd394df
diff --git a/dev-util/gperf/gperf-3.0.4.ebuild b/dev-util/gperf/gperf-3.0.4.ebuild
index 41cf1f3dde3a..34938d57cb47 100644
--- a/dev-util/gperf/gperf-3.0.4.ebuild
+++ b/dev-util/gperf/gperf-3.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-util/gperf/gperf-3.1.ebuild b/dev-util/gperf/gperf-3.1.ebuild
index 8429c367af81..06d44c774f54 100644
--- a/dev-util/gperf/gperf-3.1.ebuild
+++ b/dev-util/gperf/gperf-3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
index 7e9698af2af9..39544c0a211b 100644
--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -1,3 +1,3 @@
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-EBUILD gtk-builder-convert-2.24.32.ebuild 1140 BLAKE2B 0f806a2243e690b1e70731a4953356341038367029140de6d8091983674a22551085074c10ac8008b02b53fe787b769dfecf8dbf64c04026df64a5a9396db37a SHA512 ec8c27e3960444bb94eead1fa34ca032038b9dcd7e8f77a62795de29d598cec2138e606bf781b56cb31cf53bc14e22c80c74c18eafab36fb87c4ccb7c450464d
+EBUILD gtk-builder-convert-2.24.32.ebuild 1130 BLAKE2B d872f55d5e2502d98cd7548aece43b740dbbf81d714ae1f8e15b644cb24272112b1ee305809c7155cce9093af138723caed805291c9efbf1e537454ce8d06f30 SHA512 ef50de57af5f8ee722a3516022ac90f8b75012be104ae255ad0e013b5d8b8a8d4c856fbf0074460da8421f9c5d8ec028995e506165ae36147354b9538e172cd9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
index 5d57fbb6bfd2..5526eaa3376f 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
index af9f5a4b7389..27168238ffd5 100644
--- a/dev-util/gtk-doc-am/Manifest
+++ b/dev-util/gtk-doc-am/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
-EBUILD gtk-doc-am-1.25-r1.ebuild 1249 BLAKE2B 5773f30d1a5b91f01ba00e86fd279213dd623e0b6847af3b809d5b783dbab8c948945272acb49e268d9c4c9eccbbe297acd44ddc116278a2203fa024777314aa SHA512 1ecfa07d2da971907c43f55be7ee9e1313a16f6eead95600918c9b2ccaff176363f359f6a32469e25683c86582191edc58e8589736088f0797b31e4945df20ec
+EBUILD gtk-doc-am-1.25-r1.ebuild 1227 BLAKE2B 07fe226a04c0f5e5ffc10a314647beac2c397211bc8ccbec29bf84a302125208a8e11e2e4d55871282f154bc5fc59794e3f172ca464531f5ce0cd600f409d005 SHA512 c14da510e3f4041a6e15941e2cf37a5b5903f50f824b22c9487085ec5f685594bab0c88c8d5b9e63d195553f11ea2897a71506a67166b5057ee68972a0093c7c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
index c405782e84a5..fef7abb6f161 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-lang/perl-5.18"
 DEPEND="${RDEPEND}
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index db974407d883..fc6d86ed6609 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,5 +1,5 @@
 AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
-EBUILD gtk-doc-1.25-r1.ebuild 2719 BLAKE2B 6b9d84fdb7d3b1312821396dbbf9eb836e8af832688feed12c1f748d997a70e9ca37c43527a89c56fd610c912514800c485ed9adfa00b5c6a0152c3bd6cb88ee SHA512 7ee24f8c646fffaae08737571a08068e1c3a7275665e52ef00d6e490fcf106025f079c5c7d9608f884cd43e5bddf46f0ab7bd1517d5a9081ba926d7cd8451d24
+EBUILD gtk-doc-1.25-r1.ebuild 2697 BLAKE2B de4b84e3344e5fd3c791b21e143f46c3435cc6c324320da9f19c4257b400be6b0aebe3e051d26978d41668d248bb51e569a9214fec39f67d4ac51524b8528b89 SHA512 c7d9c6edb342078144342430bc34052f104ecfd87e69896f7fddb533559add1a0a13904905dfb5c7b65844049280fbd370ef81fa23637643618137d4453fa14b
 MISC metadata.xml 659 BLAKE2B 8c57567cad76724388d746e74bd1056a062c7280552494d6265b5fa38be518983188f22948bdb389916ec6384c17308e1ec292ec36f633b6ecd6f27102f74f94 SHA512 4ffcd239d0a5788ed94a204395a51d8b706663ac69139965e7d28282c473b55cd006cf3786a3cfd60386439f9ffa5d9242ed43ba05783962cbac002f8a00539b
diff --git a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
index 810335d8cd48..adafa6c78730 100644
--- a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 IUSE="debug doc emacs highlight vim"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 42bcae24410d..f7b62c85cd11 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,7 +1,7 @@
 DIST gtk-update-icon-cache-3.24.11.tar.bz2 91127 BLAKE2B 048e42e680e1d7b3697f6609205327c1aeded4cbde03350acc7c907bd781c4ded0c749d0375fb20919e5c3ccb45927dbc6fd7c521d59ddaf6b8c4c7b86a0b06c SHA512 40d8f415fcbfec2d7ba4bec94c92d16b40e5bb62ac3a31db1c3f05939336073e8dc376cc450b3649bc06b2ebbf7cf080f3139e5251a7b0707d306e23337b977d
 DIST gtk-update-icon-cache-3.24.3.tar.xz 372612 BLAKE2B 6087334fdca3aa7f93b1b6c5a7195ede2376ec80d2618809f924f9b612de46a8d3e95f0a90030deb939f27949458f9ec72b11600c2bf8b1ae6089284324f2c9d SHA512 0e47977567314abc64419440cc0f276525286fb65acbfe7fff21d6cf548fbc072865f8a2ed18e3114508a7e8fa696453c26e1ad53e638ee11dab57b4a6cf75a5
 DIST gtk-update-icon-cache-3.24.8.tar.bz2 91113 BLAKE2B 4a930d001a9718b14089962a6c368c9073afa7163217ec2a5f35ab6bcab593490d20944321a2980baef42e13eee43b26a3dee35c8327c8aaa984e5c36611600f SHA512 20ffc1a3570cc4de045a698e51e5b5bc214a78f9b1f730a1930e07df78d965d883262c6776bdcd68b6b39f309d75678531daa6975c0cfc9ecd9070b26b89b4b1
-EBUILD gtk-update-icon-cache-3.24.11.ebuild 929 BLAKE2B a2e06e40a204b23ba64c05971f0bcea7c40f118ae3ef0ed33b4bd58aab7308cc28e84c93281076eaa5471cb4eda3197656966fed436f8f0e857ebb03cbc90f3c SHA512 343d66080958ca27964b3f6a2795865fb8e080535293182f53e967f91dac4164bf9af9b65463cb79d85402ae9949f417bcdb1269ebac22967be813b9424fea07
-EBUILD gtk-update-icon-cache-3.24.3.ebuild 952 BLAKE2B 4233d8df548b6223fbabd12051fec2eb069e22e67eba583b143bd4ee1afddbfb521b3c6e7f1e5eb0574837a7e9606fcf591bad03edb449de2ac733beda93d7b8 SHA512 cc5c5783d8f50a7cd6010f51452fce072534c45dc36e72f9e27a8eab5b6ac5cabd172f26f9edde014e76e9c0f393396196a75683553fbb97c51e9bf3bd78d70b
-EBUILD gtk-update-icon-cache-3.24.8.ebuild 919 BLAKE2B fe57fbaeb1e1743ffaa96d1b00a47fed3e81bd2998f5ca6e1fabdf8e328d1e317c720d89781d753a6532c79d614a7708a0607f85f9c5554337b46ae0a26b2342 SHA512 bb3f02313debac171f7912fd979045c9560fc507690dede1a773b249e1ff6fa8cde887a3881deadfa7bb15c9d2c7bc14a36d8e65261d640b091f33f5d3d667ee
+EBUILD gtk-update-icon-cache-3.24.11.ebuild 907 BLAKE2B b9225d29c0da51cb7a133b610593009e450c07b634afe00250b19547f5c68988750628d52b3fb7ab8a7a5461b1a00deb8203b9a774e389a1ad0f6e786dc1dc7a SHA512 90cabc4894dc621a90f0a56688a004d418645904de51140e356a57d9979c84cf0d589723b9fb014b902620c871a6022ab58e4549d6e331e74adc3eb428d7ec2d
+EBUILD gtk-update-icon-cache-3.24.3.ebuild 930 BLAKE2B 3b422880ebd4197c036dcdee21d314774b7bce024de26d8d1c2676d74a4cb8d77c8715ae57408846ee531d6d80f10649cc82fdfd2aefd9bdc587a11e1b8f7b51 SHA512 78357dbded017674d0efccdbd0e66d9061ec94c137941e845d5dab2ac5a8eba04f2cb49acf5768c5247502cf97a27a1c1854a03c755dc62d0a4ab958fe3d1b14
+EBUILD gtk-update-icon-cache-3.24.8.ebuild 897 BLAKE2B 7496c44a758b438a6a0a9a056ba4d25e7288f1fb4cf6bbe73bd57649d98e367bc5a2521a09545f3a06d29514ad4829ea42cf9fa68bb84f239ef0fbbe76b49c9e SHA512 7dcdefc69273747abfbb6083013d28623ba8ff78ebe08ad19bd04fe106539eb695bdbdab31b72d6afd867b91df5d16a26a76a9753b309b94da3027012d557528
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild
index 8187209413d5..7b3b5619d047 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.3.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.3.ebuild
index ce2594b61286..f7025594ac01 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.3.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.3.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.8.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.8.ebuild
index 431d72d04da4..43c9a875e4d9 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.8.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.8.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/hadolint/Manifest b/dev-util/hadolint/Manifest
deleted file mode 100644
index 881fc90aef6b..000000000000
--- a/dev-util/hadolint/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hadolint-1.12.0.tar.gz 39932 BLAKE2B 1d7f7acaf5a8ebacb9b0555e60a31e2bf70474045b33f1a8fefded796c455d9ab6587acdcfdfddf23b78585cf69cd4f609320c4ac39f956bfff62322595f026b SHA512 306eeebc357352d50c48b30d424ed50e0b89deff059a61b78ae0f7493c0ac2099bf32caaf84cdb2620ff6abecb69d3e6d61ad9e5223c42cce73923cb1da376c6
-EBUILD hadolint-1.12.0.ebuild 1164 BLAKE2B dc3096d62e52a798b0371f5e0b9492f2d142ab65b267cebb6ef18d8e2f1587b227ad1bdcc82eee53fa0630165f09b48cf5038299d12fc2c6ca46156b78908f74 SHA512 8e6ed7a8e3cac87ce38312bf495bfb7382e6a01aa1e9233d7a9d61f656af92b88b29cd0fe9471c0a146f2c4fd57f3d70433d76770b07855e4b499369b4077c9f
-MISC metadata.xml 286 BLAKE2B 28047949bae509153b03e8627389845792a69fce265c8c90e9cbd14f05aae3dcf91777ef0a3e657f4c7f4ab4f26b92739fa12b313bfcf986a285e0135722079f SHA512 cfc6ff695eb5112d9be7f5cce18103ab0ba258147d98c31d7446305372bda8dc02f598e52098dbf4630189b7469427b179f71983f00b89c92c5e29bd50f2739d
diff --git a/dev-util/hadolint/hadolint-1.12.0.ebuild b/dev-util/hadolint/hadolint-1.12.0.ebuild
deleted file mode 100644
index eff49ab1f047..000000000000
--- a/dev-util/hadolint/hadolint-1.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Dockerfile linter, validate inline bash, written in Haskell"
-HOMEPAGE="https://github.com/hadolint/hadolint"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/gitrev-1.3.1:=[profile?]
-	>=dev-haskell/language-docker-6.0.4:=[profile?] <dev-haskell/language-docker-7:=[profile?]
-	>=dev-haskell/megaparsec-6.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/optparse-applicative-0.14.0:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/void:=[profile?]
-	dev-haskell/yaml:=[profile?]
-	>=dev-lang/ghc-8.0.2:=
-	>=dev-util/shellcheck-0.5.0:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
-	test? ( dev-haskell/hspec
-		>=dev-haskell/hunit-1.2 )
-"
-
-src_prepare() {
-	default
-	sed -i -e "s/-static//" ${PN}.cabal || die
-}
diff --git a/dev-util/hadolint/metadata.xml b/dev-util/hadolint/metadata.xml
deleted file mode 100644
index cc4ea93fc255..000000000000
--- a/dev-util/hadolint/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		A smarter Dockerfile linter that helps you build best practice Docker images.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
deleted file mode 100644
index 5941b382ad8f..000000000000
--- a/dev-util/idea-ultimate/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ideaIU-173.3942.27-no-jdk.tar.gz 562044023 BLAKE2B 57da196682db817b175158b9c9913502490c2a692153e5e5b8a4449958c5613469a0060f1260095e9fb70ca54b5adaf59494cd9c0f6b0cb0b9f7c25cc4571335 SHA512 9cc7e687bef5d213f37e2e24aa2464e0d3dc9a40cb683d1d8fd1438efc6ca988134509a96f558ec87960e950336e062d5161ef6cb491f9c1c572ba077dd0a990
-DIST ideaIU-173.3942.27.tar.gz 635548505 BLAKE2B e123d731b3516dee3342310b3204dce2247430e81240e4dc729b23146887fef552001bee9aad7528d46c0717654507f16b505f76baf8407609cb9cca7aa9d773 SHA512 1f3586bc2082feec5b986298334445c7b91318f6d5f3d71fe6bfbb1546a63bb33e2bc978ef5fc4438e13d2a3d1dd5abc96fdd4ea5659f64563afbdd3410df8b4
-EBUILD idea-ultimate-2017.3.1.173.3942.27.ebuild 2648 BLAKE2B 2e2e4d18dc878a3a331967d456fa209a44924fc7be1160263326e586161040da3aeb5c0824ad0fcfaf0c156fd2d89338a1f48c3517093fa10ba69d878ed583de SHA512 0b958ef10e508299ec28a46c9cc23a74802dba4e7ccdb021696bd6d78efba0e1b61d4fcf8989b9d097b02b9d0b36bf77e5f2f8f41cde3663a171cd63d1973ffa
-MISC metadata.xml 535 BLAKE2B 60d09c4839b751d9c6a7ea683ea541ca962d6360bb96526075ff4cc941796cb5ca082834dc81926133533c96b791ba57257c09c4caead13775079242df717b54 SHA512 a01da16279cb79d0b6a0b806bdf78f1030877ab491de95461c5d27ee6c1c8565a580cba03dcbed836e438be9c7a94ea5958c91383cce1e40398622435f86bfe8
diff --git a/dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild b/dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild
deleted file mode 100644
index abad0541b71f..000000000000
--- a/dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils versionator
-
-SLOT="0"
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(get_version_component_range 7)x" = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="
-	!custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
-	custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz )
-	"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="
-	!custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}-no-jdk.tar.gz -> ${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
-	custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz )
-	"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-IUSE="-custom-jdk"
-RESTRICT="bindist mirror"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*"
-S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-src_prepare() {
-	eapply_user
-	if ! use amd64; then
-		rm -r plugins/tfsIntegration/lib/native/linux/x86_64 || die
-	fi
-	if ! use arm; then
-		rm bin/fsnotifier-arm || die
-		rm -r plugins/tfsIntegration/lib/native/linux/arm || die
-	fi
-	if ! use ppc; then
-		rm -r plugins/tfsIntegration/lib/native/linux/ppc || die
-	fi
-	if ! use x86; then
-		rm -r plugins/tfsIntegration/lib/native/linux/x86 || die
-	fi
-	if ! use custom-jdk; then
-		if [[ -d jre ]]; then
-			rm -r jre || die
-		fi
-	fi
-	rm -r plugins/tfsIntegration/lib/native/solaris || die
-	rm -r plugins/tfsIntegration/lib/native/hpux || die
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
-
-	if use custom-jdk; then
-		if [[ -d jre ]]; then
-		fperms 755 "${dir}"/jre/jre/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Ultimate" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/idea-ultimate/metadata.xml b/dev-util/idea-ultimate/metadata.xml
deleted file mode 100644
index a6968e806582..000000000000
--- a/dev-util/idea-ultimate/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>alicef@gentoo.org</email>
-	<name>Ferrazzi Alice</name>
-</maintainer>		
-<longdescription lang="en">
-	Excel at enterprise, mobile and web development with Java, Scala and Groovy, with all the latest modern technologies and frameworks available out of the box.
-</longdescription>
-<use>
-	<flag name="custom-jdk">Install and use IntelliJ's custom JRE.</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index cbe4137fa479..c23926f49108 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,7 +1,4 @@
 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 919 BLAKE2B 7f6060c5b9e9d7dacd6754416cb79500f876d817524a85fb5065c3528c5489dce0877fe197c1a642749ee928e2c6add46feefa8e6e10b21116c848366bc6c2f4 SHA512 158527565371f9d31709d6eecb3b76e16d221ee638172dc8eb3f87dcb03c4827d1b349c9c8133fc7b8e60544761cc2fa1fbf263391d3867741f59bff9fffbb50
+DIST intel-graphics-compiler-1.0.11.tar.gz 5720630 BLAKE2B 1539de7aec3d0c357159a5be6c446ee4e3c98857fb666ab09ceefdb9ae93b430bc164de2f17848f25aeef1a95ce2066441aa0584354c14ed06fbb9179a17ba58 SHA512 2b4b43b152014329e2d9dcba1a5b832fb8c641a3bd004345ddc8d36a237bc15f112ef007894b5adbe175bf08584093adcee655b5e61a9da81d6956974e03248f
+EBUILD intel-graphics-compiler-1.0.11-r1.ebuild 875 BLAKE2B 197981d2f6605e23d85f45cf804e3772c54561f1b6813c3593db7f025b89d370390034c195e5a91af4e9c218ddafecb51b77c77afb8bf23deaef0e7fa8c9dfdd SHA512 b6f6cb8d65aab2eda3822add23647126d0e9e39f5f291640beed4c22dbfbb4df63821319feacb6cf917e7334a1e30e74de01eb49d6e643857de93895553e7119
 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
deleted file mode 100644
index aef204e9055d..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-opencl-clang_solib_filename.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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.11-r1.ebuild
index 6ed0f9a62901..03d09a9af2dd 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.11-r1.ebuild
@@ -22,14 +22,13 @@ 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}
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix)/$(get_libdir)
+		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)
 		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
 		-DIGC_PREFERRED_LLVM_VERSION=8
 	)
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8.ebuild
deleted file mode 100644
index 9ab4c6997620..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib llvm
-
-DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]
-	<dev-libs/opencl-clang-8.0.1:8=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-
-LLVM_MAX_SLOT=8
-
-S="${WORKDIR}"/${PN}-igc-${PV}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix)/$(get_libdir)
-		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
-		-DIGC_PREFERRED_LLVM_VERSION=8
-		# Until a new official release of opencl-clang
-		-DCOMMON_CLANG_LIBRARY_NAME=common_clang
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest
index 3476d4832c90..f48fa279298c 100644
--- a/dev-util/intltool/Manifest
+++ b/dev-util/intltool/Manifest
@@ -2,5 +2,5 @@ AUX intltool-0.50.2-absolute-paths.patch 1798 BLAKE2B 9648c96b7f4a65a19e6e62ee5d
 AUX intltool-0.51.0-perl-5.22.patch 2184 BLAKE2B 8655ee9b830828a9a0fa8841b02f1c3d213331b11bae8724d5a6767b0c3cf157959e8efdc4fb62d4d4c2ca07c712ef8ac391463304ebdfd745c0e5891d7f3aa9 SHA512 ca125f5284bba789139d9733c79c077074cbeee7e263ce98953868590e50d32d80b94935eec7965f1c2817388e0fd8e1d5c87a9faac7936c9ee7e8d0b5758177
 AUX intltool-0.51.0-perl-5.26.patch 586 BLAKE2B bc79617f7cd22794a06c93a63a3fa9ef2e3337c8b1488207ed08e11e340a726f3979703450b580bee2f5b482366843f44fc0e4d710da2eb4fa4f98b60e3b2eaf SHA512 86fe1b795118975f1930535d9bb7d01564852546fb234bddadbc4a5ac66ccf6a43c9944ede1ea72dc6c4296dc8db3dfff4ebd1989dce57e623689be444c8e591
 DIST intltool-0.51.0.tar.gz 162286 BLAKE2B 98fe40e4d669fdf65a777152ddee0a9656412b9cf5d1e682d1b4b7bd666f3e5aa623a50481b6df47e16a935550836c66c666229b0bb7ef143f7cde6893b97a69 SHA512 4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf
-EBUILD intltool-0.51.0-r2.ebuild 990 BLAKE2B 56b5da15170f5e6eaea90dde6ebcbc77066f6d3c725c128d98f9668b39680e28ce9ad4e9cc39ab8a77455f712ad509fe55c6ed212505018377bdf270b4a90931 SHA512 3f4bba245e18ff0e5f16d0fa30d67107d857318c87ee52798ece8ff3a89a56d2e302b588904e517ef5484a0a3abb1ba532d6a21790d7c0f6a02019682d8473e1
+EBUILD intltool-0.51.0-r2.ebuild 968 BLAKE2B ab9badaf4aba9a3d8db1f1a5439ded340c6bcbc771fa84ec931f6de7d981f7583d1136464fd6968b98e765cb0fc60bbaa4ffafc3a1f40b1701698b2a1dce386e SHA512 d3fc79bdcc7cb48de4e91b69ba63505f9d442b0091ba8366956b53275af032ac034c76497c3cbe499ed654c60e181b9db4324bbc1ff6c768a07ff9e30c61cff5
 MISC metadata.xml 304 BLAKE2B 87e449f29a87153e258fe194afc64202ff133f6a8bdf333cee64d907246348f504133bc8195e005039647deb28680f5762068770bb09126328aa9d9b7e76bde9 SHA512 e9f0bede4c5ab13dda61ae7ea0f5d39988373388f78a05b08f4099204154160ab0d88d21989a8bf8249aa98448744969643e118883c418968c9030a6919a9727
diff --git a/dev-util/intltool/intltool-0.51.0-r2.ebuild b/dev-util/intltool/intltool-0.51.0-r2.ebuild
index 43956778cd6d..3c7b3e82b060 100644
--- a/dev-util/intltool/intltool-0.51.0-r2.ebuild
+++ b/dev-util/intltool/intltool-0.51.0-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-util/its4/Manifest b/dev-util/its4/Manifest
index e79c8d280acd..a6d57eac80cb 100644
--- a/dev-util/its4/Manifest
+++ b/dev-util/its4/Manifest
@@ -1,4 +1,3 @@
 DIST its4-1.1.1.tgz 59759 BLAKE2B 87c616dd7e2a5d3519f8827932c4d17d50dc7646097ba3aa6a8ebf29434671e560c0ba9949f370de8b26da9af9855a1fa16117d0a5a64b6098945e4292c8a33f SHA512 c7bfa71eba114ab3aac586dfa5f30c7a935f06d72b78bae3c3d464f591085cf3419a1d23ab951376bd9c2d7e436711a45c9f5047c3125df5d731b746412be0f6
-EBUILD its4-1.1.1-r1.ebuild 1081 BLAKE2B 7d8b5790b125a7443fa86b69fa760db9b363135512fcbc6f6a822cc79cd3e078f830f6232e932b6f1eefce6dd2f59413048aa5ea689a4005a024d63f6c4ebac3 SHA512 d86350e9512d5efb9b0d8d976273b7afe22bd13bbf7fffac3eeb9c4cc067304511819b002dad1c5667b0a4d5c1ec3bbfde52e61756c89a1afdd681129a70dd01
-EBUILD its4-1.1.1.ebuild 930 BLAKE2B c65b6c3aecececcffd4a6046927af73726c7d6b7bfc5d62de3ca2841570ffd134c03b8d4320341168cf0a538f347fbd26366f2a657cff01a6ef393edb87b6e79 SHA512 28525aa528f6b02be9d5962d95442a59a60d6349b8afdc64cb6da7bf5cdd5159ecb2de62b001ae5100a76713326c672b5d71fcae8f96e9cbe3d5d5332be59948
+EBUILD its4-1.1.1-r1.ebuild 1079 BLAKE2B 34136ca089cb6c48b7cb9ad6226c3819d28d91e396ff34b7e66866f3a235d9e33cda34f2f18d55f760ed9c577b7c2426f1488e02271b1765305778f13133c9de SHA512 e3dfb3c8a2985568fcfb6083f53bf094ede19bd2d3b202fbc83716a08465808cd15803d5ef4b3b3d48d150aa30025edb2658dd4c04b3f0dffcb57618b85f5532
 MISC metadata.xml 570 BLAKE2B 79fe1782f1d7fc7700188ccd3af2874267cc0419fd910b47f1b102c4f6cee88085ea09d18f98dbe1e539334e7a17de22bc66f14363e453ea3cf6c16ba9928481 SHA512 3b626c494c1b00c1032825afcf19a4b6aadd233588ae59bd8bad858d21bce920a0a41de5b51db8d6b196d1b3781389aadae2fed6e25093be930c13a44c2f224a
diff --git a/dev-util/its4/its4-1.1.1-r1.ebuild b/dev-util/its4/its4-1.1.1-r1.ebuild
index 5bc266eaa7e7..65214f3b2b38 100644
--- a/dev-util/its4/its4-1.1.1-r1.ebuild
+++ b/dev-util/its4/its4-1.1.1-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.cigital.com/its4/"
 SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tgz"
 LICENSE="ITS4"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/its4/its4-1.1.1.ebuild b/dev-util/its4/its4-1.1.1.ebuild
deleted file mode 100644
index 1fb4946a53d6..000000000000
--- a/dev-util/its4/its4-1.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="ITS4: Software Security Tool"
-HOMEPAGE="http://www.cigital.com/its4/"
-SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tgz"
-LICENSE="ITS4"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE=""
-DEPEND="sys-devel/gcc"
-#RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	sed -i \
-		-e 's,iostream.h,iostream,g'\
-		"${S}"/configure
-}
-
-src_compile() {
-	# WARNING
-	# non-standard configure
-	# do NOT use econf
-	./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/its4 || die "configure failed"
-	emake OPTIMIZATION="${CXXFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	# WARNING
-	# non-standard, do NOT use einstall or 'make install DESTDIR=...'
-	make install INSTALL_BINDIR="${D}/usr/bin" INSTALL_MANDIR="${D}/usr/share/man" INSTALL_DATADIR="${D}/usr/share/its4" || die "install failed"
-}
diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest
index 52a82f37d794..bdf59dad2f22 100644
--- a/dev-util/itstool/Manifest
+++ b/dev-util/itstool/Manifest
@@ -1,3 +1,3 @@
 DIST itstool-2.0.2.tar.bz2 96748 BLAKE2B 7eb8f52c233878a35c01b7eea51c46f9700e9de827d38df41bb3ea78ca4ef284ab59c423aaf9876fceef023cb9d13d2d50c9ab57caff9e5fad217363412cf472 SHA512 b7915c4d463fe5969e282029c2080730c78e18d2d5878da53c6a370f471056b51a7b3f3c08417b801212ba674f55548a112a12a9d81634f60d1e52a8a47a4aa2
-EBUILD itstool-2.0.2.ebuild 848 BLAKE2B 81efc7aa6ec3323a55a0853dec499efdf6dff5ce3b4572b14697cd3c9e603b0033a6402a24ab5cf42e29d31073566874dbdcbef5423d4ead3431ca9a6a82fbbd SHA512 c070244c794533e160301e05b0cb1183ce35d15a2f6eae4170fa15513eb068a34f90cb6b2d3c1a2476ae9e2be7c04e7c60a1a4d650f1764dfb7bd30b62364f3a
+EBUILD itstool-2.0.2.ebuild 836 BLAKE2B 9c83e097e2e201d434041502e38919c9eb55164d6b5e0f55ec6a32335d9bec181847c2ba65618e32b8ffae4f01b230b188ae44ab88d282f8ae83dae594359997 SHA512 347daaa09aef5501f3f5fa34b3127608b8d09135f0b12c5d47c2d714480063701225656892ec10ca4ee6a8213f71151becb790bc74f1e359e3b5c0595034e47d
 MISC metadata.xml 525 BLAKE2B a7e426bd9dd273bed10ad74315547eb758df04ceb7ee6ef66f643ba23e60ad8b9c80aa344688e4af7a16fd699a500cf7ceb9d24eb94a930eebf1637e09919a5f SHA512 ad9928fa0359257e3418c0fb6bba6c416fc4505911f35e97377ef7c1426e228b34312fc3156e98f3657974f1156ee2bdc58bbb4b51903bb40b10c97b0714b39b
diff --git a/dev-util/itstool/itstool-2.0.2.ebuild b/dev-util/itstool/itstool-2.0.2.ebuild
index b772c25854d7..d0acbca3b434 100644
--- a/dev-util/itstool/itstool-2.0.2.ebuild
+++ b/dev-util/itstool/itstool-2.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
 # files in /usr/share/itstool/its are HPND/as-is || GPL-3
 LICENSE="GPL-3+ || ( HPND GPL-3+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/jconfig/Manifest b/dev-util/jconfig/Manifest
index 27c81b5f0fd6..66a9370a1c8c 100644
--- a/dev-util/jconfig/Manifest
+++ b/dev-util/jconfig/Manifest
@@ -1,5 +1,3 @@
-DIST jconfig-src-v2.8.5.tar.gz 1171848 BLAKE2B 579074196d538a6e5d38c777344d646c1ed9c9bb76554421cfe7f1772fcfbcc7343f0aa444dbb5dc4a07ad9056178990f337e7dd710549ede0450c136c74db59 SHA512 c6c1af63069ccaf7cfd2fe625318fec4ed3f82671754956f8d861c3254a748bbc8a7b8e63e36cf8abc436d4ced732d8ea04f770551428b04d3078293dc77d6ff
 DIST jconfig-src-v2.9.tar.gz 1202738 BLAKE2B 09e5f869ee671028e5044988a9a27af4d6eddb919fa777cb2b08980e33670359b43a87669f28cf59f421af4381df468bb49f52b3829000d4dbddf60bbf6342d4 SHA512 fb3c171f8204bd41d7b0183707b6f524dbf27d8c82335cce5f9b4070b77ea1c86345692e533f1a6d64e0334e0bfc88f4cc47828aea6b4b56058197122c675b2c
-EBUILD jconfig-2.8.5.ebuild 860 BLAKE2B 29b91245544c5a94c513096536373de7bf1585e586a95f3eaf8d046006880e3d3907611d41166116b46ec05cef65d3ca5a593792207e0cd6ed4193fcd8882892 SHA512 25c7f813b0e0a1f6821f29102d6da7579bd0de38ecac102c63e03dd9a6d14e74f1bbd5ff52bf7cf4b5816d770b3756d2f0d578dbf225d1bd98fd2e535c3eaf41
-EBUILD jconfig-2.9.ebuild 842 BLAKE2B 904129fc6bcbd7bb550131c61ed91fbe5626616f7f8c8a879cde4c8c0d0b5e8cc61fe185f9ba73ab0367955aacaffecb324bb1177c6ab7f2ea75536981a340a7 SHA512 589751320dde2e2ee74acac1545a7afd3430f8808de2edf5a641dd25e78390630c66978e290cc61355aa9ad08514ce75254ded91be1933b38d9978a7c58c1067
+EBUILD jconfig-2.9.ebuild 837 BLAKE2B 39b86cb08f7b11eab95c8545a6f0cd51e6a0f9a4af0431340e52b5f0124bee2a25752405ffce0b07a2ea6813eff50f9c5820b03bd10a0802e82ba4bdb668a172 SHA512 51d7c53b0df4eace209202dbd172259b4f210bc41eeea081828885fd1fa6aaa439b73adc702f74b08fde3609298ec4f46e84c54851513834a4bae55f772c1891
 MISC metadata.xml 313 BLAKE2B 35d3e65273f55e25c70550785fc394e3e5df5de19e450db23d40253c2384cf67e23ce9431b34d51d34c604b0d60c8926289ce409d80ed81352e6f10abe496e99 SHA512 a763cadd5e639466f136912e6a1abad023e53576ccbfc5b6b82b9ce5e7f7b173000d51d0991332dd52bff2fc0ee77963ce2e77b58c3f9ecf9701344ee4c5f2ae
diff --git a/dev-util/jconfig/jconfig-2.8.5.ebuild b/dev-util/jconfig/jconfig-2.8.5.ebuild
deleted file mode 100644
index 1b86b444357a..000000000000
--- a/dev-util/jconfig/jconfig-2.8.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Utility that provides a simple API for the management of properties"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
-HOMEPAGE="http://www.jconfig.org/"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEP="java-virtuals/jmx"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN/c/C}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -v dist/*.jar || die
-	rm -v lib/*.jar || die
-
-	java-pkg_jar-from --into lib jmx
-}
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-src_install() {
-	java-pkg_dojar dist/jconfig.jar
-
-	dodoc README || die
-
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/*
-
-}
diff --git a/dev-util/jconfig/jconfig-2.9.ebuild b/dev-util/jconfig/jconfig-2.9.ebuild
index ba1c8d27d47a..723f36264573 100644
--- a/dev-util/jconfig/jconfig-2.9.ebuild
+++ b/dev-util/jconfig/jconfig-2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
 HOMEPAGE="http://www.jconfig.org/"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 CDEPEND="java-virtuals/jmx"
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 200f0a1e5ed2..f741f3e8e394 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -4,6 +4,6 @@ AUX kbuild-0.1.9998_pre20120806-qa.patch 292 BLAKE2B 628ee52d1c147864dba48e37ae2
 AUX kbuild-0.1.9998_pre20171020-gold.patch 619 BLAKE2B e4bab6276b521752a60b94ae71f02b0963625eee06fddde79a4449a14fa235fc2dd5c7d8a450ce214dbabce9180c384f31cb2380e3fd49e8d987f56f7036a1fb SHA512 a9d084b34d8bcb431748c6c87679db764557fa2f141f4b942cfe44ca05040dc6eb7f923be89db87d6f35f8d141f3725240dff7502fc919716aa081cdb145d521
 AUX kbuild-unknown-configure-opt.patch 355 BLAKE2B 78c170c4d34d76a07925c08580245afef9859281c3d59cec1e675f19a2c3a86e9936773c62c78197d4d150ba8afd70ed7f100bcfa9fab950462224088d7aa2fa SHA512 26ae63facf7133be4fba606ad0b9488ea4c2ad2290a1e33a0f0c3283e0c8267eaae41bde6efaa52895b444178ec101a800ad580d2d85d0e69c56dc7db32b1105
 DIST kbuild-0.1.9998.3149-src.tar.xz 2314792 BLAKE2B 84aa1dbbaefc64a3ecc954c383d0516d88efd1a1791180164dd7bc3b26cd82a4a8c35c4b308e9fc960f114c40e77ea4a27acd94b62883c379acefb324a7c3f72 SHA512 74808e6279c01739170535655edbbffb73809f60b18c7ee63a110af7af651628789b9e5d253821f5685f8e8c072890c4669493e64886f53587b810ea0f67826c
-EBUILD kbuild-0.1.9998.3149.ebuild 1877 BLAKE2B 96d29162bea208c46370ce290a54749508a347839c60a89d048d1edd5d2f9422bc871c8c23cb238cd3d1b2984643c7df5336539b72bf57564f385c50b68c7316 SHA512 1b3da6f98cb84a828dcae33dd833871feb7c25d8fd5f30148c54e69714ff46739a3cc2a60bb790e353e9de753f36b8f56b73e4d142d014ea54c32561ad6ecbd4
+EBUILD kbuild-0.1.9998.3149.ebuild 1855 BLAKE2B af2f984434f761d75d756c3c2f8d2e348f3c09749a19f8a9309472a43f58d8b2a8c3895cb7407e804f1406f276740a663bf6cf84718ea52101e798d6b89bde8d SHA512 cf5963c67c49e58f289d8bfc08bfe4a7c035713ec3dc8443f22e72944ed1bfedd0bb7e9f5798ece12d73f9e1c22b2fe5d9b4aba03e3c106366ca6374b6fb0033
 EBUILD kbuild-9999.ebuild 1062 BLAKE2B 458a2dfe2a3b753783c49aeb819672e5c0d59858f5b67817b0544c56805d03cb3c75178c582981456e82909792f2fbf8e1873817cb94101076145c7388b2cbae SHA512 492ad0ab9e132b6379ce58eae3670114e1009cc32cf191869e153f4e72d52be17cf58347eaf4e39520909c463632d90d879860b6b361d0dd56568496e369f304
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
index 4ed9922800e3..157a774ff865 100644
--- a/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-util/kelbt/Manifest b/dev-util/kelbt/Manifest
index 91b0867ba605..557d715de221 100644
--- a/dev-util/kelbt/Manifest
+++ b/dev-util/kelbt/Manifest
@@ -1,4 +1,4 @@
 AUX ragel-6.7+gcc-4.7.patch 5585 BLAKE2B d8b7056d501ea0373f2a0381d59766e95741f963e48f40fca8dc81f097f4bced320dfbfc1e920858af7f37a14a206da43131c3175a839b30b7a911693dc91103 SHA512 160aea4100328accbe423e98f7f5741309b9e293aea992f287cb5d9fab25ae74c76933e924658dd4670d317b01e76d37c3defeeb47ada07370b819a16515ebf4
 DIST kelbt-0.15.tar.gz 232537 BLAKE2B 1e22baa26256fc77f42b499849525d62a2e46f9167c3e0176ade32943db1912ea71aae6bbb8fa28cb04d0a4e39dc7f8786a2926b44d45823b957476bee4f447b SHA512 2f203d3c3a12cc03d96a4d650dde3902d6815a3978af6f78f759b8dfce7971e2799e1325dc043cbc8a5b1fedaf9553a8f1693a159afa4f3601b3bdbc844df647
-EBUILD kelbt-0.15.ebuild 823 BLAKE2B ddaaf92e02276e2e02bf56c6809d41a3c09addec90557997e2870b24600f4104b4c421d9a21fdc77fe2ca2dfb71679f326143ee6665b467f0622be7cbcc0c07c SHA512 7f5b4d2b0c115deee7d925fd7c95a12cdf1efb20776ee79c197d37c35aa8c95c4db0a31d29d9397c9d7b24697e9d0ad85d06b72a07924b1eba7f9e0b9dd585cb
+EBUILD kelbt-0.15.ebuild 813 BLAKE2B 86b35bdfabcf69a880ec3ee0394c9ad7f4f7342b3f9770f148daa8d101f2bc43cb780eba887c2304c23ccec93f54ea7de8ba26d32f844442c89ff967a8633bf2 SHA512 c3e6e61bed164747a85e78ea5d4be8a2f2d291ad2c2eba218f0581ef1082fd1d0d251f2e6bbb2c9cdd18a7d65047ba0ba9d33cd6757115691bcf19845bf1ec67
 MISC metadata.xml 222 BLAKE2B 1c7746701a7405c30d961a743df2c2b3b1c5f20c863057e76862844f34bcf701a01f5b31d6b6dc4b4c3192a0f833b783d0c1db3c79f25ea45b576e1c575b502f SHA512 f5b07576edb64cee121aab00dd2a5f0c080fa947e00b6ff6ad6c514a82c132230426ca81e3430d7785c212786f7ead5f6c3f48e58478507df7d96a4e734168ab
diff --git a/dev-util/kelbt/kelbt-0.15.ebuild b/dev-util/kelbt/kelbt-0.15.ebuild
index b724f138a4cf..98730ed05558 100644
--- a/dev-util/kelbt/kelbt-0.15.ebuild
+++ b/dev-util/kelbt/kelbt-0.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.complang.org/kelbt/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86-fbsd"
+KEYWORDS="~amd64"
 IUSE="vim-syntax"
 
 RDEPEND=""
diff --git a/dev-util/kup/Manifest b/dev-util/kup/Manifest
index 5557e6e115f2..5a314f45007e 100644
--- a/dev-util/kup/Manifest
+++ b/dev-util/kup/Manifest
@@ -1,3 +1,3 @@
 DIST kup-0.3.4.tar.gz 45996 BLAKE2B 37c4738df71491b3661dcb4f780f1b24a46c28bedca32669625dfd82e309b51ef72304d41ee8c695c99b761679fca9c6eaa1a4fcf00365f92a6c754029139d86 SHA512 fde61de2978f8ba76c4b89a84313aa8b8651cc2610b1512ba1d662fbd0675f269959dd66ef5e1e0ce216ba66e12f5735e58bb36f4ba1a14d90269da1a6fcee46
-EBUILD kup-0.3.4-r1.ebuild 523 BLAKE2B ad4d0211819618d46c3839326730712a965bec3cbb3bd82af004588ec6542749e631aafa647a24ca66eb4fe395e5e5d64f1fabec37e3398e157b9c2260634cdb SHA512 ba60bc80430a22b7419defee12354ed8eae157fe59d97447b5dd074f0805c82db1070a762590431439b15e2a57c18a1e5b07b86e8a667d8a4208ab1e5ab1a3a1
+EBUILD kup-0.3.4-r1.ebuild 534 BLAKE2B 26508353b231d6850ab355ee5e774cc9b5f3e77f666e6879a0a0bed8b5c10aa3220afc7e178e02561b5f03a717c94428a40d67a858f6f275d238872c330aff78 SHA512 d11e0e77ccfbf43b33c007482340efeac7fc35e7f666be2b3d935841dc9d42ce253cb2618caef4d162d4431be3a83333adee5466e2ddf4a62de71030b1913688
 MISC metadata.xml 224 BLAKE2B a715d46de4f645f6060e89cf1da2da19fadc26cb5899b4bab2d73bb1b951d9bbb1f63b01fe4117e03645ce4a4a65cf61c890d7259f63922657b7e2deb38fc810 SHA512 50fd033081cbd709e8dbd3441700c8301309ccfbf81200ea387916a3e95d88b231748df77c3f6ec62207d02fc268d4841679374e06abee36bf196eeecfac64e5
diff --git a/dev-util/kup/kup-0.3.4-r1.ebuild b/dev-util/kup/kup-0.3.4-r1.ebuild
index 54b8b1a1e82a..69cedadab94e 100644
--- a/dev-util/kup/kup-0.3.4-r1.ebuild
+++ b/dev-util/kup/kup-0.3.4-r1.ebuild
@@ -7,7 +7,7 @@ inherit eutils
 
 DESCRIPTION="kernel.org uploader tool"
 HOMEPAGE="https://www.kernel.org/pub/software/network/kup"
-SRC_URI="mirror://kernel/software/network/kup/${P}.tar.gz"
+SRC_URI="https://www.kernel.org/pub/software/network/kup/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index 1333b10d8f55..51fce479315d 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -5,8 +5,8 @@ DIST lcov-1.13.tar.gz 156709 BLAKE2B d0f2635a6e6c29d29bd15d15c7f6c22ff80052b12de
 DIST lcov-1.14.tar.gz 177359 BLAKE2B 17069d38bf607217b8ff59f573fc02badf56afe65965d2a359a14835af57e2b6c512bff06fac3dbf4e94cd35701216edb8026d333b2baa8772d0ef551de37af1 SHA512 2d60c3a63e300dda96171c432fe304840acc76bf6275f60934d08e80765f9f85671e8b77bfed758fc45842a80156586dc0d67c42c9f215f4f163840fc5cf65bc
 DIST lcov-1.9.tar.gz 140035 BLAKE2B 5d432bcef695c0016f7d4bea57cd3c0caf8fda54eb4acac0f957c93bde714dc4dd221c3a9e98cff4a329fced75e658fd943d8db0c0fc4d32da15af158434287d SHA512 518f068d5eb4a805985863e7b755ae16b1b2ebb9e42cc57c5cda20a60f22e170c1e2957692086e5eeabe12ddbcf39132494aa2ea7ce33411e8abeddc759852ee
 EBUILD lcov-1.11.ebuild 580 BLAKE2B 0ed1313c916479ad65f78326e2eb32a7380c700359717faeffe4c74a3f0c46c26cf785b0e17409d1df1200e9420fe0a50b106bb98adc748b60fc892bd9011eb0 SHA512 bc53dbc22fe8cc80b019434d961b17f2b56b60b4f3257dff2eef196991886a27cee898f666354e6bdbe183deff1fa127966be3fb8a60c803b1b6fdc40c8dda48
-EBUILD lcov-1.13-r2.ebuild 875 BLAKE2B 498056b0e0cc168cd73b11215677eb133e275b6c43f4f7a2764cd61b404fbfdc7fae118c85a124d90439cdd1bf6ac2f417d7e06a8e417a610567e8e8e9fe1402 SHA512 0d41f7863cff19f2f2502637091a0e8c387712bac88a6a5d9a43e6c952f2860e4a5f6e81b1e8f4f56368ad9bb66f2b020538455335fc5b22622961ccf733b010
-EBUILD lcov-1.14.ebuild 825 BLAKE2B ad1c93c3934a96d2770094f84f5c80b6221e276da61a4f31051c646d04b4d91cca47ced68b2647ae9398cb8aa3717c3bdc65855b7ee09c31cc09912a15c126bd SHA512 28b0849fcd0af2961024d601f4bdeea2ca6a3810e2e574467c48185a2c9aa8064df905e1ca01625f02162fdcba206a409126265bd85e51e2a85ed3f5f5a423a1
+EBUILD lcov-1.13-r2.ebuild 863 BLAKE2B 225a3bc7d5ddd4cf45c145788cb42b28a77292080facee66a59677855cb14ef32986545adbd601e9240cc9732fe18514a6ad40b714ec99bbdcc04b163a870ccb SHA512 15c4ddbe6e88b6c41a31398a2684b4c5c74819a6030eade8c8735ad2959d2dd9bb58fac90957b17c3f57dc58898f56ce2901ac9e2239bb2e2ec6af04291c8332
+EBUILD lcov-1.14.ebuild 813 BLAKE2B ee220647f69ce9d789b296922ee6dc2324124aabc5e12f7d705787cbe69c21dc19fcb89804b19dc71645aba34b71d11116ff99fa137f2dc3b9d2674af3aa0e58 SHA512 4c7dc995012ba8b9f15b2b507e819a3da9da01b25a3f6b24544d36f1a46017e4fafef35b58795071043c473179ec0ef59fac769d3874e170b770d1de10c1674a
 EBUILD lcov-1.9-r1.ebuild 594 BLAKE2B 8666da2ce96f3246753bce1ac0c1a93d41703ef9f2a670e5bdac20b5fcd56ff70a54e64c50e6045824714853eece9d6a7d26592664b48859985a3a1eefee450e SHA512 f6d824e2fae383bd0acdb63f14887a40d28fd3175f1520c58fd9f015779a56a2875858c4bdd11cd9f112017aa96eace796c242bbfdb41835f5ac07d52628f246
-EBUILD lcov-9999.ebuild 862 BLAKE2B 9dc955663b19754562a0d83dc061a73be71d4135f9fe6faf1517ba12af3008207b5a443128071c6fedd4db9d3d2af835e10ff3d6dac879a53982b5addbb6bd1f SHA512 a4997018d74ee18e3d9aa9a4ce2b17e5e2012f111021497835a5667f51e98c4d481e37b2d834a8c4b7abfb94b5bcbf120160a2fa9f0c92748c3dc98e3da01bdf
+EBUILD lcov-9999.ebuild 850 BLAKE2B fd1abd672df98cf8329ffbb0bd46a13477c0700ec6f63b33fddc1ab3b9d44d2e5a24c8aba47a90ff761bbb283fe28bff7d9a621383265eed349f90a0726c8e56 SHA512 86de86036f1e89fb53bf84da63fc30457cb300158a66caae3f2baf8ab525de3924677c7c3f2c8675e72c6533b5ea63080590c86c553ec27afd68cdcde606c9d8
 MISC metadata.xml 545 BLAKE2B 04986c839db27a72dd78580642dc394723107ae8bd5790fcd0017db1f3324faf27ce0bfca537504a882ae8fdd12b8c451bcd8014d078309a5dad9b01c3457753 SHA512 e5753b7dc704699d98540483ec24632095c63cc8eb39cd8b20d91420ea96f79f4de95787bc7e7547fe2b1078d0c1f694e52a69065e1bccd4e18a1e86a3999289
diff --git a/dev-util/lcov/lcov-1.13-r2.ebuild b/dev-util/lcov/lcov-1.13-r2.ebuild
index 4d6f4df43817..ab94d37030ad 100644
--- a/dev-util/lcov/lcov-1.13-r2.ebuild
+++ b/dev-util/lcov/lcov-1.13-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos"
 fi
 
 inherit prefix
diff --git a/dev-util/lcov/lcov-1.14.ebuild b/dev-util/lcov/lcov-1.14.ebuild
index db891ffab229..594a85453908 100644
--- a/dev-util/lcov/lcov-1.14.ebuild
+++ b/dev-util/lcov/lcov-1.14.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos"
 fi
 
 inherit prefix
diff --git a/dev-util/lcov/lcov-9999.ebuild b/dev-util/lcov/lcov-9999.ebuild
index 54b7b4ded917..b9b110f57286 100644
--- a/dev-util/lcov/lcov-9999.ebuild
+++ b/dev-util/lcov/lcov-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos"
 fi
 
 inherit prefix
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 10297ffc9efd..b3fb4de80776 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,15 +1,12 @@
 DIST lldb-7.1.0.src.tar.xz 19384976 BLAKE2B a1d5afea255f06221516e21e80120cb35d870ec447aff774d8c610c889c8f28228c7c8e93eec160fc5424736666fcaac8ed42d9181373d266202c9f8aa4c3061 SHA512 773f79939c540f349f1c85d6b1d89fa312488c4c70f100f05cb6250f62e8d6a05832d57c02750439ede905fa69e1380a73ddde0d3ad2f99a0910acd1011559df
-DIST lldb-8.0.0.src.tar.xz 19602332 BLAKE2B 85a51b3ccae8fd0074b0f5b54e35d2eb020770246b13a0ec52a4647d30f23a6620ce410af7e49604947ff60f789ecab0bfeddfc3598642c9096cf3362d88b5bf SHA512 5192d6d6d1759db28569de929ba8db2a80283000f1bf8453d9cf172ac85574c8eacc13f9fe64ecabea0533bfc49c0f58ea8fb29b1f4d88c065d905d553f2e60c
 DIST lldb-8.0.1.src.tar.xz 19586288 BLAKE2B afb20a8303dcbdaf76ef1d78aa3165f87713f1c16121905d7a5f71e770ceafdff40d9d19e0a983d9290da2d4eb3acd0987d50607bea17efdb7dc0127d7f5cf8a SHA512 eb031985ad4d08226ec47a90fe32c1e6d070948971ca5235fd431cf7d5b7ea20f5d5131237bf83a6419773d18c339590bf9672e7b4f884304497e63c1030988f
 DIST lldb-9.0.0.src.tar.xz 9846624 BLAKE2B b6bf819c72686cba9e2b0e6a49206b90908bfe7c834e1e50e15be1c53dc8003cc6ed8ad4c83eef662b775997395bdb7e70835f94eca3768288fcbfeece68356b SHA512 86455d9d9866cde75e8d9bee7ddeb2680088dbc671e7d0c7bfff4c68ac963bc293bcaaf1a595db2b5529ddeee0dd0057ece37c90ee4ea194ac5e3fdb3122de01
 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
 DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
-EBUILD lldb-10.0.0.9999.ebuild 2722 BLAKE2B 613f34b11a3efd0ed6dbd2ee20e24f52be5cceed7194fdb15035492974bbe346e42706755a80608f0b1db7a06bbaade1de61dfc275bbd9d3effb635b61be4649 SHA512 258536299fb962763c5105edfd816b446d4109038d8f4e61d868346d8609928fac51c20b6814e8a019d8b7f3481ed15a511494e9a2c7aee8abece312d446c473
+EBUILD lldb-10.0.0.9999.ebuild 2762 BLAKE2B bebf58557637dabe036f1142f61823508cdaa4000b2bb5c0869c87f3f8d75ec9a845c68569f2db257aa0074ae723bfe8a0d90db475d3fbb6d6134c403b02b4f6 SHA512 446c4c6f1f82a03210f0773d115f86509e357a76cebc76dea85f995042cdccd426d98472dab8abcf4f2bd4c6cf0b5b14f3571042d34e03b52a578138c2aba676
 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 3078 BLAKE2B ab71eaa79f68bb2023b3a1376920fb423e9ecd643bdd9421924889ceb370c549fea57f6d8513e2b41305729f0380d62940656023f098c4773f834fb41d591ed9 SHA512 0d78eaadb05dccb38a8e02ddd9b0c7740be3438f65d17766cea26112d74c91ecc204d4eba80eb39a80009276d8baf8166e59987eebe13674eafe5794381d3189
-EBUILD lldb-9.0.0.9999.ebuild 2747 BLAKE2B c6c14740393f0808556912230587d4299ef22bac4e9e632b364e8e01413059cd5bf2e2ea715362ed676217661cbcf4553bde7ca4c34608169ffe55e75b6d457c SHA512 a8d059545a68ca487c6e3cab6e9cfc64444f504527db1d8f9921102e5b4ff03d6970fd745ff888af8770db98eb2fbce291a540c77ea6f751725e4ca0b7674075
 EBUILD lldb-9.0.0.ebuild 2791 BLAKE2B 96d09991c69e8835a557d0e49c0eb005b1c4202646031fd601fd5b1fcba5d48c02b4997cad7ed5fd201d5b216afb5dffb68393061f7304b19cec6975cb14b831 SHA512 3cc0b03a73fdd16c2a3f575e0b5b046c36b564fd7964431d27c16d09aff3a5b86fa40e5beb9bc2551eb07b34507741bf420f9953d4fbc9c2d7328d010cd0bada
+EBUILD lldb-9.0.1.9999.ebuild 2747 BLAKE2B c6c14740393f0808556912230587d4299ef22bac4e9e632b364e8e01413059cd5bf2e2ea715362ed676217661cbcf4553bde7ca4c34608169ffe55e75b6d457c SHA512 a8d059545a68ca487c6e3cab6e9cfc64444f504527db1d8f9921102e5b4ff03d6970fd745ff888af8770db98eb2fbce291a540c77ea6f751725e4ca0b7674075
 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 43495df7f2fd..a76bd5aa712d 100644
--- a/dev-util/lldb/lldb-10.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild
@@ -105,6 +105,7 @@ src_test() {
 
 src_install() {
 	cmake-utils_src_install
+	find "${D}" -name '*.a' -delete || die
 
 	use python && python_optimize
 }
diff --git a/dev-util/lldb/lldb-8.0.0.ebuild b/dev-util/lldb/lldb-8.0.0.ebuild
deleted file mode 100644
index c484dbe87baf..000000000000
--- a/dev-util/lldb/lldb-8.0.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils llvm multiprocessing python-single-r1 \
-	toolchain-funcs
-
-MY_P=${P/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libedit ncurses +python test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
-		mv "${LLVM_P}" llvm || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# oh my...
-	if use python; then
-		# remove custom readline.so for now
-		# TODO: figure out how to deal with it
-		# upstream is basically building a custom readline.so with -ledit
-		# to avoid symbol collisions between readline and libedit...
-		rm "${D}$(python_get_sitedir)/readline.so" || die
-
-		# byte-compile the modules
-		python_optimize
-	fi
-}
diff --git a/dev-util/lldb/lldb-9.0.0.9999.ebuild b/dev-util/lldb/lldb-9.0.1.9999.ebuild
index 9389776f49b5..9389776f49b5 100644
--- a/dev-util/lldb/lldb-9.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-9.0.1.9999.ebuild
diff --git a/dev-util/makepp/Manifest b/dev-util/makepp/Manifest
index 52d502fdd088..2fbed5a768d2 100644
--- a/dev-util/makepp/Manifest
+++ b/dev-util/makepp/Manifest
@@ -1,8 +1,5 @@
-AUX makepp-1.18-install.patch 2499 BLAKE2B 51d127a82a662563aac996a0d1efef5a68bf9eb36ddc4496a7307121b4abf0a1bdd66351d663308dfb208180dc7d00f631b685d3cbd327e9f6fa46d4a9f7b6dc SHA512 fe1dc50fde876e95fcf3bdfcd619faf8cef2a519cbf9512f32d715b6ad946d2e6a0f4cafe24aa6a1319d61662726b5c7e958ef2a3e5583079dd4ac409edd074b
-DIST makepp-1.18.tar.gz 236990 BLAKE2B 4f2c894a706fd188eeeae4422ac828cd99cccb2e8f6b7280a2be55363b99f4fff011932f3dfd550062e932f5c90ddc7f41fd56cb5e765c694b7296ac7f7beb1c SHA512 e6d4fe2d8136bbbbec00401761bf5a4bf5ff15357e75080b942188a613b8156c67eac63f46ce89f1e521997ca620f22924dd0b9055dcb66e30801142dab4e0a9
 DIST makepp-2.0.99.1.txz 532784 BLAKE2B e69495f0ffece81e7b15b668eea8bf4f9a26a36332bd1644594d697dd2301bea4bb2340fcd2805a33c44824113149fc617db610e6624900ec9d0d77054658d8c SHA512 457d64a2e9d2860dc2f7ad1bd4ef7df9fcd1563878dcd7b63e6f1d3fd6c03cdb89aab68faa018b3ef6b3009733a365fadbb49ad6c8a03ffe6eafcf867b765213
 DIST makepp-2.0.99.2.txz 528968 BLAKE2B e39c5fa515a1579ef5a568385550e8baf9176eac4a1871cdb7971ca8d3f92bfda73e5f27f4cf00c148a2c5c9622dd8253ebba0f555c6d46ce8c3581678bf8e68 SHA512 5aa8d255e545705802fec6ca304b2c672dfb9c59f7a064a5e9c4ef98f52d7dd5628023fe2a2449126ac1f9cc6ba7bac98233e3e4f07dd8a0559fd8aea7fd24a4
-EBUILD makepp-1.18.ebuild 912 BLAKE2B f9d6509e66bc3e4a1acc4b701d789f7b69174362cdf1ab9076500913cc9098bedf741181ff5b9538ec6add4b6d941905a83d03f6d0e91f96b700c48389a44e1c SHA512 6705554e3809102e768fc571a7a6c14fc79236ae42ad7d470ade34be10f376ccd8936a222b8b4d076fe08ce3735eb6c71973de437daa0c59a2aa13e687178bbc
 EBUILD makepp-2.0.99.1.ebuild 956 BLAKE2B 271c4ab70048e97b3af955bae431aaa1887ed2e085c9f30d5ae5638a6e230d0665c59fc28401c282f33225d27627f87f9e3d1d0028332b51d73f1bd172006eb6 SHA512 3de74875fa845a954a481850ab32015affdac1f9ca6764dbfd1143ef9435db3845731953f586b9c6cedc3e50acacf6730117495d776dd73510136e08f09da670
 EBUILD makepp-2.0.99.2.ebuild 1018 BLAKE2B 131975a8dcbe6b7ea2e514765c1d46ce61c58f70071aaa38d73bca6e3d8b23b4821a620be37dbb0a821fecc3ce8930453797476a225cb017ee2c8ffa010f9c9c SHA512 4d8c3b7f521fe3f0b0a2c8049852372545f4ff3f1413bab752ee974f43c0f6a0910a351ddb88a81a93b817c7fddc8161256d23bba635ecd370c9e5be017e982c
 MISC metadata.xml 333 BLAKE2B 58a25c0c361e93a28731379d14b028724a0fc6bb06087f34cef9aa0aa657a5de28af68287034d0c6dcb50312f264f607fe727992d15ab503cc245d31d35443d4 SHA512 a4d44741093e730e73c16da4aef90a745a8f4a3e3f844e0b68e168788d934126faf29d598a17dc1c185a97d8a9611525e7ae0f1bab17ed20e25aa7f0e466ea41
diff --git a/dev-util/makepp/files/makepp-1.18-install.patch b/dev-util/makepp/files/makepp-1.18-install.patch
deleted file mode 100644
index 7d90e2166223..000000000000
--- a/dev-util/makepp/files/makepp-1.18-install.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- install.pl.orig	2003-02-18 13:15:15.000000000 -0800
-+++ install.pl	2003-02-18 13:49:10.000000000 -0800
-@@ -31,9 +31,24 @@
- #
- # Now figure out where everything goes:
- #
--$prefix = "/usr/local";
-+$prefix = shift(@ARGV) ||
-+	read_with_prompt( "
-+You can specify a prefix directory that will simplify defaults for
-+further questions.
-+
-+What should be the prefix directory [$prefix]? ") ||
-+	"/usr/local";
-+
-+$inst_prefix = shift(@ARGV) ||
-+	read_with_prompt( "
-+You can specify an install prefix that is prefixed to the runtime
-+prefix for the install phase only.  This is useful when installing
-+into staging directories for packaging systems.
- 
--$bindir = shift(@_) ||
-+What should the install prefix be []? ") ||
-+	"";
-+
-+$bindir = shift(@ARGV) ||
-   read_with_prompt("
- Makepp needs to know where you want to install it and its data files.
- makepp is written in perl, but there is no particular reason to install
-@@ -43,10 +58,7 @@
- Where should the makepp executable be installed [$prefix/bin]? ") ||
-   "$prefix/bin";
- 
--$bindir =~ m@(.*)/bin@ and $prefix = $1;
--				# See if a prefix was specified.
--
--$datadir = shift @_ || read_with_prompt("
-+$datadir = shift @ARGV || read_with_prompt("
- Makepp has a number of library files that it needs to install somewhere.  Some
- of these are perl modules, but they can't be used by other perl programs, so
- there's no point in installing them in the perl modules hierarchy; they are
-@@ -55,14 +67,24 @@
- Where should the library files be installed [$prefix/share/makepp]? ") ||
-   "$prefix/share/makepp";
- 
--$htmldir = shift @_ || read_with_prompt("
-+$htmldir = shift @ARGV || read_with_prompt("
- Where should the HTML documentation be installed?
- Enter \"none\" if you do not want any documentation installed.
- HTML documentation directory [$prefix/share/makepp/html]: ") ||
-   "$prefix/share/makepp/html";
- 
--substitute_file("makepp", $bindir, 0755);
--substitute_file("recursive_makepp", $datadir, 0644);
-+substitute_file("makepp", "$inst_prefix/$bindir", 0755);
-+substitute_file("recursive_makepp", "$inst_prefix/$datadir", 0644);
-+
-+if( $inst_prefix ) {
-+	$bindir = join( '/', $inst_prefix, $bindir );
-+	$datadir = join( '/', $inst_prefix, $datadir );
-+	$htmldir = join( '/', $inst_prefix, $htmldir );
-+}
-+
-+print STDERR "bindir now $bindir\n";
-+print STDERR "datadir now $datadir\n";
-+print STDERR "htmldir now $htmldir\n";
- 
- make_dir("$datadir/Signature");
- foreach $module (qw(FileInfo FileInfo_makepp MakeEvent Glob Makefile Makesubs Rule
diff --git a/dev-util/makepp/makepp-1.18.ebuild b/dev-util/makepp/makepp-1.18.ebuild
deleted file mode 100644
index a5cef1c94211..000000000000
--- a/dev-util/makepp/makepp-1.18.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="GNU make replacement"
-HOMEPAGE="http://makepp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~ppc ~sparc ~x86"
-IUSE=""
-DEPEND=">=dev-lang/perl-5.6.0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-install.patch
-	# There is a sandbox violation in this test.
-	# In future versions, this ebuild should try to find
-	# a better way of avoiding this, but the current version
-	# appears to have garbage NUL characters all over the test files,
-	# making them complicated to edit.
-	# Robert Coie <rac@gentoo.org> 2002.02.18
-	rm "${S}"/makepp_tests/include.test
-}
-
-src_compile() {
-	make test || die
-}
-
-src_install() {
-	perl install.pl /usr "${D}" /usr/bin /usr/share/makepp /usr/share/doc/makepp
-}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index fc431a054c08..d7ce41501a32 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,6 @@
 DIST meson-0.51.1.tar.gz 1451234 BLAKE2B 8a925bfa3d622f75eb180226311a6531cde435a5a6573663f44ba67dbefa63f76b8bd17eb23d291594fe66a379ebc8aef5f1e680973a59b0b52c41fe09e4cdcf SHA512 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c
 DIST meson-0.51.2.tar.gz 1453328 BLAKE2B 514995ba8db534ecd488e99fb1aed25d33de73ca65fdfaf18584bd8c113eca3602a73ac42f2ae5ddd4362f8989a02d3d3aa75487ba665706c75039e3f039056c SHA512 332fa0801accd91dc8f3cc1e4e701b1139fdb17c4ae8371fab419e83305ef41534e5f367fbd9323936afb6912d5c3e7cffa9cef658550fad0861ccca9812d5b0
-EBUILD meson-0.51.1.ebuild 1952 BLAKE2B bca35de4afc867607193bee7fc66d2c03f006efc296b666c2983cf576a8a41a8ab66e5139dd5cf0998f54c775b29b76345d3b018a6a457ba225457aabe4b043a SHA512 2ad5fdebccd48b42302e8c1a10a7d7143229396479ba60a4531c632eeada1631d32c89eada26d9c5e4ee0a2d22ed479bf3522fc8ff2523cd6f09f9ba90f29f64
-EBUILD meson-0.51.2.ebuild 1959 BLAKE2B 46fb2ea1356f9b7ef2d2ef02bb61b925375feb058b3a88fc310877158e6e56ae64f007ba99712ac49217d342c427f008f0d1f03a590534768b465384dc1a8124 SHA512 255eebd0e6caccb38f3b98b20443574987b2fe894877d77c6ec766dbb41f2e074bffbba138745322daf6cf6b11391c7976880e7ec9947ea14c848914be695ab1
-EBUILD meson-9999.ebuild 1965 BLAKE2B 2957586ed283d5dcb684753b39785e3c02d72acbc7b3d6565cd9e1cd3f76000435c550cff900afc7daa4ab802a56bbc37a465bcfa78ce878630ac02d875cdbb9 SHA512 1ddf31161fe432c40bec328543a3c3c31d3f9d9ca198edf2607fb03555ed48e6610ae167e0226277d59139a2d50c87031268d1041422b5820065dda1cd1baf4f
+EBUILD meson-0.51.1.ebuild 1940 BLAKE2B 6dc6c1a49dffa23edcab9da8e60cf20d9e57d2ce612a6adf7e5cc92f21b0eaef6b241f5dccbfbdfa05de8542b473ff175f639eb5abbcc0fa23e8033ac6988628 SHA512 e3afe681ac5b465bac3d80ed6f083750430971aec0dc82ecd98910cf27f0ffd0aab40e80ae9713fd471e62bb0f7298f993564d9fc150ceba66ca02214b6701f2
+EBUILD meson-0.51.2.ebuild 1941 BLAKE2B a2037c7b214b9349c956c7275c7ad187bcdec091b316a401e312e959242fcf4ce913291c1eaf63169fcf647794e1276dacee26eff3207128f778c9447b9ad605 SHA512 dbba78b53f1ba5f52ddc8c9bc4fc6abfb276c713253bcce475d39214bf1dbdb6934ec79614946b63d30efc3f440609c000007f9fa0307f90641a8aef234fdfea
+EBUILD meson-9999.ebuild 1953 BLAKE2B b3f8c0795268e0e0ca6e5495e5a70de318632787e4e169eda0051b940f04a944e1873ee5a100ab5d73a9f3b8fb335b6965b87ad98eb5360b56a7f32032440fb8 SHA512 230e63b2c09aecacdb198186cc277582fbfcd4afdcaccc069a37a701c8466b57cd74a78bd4cb075abe40d3ab37be92b35023cdee07eae290c33302112ecea223
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.51.1.ebuild b/dev-util/meson/meson-0.51.1.ebuild
index 2dc8c391c3f0..2d3a813898bf 100644
--- a/dev-util/meson/meson-0.51.1.ebuild
+++ b/dev-util/meson/meson-0.51.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.51.2.ebuild b/dev-util/meson/meson-0.51.2.ebuild
index 5a5fac7c37ad..2025bfdfa9ec 100644
--- a/dev-util/meson/meson-0.51.2.ebuild
+++ b/dev-util/meson/meson-0.51.2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 ~riscv s390 sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 782127bd368c..6a59a76c31ba 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 89beb3c6e1ce..88da671201c9 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -3,9 +3,9 @@ DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002
 DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
 DIST ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz 213767 BLAKE2B bb6abbed155d39fe65a3a4bbbba3e577e4a13dfd1ccb9e018084153b0dd6928753be9d8c10a2c4c2ab6a2000c5292f912353f2234b01613f46bfa49d13aabd7a SHA512 6c3aaf8decfd792ce6b035dacb87f978f1052d13e5ceac9ce63bc7051fad0eed83cc530d2cf22649ff4186416b0478bb3eb0507c56fec2848061cdad7a0aa812
-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 2748 BLAKE2B 05c993001be9bcdb94ac5de726456fce04d4fcf1b6492c2ab90ffbb69f91695d0f0d9d291c0567f6762dc3610900422846b1218bc1d3d8e59810101aa8f5cbe0 SHA512 9e54810e995677453ed70435dd393fa8c4bd0dd29991fddab82d806d584bb0f2024faaf0fe9e9dd861f77c3aee1344bb8bc67fb230761082384de9d1846c9272
-EBUILD ninja-9999.ebuild 2697 BLAKE2B ccfe44f31f2341a11cec8da86e5e43da8ee7b996d8c45e4cf0cb3b5c6ce0b3e1764d36126b6fc0d9f1db761b9b739053b10ab51ace5d21699e9e755be40fa9eb SHA512 15145be6b5b23933d95f1f707b195538941a42046449f4125bd42878a2793b26bdd57b9fe7c5cd8ea44c7b98177dcf355496d816501077a1b0a984297c80ac51
+EBUILD ninja-1.8.2-r1.ebuild 2664 BLAKE2B 36478412e50d74dc8a8b9a2c7dd0f46e590fcf3117d080420a2cefcdae61ada9e58993c8f8f9e47b79b324d33846df8b239ceabf900491cd22503b5ea562100e SHA512 9deb3f4319fdd09c1fe448565ed01d031308899be3db0a4b896aaeeeb4e395e7858608982d9429a7a34af46db791f3d7037613c36ee617d82e1c8a630bd23bde
+EBUILD ninja-1.8.2-r2.ebuild 2664 BLAKE2B 9e22de951ec10b4da4f7f6623635affd20120b4c530dd6cc9fe418b326f8e3c6459085944aff70921b35c1806bf0225aceacb523665f8ffd5b225c5d861ffd49 SHA512 af03ccde30ad1e236e4564dca907560ac5ce60c158de5f5ab4bbcfda988484baf12b5db5108955abde3c7d60c146db35b4668627b5bafbb8c8b192a1946ec4e1
+EBUILD ninja-1.8.2.ebuild 2521 BLAKE2B 8ff5d56519cbaf75eb0d45bca02c52df7ec531c7f4a2e6b57e647c3cc26735a1caba75e055076237864a5e0cf820ce81f35fa0ca491686317277091171e868e7 SHA512 2e977340df20d1ebf8b428961b9ef978e5ea7cc4038ce2f99165f55902c8b7a5dd947b229d0bf0fcc264796db865358a104d629edc2f2224c9636e1dbb9a5341
+EBUILD ninja-1.9.0.ebuild 2726 BLAKE2B 948ba83a8d26ae6af26c1b64572b2492ca71cdf56e9891f99752ee866f1358e8b00d56eb143cf319df8d283c95b4141fe3aeedce0138769eebc5351a82e38f83 SHA512 ec3008bc38839fc3264ab02b15e41999e776373675bda38649b5b1fa7c50c70f4f3b0b7cf8c982bc8d4eafadb6f6855ae1c401d0d7c2c80334ae56142b67b3f2
+EBUILD ninja-9999.ebuild 2675 BLAKE2B 36326cc7ed88b3fdc42a9d2658c506ec0725e4c60a743ab3684ec505bc3b55fd74911e73baa3a436d700ebbe15e48e1ab8758d42e101f9f658f8c667c30a7489 SHA512 bd29a22f78c1218a7fa09497b1a9c1f5d47317aa7c5710f202f2f7e3161df88fb18afc0437b1d76a3350e2e433290a1f15b453074bfae8ab979c98f199e1e293
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r1.ebuild
index 558e5dc53915..ce02ef31849f 100644
--- a/dev-util/ninja/ninja-1.8.2-r1.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r1.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 ~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 ~s390 ~sh ~sparc ~x86 ~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-1.8.2-r2.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild
index 9888ed358e43..6a99f341fabb 100644
--- a/dev-util/ninja/ninja-1.8.2-r2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r2.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 ~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 ~s390 ~sh ~sparc ~x86 ~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-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index da66bedbbc77..feb5a1e88fdb 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~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-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
index ba9df78face9..1d8742de69bf 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 ~riscv ~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-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 d2fd05a0b426..3fd1ef3707b0 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 ~riscv ~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-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/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 7b12321da26b..3c108c9365b2 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -2,6 +2,7 @@ AUX cuda-config.in 406 BLAKE2B 1f1bb67d1f13da52821d640ac1875affb0ba1562df8c3eb6d
 DIST cuda_10.0.130_410.48_linux.run 2020126691 BLAKE2B f784f41c06d81b6f89d07e756347fb94148f79e5fd50650fc340feb6b49dcc2bedd05cf4c7c2662da39955f9393efc048aa17fa921aad86e182186fb6d98ec50 SHA512 409ea4cc6aa0fe7063450e77c3b67b9b41aab1bbe556db673fb1a80610b20bd52e2020bf94034a92ab68c721d3d5739500bae4bd7a3558b2d8e73730a3b4ea25
 DIST cuda_10.1.105_418.39_linux.run 2423314285 BLAKE2B 924872eaaa4e8ecd6b81765c91d5e538d968e4fc88792a805339dd9cae15dd70372f310d39b9668d76cadbab875e3c4abcfca5a5cf71e4d83c9db056dc02f51c SHA512 07cdc053989758e4cdccaad566cae7127fa79780ad85033ea52d33cc4c43c9de08e88dd087390c58b542e51703f256859cdf51a018ee57e6a412f45fb9561622
 DIST cuda_10.1.168_418.67_linux.run 2526901749 BLAKE2B ed2207400730600c63895cc894e02a14dce59c6293f198ea2a94f6dd0fab25a005d4754f91376c267cb95f3fdc66ee08e4353ec17b69d28881c59190b9eb4746 SHA512 85635012ec7081e200fb46f973852939f9709e802f495c288d5f31ff1fbd283a578fdaca0afa8955e6e0c7ca6c4862428da5168e0938b48390952d8633350910
+DIST cuda_10.1.243_418.87.00_linux.run 2572375299 BLAKE2B df9cb4faeeeeecc536e72697c6c73d544219f1b23cacb7fed646b0908fc7e573e85920861d56f76776ba637d84964cd1c789a0fe0d6541a4e0adf618b6c74d3c SHA512 f92b19d0242969a65a6e6db43bc293e442abc07a9e168c9e995692e1a401679504598c782e511be3879e1650b90f71a50bbc63c9ee45654c26b5007cdf33c4fe
 DIST cuda_6.5.14_linux_32.run 76788277 BLAKE2B 75e79dce6cac5155bde8a3cafa945047c489b10272f8a3b94bf55d499df4b9c8b82506a81a20f9fd816bd4fd0514e515a6435399db1cb62b027c76490bd4dfae SHA512 89649ee0f4543b37037b7c8f5ed0b8bd502512afb4d93e3158b3df4786123be05a5288986b5abbfe15c14eb010777d2527b715225bea96a354a898c34e4a2fcc
 DIST cuda_6.5.14_linux_64.run 972320904 BLAKE2B 4a4361fb7a90989ec4b4aa433189e7b358e5a2272fb9b9c59429e0014ac14e3b8de1b247ee98dc30c3f3ee4cc009eca4fdd86027bd3b9527a683353d60bdf5c6 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e
 DIST cuda_6.5.19_linux_32.run 81882112 BLAKE2B cf55ef7c969503c156431fc56301ed4e9a1234ae0cb867f12649636069f35e56bf6fc9df7482b6baade45d78c8baa2d98c41a28696da59294e0f575c4a0344ce SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e
@@ -12,15 +13,16 @@ DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1
 DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9
 DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
 DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
-EBUILD nvidia-cuda-toolkit-10.0.130.ebuild 3344 BLAKE2B 37bb588383fdfb0ec480c8ad961d0faeb6fbce7159ffb6ce47efa600ade12c5f04598dc053dc44ff469ff9afabecfd31b00d04501ac541ea72378884a2f19475 SHA512 aa9e7a8afd6f3949006e3b1dd03db695126e77f01a38d1ba77ce8dc94137c9c89b7afada7f6deaf5dc160371f5ee0c61bbc3d09002169d5900b1baa12a870d44
-EBUILD nvidia-cuda-toolkit-10.1.105-r1.ebuild 3763 BLAKE2B bf65d5ff364028df8775cecce32e2aa291dcb1bcb7370e4d6c54d0f909c8d2cfb7407f3f130690cfef55d8ec7d2a579e3dd5a67f6606733b13c7d9f5a30d7028 SHA512 b49ce2212d33df71824f3a4e22495ce3e30dbda2e1d317dd9c6aac5c3bcf5599f7ecac5a7014c4d2fe9f858a90b17d05e7d0564a4e4cf8b26a391df38214d4b4
-EBUILD nvidia-cuda-toolkit-10.1.168.ebuild 3763 BLAKE2B b3b783b2951b831206784b769976a835427b35866204e332f221c088e8ca0d6278376c83cc915930a85748b826e964bf9ec9dfafffb4ba5ec9dbc7c4dd30770d SHA512 1a6133eabb2896de152f409c3b9a2de7116ee5062222bc5427b4184a2063bfee0db5121e153d30c02ddfa0acdc5db5333392c65bff09421f09a759ce5d7337d9
+EBUILD nvidia-cuda-toolkit-10.0.130.ebuild 3349 BLAKE2B 19495576988f7e01178ecef6117b4e1a1186ec98174ab77bc14233ba55b199c4ac7068e4f734eba984f6546883aa8dd1787c1eda7b40c60829a0587d8286ba9c SHA512 719f934f1acf7599405a910be3b14f5888583eadc281bc93599ab8441b82c1fca6147d904a8622495c5410a86897c4acb45b3907bf44cc9e00ac9cde905e61fa
+EBUILD nvidia-cuda-toolkit-10.1.105-r1.ebuild 3768 BLAKE2B 3e0a0527e9f174452d27f4072bee45036737a6f4b1615ffdddd99eb1dcd65ee31ade936088c1df8596cdeb4b8b2c165a45753b213f3a9ba90ec0dae58470e29e SHA512 d833f528da327e9478c3ee1bcff3dd722f9a165f45907fd82079d4380aa627ae0e88c684a1c5c37b6397ef30428f01343b16465edeb0144322bfd2accc8f79c4
+EBUILD nvidia-cuda-toolkit-10.1.168.ebuild 3768 BLAKE2B 1499833ee57cd8f57243f1a4c7f2db7d5288945a217a8f56ce345b23ab820d2098f1d2b22a35550146e9f6a2a4806902556dce661acc2c83d358c6c6a4b77c2d SHA512 6737ffda572af284a65c07727dd4d7e67081e7aae3e7d656c3d4c5db7d9ef0f17ffbde069d7fc936d909881670ea34dc2025147741146a59a0330b16cc42444c
+EBUILD nvidia-cuda-toolkit-10.1.243.ebuild 3791 BLAKE2B 77871cf5f40d0e9ebc4c58ec64970ae50d1d0242061774ed8cffd3b6a2fe57e5139784e0ef01d2d5a3c7a7ca934087332b56e3a85909d07fa64f4145714aa178 SHA512 3bf3d0598e0eab6933c7b1df99ae413e03ce62d4f7c3114648bfaefcaecb90fe6e9110e4a3ecafb43802c103fa7a476729565c86ae9ef026a91401b07ff2d62d
 EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3818 BLAKE2B e368a3fa7258a86f920f53da56039b940cc84e551265d458e1a3c7bc7b9321c4020e5ada9b56fc588ef4708acc4cfe9a8d2e259ad12b0c71fb57635b05b873bf SHA512 7f73c4e321234f6a19166e6e28719f6c98cecb809f9878ee1182b812e18fcc6f8c29fb2ebd0ed520847f38bfddd6a0bc60fae6b711b75f563ab39a9b322468b2
 EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3844 BLAKE2B 42603527c1f012d49c98026d3f96f5ecd832cc4f31fd1afcf6738dd4e3e2aeee0ac55beeae994bbff4f48562adfe11b72270e516f8fb70d32cf00ae59f55bd78 SHA512 f40103348972041a9d6c09a8c129b68603ce0fafa29df1fdf6b13014bb97156a44881161d4668beef8af9b77adea9df8034c88d6413a6ac2ad709285f785df79
 EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3355 BLAKE2B 07076b6506902bcadb8f7b6430db04beb380b76da35c5745e313910518855bb7e4c5d746d880bf7f3bbd07fc06cbb17f0d7d76bb267f9679c3d8099e398f7d35 SHA512 4e8070e399766796b1589329db4de04fc0fda0cbd1dc8ec1984b8550f1bc10d490fed7b085066f4419d5cbdf98ea2ae8202b29a9d360fe3b2a3be6e20bc802be
 EBUILD nvidia-cuda-toolkit-8.0.44.ebuild 3311 BLAKE2B f9dc70a5ed6c7ba920d07e4b3213babb2d4f4c5991c8fb343563728e4b3bd2ebe0ca53f97f867c493d67e7a15f33683aa6dabb7fe13b2832dd12a617dd26948c SHA512 807ac67b141dd390d78ec4e764dc939e993aa3b23c6469dde9e29c62a0ac7bbbd3be4d2425e3a1a9863a813c88c5fe0da37f07d1bb2fc91c0593cab99f8e8a8b
-EBUILD nvidia-cuda-toolkit-8.0.61.ebuild 3361 BLAKE2B d43051ae9eed5138e952b22159035f8557e8b5cfe0b7c0bdc411b389e60a0db9ad1f890e5c8a0159689aaa1fa06abb7a8c843c6973cd2204a6fcbebd8a0f89f0 SHA512 b98d5b85eb4405ba749061b7d228f3e86057592283a36f189eda2f1d859b2e1e55c9c6c1444e9521ac699ab8bb7b6f87a8e2457a5fe5ca85cc13043e59cdeb33
-EBUILD nvidia-cuda-toolkit-9.0.176.ebuild 3368 BLAKE2B 8782b66dd08834300b4f3935544d9e3263725b3e04774bce75c55c174052d0203cef71a94df974b1cf0fa943da76137931d443e20d9f0a733db9cec18d6f3aeb SHA512 719b65770838e7497abcd39f318773d049339cd5e1335a58a7d873c4112edf85c670ddfd9544bbaa1a6f31501e1c0e699f88b9ad3d6f0409990ed7b7ce803c4c
-EBUILD nvidia-cuda-toolkit-9.1.85.ebuild 3345 BLAKE2B af1bdce7f452973e1addfd4881abf937dbb17e8ac946e496148805dd8407b3f3485ced3487334779d6d536fedb294a3eb9241f90920bce4529256bb94f4987ab SHA512 9adef55be28117a0875704cbffb4975ac99674b3dc608909e7c5978b53f558c21049454589a5e8624ca12d6ffe4308cdf1839380ad1569955902659d0ffab7a9
-EBUILD nvidia-cuda-toolkit-9.2.88.ebuild 3347 BLAKE2B 8b438d0b64b91ad20d293662e7fc1eea788155d7e90bec0746d4a4369cfb5311eb5692c2cf77c24f49d90a6d759ee8a0681635b5de385bfe7543724eb3ba203b SHA512 6a5f413ceee79a2d1a0fbe58bf697e6f6b27bc41608f66155462efc55e139cb5356c28894c7f24cb52c98b47161e8f023b713d32306183d3fcccc14452ec89e4
+EBUILD nvidia-cuda-toolkit-8.0.61.ebuild 3363 BLAKE2B a643d0ede7ec4d93dbfcc2a38f70f55598c4005982873d5cf24f5d895f2dbe5280daf4e409ff3689f9d7709a2e38315ce0ed41643a2c991c38fb13bab1335ee7 SHA512 fd3ced5369837071fe7f5b1189b3571b48ecf5533eeaaaf77abf71c75bc27451834011fdd903cd3c1d845f429c6a3b751edae813e4237eeac232427c7bcfbb1a
+EBUILD nvidia-cuda-toolkit-9.0.176.ebuild 3370 BLAKE2B b51d0a00898dfde731991ce2907eefa5f362af30222c01ad24b5ee8dc9253ff11cc9778e1029dfd3b3c091d9cc9693a3b076de64c144bfb28445314c122465aa SHA512 a031049baa4d25cbb33088d4bfb98c41458c83b3b2bb0868a78dcfb3aba4ec16326684e980ea865138b7f8749cb0ede0f963e6386cb072ba3e9d0b685c7222b5
+EBUILD nvidia-cuda-toolkit-9.1.85.ebuild 3347 BLAKE2B 6b21f6aa1169f8404904d7de6bb6561c41d6f8f23c1b5fa5c02973b4ef79cb43f720b1e8acc9bb80bd5b29e1ae8494ddd328ce853d2f860f16ecd75db3ef9225 SHA512 7864e04a743797863fec5b551ee749c5ee9f862855a05c09c98f8e3d19bbeee30db7a136f8aa4ff0114f4c6ce91ae1f662a864c9d479be3d82b76e1e8de936d5
+EBUILD nvidia-cuda-toolkit-9.2.88.ebuild 3349 BLAKE2B 540d1757c56592390818f56ba6a6a9c423d1f38a4ebbdbbd050b32df578018110ea8707c168d8b67aafc2c0f94359514a02502b08b19ab4db7d9c4aa0376d5d5 SHA512 6de942e032c07be17f16db725f923706600666302d8ec312ab9d95f103a61f14bfb30f4c122c1ccf42053b334abc387b32336309709c0f2c1b08f7850266ed22
 MISC metadata.xml 456 BLAKE2B 9c2baf84429d6969aad82a907a25acb5080bcfb3a5eb996f235ad05ed6ef5345df1c268bee9398c105f5926184f6179f46f98b396397266eef82ee9f6e7db470 SHA512 7745eb56d4a3a9a7d01e3143e807f2018d288c00bcc6c3bd0624c989d4e15ac5521dc087553cd643ff04392c1ac9964578fe03d05947eb2ed4cae21bceb9c67c
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild
index edfc48ca555e..3648b9f3e122 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild
@@ -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
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 	>=x11-drivers/nvidia-drivers-396.24[X,uvm]
 	debugger? (
 		sys-libs/libtermcap-compat
-		sys-libs/ncurses:5/5[tinfo]
+		sys-libs/ncurses-compat:5[tinfo]
 		)
 	eclipse? ( >=virtual/jre-1.6 )
 	profiler? ( >=virtual/jre-1.6 )"
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r1.ebuild
index aeec8c41cba1..49309eb9f297 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 	>=x11-drivers/nvidia-drivers-396.24[X,uvm]
 	debugger? (
 		sys-libs/libtermcap-compat
-		sys-libs/ncurses:5/5[tinfo]
+		sys-libs/ncurses-compat:5[tinfo]
 		)
 	eclipse? ( >=virtual/jre-1.6 )
 	profiler? ( >=virtual/jre-1.6 )"
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168.ebuild
index d71931efe5ef..2f30ea558cca 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 	>=x11-drivers/nvidia-drivers-396.24[X,uvm]
 	debugger? (
 		sys-libs/libtermcap-compat
-		sys-libs/ncurses:5/5[tinfo]
+		sys-libs/ncurses-compat:5[tinfo]
 		)
 	eclipse? ( >=virtual/jre-1.6 )
 	profiler? ( >=virtual/jre-1.6 )"
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243.ebuild
new file mode 100644
index 000000000000..1ce496fbb55b
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cuda toolchain-funcs unpacker
+
+MYD=$(ver_cut 1-2 ${PV})
+DRIVER_PV="418.87.00"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run -> cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+RESTRICT="bindist mirror"
+
+BDEPEND=""
+RDEPEND="
+	<sys-devel/gcc-9[cxx]
+	>=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]
+	debugger? (
+		dev-libs/openssl-compat:1.0.0
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses-compat:5[tinfo]
+	)
+	eclipse? ( >=virtual/jre-1.6 )
+	profiler? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="6800M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local i remove=( doc )
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+
+	cd builds/cuda-toolkit
+	if use doc; then
+		DOCS+=( doc/pdf/. )
+		HTML_DOCS+=( doc/html/. )
+	fi
+	einstalldocs
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz )
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		for i in nvvp nsight; do
+			cat > bin/${i} <<- EOF || die
+				#!/usr/bin/env sh
+				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
+					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
+			EOF
+			chmod a+x bin/${i} || die
+		done
+	else
+		use eclipse || remove+=( libnvvp libnsight nsightee_plugins nsight-compute-2019.4.0 nsight-systems-2019.3.7.5 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof )
+		remove+=( extras/CUPTI bin/nvprof )
+	fi
+
+	for i in "${remove[@]}"; do
+		ebegin "Cleaning ${i}..."
+		rm -r "${i}" || die
+		eend
+	done
+
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install binaries separately to make sure the X permission is set
+	local bindirs=( bin nvvm/bin extras/demo_suite )
+	for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do
+		exeinto ${cudadir}/${i%/*}
+		doexe ${i}
+		rm ${i} || die
+	done
+
+	# Install the rest
+	insinto ${cudadir}
+	doins -r *
+
+	cat > "${T}"/99cuda <<- EOF || die
+		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
+	EOF
+	doenvd "${T}"/99cuda
+
+	use profiler && \
+		make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib"
+
+	dobin "${T}"/cuda-config
+}
+
+pkg_postinst_check() {
+	local a b
+	a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	b="0.0"
+	for v in $a; do
+		if ver_test "${v}" -gt "${b}"; then
+			b="${v}"
+		fi
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt ${b}; then
+			ewarn ""
+			ewarn "gcc >= ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn ""
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61.ebuild
index 0295aba23074..fe0879318480 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 	>=x11-drivers/nvidia-drivers-375.26[X,uvm]
 	debugger? (
 		sys-libs/libtermcap-compat
-		sys-libs/ncurses:5/5[tinfo]
+		sys-libs/ncurses-compat:5[tinfo]
 		)
 	eclipse? ( >=virtual/jre-1.6 )
 	profiler? ( >=virtual/jre-1.6 )"
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild
index 3e56d9e5c3a5..c250d628e46e 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 	>=x11-drivers/nvidia-drivers-384.81[X,uvm]
 	debugger? (
 		sys-libs/libtermcap-compat
-		sys-libs/ncurses:5/5[tinfo]
+		sys-libs/ncurses-compat:5[tinfo]
 		)
 	eclipse? ( >=virtual/jre-1.6 )
 	profiler? ( >=virtual/jre-1.6 )"
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild
index e7f7fb9df63d..061d22c650dc 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild
@@ -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
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 	>=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]
 	debugger? (
 		sys-libs/libtermcap-compat
-		sys-libs/ncurses:5/5[tinfo]
+		sys-libs/ncurses-compat:5[tinfo]
 		)
 	eclipse? ( >=virtual/jre-1.6 )
 	profiler? ( >=virtual/jre-1.6 )"
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild
index de825e179c3c..abfdc9a0d2e0 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild
@@ -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
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 	>=x11-drivers/nvidia-drivers-396.24[X,uvm]
 	debugger? (
 		sys-libs/libtermcap-compat
-		sys-libs/ncurses:5/5[tinfo]
+		sys-libs/ncurses-compat:5[tinfo]
 		)
 	eclipse? ( >=virtual/jre-1.6 )
 	profiler? ( >=virtual/jre-1.6 )"
diff --git a/dev-util/patchbin/Manifest b/dev-util/patchbin/Manifest
index dd5af9b8f8b9..86ee022a4631 100644
--- a/dev-util/patchbin/Manifest
+++ b/dev-util/patchbin/Manifest
@@ -1,4 +1,4 @@
 DIST patchbin-20160208.tar.gz 9713001 BLAKE2B 4ce3c5d43f7b0a909b5058b3877cecef68f703d803bcb6a4e4b7e907dedaab98cbe87f33a5211a318f8146e9ef4753da18d58b3cbc8e4ff715b58d82227ad7b6 SHA512 eeb5c4bc708cfc3a065568ef233297586c3bb3d497c6bf3ace52b8337b5a5d127e607f668a6f74e3be892e8cfac96a046dea3646735c4404efedd8760572353a
-EBUILD patchbin-20160208.ebuild 1113 BLAKE2B 15cc745c58f9af2a9e0724b5bb78d4c0e44eda3f52eee4f242a42f8ff94bf9c2023f3584717ed3a1b163290474971cbd575dc621be0a5fa6d17ec5793c15f97a SHA512 d4e8d1ffb09f910e88158fea92a82ae2606ee288d02ed636cc0fc932d9540d9b4b55d0baa58b81e51d9dd41ca1c7deaab7035fa852c629167bef2c4473ac6756
-EBUILD patchbin-99999999.ebuild 1115 BLAKE2B 14dce023dd58892cb6df213ba5ec2aa2c4ff8334c882023f85f79200902615b2d8c7b91e54cb9f4eb3e98730fe462ba5a609e3da2a5f2e31cc402517ab9882b2 SHA512 aefae56d63d80a27a2fdecc2743ea0406e1b495b78638e81459d3dd6102d3c07b0602d99a07dffed85c9948b1568a2d8522b3bd21e70425a8a21ade9b5110569
+EBUILD patchbin-20160208.ebuild 1103 BLAKE2B 0eecf61deea38d19fc0b31e507bd8fa94a5834108e8ccba8a9e86c2b50f4e3af579bbdf7104242859654ba8b655b5a26cb37feecacab120aa7008ef7151086ea SHA512 928d2db4d0b90e6617c0c245fd5af83652aa5f3579f443625d9356bec8ea0b8e2a25cfaab5623cfd6f6fe71979d49260b3a61650fafd733c005dc8ae8c6b9cc1
+EBUILD patchbin-99999999.ebuild 1105 BLAKE2B d75b7f420dfa0dbab95f5bdd13ca9fe8b577cddef936e709d7524d79e16e5594ef9fcceab3b95107fd28c60cd54634e5eeab5be020555c586caadefabbed8d35 SHA512 60e936f2309f222744ee7cddba01a50621fb32dbe979f738da84d75c91f0fc29277e00d6dcf221156bec4c71412f97755e63c7cf3f9dbc11a4749eb69ef271fb
 MISC metadata.xml 528 BLAKE2B 566d71b86021dba9948978378279d2a4c95d50e4402c31c3da9bb3e1ab50d1d6148e104e3e3ea4c688a2bf1f720f3c4379d3eefc2eb57d316d9952d3f1e04409 SHA512 d15966f28c81025fd34bc247fc2f3f4ceda3c7dadd23f28487c80fe3155666665b9dd451e59356cd6bdcd30197be9a0439ab5c0b9383ab655870aa9033d58d94
diff --git a/dev-util/patchbin/patchbin-20160208.ebuild b/dev-util/patchbin/patchbin-20160208.ebuild
index 1f883b3bfbca..314b06b51f67 100644
--- a/dev-util/patchbin/patchbin-20160208.ebuild
+++ b/dev-util/patchbin/patchbin-20160208.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 99999999 ]]; then
 else
 	SHA="4ffcf184bb71c6c3512b3a8c144dcf4a3a76d23c"
 	SRC_URI="https://github.com/wine-compholio/wine-staging/archive/${SHA}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~x86-fbsd"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/wine-staging-${SHA}"
 fi
 
diff --git a/dev-util/patchbin/patchbin-99999999.ebuild b/dev-util/patchbin/patchbin-99999999.ebuild
index 3f22e8921aa8..c937a002e2fa 100644
--- a/dev-util/patchbin/patchbin-99999999.ebuild
+++ b/dev-util/patchbin/patchbin-99999999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 99999999 ]]; then
 else
 	SHA="4ffcf184bb71c6c3512b3a8c144dcf4a3a76d23c"
 	SRC_URI="https://github.com/wine-compholio/wine-staging/archive/${SHA}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/wine-staging-${SHA}"
 fi
 
diff --git a/dev-util/patchutils/Manifest b/dev-util/patchutils/Manifest
index 575e662d7175..661b9a30cfff 100644
--- a/dev-util/patchutils/Manifest
+++ b/dev-util/patchutils/Manifest
@@ -1,6 +1,6 @@
 AUX patchutils-0.3.3-format-security.patch 715 BLAKE2B 48be5e5e0376b6520cd0baffca1cc385bf3a267c8443b4ec195d302da6b165604471b919c47104943c1ccdc01d3c9866d93d1d8730e1a8b6889f433f607fb73a SHA512 b98932e5e48dfefb2ef8550c7f212cb0bf7417b0ed42705e3ddd9164d522ebdb47a0610539769a49a19d10e6389eb9e764fc5ef7bdd03af9b29feeb76a51c8fa
 DIST patchutils-0.3.3.tar.xz 156328 BLAKE2B e7da090e1fc7f95f5c2e4c02828702b485dc92fa22a4f45d69f5d9f610fb5a5e3267794fa572cf3aa73be45a86a5c889776eeadf5cca98237d97e53cb1b9be91 SHA512 4ec085078e9ae2e878dc10fbfea5974d9772716aef5d8e130a0023ceaa26640bccfaf1022c8153923b38230b36c8d4dddf4aaa674076c733bb1277895b63a268
 DIST patchutils-0.3.4.tar.xz 166400 BLAKE2B 382be328bfd1ab848f38126ad7a41a4c953844956c181265953a7496c8de3df5d90d071a823b226ceeddd7321bd4ecae1e06c8583155b08826c97177efa9b68b SHA512 ede006122fad180b78feaf69294f1c40c0a764981fa581f1893abeeb0421f9d586fc33f79d065690a6bc6187a31f11311b086669879dde12c6e49c7c8a2aa440
-EBUILD patchutils-0.3.3.ebuild 754 BLAKE2B 2fd891fb4f4f8e98ebc3c76d08f3ab2652838ad8760f09516b10761297cb93dbdcc29ec03421eb41bbd47a84eba9f445224a3071620c20c329ae60e06c73425b SHA512 8f67afa723ad1162d17c816bb3b185019dd648da5c6e541ac74a974e9b76689ce93df139bbf7d87c6746a87425e0e65c76cff70ae9d06b731afbf06ce7d1ddef
-EBUILD patchutils-0.3.4.ebuild 786 BLAKE2B 28d234a96c05e400f7827b543983ca77833ad58a176c48949c80f7adc6d2efedeab2506aec4f096100c64225c36470488714fc2818c9f4c3adc3b3adbe23c92c SHA512 e3903c17b9397e3597ffcaa0850101e3d25e1b20cc81db908691404fa0e9c7279cf96564a7804a10dfc458a12988898130895426af49b820b6c13ead44fb1977
+EBUILD patchutils-0.3.3.ebuild 744 BLAKE2B f791fc4376e96181a6dc00e991b39667a60baa2b53b47e1753b090ab2f2d7a013e02228fb353b4b78dd5ce767b4e06f4e287a70052ac942b10149b62b768919a SHA512 5f35bd889833e2fcd4df8d5288e36d40bc6c18f11bee9382c2d5470fb621826f9e87ca66166da7eea264f316161e3ef3c991117772e9ba8f23a24c984afa9f5a
+EBUILD patchutils-0.3.4.ebuild 780 BLAKE2B 802ed48adc72dd9865b130d61b8068812037f3d5cd764b71744b317366478bd6610afd91c6cc562093f6122e357e39b0edc46fe4bef46b617068c66150f7accc SHA512 da860abfb9cd4a29cff972fbf5c3df7c05b9346cd595488ef860c07667a119c4edbfc3c5e041e38d3896c0a5a219b8ae647e858d44c43adc3838150644bff59e
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/dev-util/patchutils/patchutils-0.3.3.ebuild b/dev-util/patchutils/patchutils-0.3.3.ebuild
index 7cccfbdbbac7..24bf73e6f18d 100644
--- a/dev-util/patchutils/patchutils-0.3.3.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-util/patchutils/patchutils-0.3.4.ebuild b/dev-util/patchutils/patchutils-0.3.4.ebuild
index cc9698ac817a..5f090fef4c4f 100644
--- a/dev-util/patchutils/patchutils-0.3.4.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.4.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
@@ -9,7 +9,7 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 # testsuite makes use of gendiff(1) that comes from rpm, thus if the user wants
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 5f569d494f50..e86f0bdb7949 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 5006 BLAKE2B 601f4025c6fd62fdebc9aafa7d1ec1128ae2670327683055ec14cc759418badab5371a7a433ef410c02bb184e2f2b820a8f593cfb638829986123f7c8f82175e SHA512 194ee54e648038eb93afadd2b440c6feca9d19547d46e173ed75a637db99467a7c7c4b1ae75e11cd5c1ddf53c077c3e1ce8a7e098986e90f9ee052c3e55d0984
-EBUILD perf-4.14.33.ebuild 4957 BLAKE2B 178c3e4dee18e132719f42cf83a209ac866dde793d69a3df3fd1a20585974dbc5a538d3d4dc5638fb20ff19ffae7eaf5a84d44b0b7f9b90ddf50a6794a57e71f SHA512 1c2346b9fd9c507185556e984b4976c55727290717d982b0fd2258e5d2d8dee015a62773de672afc9b7283afcec3820a20244911f44b5496c4bf53f78f34f695
-EBUILD perf-4.20.3.ebuild 5996 BLAKE2B e686a34c32165de5d83a6fe5e03131ac035b1109543f8c98213f9ea6c92a9d740befed22b5f963a1625bbca103d18b740223c48117ac8b93e5f288d6b779e225 SHA512 a07e343605b352a39e2ef29c6ebb52daa891fa99dccdc74d6fe2fec8f8faa0e20497f307e28ce85093675cd0a2ac86c3f0a74083cc79e3583b1f2134afd20691
-EBUILD perf-5.1.15.ebuild 6314 BLAKE2B bf3d8d8999c81b1efc27145c6742874377ef5273d7a6364606c49498c3038e0ed7385ca31177b81c019573cec62d600d68f7b42b184d2c68d51189f32c711890 SHA512 78e1914068316328444510eb7cbe8f7306b6d0a9ec6343df77d659b86ab5b442d893dff05e86828f9e8385c1d4736c94e80ae5bfd2b67cd9839e7c8bbfdaa095
+EBUILD perf-4.14.33-r1.ebuild 5050 BLAKE2B d46e8022e1a30987056ec44cb1c572b114041b91672428fb73a234b2258e6f1a71e4dd062e70ebe07487bdd767b53d19297baf18c599674f1bc59642e188ced6 SHA512 917893afd097be5e8b7d6c4eeb71750d67dddcf368df2b7a28d1f82a6f96e6c0bb92d0aab810dcdf4224d44c1a8fabb1ddb29f839f1ef5abcfc6f369afd8dd91
+EBUILD perf-4.14.33.ebuild 5001 BLAKE2B c5a5919bf33d1d1f9ae73c73715b8464ea53bdf81df6fa2fa73640a2ce519b2801122529ca5d6d05b48822d6f0985c0b3838a9ee414a38e7f64e281d4dc4b584 SHA512 744be026660a585479c3bd3ea278cd630d49d99777a50e3f76a296ec3f21ee6aa6253b9ba0c31405ac9aa9f68734e8101dec34a50e8c6cb52d7ab6fc5e377f89
+EBUILD perf-4.20.3.ebuild 6040 BLAKE2B 6b2afc45b7644e598d1c194616ad0aadc1e0f08f2bd227e8bb98fbc3742ffc7ebb5e043d1c8a0fb863933aecc365895cebbbd9aff29c85c4b30815e260809fde SHA512 95fe444b3eb8b558012e6050963524299b56b4869c78a4f15f6afbaf4fe70f50b858c8ce6b21b37c6321f8ab118b436e6daa3053f45ad4c58fa7137394b44a56
+EBUILD perf-5.1.15.ebuild 6358 BLAKE2B 7750e26c220654eeb9a2f0332032fa75c028151f2cd3859ff85e8adce404cc531ab505e1814bb2de39da811c69599f0f4f2ad51efce0da9c5fea7f7c6a0f4bd5 SHA512 6e3640e6591f0b3ecfe9b96625d3e3bfb102bdb6363346847530aac5e304c7e651588112cbca57a3fa0928887884ce36b6b83e1a09f8ce00a89f98f0db0bb73a
 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 62f2873092f0..8c80e235b46a 100644
--- a/dev-util/perf/perf-4.14.33-r1.ebuild
+++ b/dev-util/perf/perf-4.14.33-r1.ebuild
@@ -17,20 +17,20 @@ if [[ ${PV} == *_rc* ]] ; then
 	LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
 	PATCH_VERSION=$(ver_cut 1-3)
 	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+		https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
 elif [[ ${PV} == *.*.* ]] ; then
 	# stable-release series
 	LINUX_VER=$(ver_cut 1-2)
 	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
 else
 	LINUX_VER=${PV}
 	SRC_URI=""
 fi
 
 LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/perf/perf-4.14.33.ebuild b/dev-util/perf/perf-4.14.33.ebuild
index dc982eb33d6c..799478faa0bb 100644
--- a/dev-util/perf/perf-4.14.33.ebuild
+++ b/dev-util/perf/perf-4.14.33.ebuild
@@ -17,15 +17,15 @@ if [[ ${PV} == *_rc* ]] ; then
 	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
 	PATCH_VERSION=$(get_version_component_range 1-3)
 	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+		https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
 else
 	VER_COUNT=$(get_version_component_count)
 	if [[ ${VER_COUNT} -gt 2 ]] ; then
 		# stable-release series
 		LINUX_VER=$(get_version_component_range 1-2)
 		LINUX_PATCH=patch-${PV}.xz
-		SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+		SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
 	else
 		LINUX_VER=${PV}
 		SRC_URI=""
@@ -33,7 +33,7 @@ else
 fi
 
 LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/perf/perf-4.20.3.ebuild b/dev-util/perf/perf-4.20.3.ebuild
index 04e3df46fcb0..1cf8fe37964b 100644
--- a/dev-util/perf/perf-4.20.3.ebuild
+++ b/dev-util/perf/perf-4.20.3.ebuild
@@ -17,20 +17,20 @@ if [[ ${PV} == *_rc* ]] ; then
 	LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
 	PATCH_VERSION=$(ver_cut 1-3)
 	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+		https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
 elif [[ ${PV} == *.*.* ]] ; then
 	# stable-release series
 	LINUX_VER=$(ver_cut 1-2)
 	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
 else
 	LINUX_VER=${PV}
 	SRC_URI=""
 fi
 
 LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/perf/perf-5.1.15.ebuild b/dev-util/perf/perf-5.1.15.ebuild
index 791892da875c..22d9957a2549 100644
--- a/dev-util/perf/perf-5.1.15.ebuild
+++ b/dev-util/perf/perf-5.1.15.ebuild
@@ -17,20 +17,20 @@ if [[ ${PV} == *_rc* ]] ; then
 	LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
 	PATCH_VERSION=$(ver_cut 1-3)
 	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+		https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
 elif [[ ${PV} == *.*.* ]] ; then
 	# stable-release series
 	LINUX_VER=$(ver_cut 1-2)
 	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
 else
 	LINUX_VER=${PV}
 	SRC_URI=""
 fi
 
 LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 267a2286993c..f3a82b4de7fe 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,4 +1,4 @@
-DIST pkgcheck-0.6.6.tar.gz 186971 BLAKE2B 474bd3ddd6b0a4d4b242c631bd01bdd1351990500c1e9a3b97ae43064ea5ae4c3de57e2ea9e4574c30e52dbe1d10b35f71b2623336f42bac4af5e7e26290a208 SHA512 ef9b2126e3d295c9166f0b57902e62f8791ebe90e1dce333e787c45841a87acb0aa7e1b4ad7436d885a53aed9ce6c7d0619817e28c52b3195be49110bea8d39f
-EBUILD pkgcheck-0.6.6.ebuild 1344 BLAKE2B 1615f6d58748fccda11be940c4b5db1fcd023236b2e67ce09e56e182b7a72214365d75c85dcc0f8e9ee5fda639c72a2af19b858b11d48aafabccf0a92f1261f8 SHA512 95f6d648b4b7407f694ccdb0fe73c8cced9f1e29a47b5dee70ae37eca4fb7376d8d7710f5dfc893a712776746c5e34ab6b8418c459f53a47634389aaadc1bbb2
-EBUILD pkgcheck-9999.ebuild 1404 BLAKE2B e0189de8e9cbf2d811bf073cd5e7b3310a5da819750be45e33483453c0dc12e049ac2bb8d81dea06e2e6705d8adb9584527f76a4669eb0c1b91f106e3ca98b9d SHA512 b208d0e7d1102c0e491714fda766d7728aace9b033338aa0a027603af94020b41aba3725b16cd89eb4929bee7986728bb8858da024c5d0757a29677e081129e3
+DIST pkgcheck-0.6.8.tar.gz 188777 BLAKE2B 44c1dfdb09c290079d8b1e07a0937c07135ee5691ef49ea849c5a9a22eccb9ddf00de497facc6b238caf7c1c0d1c964c71bf37f0bfd92df111d90234dfe27bc5 SHA512 d80785ff9041ec4c8beb89847ad069521322938875b7f8484ad7438939a411ca4304e4a91b395944331ad0f0fa0439082f021ccdd8d7189c61da931ebf11d8ee
+EBUILD pkgcheck-0.6.8.ebuild 1404 BLAKE2B 0e4855d778ac6819cf318f1103a126227158cb6ed8f324306823e4e9b2150afb387db41fc5970781ba28d9e6190647ee915504de1f6ecd2b43e2c8f362d18d72 SHA512 2167bd98a02fb1b2ed74e16ed859d7bb5938849ce8feb2fade0b8eebb6c03792cfd37e06dab39d98a2526e8b7cb852af0d3af04cc7cb7a0581a248d0f745cc45
+EBUILD pkgcheck-9999.ebuild 1404 BLAKE2B 0e4855d778ac6819cf318f1103a126227158cb6ed8f324306823e4e9b2150afb387db41fc5970781ba28d9e6190647ee915504de1f6ecd2b43e2c8f362d18d72 SHA512 2167bd98a02fb1b2ed74e16ed859d7bb5938849ce8feb2fade0b8eebb6c03792cfd37e06dab39d98a2526e8b7cb852af0d3af04cc7cb7a0581a248d0f745cc45
 MISC metadata.xml 443 BLAKE2B 396392d1a167c32f589867da690566a92b290e1311ab159688cdd8889e84ed0380c1bea107c7457447f22f48830df9341f9fdfea1514a82255f37ea2647dce4e SHA512 5c7189d329a06617753d3dbdb96765a7c3941b90584173bf45c1047fa08dbbc8ed85f1c8f38929fb0cd11b16daa074427accaab079d135ecf038e3d0a162a727
diff --git a/dev-util/pkgcheck/pkgcheck-0.6.6.ebuild b/dev-util/pkgcheck/pkgcheck-0.6.8.ebuild
index 773ee0cdb919..f7ff040bf763 100644
--- a/dev-util/pkgcheck/pkgcheck-0.6.6.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.6.8.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc test"
+IUSE="doc network test"
 RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *9999 ]]; then
@@ -29,11 +29,12 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.8.3[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.5[${PYTHON_USEDEP}]"
+		>=sys-apps/pkgcore-0.10.6[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
+	network? ( dev-python/requests[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 999998e6345b..f7ff040bf763 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -29,7 +29,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.8.3[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.5[${PYTHON_USEDEP}]"
+		>=sys-apps/pkgcore-0.10.6[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/pkgconfig-openbsd/Manifest b/dev-util/pkgconfig-openbsd/Manifest
deleted file mode 100644
index c5555af0df77..000000000000
--- a/dev-util/pkgconfig-openbsd/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pkgconfig-openbsd-20130507-zap-warning.patch 525 BLAKE2B 7da7e41a0ad141df1df0a291a87c9ec874dc279613649afa33825f1d3b1149e843ea5686621da50ffae9ca337cfdc0026475f017a2f68b4d44ca3582b340f91e SHA512 984d662b5918a4a0f1bc75cee538f8414ca431a6e3132b74f86a2e3ef538479b7966042f414a103393a78ff236a78eb5aeef0107c16493ffe86f3c66cc64f791
-DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-DIST pkgconfig-openbsd-20130507.tar.xz 10876 BLAKE2B 38beb8dfe17742fe83d57e62d5898de1d6d029ec5bf4caa5d16edb317e179e45fc6bf3c5d7bd56792b5e774ebc53d7cb51a721abd62753f67b1cd5cb76bdfb1a SHA512 39335c986be0f58fe22bfcda9b6196b34c7c8b7e889df2df0d9707fc699ba6e45df7aaa1d1f4bbe53098ea5fb1bb4aa3e5e33c22971978b40bba395642b41b69
-EBUILD pkgconfig-openbsd-20130507-r2.ebuild 1765 BLAKE2B 76fd533299735c8aa83a3a0fe60975b7c93fc48f300e6f49fb048c2516e736bb3d5ca2e41c14507391b2202c22178f6c2f930ff8e8e694e8754162e1dbc0438f SHA512 71e2cea8ef068c4e0b6f81796529f6c6be6db03264621a3a7b676f311697d606a53554f07e6132626f8955757f9bef585ee88d6c8f6dcc1b551edd13d417120b
-MISC metadata.xml 277 BLAKE2B 4e2570bd81b94d1f9e5b33eb615a8bd632cfd09de51be61f755b5ff9fbf8023a31317be1a04051aaa9a02d56df8a2417c7b46e62df2a0b926409ee3b31955181 SHA512 d1acb1b992610407fafa7341abc0a042a3ccdd04f155a62e0280d7ed4bc403109a6937943d878851966f1c4295a6abf868c71de0f2c32989971b8f00c57fd4a5
diff --git a/dev-util/pkgconfig-openbsd/files/pkgconfig-openbsd-20130507-zap-warning.patch b/dev-util/pkgconfig-openbsd/files/pkgconfig-openbsd-20130507-zap-warning.patch
deleted file mode 100644
index 41784c919e19..000000000000
--- a/dev-util/pkgconfig-openbsd/files/pkgconfig-openbsd-20130507-zap-warning.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Use of $_ produces warnings which can cause build failures in certain consumers.
-
-Backported from revision 1.4 upstream (http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/pkg-config/OpenBSD/PkgConfig.pm).
-
-Gentoo-bug: 538012
-Gentoo-bug: 545314
-Gentoo-bug: 545322
-Gentoo-bug: 545962
-
---- a/src/usr.bin/pkg-config/OpenBSD/PkgConfig.pm
-+++ b/src/usr.bin/pkg-config/OpenBSD/PkgConfig.pm
-@@ -91,7 +91,6 @@
- {
- 	my ($class, $fh, $name) = @_;
- 	my $cfg = $class->new;
--	my $_;
- 
- 	$name = '' if !defined $name;
- 	while (<$fh>) {
diff --git a/dev-util/pkgconfig-openbsd/metadata.xml b/dev-util/pkgconfig-openbsd/metadata.xml
deleted file mode 100644
index e5d00474fa23..000000000000
--- a/dev-util/pkgconfig-openbsd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!--maintainer-needed-->
-  <use>
-    <flag name="pkg-config">Install as a replacement for <pkg>dev-util/pkgconfig</pkg></flag>
-  </use>
-</pkgmetadata>
diff --git a/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r2.ebuild b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r2.ebuild
deleted file mode 100644
index e47abefe3039..000000000000
--- a/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit eutils multilib perl-module multilib-minimal
-
-# cvs -d anoncvs@anoncvs.openbsd.org:/cvs get src/usr.bin/pkg-config
-
-PKG_M4_VERSION=0.28
-
-DESCRIPTION="A perl based version of pkg-config from OpenBSD"
-HOMEPAGE="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/pkg-config/"
-SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz
-	pkg-config? ( https://pkgconfig.freedesktop.org/releases/pkg-config-${PKG_M4_VERSION}.tar.gz )"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pkg-config"
-
-RDEPEND="virtual/perl-Getopt-Long
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkgconf[pkg-config]
-	)"
-
-S=${WORKDIR}/src
-
-src_prepare() {
-	epatch_user
-	ecvs_clean
-
-	epatch "${FILESDIR}/${P}-zap-warning.patch"
-
-	# Config.pm from dev-lang/perl doesn't set ARCH, only archname
-	sed -i -e '/Config/s:ARCH:archname:' usr.bin/pkg-config/pkg-config || die
-
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config )
-	else
-		MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config-openbsd )
-	fi
-}
-
-multilib_src_install() {
-	local pc_bin=pkg-config
-	use pkg-config || pc_bin+=-openbsd
-
-	newbin "${S}"/usr.bin/pkg-config/pkg-config ${pc_bin}
-	newman "${S}"/usr.bin/pkg-config/pkg-config.1 ${pc_bin}.1
-
-	# insert proper paths
-	local pc_paths=(
-		/usr/$(get_libdir)/pkgconfig
-		/usr/share/pkgconfig
-	)
-	sed -i -e "/my @PKGPATH/,/;/{s@(.*@( ${pc_paths[*]} );@p;d}" \
-		"${ED%/}/usr/bin/${pc_bin}" || die
-}
-
-multilib_src_install_all() {
-	if use pkg-config; then
-		insinto /usr/share/aclocal
-		doins "${WORKDIR}"/pkg-config-*/pkg.m4
-	fi
-
-	perl_set_version
-	insinto "${VENDOR_LIB}"
-	doins -r "${S}"/usr.bin/pkg-config/OpenBSD
-}
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 84bf1d0533a2..4055455faf03 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -3,9 +3,9 @@ AUX pkgconfig-0.28-strip_system_library_dirs_reliably.patch 777 BLAKE2B fab15ae7
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 DIST pkg-config-0.29.1.tar.gz 2013454 BLAKE2B 5f33022b2df83de1c9202e090ea9be926d1f2b796152969d46ad45772ceb792c3f2bb95714cf1def28393b32db1b4052c3fdfe9f71076d130a57172987c04d0e SHA512 d2963355929d7aae0fbadad445d67b5c6762934fc4963a10a4b72ae90f7f6df4e6a38694884b924ff37eedaf636b49f3f521fe4eb3009e0322a402f330f1b4c2
 DIST pkg-config-0.29.2.tar.gz 2016830 BLAKE2B e8f0420033524ad768cac3c82138546e4cd76c47f5835b7b98662ab01eaf3feef08f495a69c04980d51b57935567ab1d465ef4e1d0529735ad0031c828585324 SHA512 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75
-EBUILD pkgconfig-0.28-r2.ebuild 2906 BLAKE2B e34421f1501a31d6effe56e22b2ebfafacf6661c295369aac744f4bcdfbc404d032bdf3648c15b28f8ce0b6774190c4b601c30b53f5874d36d986957376763d7 SHA512 977205c37301a9743edaf47ad980756a77539a02e1f3d28c3e6d4f0968ee664194d87aae043e70245d22c8b7dac3d37aa85c008d20ff4a0e7fc737aadb7c30fc
-EBUILD pkgconfig-0.28-r3.ebuild 3429 BLAKE2B ceb0cf3a8abe4a51707d28275d95d53ea09ae15b0a1ede4c0ec47f4ce6f71689b2062e74f98b66c5e09e3f7d52e64b64a9427265b87df89561f37f4263d20a40 SHA512 dceb6e8aecbfd99f71d2cb92a734bd4b8ae109d185b8418463337dfb64da4c41c7cbb1499e8805fb1fa388cfac9c54afc66979b80f4182ab7c1e00ed7236cd32
-EBUILD pkgconfig-0.29.1.ebuild 3793 BLAKE2B 140d9135253a3542fe128c344485508a7d85ed2351137a5c3266cd07cd4eb6d8f96324a3278258dc5d22f6ae44640f39879dab84c1341bf3369c66a220d09b2f SHA512 7fb87709af38ca0a857295b3822c8e3bbb81a82ff9644da3a9f800b46ad2cb24edb825246fcf2ce2bf04f6c019a7099493032f84497a0fbdfa79953e1ae2a1df
-EBUILD pkgconfig-0.29.2.ebuild 3784 BLAKE2B 964741f1d3cbb429102c7ea8f97d5cecc2710aecd1bc09c72e8f3e934a3c7ae0a468be6fa99f68a0bef63498f57bdfc425b929a2bea112d145a5909c98a0f2b1 SHA512 f7e6191565fba9e5dc38a9b5625b138e497856fedd61b0b8bc08ba6daece60391ae07e840ff57bf467d91b923ed59a63f741c9a0cae045b71f4b53865f6d5169
-EBUILD pkgconfig-9999.ebuild 3793 BLAKE2B 140d9135253a3542fe128c344485508a7d85ed2351137a5c3266cd07cd4eb6d8f96324a3278258dc5d22f6ae44640f39879dab84c1341bf3369c66a220d09b2f SHA512 7fb87709af38ca0a857295b3822c8e3bbb81a82ff9644da3a9f800b46ad2cb24edb825246fcf2ce2bf04f6c019a7099493032f84497a0fbdfa79953e1ae2a1df
+EBUILD pkgconfig-0.28-r2.ebuild 2884 BLAKE2B d024e6529e8e5ec34f9a0b87cf670c3a61e58430c8b335f183594a0f5f36afe2f9b72d38e58490b17751aa79f537b40fd193198a4b10470ad535371b1801caa9 SHA512 7eecb0dd1bff91c0833b85db3783ae48e13dcea9938c10508362b5032dc5e5c0cd801a0e4e4e3a2d0e67a9aefb74ca26a33c5671ded54795cb36a33ddc62957c
+EBUILD pkgconfig-0.28-r3.ebuild 3407 BLAKE2B fe8af7216656d1b541e2d90cf3f0fbc8f14f57ba44f20ecde0e0e0c107c685ee17bd710b31b9bb87d0d4d955c5f1e118b332fe2409b5c09cc648686e9b143064 SHA512 c426d31cf521c00edfa554fe8b1cdc4f1588f3e804af228d168f6a729ca45206b8d4f8c96a0e7f8af331cca7ebb379b7f37c514ccd70fe582e7f2df0511a80ba
+EBUILD pkgconfig-0.29.1.ebuild 3771 BLAKE2B a86d9a18a4d9509816fe4332f3d9558cde720438dae73e5e7ecf3abd78a0c8f999abf7923fbf63eb40e6a19e83911fe139cfc8903fe518c7f479964aac643e78 SHA512 e5b8ce820b4d1ee9db40ad8248ebac2050e3af964916464b3484855787e7a56c8bf16974c30ea79ed9362c39fc058d7cb3ebf81e9c4e9e3ef69f79b854af01e3
+EBUILD pkgconfig-0.29.2.ebuild 3762 BLAKE2B 034bd9bc76c8f41ed2c49e645dea9b6b3abb78803517139036f87d65fc1c8770fbfa36aa4531d74e2e0bb7a071eee5964c558ef454d02bfc6aa14e6e89e76ba8 SHA512 ce6de7b5c146c46313edc4e716a8cc37928ee3b26e5282d658a330a7641eb59b9bb254a4a58be4361ba47854fed9299d7f6716ae5272037b9b1dbc0baf143ee6
+EBUILD pkgconfig-9999.ebuild 3771 BLAKE2B a86d9a18a4d9509816fe4332f3d9558cde720438dae73e5e7ecf3abd78a0c8f999abf7923fbf63eb40e6a19e83911fe139cfc8903fe518c7f479964aac643e78 SHA512 e5b8ce820b4d1ee9db40ad8248ebac2050e3af964916464b3484855787e7a56c8bf16974c30ea79ed9362c39fc058d7cb3ebf81e9c4e9e3ef69f79b854af01e3
 MISC metadata.xml 325 BLAKE2B af0abf473903faa5ce1e6d1918fa87b558b99b82d95c7f95ecb596684f7f55ee365a10e943752d1f3c8b6b1684ac4e0985329b89a6f19de2c926bcc0c3127382 SHA512 0db9510bbe132efa03acbbb4fb31407188edd83a6ac5c1d84316fa682db9399879957e8cd4447c1cbde01638f6d220f9a30a17611cd31e35769e71e5d38287a4
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
index e5f4e5588ea0..cb52ca9d7d5c 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
 	inherit autotools git-2
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
index f6d6a5400168..12bfcf9d3e96 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
index 8b33f74cedf0..1872abeebff9 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
index b89fd976448d..614a58376914 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
index 8b33f74cedf0..1872abeebff9 100644
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/promu/Manifest b/dev-util/promu/Manifest
index c132b4c88d7d..926c0e196607 100644
--- a/dev-util/promu/Manifest
+++ b/dev-util/promu/Manifest
@@ -1,7 +1,3 @@
-DIST promu-0.2.0.tar.gz 1072026 BLAKE2B 2b68d992b37421d6b9a08cc9a9134f9ae52643d4c2844c8e1f6f6724f015582c99a8724ab6b8d1ee69437c660e3b972af85949e3221d8d8c709fd8c1a45e1256 SHA512 4da4716a9d4fb96b6016c9bd452fed0403721ab15f95e6955db2ab6e8e482f3bbb35cb4c1c94f690af9520729a93c100015ee48cb69627e129004ae0b15257ae
-DIST promu-0.3.0.tar.gz 366019 BLAKE2B 0e6e93bb573da0ef20947b72989d8a68a7d6d1490efc802acaee58c9f546e9b46162054172d445e4dcb5cbc33c152529f006edf3acc594b92927df0ab489f86a SHA512 543cb514fcab9700bc45cb1b4a9f056720af4acf8ed949e03445c2f4e52d89f6fb8eda3ee538bc92feb2dc06db31026bebad9bf6c86a6e37a0be294d17e4b518
 DIST promu-0.5.0.tar.gz 643970 BLAKE2B b61e8421b5e68f3cd0ec125faadf64c7491f54cfe03de9d6497cb627e5d548b58fafe735c76a5a86a55489aea56dffb6e02d52acd1ca977ea32ec974f34475ac SHA512 b895c0b5b5a33bd0c2372e8c1c698b8548b1b7086849161ffa99bf9718f4b7f3a57bcf218681d84e4cc5ef31ef39df7e6c59345a84441369ec3ec402999ac4de
-EBUILD promu-0.2.0.ebuild 760 BLAKE2B 2630eaaef487fc9edf249c7ec4f61bc6d8d3245e6225c26cee3af0736b1d13549bfafd4be026646e29f29b1e9a5305a4b79c012cd2a03117fbe364091abb614c SHA512 b4ba612c32787b1d85398dc1cefa49e6dd35be60790c5029d4d8a8ed697154b116e2f1cd8b0dfa648df742c7455eeeac2b79113a070b3fec9af8f16ac0e14aae
-EBUILD promu-0.3.0.ebuild 821 BLAKE2B 16bcfe2bda86ca04132ab13917332af618a7c76f219321419e8b6faa5de44a82d5006e7b04eb9f8060641e1ad0e89513df3efc96222ca509082635139d9f6b07 SHA512 4de371240783536ffb116d3c14b460b645e36d2a8ba82a150824b16412aa978c60c7faa8222baae93f9d4096cbbfad7329591d735d35c26de405c25864ff83d5
-EBUILD promu-0.5.0.ebuild 838 BLAKE2B ab1be592ac6ba310b6ef41abf5c20511282bbeabd7303e70ae428501850bbb327ed75a905aa6ce19dc91c9b5422d9f9de20b5e7ede477f9cdfec4534c8e65908 SHA512 66e89e2096728ecf7dd20554d0c3fc7ac6c08dc197d3814f8fffe900d9de0991cdc4d1cd38f3a3a401993fd00d584d7ea0f1ada86c1fbe068b2e06ed43cb17d2
+EBUILD promu-0.5.0.ebuild 837 BLAKE2B 04e4d6066ec90ac3046e9f50f37f360ea7fcea9a7acd458f6dc958b93d03af921dc2f5f00ae10de32da9d95224a4701188f4f7e486807ac793c814706a55a1a3 SHA512 98c30d452c359edccf06c83c6eb4abdc3fdd961da554d8ec43752bab8c515d99d574ca7235a370c29df7f90dc59dc11313fbe92831442cbef6ac17d3661559f2
 MISC metadata.xml 326 BLAKE2B 84a14632c102d52e02ac2c9a8e7f8e2edfabb3401ab04d5fe94eab4c83ef053f27260aff0ad2b04769653665325afa6db028c8ee281835b925456b432d593eb1 SHA512 2870183c141e5d9ec65aba01e7ab02443f42d13d0f39c4ba51af7adacabdf360cb2308cb898c4bf4f0a8c3e20b35d511af2b978fafcb4de47177de77819f6853
diff --git a/dev-util/promu/promu-0.2.0.ebuild b/dev-util/promu/promu-0.2.0.ebuild
deleted file mode 100644
index df89ca92f81f..000000000000
--- a/dev-util/promu/promu-0.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/promu"
-EGIT_COMMIT="264dc36af9ea3103255063497636bd5713e3e9c1"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="Prometheus Utility Tool"
-HOMEPAGE="https://github.com/prometheus/promu"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11"
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${EGIT_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" emake build
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{doc,{README,CONTRIBUTING}.md}
-}
diff --git a/dev-util/promu/promu-0.3.0.ebuild b/dev-util/promu/promu-0.3.0.ebuild
deleted file mode 100644
index 9a9de86366a8..000000000000
--- a/dev-util/promu/promu-0.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/promu"
-EGIT_COMMIT="295a70a7f580b886572861b19545b28accfd4491"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="Prometheus Utility Tool"
-HOMEPAGE="https://github.com/prometheus/promu"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11"
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${EGIT_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOCACHE="${T}/go-cache" GOPATH="${S}" go install -v github.com/prometheus/promu || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{doc,{README,CONTRIBUTING}.md}
-}
diff --git a/dev-util/promu/promu-0.5.0.ebuild b/dev-util/promu/promu-0.5.0.ebuild
index 313fa049d984..abdc9907574c 100644
--- a/dev-util/promu/promu-0.5.0.ebuild
+++ b/dev-util/promu/promu-0.5.0.ebuild
@@ -7,7 +7,7 @@ inherit golang-build golang-vcs-snapshot
 EGO_PN="github.com/prometheus/promu"
 EGIT_COMMIT="642a960b363a409efff7621dbf5b183d58670ec2"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Prometheus Utility Tool"
 HOMEPAGE="https://github.com/prometheus/promu"
diff --git a/dev-util/pscan/Manifest b/dev-util/pscan/Manifest
index b419922f5eed..c997b3a12d66 100644
--- a/dev-util/pscan/Manifest
+++ b/dev-util/pscan/Manifest
@@ -1,4 +1,4 @@
 AUX pscan-20000721-fix-build-system.patch 380 BLAKE2B 93c29ae8c17a798bd7b0a28c43dfed21410f336fa17c7ba58c2c9b5588831ad6ca6e056d2cf9d6375bc2ba1e043665525aa58e903545691f9d6bd21616d11b5d SHA512 9c0e2b237553ae396398c0e0727b5eed7879ea112d940289c60be4e3f289dbcddeedbbfb4c9563e558dbc96d0f7420e672b9d70cc488be86b00ef42b5abbf76c
 DIST pscan-20000721.tar.gz 14555 BLAKE2B 8e1a8ea91bc2a1b323dc607f703565579e596a3001151609e46a09160766b3b913610a15b64859dc88031a3acf2e3c147dcbd7b033517d3786976ab3cb1bc9f4 SHA512 83196cc9c450217fc2287d38fd1a0b9d1d9951b8f6328b6b9f7f50b680f653b099af04d4c448f3cb2b2a96871eec8772557851e887faa2f41dc259f01c031e78
-EBUILD pscan-20000721-r1.ebuild 743 BLAKE2B f7020c464af54a911d5d51d240371895799cf89d40d210b388d9c0fe568616d359187432ff4612df1ff4f0fe9addb7c68288b3346d8b7f783f9544bafbae73dd SHA512 0aaf95f7a7e037aba1d0fc24fb8045ee9cd08fbf3f27299c0ce995729519f1f788bb3d3addf98f82eaec101f79a0a82c6ee6352f999e68b8ac5b30a1e35d7b4b
+EBUILD pscan-20000721-r1.ebuild 727 BLAKE2B 0260933cabc7672ec4eef33231d1dc8bd8e71b7c03d02ecfda11bc8058980410a616dccc86335b353d98d9c8c7b34c5b6ec2edc2234cae3ed4970e06c15386b1 SHA512 291fc873bb49782b28f336f8da4bbe7c73f8a82046975a41ff4857648d0cc813425aef70841a10ca8f12d28968fe7a69294d60e968e15970aa4c38ca326fa7da
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/dev-util/pscan/pscan-20000721-r1.ebuild b/dev-util/pscan/pscan-20000721-r1.ebuild
index e63242af2bde..90a58dbbba2d 100644
--- a/dev-util/pscan/pscan-20000721-r1.ebuild
+++ b/dev-util/pscan/pscan-20000721-r1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="A limited problem scanner for C source files"
 HOMEPAGE="http://www.striker.ottawa.on.ca/~aland/pscan/"
-SRC_URI="mirror://gentoo/pscan.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index 7d2fcc333bce..ff2d1518b7a7 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -3,6 +3,6 @@ AUX quilt-0.66-no-graphviz.patch 1464 BLAKE2B b1a67706f29f3986de0202a4ea68aa2f00
 DIST quilt-0.50.tar.gz 452769 BLAKE2B 5d466d1feca8a1f702db9d5f2bb4340331d06e413992fc8f30111d48daf71f560d60444ddb49cc06096552f32feb44cfd369f370222f574cea4664f4324d04fa SHA512 c6258872bc591b35e93ba09cc17b4954696faf391aff71b7789cc8cc58c4c54e51b605896937bd1aa54545eed6bf1e9b70352ad9b643f869154e6953c0340365
 DIST quilt-0.66.tar.gz 413069 BLAKE2B 41201d54cb26d4761413365fe19b65bd6971ada1e69198d2edbc346df6a3060ff3af4d80551d68ab4ffe003183bc0a28515ce1d070db95f2b1a04a0680ac4fb2 SHA512 c2cb75c0937612e1e0da25b713acf629b6b5aacbd8254d8bd17220b63c7b8ca996cd9d0315a32d67d54a4a7dc01b212cdda33afaacf3db063da757f1973306f4
 EBUILD quilt-0.50.ebuild 1506 BLAKE2B 8bcc89c45c61601cfe777bef33830c4f2bbe949209cde060b18c05f3b4435752996bdaa0e4916a87e787f04de95127783b850dcd1639309b8e3332e6b088a6ec SHA512 80bf6055c1096b7b8898166d2e86f434f5bb8351e50ae2eaf64c95cd49e287e504f12fe0a628554d3aaad3264b1ed174fcae56744fefa59479bb4743089ebcf3
-EBUILD quilt-0.66.ebuild 1652 BLAKE2B 2aa2dbf723d700654d4dd1393f2d35fd18b316623cb526666d29fac4df4b5e72f010db94bbba4c2af24b254666b88703ba726d9492e3bf28d87e8a8f8d470a95 SHA512 e91b889e63480a64df027f1d3422106615c95208b3116bd523e07b00bb6a39501120f6728909e995de5a0ed4fcf647e8673ef7a9fa38396cc0713f74a065ee81
+EBUILD quilt-0.66.ebuild 1647 BLAKE2B 621b6ae0d8e140cdc01cbb91c0dfb0bb8f2881aa22f7da8b7794e9ca996da7d0077a0313a8411dcbda3db53326f976dd7aaf6ad2fbb60770ed1664fd2440fbe6 SHA512 0da0428658e047279803a197a71dd1099f00ecb7eb6d571e3b4e0cb7d336f460fdc17cbb5c4e5c2eab1d87d471c520e9c52486a047b03ee13ff3e172b18710ab
 EBUILD quilt-9999.ebuild 1764 BLAKE2B a013dfb3d65d2e69077e75673bcdad06216b40cc35a198346681e42162567f327ec4a0583868b1e62d7dfd8ea451abe3d420f0e7cf9b3491b066bdf4ffb56179 SHA512 ab39ceb5756c763b911a077ca98cde61143332b21708f62963ec0632ae3b02e4d319bc92a3b7c9fd74a5fbb04d6c537088bc63aeff1fc5b06f97fece2d07e2ef
 MISC metadata.xml 218 BLAKE2B 01c06279fa64627fda89adb9c5748c7629ff3eb46c10acc15b327a0f432d50b86de1d3980ccdafa9b620582db9abdf4d4506b1a53baebd6334f1a890a10783b1 SHA512 cff4a2ad321709df053184879b278c5a5abc74790344f6170cf020cf45a20d8062421e20d215c73002077d66c6367de5fcede710c2ffdd9f067cdf1f40b784ee
diff --git a/dev-util/quilt/quilt-0.66.ebuild b/dev-util/quilt/quilt-0.66.ebuild
index d58b06a7de32..f82d56b85a6f 100644
--- a/dev-util/quilt/quilt-0.66.ebuild
+++ b/dev-util/quilt/quilt-0.66.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE="emacs graphviz elibc_Darwin elibc_SunOS"
 
 RDEPEND="sys-apps/ed
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index d36a8508c67e..bb3209eabaff 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -8,10 +8,10 @@ DIST ragel-6.8.tar.gz 1211146 BLAKE2B 41d3feecb461cede104182d918e1f052256daa292e
 DIST ragel-6.9.tar.gz 1226871 BLAKE2B c6edc63eaa21a1529c5600d8491fdce39cff5180fa132046f48c32971e1698fea820c41735f4d74b332de657fdd4c81aecda71beb9d5cef71c27246d606b6b72 SHA512 46886a37fa0b785574c03ba6581d99bbeaa11ca65cf4fdc37ceef42f4869bd695694cd69b4b974a25cf539f004cb106e3debda17fc26e1a9a6a4295992733dbd
 DIST ragel-7.0.0.10.tar.gz 779503 BLAKE2B 2f7b8bb858555719b0c7afa8209be76fd07f9d06a8f75df723211c48d59f50c21f09a1f1fa031d53e434db933d1bc12299c75d8932485e5a43eccef7506667ad SHA512 2d1d4c469d8581239ec21f128e94ab452b398903302f82ef59ce03d6fb89bc89de6441dbe53ea99d7689866f7aec485ab1ec9c537908f21eb1394650b55413ba
 DIST ragel-7.0.0.9.tar.gz 850078 BLAKE2B 0e7d458e9f78fc7e0fb2e9a0c6fdd3f3789a9104f4441bc878ac64d077dee716e27d3a54c3898fcf1e4ba56b8d46d956a36b92258750f2541fd96f951038d852 SHA512 87de7d41af4a08f09d422a0e58820f9b5b1218acc4733c58690feea4f872790813b5f2d7505ce147a2a6e1bcd341926c35fed7c6b55f543bdf864b119868bcde
-EBUILD ragel-6.10.ebuild 952 BLAKE2B cd2f3209b58b2e9798742ce5c92de92b98b29d0ccbfa28ba71a1c0d9cdd223335b7e9bcc9aedee9f039547d2481988d7ebc1159cca78f547731762165663c60f SHA512 4dfd4cbd84bd9fb388a6671310a03e2a21a987f787109d909e90baf324727b665a37c9917f4452471314e2794fbc8ea1551cf33efd8d2d1b61c5f0eb7c5e0bdd
-EBUILD ragel-6.7-r1.ebuild 1152 BLAKE2B 752eab3a8005ccd511727ed5f533560bdeac7d740d19362896c3b54e012a9a5c094bad5227e30920709a332dae2af48558abebf734e51b5b59b04da869ecfdf2 SHA512 46bee68ca0e22ef5f64a827af52f3dc14374920a31e2817a4430726bb2278447b0515acf1e0b77d58e3a6330e580f71c735e2170e4503734dd31186c10907822
-EBUILD ragel-6.8.ebuild 1094 BLAKE2B be60938645339d483e12693638a81e77c04c7c4c7799d73de103076c8d7e95ce4c3b6e0e167996c97e5f2f1e65f4f7cecbb300e4b3676f4b198ef1312cb94b86 SHA512 f290a2edb43b60b52a563927343cb5f3672dcac30a598b6e95afe66858cfb33f0af5bc1d960e9b8efc05e9eea9a369045fe8dc7dc77abd596813d80f324d03ce
-EBUILD ragel-6.9.ebuild 1008 BLAKE2B 07f6911e9117b311333b373b2ae9f8e178ddb6417e7ff06f8ba46260eb3c32995647b369a6cebc3a0610766aa54f20fa17ca320d8834fc7dd35a5bdd7786182d SHA512 539763d6d3b96efc6d47b82474126058859e176050380521c473211927c074cb98256050ece6557e7692867fd571d82f8fd2bb0cb03e4855aff7b8ebb060f51e
+EBUILD ragel-6.10.ebuild 930 BLAKE2B ad400ece265f290ebb1fad3a6a5ecc83a88780a5ae0f6edc9f418730455d4b73c671c03e280adbac65ee6e270aab37827baae4bee3ee6b48e63b70c7ae6403ef SHA512 a6bb234dcb8527dec749965fd76cb0ab8c9de62152d1cc0e76379b2224960ff663b37253be3779c16241316c88bc764d5bd6fd0035b13b3343217923e2745b2c
+EBUILD ragel-6.7-r1.ebuild 1130 BLAKE2B 6f6480f6191cda811cabf2fd45875c376f617faad742f49aa51cc0c4b5e8c83752b93c08aba17ec05cd58981d952b5f02df0e78872655962808fb4f08b1fe3b4 SHA512 25461f40bae5fdbe10ad5a57f57bc4a6c60c9d37739c5dd23e003d0bacb5c596360926529f7b5d249fb343ba1729785c639a64a3f4c0970efd55b609f62d8b06
+EBUILD ragel-6.8.ebuild 1072 BLAKE2B 879c499b08c93ae6c01d42b1801b2f6b1d7f2bb608ddc099a8731a702c47216605a783b9bd95f108e155c1b341e8e60907ca11c88735be4e51f95ffd94392c28 SHA512 8ee237bb58d6eaeafd7b71c3f807d2399deb739e95b90e5cddca6ad33c76deb3fd7f0f276abf03ec51058e4fae4a0b77e2150e70642ea5538d83eab458eb7382
+EBUILD ragel-6.9.ebuild 986 BLAKE2B 40271635fabfc45f7fb1020b8636f6461ce4d09954090ca388bf8d70b7b7d2fc7b7897874bf0f18cd323ce1ba451ad63e937f019f65ab57022a198ae46878ebb SHA512 8855488a58b252768ff9eb61fbd757ba33f8dc6b02ba4631d7affeac45880a3d0382ba196246fba592f811363230c6c899859f2c9c77191edb36912e87c3443a
 EBUILD ragel-7.0.0.10-r1.ebuild 760 BLAKE2B 9a5dfbf4ae0ee048196413a77f48f089992f1bab6420d92b0c2aed3a3a584151547d2bb844e45caa7cd30cf009a6aeaab66d004013286d25bdca12a63847d896 SHA512 e4048d4baad5174d9a37c316c36bf062a9451d6c4dbf8a8bf9793b3e0b9876833aeb1440ca6929bf5a39d85165ee957f378d426d71301f107bf0e8ac58e998a5
 EBUILD ragel-7.0.0.10.ebuild 627 BLAKE2B 929253ed83851fb333bc6c31b565b83dc30d8b02e6377824945d642a807b5ff5d8e5ea890a33f0601e0f5732c46e213c6aae93f51d19e33b5d209d3b98a9a59a SHA512 023290b91413f0a249aa409de73a22ab622290c81281f699187ea64ceb6393819a9e0e4b9b2eecaf5c25d519d09ba080f7bfbe085dc86c228ab3f7400980d9d5
 EBUILD ragel-7.0.0.9.ebuild 627 BLAKE2B b1c47b5508878b7e13fb95333bb7158a85e4795decd4be8cfc82769934106a43878fb5c15d3df5e139a6af96df04614411ceeef20ff0c3bc695cfe424ae258d5 SHA512 1f88ee8f0bac60c073a2be525ea1dcc9128961d8383f36d992121064746d7c154b1338f4582797145fe782485c8d322119aa7ac8ee903315d056cf17a635a3c6
diff --git a/dev-util/ragel/ragel-6.10.ebuild b/dev-util/ragel/ragel-6.10.ebuild
index 2ff2258b7f74..b491e22cf4ec 100644
--- a/dev-util/ragel/ragel-6.10.ebuild
+++ b/dev-util/ragel/ragel-6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="vim-syntax"
 
 DEPEND=""
diff --git a/dev-util/ragel/ragel-6.7-r1.ebuild b/dev-util/ragel/ragel-6.7-r1.ebuild
index 5e3e52d25ccf..faf01ed1d027 100644
--- a/dev-util/ragel/ragel-6.7-r1.ebuild
+++ b/dev-util/ragel/ragel-6.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.complang.org/ragel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="vim-syntax"
 
 DEPEND=""
diff --git a/dev-util/ragel/ragel-6.8.ebuild b/dev-util/ragel/ragel-6.8.ebuild
index e5090066d3e8..4b0b866fe275 100644
--- a/dev-util/ragel/ragel-6.8.ebuild
+++ b/dev-util/ragel/ragel-6.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.complang.org/ragel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="vim-syntax"
 
 DEPEND=""
diff --git a/dev-util/ragel/ragel-6.9.ebuild b/dev-util/ragel/ragel-6.9.ebuild
index 9de48f66793e..2cb2eff5e6ac 100644
--- a/dev-util/ragel/ragel-6.9.ebuild
+++ b/dev-util/ragel/ragel-6.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="vim-syntax"
 
 DEPEND=""
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index 6db02578deef..ec8b62dec5e4 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,5 +1,7 @@
 DIST RBTools-0.7.10.tar.gz 171957 BLAKE2B c92c02d2aa9598e063098316440b85842a2c31e5d32894c01b2345a49662b9f1091bb20077c6533c78618fc888f78f447f39580de64d4f48308e4c4aac5c6ecd SHA512 d4495cc73315e10d31d9b6c1517734fc58cc8b795a2d5eb32c9900b7108c57ad5b5f559e0fc7b13de0b00997f014a8f832183da46376f1480abaa5ebf5eb4866
 DIST RBTools-0.7.11.tar.gz 171777 BLAKE2B 67a0cf7d2f1e019a6b5b280a6448747037abb70d498c15b3bb2b0a415a1234e25e159929fc66484f56ad27acdbfe6bcf7bea9adb7042addbd96b88e4a9150ecc SHA512 ea02fbf02f7972d73a90097bc763549e54d130dc81e6325f0b65906d9e03819d4a9202b1e286a04bad5a17c2440b5e84fb9abe447f2b7717acc0f2c46de783cb
+DIST RBTools-1.0.2.tar.gz 199085 BLAKE2B 469bc0a4d440437126af936c370d40eefa4c59717a955cd1853a1fc437554c251508fabc797b8c6631327fd14d43545cab3710fdbe50b1ad87d4df41d6cc96ba SHA512 2b05c310b877ad57589dedbad638956b81cc539bc793ccbe6f17608f6b979a0f2767998b1e941ef826a435cf0b034cbb2b7fdb6b937d83d5bb2fa9d2f45f70a1
 EBUILD rbtools-0.7.10.ebuild 688 BLAKE2B 2769d766e8c88a8f736195a24e14db5be723a96ab9206ba7bf4ee88cdf8138439eabdf4766b75d486a53e904c45d4c00a50735ff3e3966e25d71afea70ab6778 SHA512 e24d2dfef42e07e14e1b6fbb6eb8751fdd9cbe25348a04eb6e21a6bf677c3c9db0d92f0365d33d3bce5e9b68f06f625815f50794ca7b29de0b624eaa0d794118
-EBUILD rbtools-0.7.11.ebuild 690 BLAKE2B 46a716b5e53345deb3d75490445f149d35267f4b5ceeab7a1724372345abf69be67737ab30309e9c8910df2524bf0130849285474c5ddb7ca5b98a35fe669e72 SHA512 3258c7570e96d5d7ce8593232aca797766c0f0951a089533322be81a24dfd0b1c460464200985a45b13e2c48f5e2f9acdd4e1cf4546089d1b70a16e01cefc45e
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD rbtools-0.7.11.ebuild 685 BLAKE2B 23a2124dfd97d3aeea04869713e3fb123965f499f4ee93cc9ded5f480cfa6b671c78eb0944e9d3bd76cfd2d7cff66b1c202a8e351d788734227f70b975644f79 SHA512 cab62b1a9c2f832b08c3c493e6cd343bfe56a287f45b43c4c32483e2e143612877ab6b67e8a36c3ea759510b0263953d6f165887749f519a61b13ead3bb079ef
+EBUILD rbtools-1.0.2.ebuild 744 BLAKE2B 55824dcd7d36e82e8e56ed378a496d03853418e795167a5c4e99652bc0bd8bcd68e76311102a090bbf990591b0361225c607144e2ca93859093d64587b590b39 SHA512 03b0a0f74eaf23a3dde6e7a901494b4d92d63bb3cfdaa3b3b72c69630999b64a724c25b930557d239efc6d7d8deb2a96e356c63378a9e978914e7bbf2814ce68
+MISC metadata.xml 217 BLAKE2B 92b85ca7d657eea200ee74bdafd4df6885c04b125bfdfb86650e2e1066c858aa8623f8b2a362780a200d7e33076129c9aab38a12f189c82d5ce1a9ae81257195 SHA512 1b17a615b7471a1e46b4c291aa7ff84348628ec0c3603e21db1994eb1e82ae28dc7e97321de022ccb7e4d2f411f4e7bcef5a79e93a4229126b9b58fb5d503478
diff --git a/dev-util/rbtools/metadata.xml b/dev-util/rbtools/metadata.xml
index 7a38bb900964..f83448f44cd5 100644
--- a/dev-util/rbtools/metadata.xml
+++ b/dev-util/rbtools/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>graaff@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/rbtools/rbtools-0.7.11.ebuild b/dev-util/rbtools/rbtools-0.7.11.ebuild
index 94ddd77d3d6b..942063d7b747 100644
--- a/dev-util/rbtools/rbtools-0.7.11.ebuild
+++ b/dev-util/rbtools/rbtools-0.7.11.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 @@ SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_compo
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/rbtools/rbtools-1.0.2.ebuild b/dev-util/rbtools/rbtools-1.0.2.ebuild
new file mode 100644
index 000000000000..bf0b1a6a5f45
--- /dev/null
+++ b/dev-util/rbtools/rbtools-1.0.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+
+inherit distutils-r1
+
+MY_PN="RBTools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Command line tools for use with Review Board"
+HOMEPAGE="https://www.reviewboard.org/"
+SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+	dev-python/texttable[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+DOCS=( AUTHORS NEWS README.md )
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 27fff13f33bc..0f901f123764 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1,7 +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
+EBUILD re2c-1.1.1.ebuild 763 BLAKE2B c4bfb586f9fe4422863067466fbeecf17711eaded507eb65e1dfeb5581fe4ec3eeb39567217cd8a1bc1291c7fbaaa0131af6406d38d958d04a337d3a78767a6a SHA512 f6c5caf64a09257bf360c9ac6aa743e9ed511170a62569d36d4b661e20b6bebaea6fefd8a823a2273373b045a7f149bf4310f6a29403642824a82bd1374db356
+EBUILD re2c-1.2.1.ebuild 734 BLAKE2B ae1254e3bb13bf09360cb7be05e525d6100895824e6b392441e2ec89ca3b5d650b488dfb78778b511dd6666b51e9c5f34321c80ee4a7a8cb5eb1c58ea525c2e4 SHA512 0d74f84dbc380442277d38e7e13bf6326997e57fcbe9aeec7e58e6fbaa427f19aebbc64aefae8ffc42cedc731af1fa6322608a0b4fd0f5ba832400f125a0de52
+EBUILD re2c-1.2.ebuild 734 BLAKE2B ae1254e3bb13bf09360cb7be05e525d6100895824e6b392441e2ec89ca3b5d650b488dfb78778b511dd6666b51e9c5f34321c80ee4a7a8cb5eb1c58ea525c2e4 SHA512 0d74f84dbc380442277d38e7e13bf6326997e57fcbe9aeec7e58e6fbaa427f19aebbc64aefae8ffc42cedc731af1fa6322608a0b4fd0f5ba832400f125a0de52
 MISC metadata.xml 423 BLAKE2B 69ad12e8bd8cd2356e36736ab276efa0aadc2755f784fa4e7fe23ae4d4e7a27a06c8fcd4ee727f87847a7fdaf136d12e811a20345183d261d2b649724818f9f3 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9
diff --git a/dev-util/re2c/re2c-1.1.1.ebuild b/dev-util/re2c/re2c-1.1.1.ebuild
index 51a6bf5eda2a..cb1427a4df50 100644
--- a/dev-util/re2c/re2c-1.1.1.ebuild
+++ b/dev-util/re2c/re2c-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 src_prepare() {
 	default
diff --git a/dev-util/re2c/re2c-1.2.1.ebuild b/dev-util/re2c/re2c-1.2.1.ebuild
index 20575ddeb6fd..a21542c2d598 100644
--- a/dev-util/re2c/re2c-1.2.1.ebuild
+++ b/dev-util/re2c/re2c-1.2.1.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 src_configure() {
diff --git a/dev-util/re2c/re2c-1.2.ebuild b/dev-util/re2c/re2c-1.2.ebuild
index 20575ddeb6fd..a21542c2d598 100644
--- a/dev-util/re2c/re2c-1.2.ebuild
+++ b/dev-util/re2c/re2c-1.2.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 src_configure() {
diff --git a/dev-util/rej/Manifest b/dev-util/rej/Manifest
index 3927729052b7..59aecaf25850 100644
--- a/dev-util/rej/Manifest
+++ b/dev-util/rej/Manifest
@@ -1,3 +1,4 @@
 DIST rej-0.16.tar.gz 422796 BLAKE2B bfbf3b82d71247797485006ed3c032f4db078bfe9fc67c0c01ae15a3b85e913a0bd05867c91a9f3577eeae43c9c708aecab786a9912a24194d3faf7686a6dee5 SHA512 e216edf5559141c571f56265a499dbb4273b47e3a05305a13233d3fc7d9d02aca4a2305317fb467fee1b08ecba147dbe72516d71ba189f1dfeedb45faa525d46
+EBUILD rej-0.16-r1.ebuild 565 BLAKE2B 16847c8d94ab910237c1675b9fab0a5c18c0203d16de6b64161192ee8eee61930d39328a51cc1fdfbce9482a82fbcd9b88f4cb9b152914492ac92f523e80ffaf SHA512 85b917333e0e3aee6f0b98d8e0584404cf17a3d9b91c0bc914f6401656b9e56d68453f29de91c2937841ae12ab5a439a8ee69544c9b39944fc1e1f3a45b93f54
 EBUILD rej-0.16.ebuild 571 BLAKE2B 402e0475e1a70647cc99efea2a12771150e482156e943813ecef088cbe0d6473f2d115e1611602c280ca4b7e80a474109da47aeda4904832fde2651f7c1cbdc5 SHA512 55df3a272485bdf3d124241e98221436de0f1ce59c12fc283c9695d160c756b6a061b0e0a7c13ef25eb99791cd1906a345f20ed829de2b94227091bdd4443d93
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/dev-util/rej/rej-0.16-r1.ebuild b/dev-util/rej/rej-0.16-r1.ebuild
new file mode 100644
index 000000000000..1a019d168e68
--- /dev/null
+++ b/dev-util/rej/rej-0.16-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A utility for solving diff/patch rejects"
+HOMEPAGE="http://ftp.suse.com/pub/people/mason/rej/"
+SRC_URI="http://ftp.suse.com/pub/people/mason/rej/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-lang/perl
+	!<app-editors/mp-5
+	!dev-lang/qu-prolog
+	!dev-util/mpatch
+"
+
+src_test() {
+	sh runtests.sh || die
+}
+
+src_install() {
+	dobin rej qp mp
+	dodoc CHANGELOG README vimrc
+}
diff --git a/dev-util/reswrap/Manifest b/dev-util/reswrap/Manifest
index 3307641cd238..2ad0af30b412 100644
--- a/dev-util/reswrap/Manifest
+++ b/dev-util/reswrap/Manifest
@@ -1,3 +1,3 @@
 DIST fox-1.6.40.tar.gz 4353981 BLAKE2B f024341d12a9ab0e69284513e0500a0448a66f112a656cfbaa700720a4823f8a13fa81752ed90b843eb27f72bd948ea3fd7ab106e9fb57fc43c728aefcfc88f5 SHA512 63c46b3db2693c91dc6277b08395ab3a0748414471b7bff10062cac9ddc5e743ee7af5b85ea5f7b7dc96723baa1c9ff7ae18a0f503a210b6255ac956023ac17b
-EBUILD reswrap-4.0.0.ebuild 596 BLAKE2B b1c0737764d8d9c003c2bbc01fa2d6de73ef7a9ef99daefbbb61fbbf463b470c6f0826fc4ce1706f33ede10c87e8d1031b6d9f791fbea08350c75087c1d690e6 SHA512 e8ddd6f5719265854f033dc1b5e3069927b712b3337b000c72bb8138ba6d696203eaad12076b6b6b2b7807276452362cf6be555f392daa27c6db5be777a8eafe
+EBUILD reswrap-4.0.0.ebuild 586 BLAKE2B c84cfadd1a528b24a4c0e4a3ba6191a4ce0d5c8928e7553074112d6d36aebff6458ab67a106c6eb0797adeb20739e50f569072ba62a979c16cd25e432a8a00cd SHA512 6a8488ec5d9f776d557b267c2c10c5693e2aa2f99faa92479701bc90884c9d1ef1be8391424b4865bbc7bd27d8fbe1be06f3e0c0e0742e089100da7d4fc045a1
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/reswrap/reswrap-4.0.0.ebuild b/dev-util/reswrap/reswrap-4.0.0.ebuild
index 162fda399fdb..51f0220b6816 100644
--- a/dev-util/reswrap/reswrap-4.0.0.ebuild
+++ b/dev-util/reswrap/reswrap-4.0.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Utility to wrap icon resources into C++ code, from the FOX Toolkit"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
index e0af3a11df7a..4467f60dd480 100644
--- a/dev-util/rocm-cmake/Manifest
+++ b/dev-util/rocm-cmake/Manifest
@@ -1,8 +1,10 @@
 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
 DIST rocm-cmake-2.8.0.tar.gz 13677 BLAKE2B 24fdb6685190e06be0afe9184b048d1be36f66d0fd5033244d481fdc41db6333cde2d4b5e23808add0115018f23e80cf78e09e01f8aacf1f34eca2e9cf64e0b5 SHA512 61fa614acfdd5d18da617f73f6373e3c39ece22674fc9697e2f2d9595317fed179298672f98e178ddcfd73e7cad908189f32b7265a98f773750616abdd11a74c
+DIST rocm-cmake-2.9.0.tar.gz 14185 BLAKE2B 7eaa8535eae99749d0a46b84daa4ee5d00fd7e992a63d97fb578319a3dc309a61b1b239af4b58ee5c668c0c45e944138c85ab2a5aa3da1f83b129ca6a874c6d6 SHA512 ba619d428e7f5bbd2970eb84df1421e0734f33a259d5c98a62a8ea4859eac5fdaba0d0d36fb504618e605c0c6d62213d696e265054814926b9156822e3cd1f24
 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-2.8.0.ebuild 741 BLAKE2B ddb75c1be4c7334dba970676f392e207807836507968af8921dc224ea6d9b3c13e84225645f6a589efcd1a591fe602f6b1968a604d39afe35163f20d9ad105db SHA512 01ef6b384fc02a2792cc0963091b90556cb3d0ede1346fff2bde55dbace9c1398f53e0e035894e75c11547eecccd4403710d2ca38b6b1ebbb9677d12b52ca0c4
+EBUILD rocm-cmake-2.9.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/rocm-cmake-2.9.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-2.9.0.ebuild
new file mode 100644
index 000000000000..d6c02fff0fd4
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-2.9.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/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index fcebec603efc..bac0e55bb677 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -3,8 +3,10 @@ AUX rocminfo-2.7.0-sizeof.patch 1083 BLAKE2B c86e9f90660afa39b2cfcd6c5362734db31
 DIST rocminfo-2.6.0.tar.gz 12293 BLAKE2B b08725b45f48e78841da9d6e57bb19a441a423e20f853d16024c620914059abf3cb2e61c12ae6fdfdb85eb3e984d488ae9975ab3fd2fcc529ecb576c6816fc92 SHA512 e2dae7e2e02b674b3ad959a3dffdcd8f550842edfd0eac5866259a6a12de1a5f935afbdcb37845fa189d0937c41186f0eb8be08e7b346ddef959d5dd7b62dca7
 DIST rocminfo-2.7.0.tar.gz 12671 BLAKE2B 6cb6e2fa458224654f4b672d117e2a6c71c7d5aeed8ac71cf7ecddb76d9209f25596521b31465a94fde1c91744fc9bf68e637f7ff4f67a000cbfbe4793c5fa4b SHA512 ffdaa3d11d85475c7600c6b25d8eb7f90cbda13b820f33c250a7ac9b90f92d4d5352d8baee765b4bd3b9c7389b5ab6d3b87df77bf62d6696ed8cd96bfc6be1a0
 DIST rocminfo-2.8.0.tar.gz 14786 BLAKE2B ec439fb771980d6b4777e9c3b11e23055eee7b898db2fd6d109c8ad53b0d615baa2d29ed4f1eb7ef673520396e63f0901dffc986bf38e58dcf41f068b25e26ce SHA512 7528deb80b97b70215a0e6aeaf55f9409a53d8aeee921d25da037fbc081bda43263954be8c12a0c3e3441b53aa16a10b83cce7698fc1eaeb5a2bf9168844e617
+DIST rocminfo-2.9.0.tar.gz 14791 BLAKE2B 5438862e461b9c2f53560138f4b7437876048edff6ff31715e9af2be535167042b170c492c59c41862a55a742a53047e2e9f0478fa73c8cf948c0fc1ff388594 SHA512 90c5c1de3ea6e917b338a5498d9e071dd491a97bd7b927dc1ddca568df08b52b6b8518a1105dfab7a262b78d1cb89117813084dfce6b73d7aae40abd357f81d1
 EBUILD rocminfo-2.6.0.ebuild 859 BLAKE2B 4e9d3a3472d368d74969ed7bfd5d269343a9612f0ee558d201d5ba24e033c9ad62ce8717abc282147c35dc01cef93e86770a89923ea8fe434bc569a6393be080 SHA512 c10a8cd4a853d7d343d907502c0064f6453cc876e6b34f6c63aec7a355f5114f598478f83d723dcc86d45c0e620b71d6e1d7bf18da429d8619fd0d699bdda88f
 EBUILD rocminfo-2.7.0.ebuild 899 BLAKE2B d353500d57cf39ce63a8caccf6f9ed29d6181aa532a2054fb9ebab01502ac7a5a44d8b871d5763ee5af0111c7d11b7c6f3d1173eac6bbe75267a4513d1cd12c1 SHA512 57b2c8f3f806bde49656a749855c0797559d4d05800d62d8cce295292d11ff51315f871f14ee5c7d2c5294ccd065343134c8e3ba96bc1a60ccf16e03b5601da2
 EBUILD rocminfo-2.8.0.ebuild 804 BLAKE2B c1a02bd0c6c66a230ea280049e9071ce66774624230d917372eaafd1960ae52f5d4b41b8d5208fd5a5292835377a42a3b82ea331c01ecc6533bcae2b6a0b52d6 SHA512 9d188e2c80bbfef0408b8b6978c6a9ce9ec2853055a499110cc076642b8252f4dca60c35eb8e58c43fa7f9111cccb2b4faa22d0b90cfe8967ae5daa892a8e89c
+EBUILD rocminfo-2.9.0.ebuild 804 BLAKE2B c1a02bd0c6c66a230ea280049e9071ce66774624230d917372eaafd1960ae52f5d4b41b8d5208fd5a5292835377a42a3b82ea331c01ecc6533bcae2b6a0b52d6 SHA512 9d188e2c80bbfef0408b8b6978c6a9ce9ec2853055a499110cc076642b8252f4dca60c35eb8e58c43fa7f9111cccb2b4faa22d0b90cfe8967ae5daa892a8e89c
 EBUILD rocminfo-9999.ebuild 804 BLAKE2B c1a02bd0c6c66a230ea280049e9071ce66774624230d917372eaafd1960ae52f5d4b41b8d5208fd5a5292835377a42a3b82ea331c01ecc6533bcae2b6a0b52d6 SHA512 9d188e2c80bbfef0408b8b6978c6a9ce9ec2853055a499110cc076642b8252f4dca60c35eb8e58c43fa7f9111cccb2b4faa22d0b90cfe8967ae5daa892a8e89c
 MISC metadata.xml 475 BLAKE2B c1ca0f1d0ec94ae012d3a6c2e5b0a896de75fae32ab8af40d2d0e8747544c15f11ce76cc45bd429d4b5b3b3abde5c896fed362641abf995c4bf9f10077e6933d SHA512 f84d5a379fc07d3410bf6cf946c91056295dccad64f100be02959d94e39eaa47d4fcfed84ea2bd596b2ecccb4ad3267bd86cd76b50d938b235655220fcef1549
diff --git a/dev-util/rocminfo/rocminfo-2.9.0.ebuild b/dev-util/rocminfo/rocminfo-2.9.0.ebuild
new file mode 100644
index 000000000000..cf2e52c9247d
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-2.9.0.ebuild
@@ -0,0 +1,32 @@
+# 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}"
+
+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/scons/Manifest b/dev-util/scons/Manifest
index 2f2237f50239..12eba65100f6 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -15,8 +15,8 @@ DIST scons-3.1.1-user.html 1134061 BLAKE2B de025ff73ecacec591c63b22bb3f934962a34
 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-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 2657 BLAKE2B 74a9c3a477252dfe2ad38f43e18334265146c107d9a9679b9bc6b45bfa1b1846c27d629542f797717c536d8a715015ea33a48f49474a6575425b4cc9a0572e15 SHA512 3a784694f57156d2a101371883a836610ad33f3bca64e6b4ef2ed5f9c4358cc953261c4f63fd59030c0986c7ce47ea5035c7b30f990e4a1c1cd8db695ee66acd
+EBUILD scons-3.0.5-r1.ebuild 2912 BLAKE2B 701e8e7f2a19608f170b03c09f50253c74c154da95580f127dc6d28c434770227f7fa6a154fede155eda571eaf7f0a006330833c78addc5fcd297b3374218458 SHA512 a5b05f16954ae98c5eb1e749480bec23851741e29adf357a560317e58d7e16e40e64ff4d2b92a0f15ee7b2e241d940dd80dcd1f61b0e43acf312d04ae686b890
+EBUILD scons-3.0.5.ebuild 2090 BLAKE2B 1453fd6a734ce773bbfd643fbf896e56e7e514fc1787a54f169f957ffc71614c772116bc545d83ab426b05e0e6464d4fd85e2b2f983cd75a152c5f246218ae16 SHA512 1aa81365b512652a1bce0e009b0549bda333a8d692d1701f196addb5b1e69994af307ccb2aa112dbdfc96b9bd031ac965f188d22500de9dce3d0c463e529a646
+EBUILD scons-3.1.0.ebuild 2643 BLAKE2B 7e4ca6a988170c68eccf2815ac92edf56eecdab56d8e2871271fc81139a72dafc70382a578941d1ac3efae29ca166ba37242d40cd78df5e8b2032997ef08a455 SHA512 0a29ed83e313087921ba30bb7b2d9a2c183ce84891614fa0b0f429fdcafeee30092fac6517aaa1a5eba085e171660ca9e5c329af686ab961012da2d3312622b9
+EBUILD scons-3.1.1.ebuild 2635 BLAKE2B 2fc2541069d1feb8c09b071a27ed9c1fdd3d7f826215c7a1620b60853a2ab849c14f0112ae748c62d3579462c32a72352575be921dc29ba70416909bab8a854f SHA512 e9e5f0dffe5bcb70e1c3f8cf42778528681b4e6355b29ed1a6faeae7c93badbe112216e342cd73963da331c085a339948b136b09dfd526215d6545ac5907dd06
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-3.0.5-r1.ebuild b/dev-util/scons/scons-3.0.5-r1.ebuild
index 8ef412974e44..b8f27f5dfd17 100644
--- a/dev-util/scons/scons-3.0.5-r1.ebuild
+++ b/dev-util/scons/scons-3.0.5-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/scons/scons-3.0.5.ebuild b/dev-util/scons/scons-3.0.5.ebuild
index fcf6539d3a57..7f7185c37050 100644
--- a/dev-util/scons/scons-3.0.5.ebuild
+++ b/dev-util/scons/scons-3.0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 # unresolved & unpredictable test failures
 RESTRICT="test"
diff --git a/dev-util/scons/scons-3.1.0.ebuild b/dev-util/scons/scons-3.1.0.ebuild
index 4da9718eabcf..363c4a06dd55 100644
--- a/dev-util/scons/scons-3.1.0.ebuild
+++ b/dev-util/scons/scons-3.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/scons/scons-3.1.1.ebuild b/dev-util/scons/scons-3.1.1.ebuild
index c8d9266f84c0..20b26d0118ce 100644
--- a/dev-util/scons/scons-3.1.1.ebuild
+++ b/dev-util/scons/scons-3.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/shadowman/Manifest b/dev-util/shadowman/Manifest
index bbb9da641f42..9b909bf668a1 100644
--- a/dev-util/shadowman/Manifest
+++ b/dev-util/shadowman/Manifest
@@ -1,4 +1,4 @@
 DIST shadowman-2.tar.gz 3349 BLAKE2B 2881c0487205c00114967be7600ef5483cc64c7ad5ed5cac60fe8bf2ca17e5b06d5df6e39148d90ff68a51d3e918ca616d0c5eedf11366df90c788a07e4c63b0 SHA512 eeb10248c7f76116352bffa671ab7c761b2f79cb943de20dba327b0d7bf1126d15021508c9e9389b9f0c37cf5049ad2c67bad93f6a03340fcfd27e03c4969110
-EBUILD shadowman-2.ebuild 682 BLAKE2B 1fbe78fa3304c7e517fd5df56297747054503675f89a697d6341e6cadc93430001de477f69f0dd92300718969c466aa143687fad97c63579d404e426dcd787e4 SHA512 a04fceb2a190b1828577d5c57a867fd334c45dcbd5cefc04aaaf4ce2bfb355029eddb98adcc3a69908af16aae24990f4a3326ac251799d9b3343500c4270fb69
+EBUILD shadowman-2.ebuild 670 BLAKE2B e226fa32615278b40925ef28e2eab42e208f693b73cb1c5b6e093ea97db6ba92d8bf0d436233fdee71e753c383b84b93f75d82aaaa120fdc663b98a467b23e11 SHA512 a3c6aef7944c36dd229a2c2e33043a97c6ee6efbc64efe99b28b943758b9b3966de4ca251164cd50302d9e19f8a7095ae686ae047904e2835cb62625c0d33008
 EBUILD shadowman-9999.ebuild 568 BLAKE2B 199779d69123dae88d3024a00370b24a898f40ce7aca43257e0dfd3a9747f5b969133cffce9aa70ff1fa0555a18442e4170829df7d27d397ea10b96136a76524 SHA512 4325db35429e59387690b10c09e86268e79e3a4a5e968075f36155fbcd5af7e0ec0a79b6a08b6e9e74ea5cad6727be0697abebcc63ba48c7449cd54141edd794
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/shadowman/shadowman-2.ebuild b/dev-util/shadowman/shadowman-2.ebuild
index b56f5f93005d..39d4d31f4fae 100644
--- a/dev-util/shadowman/shadowman-2.ebuild
+++ b/dev-util/shadowman/shadowman-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 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"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index 8dde81df4776..c51658d4021e 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -3,9 +3,9 @@ DIST ShellCheck-0.4.7.tar.gz 126593 BLAKE2B cbb925c4760a3744381dbee293d5e28ce429
 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 928 BLAKE2B b1ead285dd5cf59c68aaabf76d7ecda67d3d6139bcce2ab27a758e1424770393e2ae2519e87c4e048fa77bd7b74e7f917738cfe3373f5b46a346846ecd760979 SHA512 8ed271669dc7829a7ee6a2357bb96353389523013b80086fcdfbda4d064ce6f00cb90667a14c6321e8fecb13480121e1634a38f904bc1c6b6a6c15ab2ebdeec8
+EBUILD shellcheck-0.4.6.ebuild 856 BLAKE2B 63998c92560ad4af4328428566f0f54ed21973e09788ecee000c8c4609a78d95e629f8e1c7458167b9c23a3296837a4bd4f0803614df3727a3a128ff6fbab807 SHA512 e65c4a0d93de0b0280e79be5ba575296d17190af2bc9742eb7d657fc49fd03051fbfa4ab5d093cbabfa1498ea9c604808b00b91c0ccb06debde0d2d913bd957b
+EBUILD shellcheck-0.4.7.ebuild 858 BLAKE2B 4f58149c87cdd5806c5cc1e09502d45fb356dd8624187a29f30a1255eff480aa97ab88a20ae52b25a59576365f4594f034f70ee99b6c3579a59aafaac3f55300 SHA512 0910c8134b43b3f96a8bceb4e35acbbb48971e388c22495f0305187be97b25530854a530e3bb83bb12d28c0ce9601ac400e859ee7104ef0a1fa4e0eb408f0fe2
+EBUILD shellcheck-0.5.0-r1.ebuild 923 BLAKE2B b99724e0f951a52730e0fefa22c9e8329c60e22fd7235104844040600954f811557a6fd461bacbb89ac6213ec92d95ea0040b074b59bbc9642854569bb9704d2 SHA512 150c50be60270331de0891e7deeeab7d82f8be1d6460f12794540dcba3af06763e5e5cd3c9e27adf50c602779c153b326687375f7bcd91584f489e42d38b4414
+EBUILD shellcheck-0.6.0.ebuild 923 BLAKE2B 44d73490ce7108af66cdd93012a4dfeb6bbe400bcaee9f9f5498651c43ab51868a19700bc637c51ce5255e4a08a0a805ac01e3730f6036656a43c2f26bb6e368 SHA512 dc527daa888052e8dba395d09f921dc0a9b232b7213af7507c7552b8b009fdd9b6d8da6b07efcd246896ae9f6362d90e5ea5dd6e6a03c85bf61bfce3fdfe02ab
+EBUILD shellcheck-0.7.0.ebuild 928 BLAKE2B 558cfdbb9e961d5de87f1af0ad6811c96b9163364e267fd90ff563be30dc8009e0efa8c1aa96044138e91d108dcb324dbd098c9dd18275a2964127f7397418fb SHA512 b9ff66ea3a8132b9a1f9266645863669f19a16fe347f5318ec4c0a770322f969cb47e05efa7c6f3ba162db87c7cb6dd25cd9e7126849a1bc222e5f59992531c6
 MISC metadata.xml 354 BLAKE2B 147d2403f29d6faf487627ed1bcc9b16cc02936a1afe0f25f7bab24071b7b0009960ec950c2bcbcc3738033c5e10f5d790f0b90a7e75d3f9242b694e1bb96cc7 SHA512 033d85c60d488513cec6cbd63c406ff12882909629acd2417e4d0b1e2046ff9aebda7dcca7b95ee144deb3d876ccc422211cc31eb259f306deb35938b56183af
diff --git a/dev-util/shellcheck/shellcheck-0.4.6.ebuild b/dev-util/shellcheck/shellcheck-0.4.6.ebuild
index 0d6b3a6027ce..51cfa9068644 100644
--- a/dev-util/shellcheck/shellcheck-0.4.6.ebuild
+++ b/dev-util/shellcheck/shellcheck-0.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ IUSE=""
 RDEPEND="dev-haskell/json:=[profile?]
 	>=dev-haskell/mtl-2.2.1:=[profile?]
 	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?]
+	>=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?]
 	dev-haskell/regex-tdfa:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
diff --git a/dev-util/shellcheck/shellcheck-0.4.7.ebuild b/dev-util/shellcheck/shellcheck-0.4.7.ebuild
index 78dd5b5e1aab..2c3a2e11fcbb 100644
--- a/dev-util/shellcheck/shellcheck-0.4.7.ebuild
+++ b/dev-util/shellcheck/shellcheck-0.4.7.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
@@ -23,7 +23,7 @@ IUSE=""
 RDEPEND="dev-haskell/json:=[profile?]
 	>=dev-haskell/mtl-2.2.1:=[profile?]
 	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?]
+	>=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?]
 	dev-haskell/regex-tdfa:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
diff --git a/dev-util/shellcheck/shellcheck-0.5.0-r1.ebuild b/dev-util/shellcheck/shellcheck-0.5.0-r1.ebuild
index a02cf03bfded..62505624be0d 100644
--- a/dev-util/shellcheck/shellcheck-0.5.0-r1.ebuild
+++ b/dev-util/shellcheck/shellcheck-0.5.0-r1.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
@@ -23,7 +23,7 @@ IUSE=""
 RDEPEND="dev-haskell/aeson:=[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/quickcheck-2.7.4:2=[template-haskell,profile?]
 	dev-haskell/regex-tdfa:=[profile?]
 	dev-haskell/semigroups:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
diff --git a/dev-util/shellcheck/shellcheck-0.6.0.ebuild b/dev-util/shellcheck/shellcheck-0.6.0.ebuild
index cb608f31ae24..63a1ef6597fc 100644
--- a/dev-util/shellcheck/shellcheck-0.6.0.ebuild
+++ b/dev-util/shellcheck/shellcheck-0.6.0.ebuild
@@ -23,7 +23,7 @@ IUSE=""
 RDEPEND="dev-haskell/aeson:=[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/quickcheck-2.7.4:2=[template-haskell,profile?]
 	dev-haskell/regex-tdfa:=[profile?]
 	dev-haskell/semigroups:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
diff --git a/dev-util/shellcheck/shellcheck-0.7.0.ebuild b/dev-util/shellcheck/shellcheck-0.7.0.ebuild
index 848d0d21e3c9..29965d39bf7c 100644
--- a/dev-util/shellcheck/shellcheck-0.7.0.ebuild
+++ b/dev-util/shellcheck/shellcheck-0.7.0.ebuild
@@ -24,7 +24,7 @@ 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/quickcheck-2.7.4:2=[template-haskell,profile?]
 	dev-haskell/regex-tdfa:=[profile?]
 	>=dev-lang/ghc-8.0.1:=
 "
diff --git a/dev-util/smem/Manifest b/dev-util/smem/Manifest
index a27e18b44d52..760474cfa80f 100644
--- a/dev-util/smem/Manifest
+++ b/dev-util/smem/Manifest
@@ -1,3 +1,3 @@
-DIST smem.pl.20071119_p1.bz2 794 BLAKE2B eb48d3ed41d0261a94381da5795764a78d95abcb23fe9d46755e7c4a6672931a972bca8f188a359b7bb4a52afcfe177098c048e3dddc910a7423f5c2bf5d37ac SHA512 452d10b2e3dda5d4167e62e3fd541f89f90cb07c431876e0fb671f30e224b8cd14a0268ab14243342c2188f3d3826e7a8303b3fd2eda393fdc8e31d0f1b1d575
-EBUILD smem-20071119_p1.ebuild 499 BLAKE2B c94bac5be5a10cd218ce0312b830861fea822b9998e9e3a764c99c250317fb42472166eaa05ad600b350bcef23c72021c0278f3d8ccbbfa3f409d1a8b854ac41 SHA512 bdae13b9445d5aafeba05945b1a7c169953c3073da104e1f3990fcc7f7a4528219a5bf7512d7b430bbb3ac6e055063dbbb0fe75225e2d72c8b36c8b2c10ee46c
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+DIST smem-1.4.tar.gz 15733 BLAKE2B 6c097c10625050a9d3a133144054d9791bb0ae2f498335398889b58c243b4477d38aefd8203a0483016647a6a72b4bcf4b9af23c241c0e87494614ca6cdaeade SHA512 2740b9ebede8e742e3d01f5f2e7a77a4d3ed04bee78585a904d07c299ea5a77be135dd5b6626abfdebcf2742b9004035443d3faeca04ca9b59c603f74708af9b
+EBUILD smem-1.4.ebuild 794 BLAKE2B a93b65d84793751ad86834229db06c58d4c4e6837a09a2a83e8c19b4256711b5d0990130c4f52b086a737f99e031ef0de3769c9ed83ae4137a16c3f44304805b SHA512 79cbdd526a8702104effb3be4c8f64ecbdf10d578d4e78fcddf699f7c8e74f9a9b0457aafaf78eb40bf75682f495668a98d1a95813e30eddc6cb302eea990d2d
+MISC metadata.xml 1006 BLAKE2B c547308370ac8bcd34b17e418415de262efe6b1898ab049e7133aa6715227baecacd23ee5811d6b86b9d095c9fa8756b86f547a1728436e57140f1e303d3b828 SHA512 eed65e803abf73ded23cd7ce0dbc2c5ee32c7ac562e99026828589d964aff5ad19a00c0d21b2602c8737a2203aff7d116fd3fd06316de09276faa9818c87454e
diff --git a/dev-util/smem/metadata.xml b/dev-util/smem/metadata.xml
index 7a38bb900964..bd732509198c 100644
--- a/dev-util/smem/metadata.xml
+++ b/dev-util/smem/metadata.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		A tool that can give numerous reports on memory usage on Linux systems.
+		Unlike existing tools, smem can report proportional set size (PSS),
+		which is a more meaningful representation of the amount of memory
+		used by libraries and applications in a virtual memory system.
+
+		Because large portions of physical memory are typically shared among
+		multiple applications, the standard measure of memory usage known as
+		resident set size (RSS) will significantly overestimate memory usage.
+		PSS instead measures each application's "fair share" of each shared
+		area to give a realistic measure.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-util/smem/smem-1.4.ebuild b/dev-util/smem/smem-1.4.ebuild
new file mode 100644
index 000000000000..2eff0923ad8f
--- /dev/null
+++ b/dev-util/smem/smem-1.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="A tool that can give numerous reports on memory usage on Linux systems"
+HOMEPAGE="https://www.selenic.com/smem/"
+SRC_URI="https://www.selenic.com/${PN}/download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+
+BDEPEND="dev-lang/python:2.7"
+
+src_prepare() {
+	default
+
+	python_fix_shebang smem
+}
+
+src_compile() {
+	"$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -o smemcap smemcap.c || die
+}
+
+src_install() {
+	dobin smemcap
+	python_doexe smem
+
+	doman smem.8
+}
+
+pkg_postinst() {
+	optfeature "for chart generation." dev-python/matplotlib
+}
diff --git a/dev-util/smem/smem-20071119_p1.ebuild b/dev-util/smem/smem-20071119_p1.ebuild
deleted file mode 100644
index 713f7b9e6a04..000000000000
--- a/dev-util/smem/smem-20071119_p1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A tool to parse smaps statistics"
-HOMEPAGE="https://www.selenic.com/smem/"
-SRC_URI="mirror://gentoo/smem.pl.${PV}.bz2
-	https://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${PN}/smem.pl.${PV}.bz2"
-
-IUSE=""
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Linux-Smaps"
-
-src_compile() { :; }
-
-src_install() {
-	newbin smem.pl.${PV} smem || die
-}
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index a67d530c72b1..4a6f3bf32a7d 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,7 +1,7 @@
 AUX source-highlight-3.1.8-no-black.patch 416 BLAKE2B d53c85b52a04118b613f7683e0506a0f7440c7a0d98f8b8a632ae30da3e0a62e763d51c7341ff3f78a65a02a04b9c0d25909aed847cdd864f4da46876c36e3da SHA512 c65c7f20f5185635153ee111e0b2fd7762065dd00a1773f1a519a449de2355d7255bfb9fda805ec863331ed9df309694fb978a109a479e1c92c7c8dd612945eb
 DIST source-highlight-3.1.7.tar.gz 1600692 BLAKE2B dbd740c79e4368bab6e7207a81e037f3fdf9f4ac5373113aac15acd7c18383cebcc8cadb91f59aa01b5bf30d3240b4510ae8d3af765b6ca579859367aa7e4ea4 SHA512 4a1e733bd06468e6ebd023dfe4a62d7134c35aac311509a61e8d80de35ff3cea25fb79adb56bfe413ee214bbf4d578b4d4ebdcf1236481d9b83152aff6d7afb8
 DIST source-highlight-3.1.8.tar.gz 1648351 BLAKE2B 1ce1590c86f7aed9d27bb21bce6b0869828b28068d71404410e080b85f6354eb6f520cec8c81d1e9170dd90b158dc4536e5287a04bf2d271fa26354fb853ea32 SHA512 00a49ab180460750614b38be9a569478d1d34d01f601ebc7452a4fee8475a19faf9bb9fb2f256c6b40d43fbc3d34962a77ba8b9833483345c4e4a42faad6976c
-EBUILD source-highlight-3.1.7-r2.ebuild 1156 BLAKE2B 148dacff17f075819620fe984b8671e2ef11997e496fdc3337ca0a5cab19d248bcdcc8d754b4bc547dfabfe63edec885738ba76561318798330876d21de7f8a8 SHA512 362e3904871945ffee6096e708ee85ae0e7edb749e1755abd260e8e2ca63587d312c4ed271ae61549b55391bcee543a110eb140eb2614ec754c8d9b053b06075
-EBUILD source-highlight-3.1.8-r1.ebuild 1484 BLAKE2B 0ee412783a7905c7fce6cc57da0469223e64fc4f74430edfbada7b940be29490cc07274eae2df6804fb80e0d8fb1e871a13484acc488c11c4887f2fe0080bcb2 SHA512 7c580789bb6732f1c92eb6ee43b89e2ce932391c955a04f4f72d51559cf4ed4dfeacf7066eb1438efd622074d72f3ab872c3ac64f79777b958bad6f3400691e8
-EBUILD source-highlight-3.1.8.ebuild 1415 BLAKE2B 8562a018c2aafa335f6391e510040a8e40e1e50e4884cbc9d933e7e47ba508de4478f721006b4d84e52213132af084623f930293b9e0a2c092331262e511537d SHA512 2d457f751bcaea8e8f5728971f31555524bfc7d9381acdb202a43f46cec852c23ebca1294df90dc71b457a2e39a9c7012d1e66766b2734df33780074609817ae
+EBUILD source-highlight-3.1.7-r2.ebuild 1134 BLAKE2B f7a1d39981883e15ffe39ada338b4441936ea7bdb7676fa7d264a8daa7c13b98b753b196289cf76ca1d5d3de249f5ca4ccb1ba2b666591ba45bf3e2ad9cdc440 SHA512 a220ac7b19541508e228fc7d5535f94d68c2bcba7f3d93611f4c6490c20dbf782b8dbfb341e63829a6f97cf6201483002a34ed31bfc4d1790defb4e9e898f25b
+EBUILD source-highlight-3.1.8-r1.ebuild 1462 BLAKE2B e7e2410a00722ebbf2fa6f96ce385fd3f4b6d27b359df80da51a5228d4698d96a10eecb805b4eb17498f686dd43fa06241c5310e80484278bdd04435bfc71e4e SHA512 c736e1271d58c696c3017c0e5f8f657d545a8105203dbffd1dfd4dc0d3832bd2415b7978d63b5ee03e72c23b6505cb89b745dc62481e4431f4341697411048ca
+EBUILD source-highlight-3.1.8.ebuild 1393 BLAKE2B 9a6772e90ea7bf4a286d3937c7114c7bd0db5610dd050ee02ccc3a5a8fd3c1cde1959c3d6d7ce0ae364a603144bf859d8be3ecda63dda5f254b93d64f91336c3 SHA512 a7b64423ee9ee9885bb096d0ab1cc1fb936423ee072316cbfa056c1f9f0a3691337201d3405fbf6315084fa0bda0cccebc24a39224d7b300ec3739820f1f8692
 MISC metadata.xml 250 BLAKE2B 50c4b89c67107f8c4eba77c3b35992d381dfc6a30f5e8fb7c696f6b2cde6b7b1f90566a99ceba3df17485a88283059ef51010414e8df6c72d9e7b8c7f9ff0e27 SHA512 a57d332a86b16f67fe2896c47c6cc9ba57f602b65943080289c816a9d0f70b779f61cde882034cc1c2adda79208865dae0bf43d95deea4556e840b785e062343
diff --git a/dev-util/source-highlight/source-highlight-3.1.7-r2.ebuild b/dev-util/source-highlight/source-highlight-3.1.7-r2.ebuild
index 11686c55373a..6cf1f103bb3e 100644
--- a/dev-util/source-highlight/source-highlight-3.1.7-r2.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.7-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
 SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"
 
diff --git a/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild b/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild
index 435b03a9792d..a617779a282e 100644
--- a/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
 SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"
 
diff --git a/dev-util/source-highlight/source-highlight-3.1.8.ebuild b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
index 6b4ae33d4bba..af831bec3109 100644
--- a/dev-util/source-highlight/source-highlight-3.1.8.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
 SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"
 
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 7b8c7a5f0cda..df3bf5d0082d 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,4 +1,4 @@
 AUX spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch 533 BLAKE2B 4d0d1b4c605681b2dbfc4c52730c9f20f8290f11a2be9c37db78e533a996c22140faafc2691c732b49b9de28a59644bd5e39a2b7d4209eb44486cdeee1338de8 SHA512 db4786a10e4380f4575d52cf861a82d0aa9f69cec7d47d574f453d159396e993527ba4e469fab75fabc36b977ee4b61abb9e3787ee2af45af8f5865b3b06e10c
-DIST spirv-llvm-translator-8.0.1.1.tar.gz 451282 BLAKE2B 6c1a5f7b9d280b040a48d987304f11c743180cb53d7068705a5be2c66a5235fd04344e31e3538cded1e9c5bce81155e00089de65b2b8baceebe54598a1305dd3 SHA512 b0e06b967caecf9b47921e7df1fef42c5c112ccf7962888c6e2f34358e9c27acb4a549cd855625fc942c4a6bcf0e5992e4c7e4d40ff962115733fc8901d04bcc
-EBUILD spirv-llvm-translator-8.0.1.1-r1.ebuild 1250 BLAKE2B 568a8a0e02081fed98ea15d4056cc5d13a1f90675e48110f3b016b48fc0a27a7e5911b07eb9f285d17567fff09863b7db7a35d36344acdeef97b29c66c60e370 SHA512 644ec589dcbe8b048b38f725d870f25b4eca9e2443c3e432ac27c36bee7721e2a27b2a9546caabd8c4cc17ff589b6f2eb34fcfa469073798332609176fe6ed7e
+DIST spirv-llvm-translator-8.0.1.2.tar.gz 461803 BLAKE2B 58814d88bfa555f0deab8d072ecd0b54c1ee22c4f6464a9988d18dad2c99d25a5ed49e506644d01455fb92f476536148e0e0cce2eaca22b4b1c88220724f8d40 SHA512 954d4600f680d3325d4f7ea80551f814f2cee486254227609fc0354c1b112d4dea387736d601750587369a7c4f1c2a528a19f8a969df433649731efdd5ba4c23
+EBUILD spirv-llvm-translator-8.0.1.2-r1.ebuild 1296 BLAKE2B 90b984d769ffc6ffb5df8d36670511872a628b1106637bc8a4c10b32f25d67e7fb3f3e7f7ca4cbecadb8aea1de3243436370ea92d79bad4031e52bdb3d1a573a SHA512 a63e034215979d0e5381c236237febe34749d1d9b8fede39d32efc70c4b994f56166b166eb5f6f6b3d78abaca744d2503472a515a6e1769a99863957d63c31ba
 MISC metadata.xml 442 BLAKE2B c63b20489865e563e064525b8df310eca993f15ff03cd533458729e5d6611b678e2f797d6efbe177e1bdeaed84e9bcf63921cb67318e948d579b57cc7f1cd28c SHA512 b036abe761b1aeb68ce5668eb3d501d2e5530be3456e85f51bee15c0aa8387a8be89c212308d7997a5f60bb0301bcdd22a7cb44a27324c05533aed94215b4721
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.1.1-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.1.2-r1.ebuild
index 8a43036f337b..0f46fcff9922 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.1.1-r1.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.1.2-r1.ebuild
@@ -18,9 +18,11 @@ SLOT="8"
 KEYWORDS="~amd64"
 IUSE="test tools"
 
+RESTRICT="!test? ( test )"
+
 S="${WORKDIR}/${MY_P}"
 
-COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]"
+COMMON="sys-devel/clang:8=[${MULTILIB_USEDEP}]"
 DEPEND="${COMMON}
 	test? ( dev-python/lit )"
 RDEPEND="${COMMON}"
@@ -40,7 +42,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
 		-DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
 		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
 	)
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 34dd599d20c6..5a762a94a169 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,8 +1,9 @@
+AUX strace-5.2-linux-5.3-compat.patch 3982 BLAKE2B d60a8a17c6a5e1831d9a37dc5dffc1195c4d7ca27be9bb1e1e4ab109aa1813fd08dec512e7e1cdd836d638030140d5f31a07839ceb5fb01c2d9b32bdd83f27bf SHA512 46c442340aa27b1bb6616efd1bb33c0df2987cc75658555e72401c0628787785070579e2054fb9765e5e184f83f3e233594eee8a5589f48d7e1364d011e5c213
 DIST strace-4.26.tar.xz 1444216 BLAKE2B ea8ff5f863afa29a3a40e8d89ff5c3835c64adf7c34c8957bbe3d99a02998d61714437470293d1759e87c1ceb8ed42564632ef33dd9d5303452ec7505822d1ba SHA512 cce153246802fcdb1547bc11164784066101a2e672e2a264cb742593b559e579aa4bedc749d87fdd1fc2045f4f79b54d419bb50c823074d2cca6f3c75ccf2290
 DIST strace-5.2.tar.xz 1515544 BLAKE2B 919a689741eabd843a43fdb557953ee6095a4d1abea808d7c35049b93afd338e0df7c69014486dfb88d22dd7cdb2f74b939ed55f08e85cdb9793d8150d08bde0 SHA512 41bea20215fa80ad90a5d49c41944e02774e715efda5e563b3714e5800933a5fca4a2392634193cf49c0752321a39e0c185bdbc9cfb8ee053b09a6bd5723da35
 DIST strace-5.3.tar.xz 1572708 BLAKE2B 808bc7afc6c70137c44d0f5a47706953bc7c0214348cda2ae45e10876bd6e118c103f15abffdfe0d7fdb01d8d3de163b9c7de3970d9cd07c88ceca11a99dc7f9 SHA512 02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546ccccdb3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a
 EBUILD strace-4.26.ebuild 2288 BLAKE2B e39d94b807ba5ce91458dda8447ae2b755a5a61b0ad651632e7fde3c755dfe7c0737815f6f40a9cd13e0aeffae1fa55c386a0ff9326d25440f04be487f4d7d02 SHA512 8af2410ba171659feb8495c769c7143d29a1c4c39fa1a3de04c4be9b712663089edfb1c3d811a0fd8d2b039e88cc7f71c73155e46c04a1873ff0072bf829a8f2
-EBUILD strace-5.2.ebuild 2336 BLAKE2B 476de457dfad9302e5e62b76aae7ecb463074b81f265aaaca03b990241a6d8773b20418ed9aaf00476adea083c2ba7418cf4ce9a9f8ab284a5c393e8f3a6bb6d SHA512 05db005186222d939bd1692b992aa43d74f138458c05d11af5ab8840ebf785f1400e0d59b713e37421d3124306bf47a7d2cf3f783a72d91c7688d9cb6b325f2b
+EBUILD strace-5.2.ebuild 2391 BLAKE2B 903f519f389605b6aae22b20609070ae0b2703cdee5952aeb5e153cfea38ed01dfc8721ab40e121bdb40c835fb8d4d053fb8867cef6a3ec3fd86e638a591aaa0 SHA512 489e8ac527c80af548ea5bd0d895f658c6b4f9c0976879e4b5f2aa96b1a4686f81d8548f980a5a6b110d6c790a68fb95cee8ef584076fe76bc026d35ab794b4c
 EBUILD strace-5.3.ebuild 2336 BLAKE2B 476de457dfad9302e5e62b76aae7ecb463074b81f265aaaca03b990241a6d8773b20418ed9aaf00476adea083c2ba7418cf4ce9a9f8ab284a5c393e8f3a6bb6d SHA512 05db005186222d939bd1692b992aa43d74f138458c05d11af5ab8840ebf785f1400e0d59b713e37421d3124306bf47a7d2cf3f783a72d91c7688d9cb6b325f2b
 EBUILD strace-9999.ebuild 2336 BLAKE2B 476de457dfad9302e5e62b76aae7ecb463074b81f265aaaca03b990241a6d8773b20418ed9aaf00476adea083c2ba7418cf4ce9a9f8ab284a5c393e8f3a6bb6d SHA512 05db005186222d939bd1692b992aa43d74f138458c05d11af5ab8840ebf785f1400e0d59b713e37421d3124306bf47a7d2cf3f783a72d91c7688d9cb6b325f2b
 MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/files/strace-5.2-linux-5.3-compat.patch b/dev-util/strace/files/strace-5.2-linux-5.3-compat.patch
new file mode 100644
index 000000000000..254326f04577
--- /dev/null
+++ b/dev-util/strace/files/strace-5.2-linux-5.3-compat.patch
@@ -0,0 +1,75 @@
+https://github.com/strace/strace/commit/60da39553ff92cf741bf7f54daff636bb28cbb3c
+https://bugs.gentoo.org/695260
+
+--- a/xlat/v4l2_pix_fmts.h
++++ b/xlat/v4l2_pix_fmts.h
+@@ -269,19 +269,23 @@ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
+ #else
+ # define V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1')
+ #endif
+-#if defined(V4L2_PIX_FMT_BGRA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_BGRA444) && HAVE_DECL_V4L2_PIX_FMT_BGRA444)
++#if defined(V4L2_PIX_FMT_SGRBG12) || (defined(HAVE_DECL_V4L2_PIX_FMT_SGRBG12) && HAVE_DECL_V4L2_PIX_FMT_SGRBG12)
+ DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
+-static_assert((V4L2_PIX_FMT_BGRA444) == (v4l2_fourcc('B', 'A', '1', '2')), "V4L2_PIX_FMT_BGRA444 != v4l2_fourcc('B', 'A', '1', '2')");
++static_assert((V4L2_PIX_FMT_SGRBG12) == (v4l2_fourcc('B', 'A', '1', '2')), "V4L2_PIX_FMT_SGRBG12 != v4l2_fourcc('B', 'A', '1', '2')");
+ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
+ #else
+-# define V4L2_PIX_FMT_BGRA444 v4l2_fourcc('B', 'A', '1', '2')
++# define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2')
+ #endif
+-#if defined(V4L2_PIX_FMT_SGRBG12) || (defined(HAVE_DECL_V4L2_PIX_FMT_SGRBG12) && HAVE_DECL_V4L2_PIX_FMT_SGRBG12)
++#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
++# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
++# undef V4L2_PIX_FMT_BGRA444
++#endif
++#if defined(V4L2_PIX_FMT_BGRA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_BGRA444) && HAVE_DECL_V4L2_PIX_FMT_BGRA444)
+ DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
+-static_assert((V4L2_PIX_FMT_SGRBG12) == (v4l2_fourcc('B', 'A', '1', '2')), "V4L2_PIX_FMT_SGRBG12 != v4l2_fourcc('B', 'A', '1', '2')");
++static_assert((V4L2_PIX_FMT_BGRA444) == (v4l2_fourcc('G', 'A', '1', '2')), "V4L2_PIX_FMT_BGRA444 != v4l2_fourcc('G', 'A', '1', '2')");
+ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
+ #else
+-# define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2')
++# define V4L2_PIX_FMT_BGRA444 v4l2_fourcc('G', 'A', '1', '2')
+ #endif
+ #if defined(V4L2_PIX_FMT_RGBA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_RGBA444) && HAVE_DECL_V4L2_PIX_FMT_RGBA444)
+ DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
+@@ -1343,8 +1347,17 @@ const struct xlat v4l2_pix_fmts[] = {
+  XLAT(V4L2_PIX_FMT_H264_NO_SC),
+  XLAT(V4L2_PIX_FMT_PWC1),
+  XLAT(V4L2_PIX_FMT_MPEG1),
+- XLAT(V4L2_PIX_FMT_BGRA444),
+  XLAT(V4L2_PIX_FMT_SGRBG12),
++#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
++# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
++/*
++* V4L2_PIX_FMT_BGRA444 was introduced in Linux commit v5.2-rc1~33^2~24 with
++* the value of v4l2_fourcc('B', 'A', '1', '2') and changed in commit
++* v5.2-rc5-403-g22be8233b34f as it clashed with V4L2_PIX_FMT_SGRBG12.
++*/
++# undef V4L2_PIX_FMT_BGRA444
++#endif
++ XLAT(V4L2_PIX_FMT_BGRA444),
+  XLAT(V4L2_PIX_FMT_RGBA444),
+  XLAT(V4L2_PIX_FMT_ABGR444),
+  XLAT(V4L2_PIX_FMT_SGBRG12),
+--- a/xlat/v4l2_pix_fmts.in
++++ b/xlat/v4l2_pix_fmts.in
+@@ -37,8 +37,17 @@ V4L2_PIX_FMT_RGB332  v4l2_fourcc('R', 'G', 'B', '1') /*  8  RGB-3-3-2     */
+ V4L2_PIX_FMT_H264_NO_SC v4l2_fourcc('A', 'V', 'C', '1') /* H264 without start codes */
+ V4L2_PIX_FMT_PWC1     v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */
+ V4L2_PIX_FMT_MPEG1    v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES     */
+-V4L2_PIX_FMT_BGRA444 v4l2_fourcc('B', 'A', '1', '2') /* 16  bbbbgggg rrrraaaa */
+ V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12  GRGR.. BGBG.. */
++#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
++# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
++/*
++ * V4L2_PIX_FMT_BGRA444 was introduced in Linux commit v5.2-rc1~33^2~24 with
++ * the value of v4l2_fourcc('B', 'A', '1', '2') and changed in commit
++ * v5.2-rc5-403-g22be8233b34f as it clashed with V4L2_PIX_FMT_SGRBG12.
++ */
++# undef V4L2_PIX_FMT_BGRA444
++#endif
++V4L2_PIX_FMT_BGRA444 v4l2_fourcc('G', 'A', '1', '2') /* 16  bbbbgggg rrrraaaa */
+ V4L2_PIX_FMT_RGBA444 v4l2_fourcc('R', 'A', '1', '2') /* 16  rrrrgggg bbbbaaaa */
+ V4L2_PIX_FMT_ABGR444 v4l2_fourcc('A', 'B', '1', '2') /* 16  aaaabbbb ggggrrrr */
+ V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12  GBGB.. RGRG.. */
diff --git a/dev-util/strace/strace-5.2.ebuild b/dev-util/strace/strace-5.2.ebuild
index db378889c0d5..88a2db590c17 100644
--- a/dev-util/strace/strace-5.2.ebuild
+++ b/dev-util/strace/strace-5.2.ebuild
@@ -37,6 +37,8 @@ RDEPEND="
 	perl? ( dev-lang/perl )
 "
 
+PATCHES=( "${FILESDIR}"/${P}-linux-5.3-compat.patch )
+
 src_prepare() {
 	default
 
diff --git a/dev-util/tailor/Manifest b/dev-util/tailor/Manifest
index ab32c69149c2..74d8b6b3948d 100644
--- a/dev-util/tailor/Manifest
+++ b/dev-util/tailor/Manifest
@@ -1,3 +1,3 @@
 DIST tailor-0.9.35.tar.gz 228650 BLAKE2B 00f609b64f22f35791bcbced1d5e62aa38b3d00c88b5d96f525807991cc51e5e82e2312583c257fc039bf89d794bcf3dbe9580e582f0d3d638289399808194ed SHA512 184521adac681ccca279215c115913d98d1521aac41fe15ca65a35e3c5075419e1cb0f1b453bca6d5a56a15b09928c34738a264b44f666de7067b2aba0562bed
-EBUILD tailor-0.9.35-r1.ebuild 868 BLAKE2B f3209f65373063f0c7b2e1b3e2c1294010513b35962b5c2e78d326ab0f833f0c088c7acf9a4b0dffe67c6811afd2ec52d542d2c0e6b0053c5f3ee1533fdf93a1 SHA512 2047073ec9dbc72d66bc99d773769aa37ee4c7a2ba4d562ee0ffb7c8628d305d35820c7cfea95829943bc8673129033ef5e313c1d4c0b9c9aed7b53e5e9f11ea
+EBUILD tailor-0.9.35-r1.ebuild 858 BLAKE2B 1acc36e234f777dc6d314c6a15a8e725e0636697395b610185f6585f3c62b09ca6e10c80dfc95289379a5b6c49a813ca7bbc0012b14ed48786da235d7b6ceb1f SHA512 e57edf3b0c3ed794828f6350e17a9f15d368005e74455b5781fa721928c5b70e90ec6f4d597a89ef4ed4e0c283d1c6e245c0ced277e3f799bc43d129bea35ed4
 MISC metadata.xml 375 BLAKE2B 33ebd2d721501f15f3688440fea5ee396d7a2edc27f8c8443f71a2a21091db612bd7b1de7b5e811f624a49531081642292e4957fc52881a20663bcb470147773 SHA512 941495f6fcaf8a68c320ad045533fa95a7deab3ec1cf2b55113c67efe004045685464440eaaf4b879711389c9b4afd21eccc74c2be865ce59b1216c206bb8877
diff --git a/dev-util/tailor/tailor-0.9.35-r1.ebuild b/dev-util/tailor/tailor-0.9.35-r1.ebuild
index baf62a2442bd..6999849c97e0 100644
--- a/dev-util/tailor/tailor-0.9.35-r1.ebuild
+++ b/dev-util/tailor/tailor-0.9.35-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://darcs.arstecnica.it/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/treecc/Manifest b/dev-util/treecc/Manifest
index 9a900ff08c09..576eb95e15eb 100644
--- a/dev-util/treecc/Manifest
+++ b/dev-util/treecc/Manifest
@@ -1,4 +1,4 @@
 DIST treecc-0.3.10.tar.gz 375762 BLAKE2B 1d4fb6905226d79bef021808639f011731cd665b76db07efbf0ab4285c35986c1efa99381694ab5ddbb20131a8bef0d26b677d1b3e5311f2fe8fa99b1a575efb SHA512 426add1a96913a169a0f03a6e3247a8b48c9073335cf967ef05d4d4188fbe3b8ebc837b38b9a4de94ccdb13685ace47a91b185c75a845cf2670e929802774b73
-EBUILD treecc-0.3.10-r1.ebuild 1004 BLAKE2B d8c30dc19664985548951e3e63e4bb4ddc3e08680503a7b4178cd5bf91f2192930ee44162a38ecf0aba9f7564d641fd60e8387ba211bf963d5345648e25a1bf6 SHA512 0bf52222d82c0d7879541ed8d3d1c634adbf463db1a3fde6c45d4ea4b96cb78e47c51b0df1859f302a5c752aec5b4eea59d9b6ccc23db151e249aac07dcb0aa6
+EBUILD treecc-0.3.10-r1.ebuild 997 BLAKE2B 2ebadc6197e20b3390f24e681e7e55a4a4bcbd9c633204a20169501ef048db3d40e8ee9e42b296ec9b45bac184b25b4e702ff5ef0316f5890f7a5193547ab7ed SHA512 0a3027588d362fba815d0e07a6c4209f8830af861206f5fde9575758c7504de9fe291b317b05feadfb50c7a9f2f86c83f2d0ea821b131a9fa54f11092287ad44
 EBUILD treecc-0.3.10.ebuild 1135 BLAKE2B 9c4d314f1478636dce24b38bbf0bff709236a4ebe59b720973a7348e3965ce8fe1f6216ad585c23e35d6dd7623f70cc98670f233f1727eaf0f68e840f5fc39be SHA512 b84c2984feeb18e72f6c892943a7b4132bccaf8d41d78342d1657630834b1874d5d040d78b4a48cf5b7bb3ae9bc5b86e91801489156b8df04f3bfe38d1e58473
 MISC metadata.xml 251 BLAKE2B 102da490c04b5ec767aebd0f076ea9aa083ec51416f584daad83e4202bd51e7182e95b7c1c98125c2a9da29eaa6b97dd4d9825c9d72e9c89d85d209e89031f48 SHA512 9b3d8ef0e933c58ceeae768b5e07fec1aba98d2f0add71719bcdec0e571b503b102610c0c4cbc322cc15638547e2f26f149d80c1498edb10b16a874014ae20d0
diff --git a/dev-util/treecc/treecc-0.3.10-r1.ebuild b/dev-util/treecc/treecc-0.3.10-r1.ebuild
index c1720eba0887..985e45d2e66c 100644
--- a/dev-util/treecc/treecc-0.3.10-r1.ebuild
+++ b/dev-util/treecc/treecc-0.3.10-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/dotgnu-pnet/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="doc examples"
 
 DEPEND="doc? ( app-text/texi2html )"
diff --git a/dev-util/unifdef/Manifest b/dev-util/unifdef/Manifest
index 6b0370579395..1a1052a4221b 100644
--- a/dev-util/unifdef/Manifest
+++ b/dev-util/unifdef/Manifest
@@ -1,5 +1,5 @@
 DIST unifdef-2.10.tar.gz 73285 BLAKE2B e13b75afc9b8e514559b8a13e3069bfb1cb489d21ce4ac56134921e702666bd9b23dad36d251cb65535e5d6fe02bea0d21a5610c542d727dc5e90d7e1726e4dd SHA512 39d4551f43fa8eccaee8a9fc469b5ddc8ca8eb0e0ce46c17c3a8300f7e6960fbf0960f364a83df20059b4aa623edc7c3c16df1b7162f068332e6c066d7ffe9b3
 DIST unifdef-2.11.tar.gz 77947 BLAKE2B 2ddc1a300b329ae91f72f1a8dad86443ba36fc02c7205eacafe1ec3ef82467003bb855c32485e6ca92b61dc45d160990b8aad531ace60ba3e55967f900150af6 SHA512 948abf878852da321f15c6060dfe33a2ab38f1787b0a6096f10bb3828d0b4e50226643e9dbcb678a422868c215b5c4e981dc7da5244d38688e8e91287beb8845
-EBUILD unifdef-2.10.ebuild 552 BLAKE2B 8c99246187b5c3e90cbbfc450083fff6b3770c1551d3fd04e7d2b65edd17b4f7cc0e4005aecb271838e9fcbfbf781f070d3e9237016df3d9a74cb06158cbde55 SHA512 8d3fc896dded85e9e2ac52376e8fee4fae726b403332d7af6e3750771c547cdc914adac25ccff906c474367d9a170ed913487df4690588d36a9dee5fcf8e11c4
-EBUILD unifdef-2.11.ebuild 574 BLAKE2B b7f2c61dc7a1c1deffcd2c24b065f6556a97dd92db37f9d91b55807dea70b7f77167638a9d288bcac156702f49be248cc35521e416e8c850fba5f98f389f77c8 SHA512 f815b777dd8aaec261bd19e3da43527c13314c8355bd25441f2b638f035eebadb51ac9dbd26dae309dc6d6061479d81ce28e92bd53dd5fdc9226c70b56dd63a7
+EBUILD unifdef-2.10.ebuild 542 BLAKE2B 06bded76e41e766038550174fd3d161f6e7c60c5b5a0d047ecb7c29501d1bc76f94f9b0ce49fb760a56cfcd935d31528da69052eaf48a57db019ea8f5888c9b3 SHA512 322b08a8f1271c80e68eecf36e3da495656ca3cdb9cd0009dbbf6f8085bab08ccaec1460cda894998c80bf197b4bfa099aa4886887bc4faf3a777cf612c53206
+EBUILD unifdef-2.11.ebuild 564 BLAKE2B bbbd92fae4908525fe074816df9117f5f4b39f24a4f91175bb0d9f8d8ab88e44786ba697f0272efac94421871beb1ddaec20e7acb9ec88024d0dffdadd1be6b0 SHA512 8d27b5ca223a6d243e7bead5c6f79bfd7f6d660290bd796468074f8bbddb5b44afcffdb36be0f8b4c0f91636fbe537b4ccbe68b7942de8f2eb54606b20879b15
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/unifdef/unifdef-2.10.ebuild b/dev-util/unifdef/unifdef-2.10.ebuild
index c552129e314f..038a1285cef0 100644
--- a/dev-util/unifdef/unifdef-2.10.ebuild
+++ b/dev-util/unifdef/unifdef-2.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dotat.at/prog/unifdef/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 
 DOCS=( README )
 
diff --git a/dev-util/unifdef/unifdef-2.11.ebuild b/dev-util/unifdef/unifdef-2.11.ebuild
index 6eddb8283ecf..cb5bb6583722 100644
--- a/dev-util/unifdef/unifdef-2.11.ebuild
+++ b/dev-util/unifdef/unifdef-2.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dotat.at/prog/unifdef/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DOCS=( README )
 
diff --git a/dev-util/vbindiff/Manifest b/dev-util/vbindiff/Manifest
index 469d3d55aaf9..9398f788f79b 100644
--- a/dev-util/vbindiff/Manifest
+++ b/dev-util/vbindiff/Manifest
@@ -1,5 +1,5 @@
 DIST vbindiff-3.0_beta4.tar.gz 121538 BLAKE2B 2d9d548461497d27eeb26a96135ff0c9e60e069b8bea8f640ae526267bb53d0da3550b8b251cd922b131d1bf499d6c2c0c6353a9e75a94af61256340944afb5a SHA512 6437f107fe58e8343ccd8cb65b3c562d5cb25445fcce284c7ce73fe4a2ed7191100595b9cd0c88d5a630a176f4c4bd374625c97c109a6ee14f1f56ca136d23da
 DIST vbindiff-3.0_beta5.tar.gz 134192 BLAKE2B 9a7437833fef8db4316fd2c67a781868f6aead5ae47c7abc05683545bb3990950a465b1665ff5bc2e7d298465b3b1a427d6d67b43f59bd7dfb112143c9b52d2f SHA512 e6abd5cb93beffa3bc55455dbfbc98f0effc2a6667c8b9c721792c4a274dfe6f35ef121d27506fc9c951a1decb0e69886775fcf092a5f47fda82ed75ef760a74
-EBUILD vbindiff-3.0_beta4-r1.ebuild 512 BLAKE2B 0b23603fd9d90585ab62bea8e128b206fb877b221fdef67aa2a266098755ebb9aa3ebd870d0c3f53fb5c48853153823240a79a9f5cd046893a7ab372a7204fbd SHA512 cccc8ba05665680717ee48ff6f38eeaa12ac8e7eaab1c88f969b0667a027aa10f5c55fa37cd8cf2a0dfe3e8fb6b0e4c300ee022e1ea5d322239d31988ee385db
-EBUILD vbindiff-3.0_beta5.ebuild 412 BLAKE2B be00bf6d380fc6c1cc7051f6c7297ffdd377a8195561916485ca4d7f309e7797fdbd74c84a0c4d900f0d96f978ae19f59a133a78318280cd07a5cc0f07d918c6 SHA512 384faa243aac444b2eefdb9a0d0b623cd9f377a02b0c6d371a518691573eb68fae15e75d5876bde0691e5f023116c4059197394ed870c2d9d469c5c78ffb89d1
+EBUILD vbindiff-3.0_beta4-r1.ebuild 502 BLAKE2B 5ed80b3d0147e49badde9e496741a052374b250a74b064ce090ed0a262b1b6747b661664954a4d969957f2aafedb34a05eb37a7e85bf0fd5edf6a34238cf8762 SHA512 5490f4071ab11d6c9a71bfc9f5226c2d382493430c0f178868ea145699c71e95c28a047b43759b9d46beb8c665aa892474beb0ddfa8502b3fb03e3dc42e8e7fd
+EBUILD vbindiff-3.0_beta5.ebuild 402 BLAKE2B de60734a986c6648b761944149bdc4248a1af0279540d77c850a55489d7885de091e21d2be31914ef224bc8cf05889e4f4c6edba45468767749e4603abf7c96f SHA512 0f2f30c2d0430c65e84c1615c71b9d440a287cbb3248aa20b9c3354614c62c4a790760f8197fd0c8dd9c58b75d41c46232d2473a300f98cf8c8385b61f9b144d
 MISC metadata.xml 331 BLAKE2B e1827fc3619bfde5ed89a9eebb60943e22419a20e89d6ff3441f30195bb05fdafff6549cf09985e43a58712cf5846f9eec82a792dd66505cded6525c1c5235a2 SHA512 32b9763a0137fc5fb36751a38c9476a6f813ff118f4cc0a491dcae75439fb7ce40f934d6d0cffb0397ad11b85373859791622884c194ddddd3bd5bb03427001f
diff --git a/dev-util/vbindiff/vbindiff-3.0_beta4-r1.ebuild b/dev-util/vbindiff/vbindiff-3.0_beta4-r1.ebuild
index a27438a4c301..a1c8216b60fd 100644
--- a/dev-util/vbindiff/vbindiff-3.0_beta4-r1.ebuild
+++ b/dev-util/vbindiff/vbindiff-3.0_beta4-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.cjmweb.net/vbindiff/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 RDEPEND="sys-libs/ncurses:0="
diff --git a/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild b/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
index 1c713d3f2daf..762a69588b80 100644
--- a/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
+++ b/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mrdudz/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses:0="
diff --git a/dev-util/webstorm/Manifest b/dev-util/webstorm/Manifest
deleted file mode 100644
index e9885a23f406..000000000000
--- a/dev-util/webstorm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST WebStorm-2017.2.4.tar.gz 257748171 BLAKE2B 2b0951e94f92a0d690bf9261573963dd6250d9b896784b7156dde8b39ec3a59f94da023bcd3183b404e4bfa16d27928d3eecedf54f5b9036e856af5237e8c5ed SHA512 283339f7757093affde698cfb751f7ced18d54159db7696c9fe6b4d37751e94ad1ca9f0c54db9d5ca256da35ee24454a3b48ced21d6db434c23ec94b023a4d09
-EBUILD webstorm-2017.2.4.172.4155.35.ebuild 977 BLAKE2B 3a64256b0e9e8e86e622e6d0deefe74c3114aa2eb28e6ff93001989955baaf596f51a18a17020672cd58fb86338b5bd28eab11c58e315a4754e39e95b9e124fa SHA512 6accbba6b2d80ee5ecedd03ad2aed982fdd1bbf531bba3603b20ff427107abaead0c0a886bd68b5b29eab5b183693c8ac2dadc620e9065c14e9644c0284be6aa
-MISC metadata.xml 353 BLAKE2B 00bc5dc6cf44dbf5b4efecf6f8960fed13737d92ecd2813af24d696a88a3d9fe63789584b4afe8ec6cb2068c77066f5c3260af9dc243dd03b2f85b3cd3bb902b SHA512 141b9620fe7a3839c6fdf2dad646948e413c85c3a9b1ae15aa2582db0af57461f741c038127627873d02c62411262cbbdc7dd21705ea304bc3072ae3491bdcac
diff --git a/dev-util/webstorm/metadata.xml b/dev-util/webstorm/metadata.xml
deleted file mode 100644
index 1866cf4b1397..000000000000
--- a/dev-util/webstorm/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-WebStorm is a lightweight yet powerful IDE, perfectly equipped for complex client-side development and server-side development with Node.js
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild b/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild
deleted file mode 100644
index 29f6a26054a5..000000000000
--- a/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils versionator
-
-DESCRIPTION="JavaScript IDE for client- and server-side development with Node.js"
-HOMEPAGE="http://www.jetbrains.com/webstorm"
-SRC_URI="http://download.jetbrains.com/${PN}/WebStorm-$(get_version_component_range 1-3).tar.gz"
-
-LICENSE="WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal"
-# This package cannot be slotted for now, bug #592636
-#SLOT="$(get_major_version)"
-SLOT="2017"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="bindist mirror splitdebug" #656858
-
-RDEPEND=">=virtual/jdk-1.7"
-
-S="${WORKDIR}/WebStorm-$(get_version_component_range 4-6)"
-
-src_install() {
-	insinto "/opt/${PN}"
-	doins -r .
-	fperms 755 /opt/${PN}/bin/{${PN}.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "/opt/${PN}/bin/${PN}.sh"
-	newicon "bin/${PN}.svg" "${PN}.svg"
-	make_desktop_entry "${PN}" "${PN}" "${PN}" "Development;IDE;"
-}
diff --git a/dev-util/xdelta/Manifest b/dev-util/xdelta/Manifest
index af3fad286d30..a2c0f983dd41 100644
--- a/dev-util/xdelta/Manifest
+++ b/dev-util/xdelta/Manifest
@@ -5,6 +5,7 @@ DIST xdelta-1.1.4.tar.gz 423529 BLAKE2B b565f82ba0504118b74127096939e5699ea312be
 DIST xdelta3-3.0.11.tar.gz 683605 BLAKE2B bc33c9d6a3bb21bc52d72bba54f5e2b1058ea8d7cd7474aaf6dbdc27e165e0fbea644c584402f5bbc8ace7cd6a3aefae18588a659418f93eb041168545363bf4 SHA512 41c48e28f92ad50a737cf0acac150fe17d1132e9a652c482d751c8c4e745c6922d576a183eeabae343a1a238ed8c53353e537977628c86eb599ab3d1c01e7c52
 DIST xdelta3-3.1.0.tar.gz 727607 BLAKE2B 1dd7846dad0414071a8af172fc3b73a0321fc9c841786563fe92ebe5c53d80d3eb07cc553cb5a9813432d9df5aae51d5b4a4c32a8c06a34dace5868297b5a68b SHA512 848c90a28018ec3c541ec43be59ea90328142c4705d3b59907fd89e8f6ac2758e288b1a1112fea601884c50ef7f6cf2c1634f539a76bea65a2741d3bb0e9b990
 EBUILD xdelta-1.1.4-r1.ebuild 896 BLAKE2B b6b0f32c7c4b2571258628b756dda26f5128ca366ddb1914bb3bed3982dca080a8db05fef23bd42456ef1ca27ab5cef8c1659902754905f883dcf31c1fa251d0 SHA512 b4952b33ee40c5cbc73e1e959b7a8b595c6e0a43497f7e178e28901a0e3b417f06df03c123fcbfc3b42c8419cff0b135d59702af7f321f85feac623dc9550ece
-EBUILD xdelta-3.0.11.ebuild 859 BLAKE2B c84af4993e3b0c6616b49f600cca10118b5b3a4ab1d812877b80a7d8fd65801d9f6485998f88407f44529d8be4f96c26dd8140c1f0d909baf0062bc78e9786c6 SHA512 a3297efc74f4b733fc4273de9d575987d395d1fad9dbb5a34387e62dbfebe2ec73f151860ae3084dc880f6ec713fc86fe49c79efa60875254efde696dfb07a5e
-EBUILD xdelta-3.1.0.ebuild 1134 BLAKE2B 26ad2f326edca11f9da317de66aa45278fd6bd9db99567695b405af244ebc1940dece6ff0d5d766f83bea901df5f4151940f3bf57c4eb7eeed5bee7864f308c2 SHA512 5e38e5fd5548ac6aa9eb2aab8c81539f99e7e1fc4940019888354dd78c769ef6be8ac7e38b624b4c95acf1d45d532ab58ffb7d92f3e0b60f2d1b9d73cea1d0e6
+EBUILD xdelta-1.1.4-r2.ebuild 723 BLAKE2B 871cd094f8e866f37e16e2b217d0a449518ccf0f2594c509ef3f43c5861298585f3f0569526793f850648941a6b1a8fb9fd7660bbfe496ee7b87d14554d34efa SHA512 3418d26ebf60ed63daf82b8567048134e0593d345f146d4471e920e2c2d7677dfd2648c155b8d16aaf22c7d153f9a4741d17f76de051e3b286ed8a36fbefb122
+EBUILD xdelta-3.0.11.ebuild 837 BLAKE2B f6d575a2bbc1091c0565225bfee15f2ace5c1b308e6970acd8d6755df3b92633ea9b4685a0d51b20ec5ea2cff25f9dc76011e8966ac4ef57435ebc86a5ae229c SHA512 864c62d7307064f7ff8b7c827ec98759a375684e596efdc729b332dafbe22943584c09c2d4cc5391f7e4f4adff358f1d98d1252980222c048602bea83182c819
+EBUILD xdelta-3.1.0.ebuild 1122 BLAKE2B f78880912c1b4436d8ac9d70787a8b3643acb86fd2151c4a2da8f4f4c7d6a929c8490d04fed71ae57a9ccc5f64b5f123e526273ac055a9c3e61b1cd16bc4cf64 SHA512 441fb38fc8a40dbc261fe9efb21a9d026c52f59f2c7f70fc9fcf86f290c9471a0cc380ec919ee18777e13cfacf1a829ec58575f4e5300ccd97c2865a5cae360a
 MISC metadata.xml 381 BLAKE2B 1e67843f342c5d64a78b0ec5f6b20cb6c091f020be78355e83cc5ab8d53312fa97e025d9f819e73fd0c4fe936d15bf87600835bcf2d9040ba67dc740d270d2cf SHA512 2c439c35f726e18396d3a0f2e923cf2f2d0eb7a9798907fd0f039dddcc9fdbac95d6e89d113fc8a937ceb260c90901e0657ecdea2f0bf423ca9456627b2912d3
diff --git a/dev-util/xdelta/xdelta-1.1.4-r2.ebuild b/dev-util/xdelta/xdelta-1.1.4-r2.ebuild
new file mode 100644
index 000000000000..008f5b44ef68
--- /dev/null
+++ b/dev-util/xdelta/xdelta-1.1.4-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Computes changes between binary or text files and creates deltas"
+HOMEPAGE="https://xdelta.googlecode.com/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2
+	>=sys-libs/zlib-1.1.4:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	eapply "${FILESDIR}"/${P}-m4.patch
+	eapply "${FILESDIR}"/${P}-glib2.patch
+	eapply "${FILESDIR}"/${P}-pkgconfig.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	default
+}
diff --git a/dev-util/xdelta/xdelta-3.0.11.ebuild b/dev-util/xdelta/xdelta-3.0.11.ebuild
index d659122d34f2..c68012e99fee 100644
--- a/dev-util/xdelta/xdelta-3.0.11.ebuild
+++ b/dev-util/xdelta/xdelta-3.0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="examples lzma"
 
 RDEPEND="lzma? ( app-arch/xz-utils:= )"
diff --git a/dev-util/xdelta/xdelta-3.1.0.ebuild b/dev-util/xdelta/xdelta-3.1.0.ebuild
index a3f444acd4c2..a3ef6307073e 100644
--- a/dev-util/xdelta/xdelta-3.1.0.ebuild
+++ b/dev-util/xdelta/xdelta-3.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples test"
 
 RDEPEND="app-arch/xz-utils"
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index 83f9b7019a2b..0f4529cbeb25 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,7 +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
+EBUILD xfce4-dev-tools-4.12.0-r1.ebuild 626 BLAKE2B b9aabb496bcb32c9983079da11c70e09cc2bbbb650d15e37e3ede940cf65919e7f404b2ce371c8414f9ef8790be4bb632b088fd7eeea0846ba10e9707ea6b37a SHA512 51eaf1a4e44f215a91b32f4c83f27e6dc373b1dfd0a07cfc4c1f282b4e432ba5bded6d3b81ff859fe9eb2f1832ada9500a33210ec61784808b5124de73360f37
+EBUILD xfce4-dev-tools-4.13.0.ebuild 584 BLAKE2B d17bba46a6787fd07cfec37678abc83597691beffd08c2c0019594711d65ed69fcc370f62a527a0af09551f02a84340778c7324a409d6fa1b43e2ba9cd8f1034 SHA512 d5d7186d3933c30119e321015c9170d9a2e98bf838a9f2af2ca823e4043b588dd4ca3170b0b0d9c13a7b9c1d5387cf4f2262fdbb696b3f7553aa1c0a4968d879
+EBUILD xfce4-dev-tools-4.14.0.ebuild 577 BLAKE2B 0ed29c8e1ed9b465bce7038ee5a44431e7b922a0f893e760a854eb73a430d3ebd46cedcd499b852dcf9023a00c7004ac78d5b3251d373b05a759c188b543d6f5 SHA512 774f086181479a4663fc2894d023a00d8d277765f97b74f472c1d374deadc4a63b9698e370e3ee800ba6c9867daf3ec32c82f546c0ff0294e00b1140c3d023ec
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild
index b5f323b6aaf0..cc4c1faf4705 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.30"
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.13.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.13.0.ebuild
index 2d5f6650e28b..b09d36436101 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.13.0.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.13.0.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.42"
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
index 2d5f6650e28b..7224de308444 100644
--- 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
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.42"
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /dev-util
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)