gentoo resync : 10.04.2018

32 files changed, 82 insertions, 551 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 59d37af00aa2..c9f6e852aa64 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 2815b28703d7..658f42633e21 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -2,7 +2,7 @@ DIST aruba-0.5.4.gem 69632 BLAKE2B 77e0c739681d4ff08430a63db9614568346328c1c0594
 DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
 DIST aruba-0.8.1.gem 121344 BLAKE2B 0b601a4d4bcd19159bb23b22b7975d1275ed2ab9c06e9ab550e11a151e953eba9ec4cc05280e69685a54b82996b4863b485a74f91d64270cc058f43272f6df6d SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f
 EBUILD aruba-0.5.4-r1.ebuild 978 BLAKE2B 87b1c5200542713b1e1aff8c42146bdc3cfa5984f9d44a358444a24554b88388b84d60ecb4abdb63198e64af0c6d7f3c462c2e39c11a54152936cb9af039ffae SHA512 6064116cef51005229e016cba328b1b63c96e5279c52f09ca76a89c1a62bb0e2e134d5cdc10a484ea37d849ac34d98763bf0fbf9a1b8f82ae53bfec364e5b1cd
-EBUILD aruba-0.6.2-r1.ebuild 985 BLAKE2B 34de3d050535152b746fc775cd24e3944026f5f649bccdc780f7b112c2ef5df936224a1d53985601ed881b8f1fd87c023e33ce20ce50b6e6cc862c9c38239219 SHA512 4b3ae237c2a896e489b65df63cc38687898446415489fdf3e6b992a0841efb4184de87a55ebaa714793abd47cc8de4b8c75d9509d4eb0d30960288038551327f
+EBUILD aruba-0.6.2-r1.ebuild 992 BLAKE2B 44400b3953d5f6b4ff34d1a8878249238c9b64c9142ade8b6ec182ac6cc2ad4192e2e48f7e515932e01d1a1acb771d2edba7c99e047b92f965c6b11afe4abfbf SHA512 cade3518b27a5935b40276c6adb7a8f339d0dcdd147e7b90857959c8b2889c82b28a450e81ef459483e15639a9d40736d289ee5031764cc576e90e217f105100
 EBUILD aruba-0.6.2.ebuild 985 BLAKE2B fe9c02aed0fd268983ef592164fa53306fda96ce32d27ef3ea93090c3917da2f97030e2dd21777751d78cb0666d192c947f722f62aab70f15770ef85d19a9a3f SHA512 deb59f89b7ad08e033cad93b6075b9d72a89959fe72553feb3b4f66a458c0d4508a4833ac0e9ee7e0199910e5ecc7551f56b6c5183c68e3f4407bba22e2abf30
 EBUILD aruba-0.8.1.ebuild 1666 BLAKE2B 9aff62c204cd99a32b631cd3765d07fbe7a9751bdf2460085ad08102145159be2a5b5923c85aecc69c54584a8519f4cb046ff7639ccf3f623a7bfeab9aa55608 SHA512 738cbf69940544392993e84fdfa1d5f34423818e34e7fc301ae4c2378d03a5641c6783e83b6f71951e667f050f6c24c84e6075b30959e463508733004db9bdb9
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.6.2-r1.ebuild b/dev-util/aruba/aruba-0.6.2-r1.ebuild
index d605fd526fe8..bbd7c4507ba7 100644
--- a/dev-util/aruba/aruba-0.6.2-r1.ebuild
+++ b/dev-util/aruba/aruba-0.6.2-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 3b02b126290a..a2e36b7eaab5 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,7 +1,7 @@
 DIST cucumber-core-1.5.0.gem 45056 BLAKE2B 39c56fd48386556f36921694940d8d8be7e2345c81bec83e7a47b4a07e96b22f4d30898cbdcedeebc44be671c166b42cb52d55c36b7196eb05b9cb82333a76d3 SHA512 544d2c5707bde46d0c12dc975b3858e663776d9bc87ef044681525a547ef2de171a74ba0c53fb28dafcbdf90a153bea5357ec1a129f11b2c0dfedd288c5def74
 DIST cucumber-core-3.0.0.gem 52736 BLAKE2B 8c46b6209ffcea6c4840c038f956c90b0cbf4ab6e227ff0d0bcd92202f4bc233c9815bd270baf8d01a9cf15ef32cda2ca9fed172571fa2d8fc00ac024667a725 SHA512 2991bc8e2f3f5042b10cd430273dd1fd4c851ee444defbdfdf16ba920f93c6523e1b503c562438691947a969c95c8f65416a69c4fdf1fe876ad0c274982b9e75
 DIST cucumber-core-3.1.0.tar.gz 49335 BLAKE2B 92b82661a6fb49ebff987fc5c729fee894509667d2a9600dcafa305235097249381b51ba4549f6c465dd7d8733e125d891d7c04e204fd683f68f08792e862a8a SHA512 c50186288bc855e30611dd25956f343bb97c7fc75e0f3341917e5816db2dcb7ea76a189fda7399c1304db7a643d8c10b7a76e3bf98a775e1ef2356a389e3eb7d
-EBUILD cucumber-core-1.5.0.ebuild 727 BLAKE2B b01f36458f760811433de6c8b397d6e21e67eda1f49737aa189c3d3021e30ac0eefd175d736e7d450b38feb841d8e438c15209a159b12160199a3f8539576538 SHA512 811a71b9b5715bf384931e1efd76ab02728178cc392b76e568d9b653d06cd2040ea7ef818ddf9bae04ebf98f7316288dfba1c90decec00568e360902562c5c02
+EBUILD cucumber-core-1.5.0.ebuild 734 BLAKE2B 9bd3508c564cc270268fc10e15d9a12a60bebaba9381e9c2d86237d2904d1e15c6ed9eccef71266d1cb2bf18c9f85386374c48a1e5d9e73a0dde0dfdf5472eb5 SHA512 743330dceeca01e455cdb6405050a48d4463f9e2a105355b4562e6dcdb727803c2768415292257f345036d367649a92d50a2824dd864dce212dab3a837545302
 EBUILD cucumber-core-3.0.0.ebuild 795 BLAKE2B 89d7da70e3509ada352d8e2644886e193319b5d3ce2c0587acf7dfe3c5089b55ffe6cc91687a51d3ed6745eb1dbf8f884c968d94127ac19aee3db29cb5c1d7e5 SHA512 0d5d991e93b2b1f15bab9e4a59ab6aeac39249582f10071331548f202e0c88dedcdd427d9889ded3b337e62bbe65de73cce0cc0a87c31173a9fadd9375eb09e9
 EBUILD cucumber-core-3.1.0-r1.ebuild 969 BLAKE2B 02f7f98e1a49865a42a241bca85df5a43050361374438ef2768471a80e58e855b9f582c6ca0bc1eb05b3c73f6ef707952c5d007a1d700d9d1bb09e6fed338aa4 SHA512 3dede8db36cdb1f0414ffc234c19644b41c986d4caf21b0d34364c6fceda3f0291b9f29cd2f6b7027109f035f837fdca9b68db806d88b35d7ce4b0bed069ad41
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild b/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild
index 1918b41f43fe..70caf942ed2d 100644
--- a/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index fe320de05228..d5517dc041f0 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -1,9 +1,11 @@
 DIST cucumber-expressions-4.0.4.gem 16896 BLAKE2B 5e888f63d4c976db4b10bd99b8f8f4122364fb32c106f6485b3b75e3ade15fd573260cc37aaf4abc3754bdf3ad62ac37b4d78a4abc63099a841e256e12425bd3 SHA512 9a52b866545154c9e7d4e8f08cbbf6b2d0dcee28c24486eb95ad4717a757a25ae8ac844702dd2e0c892fa0406f686d3b4eb024c90fc6e7b90be7a6edd7e2dadc
 DIST cucumber-expressions-5.0.13.gem 17408 BLAKE2B 113554f5350dc289dea2a97530e1982f4afa00fe23da4e63d55d648e8767443c2f6c18bb2639defbe79034e709dbfd5865bdff0e11f090320132de9724994b9a SHA512 7035d3d6b9bba0f56ca15580956bbb69c3449ca75c825563217ea5773984a976e455866a0046f045573c5fcf8398887e19a87f425299a3231a077a158ccf2f97
 DIST cucumber-expressions-5.0.14.gem 17920 BLAKE2B 623b1c328703d6f9919c9fc7ffab64d26b752fe8f75d21d5ff2323aa502fe49e9b65bfb5f9f0c64c4baee3189c28e5cf05a404fd499c72fa8cf95157492a0e6e SHA512 7e44de399250d21d017a38d72e15390e9e0dc48b03755508767c5c237aebec830623428420a500bcef1bbb9db2157994b59718a731e8baca4266d1393e0b5843
+DIST cucumber-expressions-5.0.15.gem 17920 BLAKE2B 83c741f985aee1fdb316693c70f519bd82e4cb373285f0bc9976405dad143ef562cbac92263e7fbf73254713a699270cf99080ed9d3a3f85a6b982caafebeb6d SHA512 0d50975fac9b94e17f7f0388b50cf1fe98775dc34887846f72d4b1f471ff957b466b9d567fd6e0da7561860d6e2d8364c2f3490ad9e8059ee0d1cd99ebc5f386
 DIST cucumber-expressions-5.0.7.gem 17408 BLAKE2B 1f958063f276154bd75485e1f2b9beabfc41d26e4029ca7a7e89d6f6d81dc25bbd69626920dfbf1a9323f65b6eea105dab328f06daf15c290a11ea0c86dc69e4 SHA512 af83d028df20ac608ce3fd85850da451f1ec76de688f1d0bc71c1e6a0e70cdbb15f4df6710cccf6b736426f9a547b5a5ae0bb860cd626291237c2bc11371a24f
 EBUILD cucumber-expressions-4.0.4.ebuild 479 BLAKE2B b6d58cb994fcc741ba5c6f8d26531d01530c26803df4ef3a914882bc9eb440a9da4c2b84a593a622807616b8e2bb82191b827f08facad37521d83840bc53e6c3 SHA512 43d857be0ad1cf4cc39ce9852c8d032b65607331eec1402ed7f0ec92524621ec34bf4c2213e8c2bccc0763311a06b0db38b205baf13219cf8d49b63eb52b8f9d
 EBUILD cucumber-expressions-5.0.13.ebuild 479 BLAKE2B b7b1e29bb64e1bbc364b087cc8b5ff518fd17b1a8fbb47701e009f50782cc75b46b31a90ad513443e39c82efea30a14571a2fd72b64290a9d7f8116755228ff8 SHA512 2814a2862d56e9635b0065f0bfda264a93494dcd9f57d7df70c4bf03494b9fdbf95eda5f95e739f98b7b28623c2058445bf538efd31338b8c00d9f1160138daf
 EBUILD cucumber-expressions-5.0.14.ebuild 486 BLAKE2B be168b3065f738b734d610906cd70d4a78ede9d9f8ae244518d5c52ce8a3a9711a161a5b95439865c8a98edba86429d523f29430bc5aee3e712688381e0e5e6f SHA512 37280514dfabd2dbff86634558be5109245ebc799a860eb86616cf49b80f6cf4820502ef036732b42faf72abd6e8964a4829479891ba82e22c1093fdac80d33c
+EBUILD cucumber-expressions-5.0.15.ebuild 486 BLAKE2B be168b3065f738b734d610906cd70d4a78ede9d9f8ae244518d5c52ce8a3a9711a161a5b95439865c8a98edba86429d523f29430bc5aee3e712688381e0e5e6f SHA512 37280514dfabd2dbff86634558be5109245ebc799a860eb86616cf49b80f6cf4820502ef036732b42faf72abd6e8964a4829479891ba82e22c1093fdac80d33c
 EBUILD cucumber-expressions-5.0.7.ebuild 479 BLAKE2B b7b1e29bb64e1bbc364b087cc8b5ff518fd17b1a8fbb47701e009f50782cc75b46b31a90ad513443e39c82efea30a14571a2fd72b64290a9d7f8116755228ff8 SHA512 2814a2862d56e9635b0065f0bfda264a93494dcd9f57d7df70c4bf03494b9fdbf95eda5f95e739f98b7b28623c2058445bf538efd31338b8c00d9f1160138daf
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-5.0.15.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-5.0.15.ebuild
new file mode 100644
index 000000000000..832428b34fa9
--- /dev/null
+++ b/dev-util/cucumber-expressions/cucumber-expressions-5.0.15.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a simpler alternative to Regular Expressions"
+HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+SLOT="5.0"
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index 6492067e5126..53b61025ff4f 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,5 +1,3 @@
-DIST cucumber-rails-1.4.5.gem 406016 BLAKE2B 8ab7b196d986eea09f2a8965c222227f1e3025519827de455f4ff8f058c6af16b7ec2f99bd6cb94e7821914aea850e332a97d012a47cce5590934fe85dce23c4 SHA512 66ad3a23503a5f28202e13fd041ca8c75ee447c525daf4b4711cbf789c7ee924efaaabf9753173eb67b8d9fd201f08d2d2fa1905175b7615640d4f2861c92701
 DIST cucumber-rails-1.5.0.gem 406528 BLAKE2B a43f6bf93d10df49b57f1da914474f54eb5983b53afe54cb13fe1a1b95792c5c9031b26651d3ac8fe2f8788d86e6ec891aaa91853e95c603f746f02a719f7b6d SHA512 d5a416cea8055319b768243b2029fcc05412677ba8fdc523b246d69e12d820e429b80892d6cfc43600aa84257e2175058ddd5f0946d68c42efa7ebadbf1a536d
-EBUILD cucumber-rails-1.4.5.ebuild 1226 BLAKE2B 1a5faaf79779b819cc416e80ab7b21e946aaf9b487b7c71c6144ad6858daa175ea626681a6e8485ec6fecc282f5292e7d6e7359c5f9d4232068823e862ae52b0 SHA512 5c22f4a764aa3f5ce068fceb0ebcab23f603551cc121eddc892f9eea495e27f4ee7b4779ec6b54ca2a7d68432eee7e8e7ee3b098f456b1308b5ef9b3b6eda3a5
 EBUILD cucumber-rails-1.5.0.ebuild 1215 BLAKE2B 3948f577a0a4229a2cdb34f1e97a034380127860894c5a62b918e021cebdec058d91c5cfa7ab938441b27d4172952413ea11aa50adc2104d19e6e64bf4b33ff2 SHA512 c93c1ac5595bfdf823e4c3e2c127eab035cb2c954f19c4c78baeb2f7dab21f4eabc396e3c359b36a5b9ec53324e02d30b974a475df23e0d81d55c33a729243d4
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.4.5.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.4.5.ebuild
deleted file mode 100644
index 049436501e4a..000000000000
--- a/dev-util/cucumber-rails/cucumber-rails-1.4.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-# There are also cucumber features. They require a Rails project with
-# factory girl which we don't have packaged yet.
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64"
-SLOT="1"
-IUSE=""
-
-# Restrict tests since Appraisal is now mandatory to manage different
-# rails versions, even for the specs.
-RESTRICT="test"
-#ruby_add_bdepend "
-#	test? (
-#		>=dev-ruby/ammeter-0.2.2
-#		>=dev-ruby/rspec-rails-2.7.0:2
-#	)"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-1.3.8 <dev-util/cucumber-4
-	>=dev-ruby/nokogiri-1.5.0
-	>=dev-ruby/capybara-1.1.2:* <dev-ruby/capybara-3:*
-	>=dev-ruby/railties-3.0.0:* <dev-ruby/railties-5.1:*
-	>=dev-ruby/mime-types-1.16:* <dev-ruby/mime-types-4:*"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index 20a0a0dda34a..e5882a02cf52 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087bcadd5f494b807fa530d20b7e14f327ca2ab377c3f9abc28df60c7986576b59a246e5fb7537daadb016bb21420b7 SHA512 c6bae727814f6a2d1dfa8cfee9bc9e63e3bfa755f6bb070f907a24d52009dd29652ab21ea7719527a5423ddf4471208f91a388ec53555d7021abac7769b2109a
-EBUILD cucumber-wire-0.0.1.ebuild 516 BLAKE2B 5735bf24c5c5da89fc4b6c946d931d73eafa618ae3e33d659a11de4b5711236cadae5a8e9144b292097a9008c8c716bc4334b701751c21ed3a001ca9e7285e7f SHA512 e640546e320681d2ed330bdce470b496d530a9bccdbf20322e2db02f2b786cf9cd45632d542a809dd9bfa831b2dc4f0680a1d90d24b663077f0d71e503c40c47
+EBUILD cucumber-wire-0.0.1.ebuild 523 BLAKE2B 60a9fcbc7f151d12204327b1a13647d9e8b0e8816c7809cc89b674e29670e326ca05fc5adf104ab485966ee53abe89f87c3565253ccadbe2585a25c5b17b2169 SHA512 8776e1f33e135aea2b4af64948647a13bff2a861df8029a9b3419ff04a37cec0174b210f3bfb3477f6b3f885b054fd50f16c5232e66691163a6217e3cabf5708
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild b/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild
index b43d6e68c38b..61795e63fd92 100644
--- a/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index b0eb095970a1..44aac680a692 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -3,7 +3,7 @@ DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc5
 DIST cucumber-3.0.2.tar.gz 267557 BLAKE2B 0ce098d9c747a6291e53c647f0e6da7adbcf4cd6f85953023f5fa0e14dc7186a706c43b81cf77a55ad56f932e60146e7e0ca7d4107f85e9c6bd46cbc8b2d1f7a SHA512 1506427fb6d9233231497f0e1396143cfb1495673113fbb26344b171413c1bc9d35fd8a8ca86aa14ffc279d1d9db05712618c3a0e96f2288056d76f39bbf2cf6
 DIST cucumber-3.1.0.tar.gz 267954 BLAKE2B e309c20a63621859375549d85cd85a89ec399821d7412932337b9d2d39c98204484297ce136b0023bdfb20b0a5844d27901663d5864007609657ca53c59f6572 SHA512 ace42faa4830740e09f484af65eac092cc5f5ac0607d3aaf6b6df1b2a27f16b9647d8759edf15c636f87177ce6b545a07bb22befff79b74234cb0c08c92ea9ca
 EBUILD cucumber-1.3.20-r1.ebuild 2165 BLAKE2B 1030d687efe56f2e7dc3b8dc9f3869ab89d7ea3fd79dd33fc06a9495425f22d9b5979467c2875a41bcb4ec43d41db486ec2c0da752ae8a6e9e409f7cc177b76b SHA512 7d468eaee8facf0cf1e1a1272e12e55ba14a927a0611de734f9c4e328dab9b12b6211239b6112883d36769352f216d48e0e253548227b4b80723a8dd544b7831
-EBUILD cucumber-2.4.0-r1.ebuild 2467 BLAKE2B 8ebeaf23d75c8d2266dbb8e31c1bf761c563b951f3b66a4698ad799c52dabeefac344bf9db23f740e4a8c49c65189ef72b5477513af8d92d069b3bdd1a5ede98 SHA512 ae9795ee6a9f1371a9a05bb79c72e11e9ba2fea69f43f65a42d9f6f02bb65a60a6c069c637be08009c566899f9568f45ad681edcc1996d5ff57c4161a2668bf6
+EBUILD cucumber-2.4.0-r1.ebuild 2474 BLAKE2B 903a331e64431daf17d77fa8e1edadb3d23247316562f15cc8405ac52a73345b957a9a9728b68bf951867b99f32a4c8f9e292abc942373be2665b95fac522da3 SHA512 7bd96a6b1499b4b55e1d530e12e1f275336f5497056bd529cdd83c1d1e7a9db016189e728a690d9dd4d312c23dde6cdf7cde12d1074b0d0c3721f3865e4a8ad1
 EBUILD cucumber-3.0.2.ebuild 2640 BLAKE2B 575206b7bbee67cb9a3e3d0ce269784fe08eb3698ea1ac18ec3a24ab86a65c856c55804f7ce134d4ff634b5f31f24d74b7cab6a59fc629cda81a15ce627f550a SHA512 66d405edd35ff7de97b9ed05994d602e0363d2d92c2370259336fc162a3d91c5aaec4e59e3efecd7be17d075e82c620f972c31aeb85a70d17f19df8566ab4784
 EBUILD cucumber-3.1.0.ebuild 2640 BLAKE2B a2a2e324bf54915821fe9bcc3e46976bb93774cf8e685b50fc9cb56513989cfe46912978a543211e3614cb547c7f038be79c77ab4a400f27d3373552e6cf3ecb SHA512 8ea1f237fb1838e3f36a224e2ea9b64e1c649eb711ce0c625bc2cb6d497afcbef53236302175773c799b38f401c5420b8cfb5c761a9d7ea682ca9b27560bf80b
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild b/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
index 6deb44709ff4..928b8d1415eb 100644
--- a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
+++ b/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index 726c3ccc9646..e2ba0ce1a116 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -1,9 +1,5 @@
 DIST drone-cli-0.7.0_p20170717.tar.gz 1148862 BLAKE2B a631b546917c542dc9395a2390a8f22c6f041314ece6cd185fbfd312a636040098c7f50f1ae07bedaba5ca1d718ad2a6741a24322ad0d9c291addf11b9b74035 SHA512 f901b9409354c9dc3bf21024f82a188e789c8ab05e8bca179cc77069baf024f40ce13995230f48d5c40e7485ab31bb3f22fae0ca68a8669295cdfb11dbb1b168
-DIST drone-cli-0.8.3.tar.gz 1378969 BLAKE2B 5dd0d399067b454422aa0ed07e665efaf40d4882de941176f8032441c0cd32a74be2f374ac57ec56ae7cd625e2ba1307821bf713732a30e3403cbc8f28f368f9 SHA512 2dfb4739536e7af9c220f6c21e1e3861ef8599e30ad8406efb5cdb035ee5721957a8b5a340f991335b51de34477b5acfcb5372ca10a9e6b1e28a8f0d1a284438
-DIST drone-cli-0.8.4.tar.gz 1380019 BLAKE2B 1fa7d6efa795de7b0015afff77365d21a7f019a4bd1c47a6c77b590e2fccf50d0c8bae3b78c8a4dfef45421cce00017ee3a72e4e3d87b86a5fd41b08c04aca94 SHA512 14bd7e5172311117a7a012d6a1d9a0d271384355ff99894250b4a352f86678597f545ec9f4e40e9f8718e1058e0dd2c940e5afbd4bee73ada0bd6ce165f1299b
 DIST drone-cli-0.8.5.tar.gz 1381755 BLAKE2B 329a73490af7dced38e5a8ca7c8799e3cec5f8f2da396cf2c7e307cf65967c7688e1d9df3484a45da1906a187edfc3d4e45c48c7953549d61cf40903c334da07 SHA512 2e42b5aedf6b4b2666da84e457a161312c59a2e0d8785167ddc272f016d5ffaf4e5964e0da4135ad459a767b16259f8905fdd222e87247ad1915cdf2f85ed50f
 EBUILD drone-cli-0.7.0_p20170717.ebuild 784 BLAKE2B 22d5fbe09cbf07437a2b095caddf942fd5c0ee484e7d30404b5a109856ced11f99930601234fdab2bfe21d8ae32134909594491d435eef7fc74f4e8682ada7d4 SHA512 e0b0fe272d3fa48d84b346a6114e98b477f7d6785e9d214d70202e15c84a92bf80ea3af1ad98ff08e90121d18d3a39c4b7f97665db8d03736d8100a53eb49558
-EBUILD drone-cli-0.8.3.ebuild 776 BLAKE2B fc60842f9e273d7a43951040984b11e9e04ff4c5fdba486a9781ff055b891099f64b96517e6acd39fb83ec63d42280866c6f3d4dcb5ee4d7b88cb028a957d446 SHA512 c018118f50a62416ffcc6b0e7214a9fb9de850e594c44a2270ed4cbab4cff5a8d0c81f5c2b938906f704315006fc3c4e75bd4e8db6982acee94101cc06a9bcda
-EBUILD drone-cli-0.8.4.ebuild 776 BLAKE2B fc60842f9e273d7a43951040984b11e9e04ff4c5fdba486a9781ff055b891099f64b96517e6acd39fb83ec63d42280866c6f3d4dcb5ee4d7b88cb028a957d446 SHA512 c018118f50a62416ffcc6b0e7214a9fb9de850e594c44a2270ed4cbab4cff5a8d0c81f5c2b938906f704315006fc3c4e75bd4e8db6982acee94101cc06a9bcda
 EBUILD drone-cli-0.8.5.ebuild 776 BLAKE2B ce07a12dae83ae7bfec997a93ac3793ea81cc0f0ea3d847130421dde6382c309c60171d3e4ff18cc76844f0978da4cf1f12eac42ecf2130e954b88acd32a98ba SHA512 bf5f47409a06868fe8224dc7b056bb516fab862ea56080d02f8735a41b240236e0e4d9bac8fee38b6c8ea7234beaf43e9027423f0858ac7c1aef8404affa5912
 MISC metadata.xml 325 BLAKE2B 0e7da145abc83905a490d331ac2c8644e8c59e28914cb6624d0cb4b36da345806e945ecae3b12a122a099241849701856ced8b4be04b9cba5a569b0bbc0d7ee7 SHA512 b4c00a840f5fed22888fb462dc5131e710a5065a1801eb0dfefe1979012d4ad9beff279bc2ecb98f2c0595e1b1d1d020830c123ad0be3a31cc3c7753242823fc
diff --git a/dev-util/drone-cli/drone-cli-0.8.3.ebuild b/dev-util/drone-cli/drone-cli-0.8.3.ebuild
deleted file mode 100644
index 72f567d5fa44..000000000000
--- a/dev-util/drone-cli/drone-cli-0.8.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone-cli"
-EGIT_COMMIT="29b8161b0de2b1ecc69dbf61d47ec99d5b18dffc"
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Command-line interface for Drone"
-HOMEPAGE="https://github.com/drone/drone-cli"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="!!<dev-util/drone-0.7"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}"\
-		go install -ldflags "-X main.version=${PV}.${EGIT_COMMIT:0:7}" ${EGO_PN}/drone || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/drone
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/dev-util/drone-cli/drone-cli-0.8.4.ebuild b/dev-util/drone-cli/drone-cli-0.8.4.ebuild
deleted file mode 100644
index 72f567d5fa44..000000000000
--- a/dev-util/drone-cli/drone-cli-0.8.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone-cli"
-EGIT_COMMIT="29b8161b0de2b1ecc69dbf61d47ec99d5b18dffc"
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Command-line interface for Drone"
-HOMEPAGE="https://github.com/drone/drone-cli"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="!!<dev-util/drone-0.7"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}"\
-		go install -ldflags "-X main.version=${PV}.${EGIT_COMMIT:0:7}" ${EGO_PN}/drone || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/drone
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/dev-util/drone/Manifest b/dev-util/drone/Manifest
index 186a64386402..f7b58a54ccb0 100644
--- a/dev-util/drone/Manifest
+++ b/dev-util/drone/Manifest
@@ -5,20 +5,11 @@ AUX drone-server.initd 455 BLAKE2B 73d173c4fb2c53826d6f0f9395a18dfc9802c01f23c28
 AUX drone.confd 1238 BLAKE2B efa7a96761fb7f57ce2d34396dce7c3fafc12942e45603bd89334e16f99f81c35d9334a7db14de7f42bfcedca34577d0c60430cf8470c843cf736e77d1065e87 SHA512 bbe3944eca8d82afd3161f53d9359422b2fb8985e69facd781a81f1c55ec647e8647f0fffc284375dc091b15ab5d665669cd6a2818ff62f4afe255e0a22a21cc
 AUX drone.initd 472 BLAKE2B ad8966d5703fe092d3fb3b7e34344c092bf3a221945405f34329d936052c435d4f68537c1f6ec889e35d1b989dc5b395dc77bcdcf224d8159eabdb12d327782f SHA512 54b4ef6943a018c0d194658c267bda50c51b2594aaab1d25350d512e50ec5136eb5bc6249f22d1b3e055574848bd50025a6158b1e02bd89da8213611ac41a16d
 DIST drone-0.7.3.tar.gz 4133041 BLAKE2B 819976f11e37c4f2484b00648191f64818ab254a326f31c594917c5ba02122a4e061168344148c113a32e0d14791e59e95a71bb224cd04bef7d1586703fd77fd SHA512 4c85e964f43ce3076996cd1cbcfc3675d74b254278d046d1e7d4b7f04ee5fcc55a6de04947c3f8102be474e0ef3fbd5d0006ac2b39aae04fe2bc6b466b513c66
-DIST drone-0.8.4.tar.gz 4759676 BLAKE2B 6da0ef008468e60dec0bfaa0b2f0f6171439d8b7b1ba842173f435eb60fd48992236fbf3c040f6591ba7f84fc91cd7968eac2b9785893319a2d69549ba81c64e SHA512 978f07aa471125dca00e6c6e5a9061c20cabe84f802fe21f2a85a383bf79f59d9baeb305d45acd5c8918aad5f1882e598b39a3174b31a4f6e5cfa226d9bcccaa
-DIST drone-0.8.4_p20180216.tar.gz 4759023 BLAKE2B 4a99e8a32230abb39c5bfe47f243efd1a5cd01cdcd2cc416148876e156370b8a88a8db85332f29172d69a6308670f48a9c2216db4180b11d4162e358581241e2 SHA512 3ffaabd8099720a1b56f81a5b758db1b17a986381970480e40a75630a1bad17eab6927bf8f00872b9dbfa83b4f0a1a028fcfc9a762a495efededc5b92780bc44
 DIST drone-0.8.5.tar.gz 4766128 BLAKE2B 11c60896a8aced0aa6303ec049755192e473f742af45fcb6fe1509a3085cbdfd0c016e875a1822cedff9040abf08d238490430ac8f6b2136b31491207de1748a SHA512 a2be1082b6b923d432f4addaa12ec45a76f7edce0ac955c1d3eb812b3541c140919e6195bcee9ed218b92045a63b303759702ffb63831757177f44b2307be164
 DIST github.com-drone-drone-ui-2910d0ee662816a2463d31f0988b1ecccd0410b5.tar.gz 167172 BLAKE2B 26d5aadcaee776c073bc5b4514f5c7b2925a7dab25a22162c10464f16a18e14cb564012b2b13ca929d7c5156dc5790d0d0659ccef8d8424ee82be2410ce0d211 SHA512 d4c6fbeba9ae5c55533a76fdcf6c251516aa4f8c650f49add7e9392d22a131438bd829670df801495d361417ec12cce07e9d9c28aacd1ce1adc0024408cf3cca
 DIST github.com-drone-drone-ui-4d60e46e3938c277e90de404cc6236530beaab3d.tar.gz 229886 BLAKE2B 3681f8fc5f380da3c7ab6dd5f34903f44fbe1ee5b309f5d1db25cd72347690249943814bd9e1ea3f4eaf04b14247bbf53e9a817dcfa5ad0e0bbc7d5d1585d2ea SHA512 4bd9909b82b31ed0b872d39da79fea161fdd1408d9da262b8a92c8cb884caf3dceb953ab522daaf8c96747cf4b22724e8e1d6234d80f2859a9ddd436fb513345
-DIST github.com-drone-drone-ui-cc079b1279f70e54f64cf0c14e1e531b6689232b.tar.gz 229805 BLAKE2B 6ecf7a24405d5881a6dae751a77bcc0a41f2e4d01e8166a1edd92f7d4bc4e7a1ab1fa310765ded55068d20d3a4abdd1c2f54f15fc42ca17756e7fd89b43f1b96 SHA512 8c9dcd0f77916cbf144ee062453adebfb73a8537c0f40f799d87cae9e3811cdf914cec90ecd4526149be0c3baed646b9065ed879c69d185df7c7ecb452bcf798
-DIST github.com-golang-net-0ed95abb35c445290478a5348a7b38bb154135fd.tar.gz 930720 BLAKE2B 73434ace62ef2a9db1b551075baf05458b8a8ed25b44ce88ca0780d9ff38a2fc176ab3040b198d5a8b2b8744ba60aa97f57cefdeed5cf1574c010b933bb033c2 SHA512 0e5bfc2f04e44b7eb3b1aa44a77f0a5e40e0df5e80284cb4fca267ee224f44089f1d28d1486cf5748fbeb4bb8818159dcd019de9e1f24f016f06b05c5379f41c
 DIST github.com-golang-net-6078986fec03a1dcc236c34816c71b0e05018fda.tar.gz 940111 BLAKE2B f1b2a50d9aa73a7aa8f20cff17247c0b555fc14d64bd75dd320d8df8166d7ed0b29bfa15021f5f8251e6c3a1909217bc6e4ba3208f2bb010789a9449ef3a2296 SHA512 24d4d72a1a502c1f4f9523d85dde6070a1a47ea72860a00eb64812acf27cadd22ca4422575b1a58b1b55e1997e8fe959b645d8810e2c128ab09c73f9e81c5f72
-DIST github.com-golang-net-92b859f39abd2d91a854c9f9c4621b2f5054a92d.tar.gz 936723 BLAKE2B fc8519b7259939c1d3508515a39489b8b2efc19515deb5a62cba92be1e475c116f167c52e539d734b7793b5d31fbc1da6993c4ae68c4bd2af5eebcc34a0d4c73 SHA512 cc70a2c15032bb44ccc77251c83d19be5b2b66e68d43861c99d11ee156d565674d649f27989320472f8a6adff9e1098b93c1fa1f5bbc58055003dd239dc5b4ff
-DIST github.com-golang-protobuf-925541529c1fa6821df4e44ce2723319eb2be768.tar.gz 269739 BLAKE2B 8f2b6aa86390b6f5df1e8af249a5a7ad268006e8d5da72aab1c76a54acf7b4f9d365a0047ad65dc966b7e3fbb9667c544fa97c76e98db3749b2dd13889096569 SHA512 bb420871f20ab482d1ebefc0d9225d2acc890252cec3cb3ed02bbf4720d5733aaa39b78c9a7b72998be094a77148d121c3afc0c2811ddc3e728819e5d36963d4
-DIST github.com-golang-protobuf-bbd03ef6da3a115852eaf24c8a1c46aeb39aa175.tar.gz 269721 BLAKE2B d79e88018bda589557af76bfc6751c130301a58274658a4eaede05c65e946a55aaf3e93c672387dad1e33355b828f806cb2a5d172a5c0c4a4e3f6ac67f01d080 SHA512 fc73beb6b112692a51bd7a20d44bfe14a61347b06dd789f99cff67ababa9699b9ff0643d85786f949ec819d05a6439fa7287c2ffd115e480e1599aac740aab77
 DIST github.com-golang-protobuf-e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz 269725 BLAKE2B a62a3f96c49d77776103a9bece69b615e00d4140c9de8b42fb7edac979c8a8d172bd21062d3d6e24ae01dba10b320ff208ff8c6916da2d84118da448afc8caf7 SHA512 f64fa42e7ed9701860e16b1cdedc9f6b029630b6f534ee403ede1223c0c7542c731735995ea9763f093b56146776902b6633e5b1691b1f1dd4ab84dea0092099
 EBUILD drone-0.7.3.ebuild 1406 BLAKE2B 857aef910f1354aed8dfec202e7c404da7eea3f9048df6086853a062436a5a6463b24664ab556a9d3f3bb3297a0ae9c76d21895475e3c29e9257ce3543a17c70 SHA512 26edd24f0e66e13a3f397cac24b14c0ee0237ead70fa8204f7b2a76aa0495670a9783b7dddc7d363c778f2d973fb5bc6c75dcb61c8fc9359ee168a2d3356b0df
-EBUILD drone-0.8.4.ebuild 1812 BLAKE2B 96357aae4cd5aaf5f4b8eff4b4fa4933d4ca00291085e9fbf208b9351f0ef73a4a1b5c5a0528f7d561b8837a96c47a9fbbfe8abcb9d4cbccd00cbecb0d47e70f SHA512 c2874dcfc5bf0177f7fadbc2c751d10bc41e0a4b50a46650508fe25de6bf8ea537e9e7f609578a9a4f9ee10b02f60d5bcd742f1bdc232780f9ffc936d9b64299
-EBUILD drone-0.8.4_p20180216.ebuild 1812 BLAKE2B 4ecb9b0beeda2bea3db79b58de8a630d8fb5e2de666d443fca98fb04f41b3b089e5c5e6f2bdf6a6a3f783234e6e3e6e80ac30b0bfbbed073dac73d088c09cc81 SHA512 d6c44be2a09df48b6e6cc956afb09c84976d1d0c3d6ab13fbdef3155e109b112ff8d3ff4bcd4b33e4a47048aaef03cd97b97ad4668b2007983ad84d5a55d94b7
 EBUILD drone-0.8.5.ebuild 1812 BLAKE2B d6eae0a8fd1522bcca6c7ad08e4305d6812f86bfe89d4ccf438bb1e2cef2eeb4e8a70b308ce5be7300ff2ab67df48f490dd5e995eee148d373ffa41c0dc479ce SHA512 077808dda006067faecd74149b1c7c01d08b32ce9cf96209e6d375c170b758309dcc6cf46e50a0a9ad94bef025c7ce1efcb348d5c04696114db5f06d48df1ec9
 MISC metadata.xml 321 BLAKE2B 7e3819d8553451b8b4938040d4e25afd6a1b456c16ad7366b648274cb84a5a694f9a8d88f125023298d5e7e8f098de3c233d397cad44682813fca82329f55e5a SHA512 01b1dd14592873025099119b28c840eefa31d098e77de1e8e26ecc6894dad73778e4eb8d4df6232a2a444bc906057e8d7f853ecdc1f3091cdd27a43c19d8b950
diff --git a/dev-util/drone/drone-0.8.4.ebuild b/dev-util/drone/drone-0.8.4.ebuild
deleted file mode 100644
index 0e2a40cfa814..000000000000
--- a/dev-util/drone/drone-0.8.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone"
-EGIT_COMMIT="75150d4a429da6c95cb851bfecded03a50936675"
-EGO_VENDOR=( "github.com/drone/drone-ui cc079b1279f70e54f64cf0c14e1e531b6689232b"
-	"github.com/golang/protobuf 925541529c1fa6821df4e44ce2723319eb2be768"
-	"golang.org/x/net 0ed95abb35c445290478a5348a7b38bb154135fd github.com/golang/net"
-	)
-
-inherit golang-build golang-vcs-snapshot user
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A Continuous Delivery platform built on Docker, written in Go"
-HOMEPAGE="https://github.com/drone/drone"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata
-	dev-go/go-bindata-assetfs:="
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/drone ${PN}
-}
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -v -ldflags "-extldflags '-static' -X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-server ${EGO_PN}/cmd/drone-server || die
-	GOPATH="${WORKDIR}/${P}" go build -v -ldflags "-X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-agent ${EGO_PN}/cmd/drone-agent || die
-	popd || die
-}
-
-src_install() {
-	dobin src/release/drone-{agent,server}
-	dodoc src/github.com/drone/drone/README.md
-	keepdir /var/log/drone /var/lib/drone
-	fowners -R ${PN}:${PN} /var/log/drone /var/lib/drone
-	newinitd "${FILESDIR}"/drone-server.initd drone-server
-	newconfd "${FILESDIR}"/drone-server.confd drone-server
-	newinitd "${FILESDIR}"/drone-agent.initd drone-agent
-	newconfd "${FILESDIR}"/drone-agent.confd drone-agent
-}
diff --git a/dev-util/drone/drone-0.8.4_p20180216.ebuild b/dev-util/drone/drone-0.8.4_p20180216.ebuild
deleted file mode 100644
index d3dab64bcc4d..000000000000
--- a/dev-util/drone/drone-0.8.4_p20180216.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone"
-EGIT_COMMIT="ce3855812bb00dbf1993d8663b6100b272e104dd"
-EGO_VENDOR=( "github.com/drone/drone-ui cc079b1279f70e54f64cf0c14e1e531b6689232b"
-	"github.com/golang/protobuf bbd03ef6da3a115852eaf24c8a1c46aeb39aa175"
-	"golang.org/x/net 92b859f39abd2d91a854c9f9c4621b2f5054a92d github.com/golang/net"
-	)
-
-inherit golang-build golang-vcs-snapshot user
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A Continuous Delivery platform built on Docker, written in Go"
-HOMEPAGE="https://github.com/drone/drone"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata
-	dev-go/go-bindata-assetfs:="
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/drone ${PN}
-}
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -v -ldflags "-extldflags '-static' -X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-server ${EGO_PN}/cmd/drone-server || die
-	GOPATH="${WORKDIR}/${P}" go build -v -ldflags "-X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-agent ${EGO_PN}/cmd/drone-agent || die
-	popd || die
-}
-
-src_install() {
-	dobin src/release/drone-{agent,server}
-	dodoc src/github.com/drone/drone/README.md
-	keepdir /var/log/drone /var/lib/drone
-	fowners -R ${PN}:${PN} /var/log/drone /var/lib/drone
-	newinitd "${FILESDIR}"/drone-server.initd drone-server
-	newconfd "${FILESDIR}"/drone-server.confd drone-server
-	newinitd "${FILESDIR}"/drone-agent.initd drone-agent
-	newconfd "${FILESDIR}"/drone-agent.confd drone-agent
-}
diff --git a/dev-util/icmake/Manifest b/dev-util/icmake/Manifest
index 0716920c8b58..e5ca76aab6b7 100644
--- a/dev-util/icmake/Manifest
+++ b/dev-util/icmake/Manifest
@@ -2,6 +2,8 @@ AUX icmake-9.00.00-ar.patch 600 BLAKE2B f549bcaff7aee31d22a452df5db16695ab75d4b9
 AUX icmake-9.02.02-verbose-build.patch 141 BLAKE2B 14c498f1825bd605f70f409fe0d72f6f494009e6d90e8762305556377671f4d2d11104217888b8300a9fc67e5821c440bb08d444bfec63b987ff8ad67ddc1088 SHA512 7199f34f8b48962e44306e9102d674b8970e03f99f2e2db29b9d813f2c4631f9768582be3423f528f2585106806afff0c2c7430c9125911a1eaca5e77902d546
 DIST icmake-9.02.02.tar.gz 371881 BLAKE2B d7ef3fd49b7e611ff2534a0885d1c2be0e4ae7eb9a28cc6a048e6193371ecca86df10c63657b962d0a0d03efd38606c70cafe1a4e7b0c083e1cfc33d2339919c SHA512 7d62569d21224f4584fe6901690a53fa82882e5690ef296cd0fcd770bc19503ea5a5469a7b6eebc8b6719606630e24477801c3c5752c70efdb74a6f6d30bddb9
 DIST icmake-9.02.03.tar.gz 372015 BLAKE2B 95886337693405c9c4ca73a0bf787fdd7dc0d4ca0b9955455acf99d9400ea7887b689f7f6b32cb19ab0043bb2d8463cb93443c63c6bbf1dd9dced8e83f03288e SHA512 1650497c8c2b2de949da33a293761ee371b1004c43234eced7840b66d0808b551dcfd09ca6b5fb82a9438539033dfc91138c2c16c700efab24821b043e3b0f10
+DIST icmake-9.02.07.tar.gz 372605 BLAKE2B 942edf17214d2646aa7146d19eff36e4c2035925d7279555ae660c96cec595ac83f32b658346d0c22ce0bfcba434b0022f10a55287a9e1efbefd07ca560b71c6 SHA512 9723dc9707e91fbd7cf075b461b0e6d9993891b6776be4b55265b5dce2359ae8232e9936ef6e0a9517783e652617851e7f9d5a9e58325b56da31239721054495
 EBUILD icmake-9.02.02.ebuild 983 BLAKE2B 156342cbeb95e031b045a579e38f7fd7d298d3c47d695acf5c2410b846f40c52d255829e5371e2f427ba182009d8423c62950b8874b427f6f060a0631769237b SHA512 0a2be376db0816a4d62626e96dc28129306d8dcd41ecdb08a86aef650031e69ed3881b594cb024ef6c9ebddb3d373c770577322bd0adcc5ad06310cab474916a
 EBUILD icmake-9.02.03.ebuild 992 BLAKE2B 79e819cb0cce0791390f91aacdffd157283da1083ac655e527412907a509226ecef876063550873679b20644dca276c112db46debcf0bdd8202f7e58fbe85e4b SHA512 9e0c1420696ce6a88c7557ab0868c0900879fcb4b7e494e66a491f21018a7de9f3bd23458730ba9084578b26036650d0cbcb22f9c698293a30a04ca6680aaf83
+EBUILD icmake-9.02.07.ebuild 992 BLAKE2B 611dc92316f33d3a782db08572c031cd303157af8bb3639d134629ae7e53793bfef55fc0f3952eca352b969e3d51e554eec4f274f09c96f097aa6b4fcdb5cc6c SHA512 6ac8896ab4859deb89103abcbc1c5f9bf0b505acd8b7ab4a2b7c4a15c45fcc0d0cbbe4e7557c3af317a26d48fb9e7e8b5347dd21f2a5d9ce5574e99c4b2f69f9
 MISC metadata.xml 376 BLAKE2B 634e6b0be8b62eb23a242832d14772bd8bdd042747c80ada99c14fa4980e0be11b07e411746d48767f5f4df2288c70cf38f8eeb0fcf5efd97e044adde85fd73c SHA512 3ead41cb13dd73abf13566a5ce6911b39d4081cea9a77360b1102b2c439c04a97dc98e311b34e87200db7ab53f7ed07d6982f363b6ea29e8115dd808f2d0c245
diff --git a/dev-util/icmake/icmake-9.02.07.ebuild b/dev-util/icmake/icmake-9.02.07.ebuild
new file mode 100644
index 000000000000..bab99eab6fa4
--- /dev/null
+++ b/dev-util/icmake/icmake-9.02.07.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Hybrid between a make utility and a shell scripting language"
+HOMEPAGE="https://fbb-git.github.io/icmake/ https://github.com/fbb-git/icmake"
+SRC_URI="https://github.com/fbb-git/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}/${P}/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.00.00-ar.patch
+	"${FILESDIR}"/${PN}-9.02.02-verbose-build.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "/^#define LIBDIR/s/lib/$(get_libdir)/" \
+		-e "/^#define DOCDIR/s/${PN}/${PF}/" \
+		-e "/^#define DOCDOCDIR/s/${PN}-doc/${PF}/" \
+		-i INSTALL.im || die
+
+	# fix build issues (bug #589896)
+	append-cflags -std=gnu99
+
+	tc-export AR CC
+}
+
+src_configure() {
+	./icm_prepare "${EROOT}" || die
+}
+
+src_compile() {
+	./icm_bootstrap "${EROOT}" || die
+}
+
+src_install() {
+	./icm_install all "${ED}" || die
+}
diff --git a/dev-util/intel-ocl-sdk/Manifest b/dev-util/intel-ocl-sdk/Manifest
index efb5833c518e..df7f24918f74 100644
--- a/dev-util/intel-ocl-sdk/Manifest
+++ b/dev-util/intel-ocl-sdk/Manifest
@@ -2,4 +2,4 @@ DIST intel_sdk_for_ocl_applications_2012_x64.tgz 28302946 BLAKE2B 991fe387c3bb0c
 DIST intel_sdk_for_ocl_applications_2014_ubuntu_4.4.0.117_x64.tgz 105808431 BLAKE2B 58b9bdf1979c070757beff7abaa2b16d43993e7dd4aeda05843facd556f25f3c695a6b2de4745890ce6b7b1a5cee1113b62ffae4059aad49a462d28d6d3461c3 SHA512 c0f65bf4d9b894f11076995744d32aef983e01b40472028e411c7be6b9117ef8b260b9abe46d6e936333aca525f98f81aaca2ab3e093ccefb09f525a3646d7e9
 EBUILD intel-ocl-sdk-2.0.31360.ebuild 1444 BLAKE2B 840ce46bd4e9cf54e91a58e2f4385ec7940fa62991342969970431f0d7cb015bb8f08eaebf2e8f96ab996fa544113f4cf2e9b60952a3732870221cbf8dd5362f SHA512 a5c5875f45bc572131cf9b6b4fa0b5f819fac2795a60a8ebcf459c0735337752f7ed367efabbe7a95b7744b97a8766c03bbdcd7a813c6a8d9b6d491bbf3ea36d
 EBUILD intel-ocl-sdk-4.4.0.117-r1.ebuild 2344 BLAKE2B 5a38038f261888b08c6db27bcd27f03613eadcb49a9d5c0a715df1185e7d28a8e7f38d80644d8919b8885add9dd8efa32317eff246c6ec0074103d898f333596 SHA512 01131983224e4bb673e4dc65ea9eecb18fc7e0023279feb3b9890c5435586cd228e73fb9694b3554b6a8ca9e762a29698ee38adf6d942d20bc9f94723488a4a8
-MISC metadata.xml 871 BLAKE2B 62c1be2b5cb152cdfcf946c6582ef5a62578b38db91f87c9e708ac7a0f9c38accbd2a5e9d1f4f820f46a90db4ecf88cb529c056776a2c666abbf512ed6b2b6a1 SHA512 373285af5cd075db8ce4d298ce68b3a0ecac4ff9264a3873a05191b8daa7b9dd167855fa6b2f51c0204870d876b88406db010ed95a1d6e17fff37118da002439
+MISC metadata.xml 774 BLAKE2B b5d5e2933e1a03ed39a1f5857fe96f8c0b51a19210dd1a59acfe93f56e6cc39bd0c5c646f4f1b76740dd50a02fd0c463f9a2dfc2b762d1511b39833122173323 SHA512 f52b91fead4961711f04cee7ef9b35467396db3010b46512e25aaf67efe7cbe8742ed09364735ec7931afc20f033b14ebe127b9472a1cfc876ebb9c30d8400f8
diff --git a/dev-util/intel-ocl-sdk/metadata.xml b/dev-util/intel-ocl-sdk/metadata.xml
index f694e9e2845b..1c21e7de1dc7 100644
--- a/dev-util/intel-ocl-sdk/metadata.xml
+++ b/dev-util/intel-ocl-sdk/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>dev@kicherer.org</email>
-		<name>anYc</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 3a555a3650c1..1112656e6a2c 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,13 +1,5 @@
 AUX radare2-0.9.9-nogit.patch 352 BLAKE2B b65dd677a246bfd47205061d41f731e5b3ae477946e8b5b1fec6a19aa54fb2bf307ae4421c74ae38049f259476b43897968670c5a5b34808d37de5623ba620c0 SHA512 5a84c2f768b60dc6ffb35130f409714e0ffc4cbc6fb9e08bc4bf86d28651060398d809fed8abafcd56cabde86aa9e8672df77212f0d8c0b6dfc056b243e1c270
-DIST radare2-2.1.0.tar.gz 5954222 BLAKE2B 9128a01d40ef1401d457f1fa5610ad7bbda92021e6e16fd70e9488bdb11be923c3d0f453e49a7bf78203c320ec2f1b2276925db2ae6eeaad90100ae0c2724b56 SHA512 38a907834e21967a83943e62cb29d8097e0522ff71ea61a2e3ab9e5263c3884ce28c17fb3ca9201c2b9f341e1b066ed0899e5152e146e61fc4f650f319299cd0
-DIST radare2-2.2.0.tar.gz 6145228 BLAKE2B e85d2243b477f5e233d4cb1989452f3bce798e356b8022eaa7b90ca6027ee01365868c6b933a3c3470ef0d80e107d955d4127e55ee7664e829b44259facd1863 SHA512 e632ca3ffdeefc394e571b5ae7f0619cbbb93c657ff1ef316771e1d10089fbad98dc08b6e7d152e664a4c16e97d4519c1c6445fe737dbd4e3d296bc93c3ee410
-DIST radare2-2.3.0.tar.gz 6175929 BLAKE2B ac52ce32d4161b51adcc988a4adb02d02cef2e05bf90325f032585973874cdaa370f00a5f7734e7c00787beaf579c1745de27271c35f63f54d31003f6328c95a SHA512 4b52ae3678c5bbba1d173f95715807469e88603067faf4f1058606a4235050ec07aebdb6408e24c0c031b9554b4ca095bf77fc2791a9efa498dfff49200b3b1d
-DIST radare2-2.4.0.tar.gz 6301920 BLAKE2B 8a1b6322d293e16d743bc49f799bc90754a648b0c257f126ea3c652ced46773dd1124f618bd5cf4db91acd324a43581218b70cb821004e3d551778cfb7f6bc6d SHA512 fca5f78c7e1dab4af0aa4bf367953bc7a49bbd9da3ab7b32e8be79cc3c4f6a1be0db4c466d5f6e68c87c569d0096dd2841ea52f4ad75234046f1a96d8b4d4fc3
-EBUILD radare2-2.1.0-r1.ebuild 1284 BLAKE2B 026e4316d8550575e063c9570f6a2c638cf02b97e2515d013b0d8e035ac6f7da2868db2a10676f00221b374754fff0d82320f85b9077bbc850e0519553484118 SHA512 4c16ad11920f60aadc1cb02058a5a37b6624aecd402aa2b00a6d5143c1a9e700718964950738b5a3aa693f6e78306a43ab945e67450db025d5c099b276ddbce5
-EBUILD radare2-2.1.0-r2.ebuild 1187 BLAKE2B f23e498204fdfb882e5018cb34e37a1217ef415391d105be5974f922f55f8c0cb18294cb20fa8583cc5152dade93ee83701d10fc7c6399834b76140103a4a7b1 SHA512 f154b22aaf19daa27b1ffb3ac770f6096b6c92bf4bd8ae902e47f819b05674bd4be83c14984f6e06465d9f8989513e956893e7727abcbf64ccff96ed4af6d786
-EBUILD radare2-2.1.0.ebuild 1165 BLAKE2B 9fd6170c53cb6e7c3d34331c2236ef7249d024fb520ef8b20ab492ebe8f3f84b664fbf6810775842ab6d6baa69016991a17df1efbcf666f2da62f514c1c39886 SHA512 d3c157297dd25ed84fbf2180cf22243a62df98218eb5f0354bbe35e91c70d8f1d2f0248ebe013ebed5e3c23730b5592eebe54d88664c6aab81eada30d7743432
-EBUILD radare2-2.2.0.ebuild 1187 BLAKE2B f23e498204fdfb882e5018cb34e37a1217ef415391d105be5974f922f55f8c0cb18294cb20fa8583cc5152dade93ee83701d10fc7c6399834b76140103a4a7b1 SHA512 f154b22aaf19daa27b1ffb3ac770f6096b6c92bf4bd8ae902e47f819b05674bd4be83c14984f6e06465d9f8989513e956893e7727abcbf64ccff96ed4af6d786
-EBUILD radare2-2.3.0.ebuild 1187 BLAKE2B f23e498204fdfb882e5018cb34e37a1217ef415391d105be5974f922f55f8c0cb18294cb20fa8583cc5152dade93ee83701d10fc7c6399834b76140103a4a7b1 SHA512 f154b22aaf19daa27b1ffb3ac770f6096b6c92bf4bd8ae902e47f819b05674bd4be83c14984f6e06465d9f8989513e956893e7727abcbf64ccff96ed4af6d786
-EBUILD radare2-2.4.0.ebuild 1187 BLAKE2B f526fc8a5b74fd80de3291aebe2a3805bbf7bceda29552772b50fb1ce3a3dab0dbdbbbe2c1895f596dbf79f52ce27445efa43bffcc18a333951b2367db1510a6 SHA512 358c0f8116b15555cb34aec3ccc4ddccfd6c6211a1b9b882242c779f6ea0ac358c7e5dc946bd4d82ed871bfc7a01d45c621eb59ded303ad6a3cb23c1b18c8f56
+DIST radare2-2.5.0.tar.gz 6272646 BLAKE2B 44c88327b544d03bd464f1ecb72a51b7e3fa86602aeae9055b6f2d41763be9ed9d63be4c7b959e1f920605feeed998c1f56ef0ed3a6a7213b4d5265c057b1213 SHA512 a29e0e61aeee6e08a99a1ed8a8bc428ec8b0474b3781475db3091232353d03d39d8750f774a266e01bb7565049269ee5f43b666b3b69bfadafb75cdb35f6cc4b
+EBUILD radare2-2.5.0.ebuild 1187 BLAKE2B f526fc8a5b74fd80de3291aebe2a3805bbf7bceda29552772b50fb1ce3a3dab0dbdbbbe2c1895f596dbf79f52ce27445efa43bffcc18a333951b2367db1510a6 SHA512 358c0f8116b15555cb34aec3ccc4ddccfd6c6211a1b9b882242c779f6ea0ac358c7e5dc946bd4d82ed871bfc7a01d45c621eb59ded303ad6a3cb23c1b18c8f56
 EBUILD radare2-9999.ebuild 1164 BLAKE2B e35816da5d7606f7e5ebc26bd5ffc4b2e681e04f7c35074b1062d99b2058a1ebb6ed120c4eeaddd52312b35e9fffc4568810a1ac9f28f179b74a80fac42413ca SHA512 53c4f6b87b4c25e1ac072f9bcd5f06ead66f1b79c329fadaa2c88f27d77777ba160dfe75aa48779ba3083fd532d7957b00c4fa87c66a33d67a52e6c186e848d7
 MISC metadata.xml 472 BLAKE2B 9eac8a52ecd7dae41e0cd32ff13bc02d7c936d0d36bf52309d28b9d03168ec55655ce3588df2c330c08f0779fc8c1a095c972cd6ee3deecb68a9c333d4811421 SHA512 110f9ec2d6dddd20703b9cf6ec8cd77e2459f67aca74065211dc30888cea9c9154128da8a2f15810063de9c4867e3e1a31658d3c5cb27be44824342784b67365
diff --git a/dev-util/radare2/radare2-2.1.0-r1.ebuild b/dev-util/radare2/radare2-2.1.0-r1.ebuild
deleted file mode 100644
index f9184e637759..000000000000
--- a/dev-util/radare2/radare2-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radare/radare2"
-else
-	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.9-nogit.patch
-)
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl libressl +system-capstone zsh-completion bash-completion"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	system-capstone? ( dev-libs/capstone:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_with system-capstone syscapstone)
-}
-
-src_install() {
-	default
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins doc/zsh/_*
-	fi
-
-	if use bash-completion; then
-		newbashcomp doc/bash_autocompletion.sh "${PN}"
-	fi
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d $d ]]; then
-			rm -rfv "$d" || die "failed to delete '$d'"
-		fi
-	done
-}
diff --git a/dev-util/radare2/radare2-2.1.0-r2.ebuild b/dev-util/radare2/radare2-2.1.0-r2.ebuild
deleted file mode 100644
index 2cf3090aec73..000000000000
--- a/dev-util/radare2/radare2-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radare/radare2"
-else
-	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl libressl +system-capstone"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	system-capstone? ( dev-libs/capstone:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_with system-capstone syscapstone)
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d $d ]]; then
-			rm -rfv "$d" || die "failed to delete '$d'"
-		fi
-	done
-}
diff --git a/dev-util/radare2/radare2-2.1.0.ebuild b/dev-util/radare2/radare2-2.1.0.ebuild
deleted file mode 100644
index 13f59936254d..000000000000
--- a/dev-util/radare2/radare2-2.1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radare/radare2"
-else
-	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.9-nogit.patch
-)
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl libressl +system-capstone zsh-completion"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	system-capstone? ( dev-libs/capstone:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_with system-capstone syscapstone)
-}
-
-src_install() {
-	default
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins doc/zsh/_*
-	fi
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d $d ]]; then
-			rm -rfv "$d" || die "failed to delete '$d'"
-		fi
-	done
-}
diff --git a/dev-util/radare2/radare2-2.2.0.ebuild b/dev-util/radare2/radare2-2.2.0.ebuild
deleted file mode 100644
index 2cf3090aec73..000000000000
--- a/dev-util/radare2/radare2-2.2.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radare/radare2"
-else
-	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl libressl +system-capstone"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	system-capstone? ( dev-libs/capstone:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_with system-capstone syscapstone)
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d $d ]]; then
-			rm -rfv "$d" || die "failed to delete '$d'"
-		fi
-	done
-}
diff --git a/dev-util/radare2/radare2-2.3.0.ebuild b/dev-util/radare2/radare2-2.3.0.ebuild
deleted file mode 100644
index 2cf3090aec73..000000000000
--- a/dev-util/radare2/radare2-2.3.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radare/radare2"
-else
-	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl libressl +system-capstone"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	system-capstone? ( dev-libs/capstone:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_with system-capstone syscapstone)
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d $d ]]; then
-			rm -rfv "$d" || die "failed to delete '$d'"
-		fi
-	done
-}
diff --git a/dev-util/radare2/radare2-2.4.0.ebuild b/dev-util/radare2/radare2-2.5.0.ebuild
index abe520e9a37a..abe520e9a37a 100644
--- a/dev-util/radare2/radare2-2.4.0.ebuild
+++ b/dev-util/radare2/radare2-2.5.0.ebuild
diff --git a/dev-util/sel/Manifest b/dev-util/sel/Manifest
index e6bbb40d4339..0150449f8e98 100644
--- a/dev-util/sel/Manifest
+++ b/dev-util/sel/Manifest
@@ -1,5 +1,5 @@
 DIST sel-0.08.4.tar.gz 22188 BLAKE2B ff965c1e6296482d14e09109932165524f666486d37239edc2c30f268080750de2b20e40fe5dfc65eeb1c52009db139e2b7a47c9f8011b70eb5ae561466c19a3 SHA512 5550f1b78fef10c2ac7c132f752db4e0f7a3318419bf5751a4f812c1da04b07b3fcac341076d32f6ea436a0216ad6746e9cf29c4bcef630b76e307ded6237e52
 EBUILD sel-0.08.4-r1.ebuild 724 BLAKE2B 50930e9e18dfaede634eac8266a93d018f8fcc367ed90dd1ec29a8169ab2123fdbcf0ce4bc2c3e2544ef13f514ce815c60c987c09ce78761acbba028a98b0c0a SHA512 9978eed79f8494738b544c1fa2e122e532a62151db28cf30b6de726db970a88f86897d04bd1f68ea51062042835e28277a42551d1662f85955bb54148465c285
-EBUILD sel-0.08.4-r2.ebuild 717 BLAKE2B ef7cfe38566a804b9d1f288e3e5ef43d8d7e810d1e357258cc8d9e510c407f8fd77de3552d2dd0894019c56aaefb933c4929435970a3aa91efbc7eef578c14aa SHA512 e6517878c8b90b535614037a21f7fe16ba040633665219cd2a90e6df04e9f5b2a7b8183b41887791d13b83b092731f145e038f37535b0997be80947e773f97bf
+EBUILD sel-0.08.4-r2.ebuild 716 BLAKE2B 79df43f934e424ca4e229d33edc650ce0255e854d307f7d6e364ff6d1b5a14390073afbdd9af75572d0543dfb945ff86229d6ada0733f9ed1ba3287fa41b8d4e SHA512 8f693c3bbac5c520fa817af1558de234014ba2ec1f0f2b2baf02288964d44f6b6b25ec80381d560b640f013d9c98ddfba3901d1304c304a93b1def71e54093f7
 EBUILD sel-0.08.4.ebuild 840 BLAKE2B 38f87fc0dcb7c571f8be279827720433b4e155dd5b1dba117d849891a0e1137e3c28c7c19e5529ae6a0d69b8a61686b02c8542dfac634b47988aee0899316d59 SHA512 ad031883bc3001c85d233ed580a614f4a9abb82715c2e6f5cf169a1326a59453fc785e91be9cb6d149af6707c72da532840ac29c01f9396177380b88bb44cf1a
 MISC metadata.xml 357 BLAKE2B 350bd3f9b854f7cceb8d9281c73891ef21077ae5e15a51c4a93bc96ac438bde4d687bdbdfaa15b4e8e227c023ac6dc2b560c31033501b9d4b6f7690853fe54dc SHA512 3d3239c312742d66faf8633c15e799b93c48e42c23dc555e7de2df2d773f5b5383a37208f6f11eb37db18d0c9a51cfa3504c5ffb5122a9e62e14192a6e051bfe
diff --git a/dev-util/sel/sel-0.08.4-r2.ebuild b/dev-util/sel/sel-0.08.4-r2.ebuild
index 4699a177a3cb..ed76a82daa42 100644
--- a/dev-util/sel/sel-0.08.4-r2.ebuild
+++ b/dev-util/sel/sel-0.08.4-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.rninet.de/darkstar/sel.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~s390 sparc x86"
+KEYWORDS="amd64 ppc ~s390 sparc x86"
 
 RDEPEND="sys-libs/ncurses:0="