diff --git a/dev-ruby/em-proxy/Manifest b/dev-ruby/em-proxy/Manifest
index ce39071bc..e4a32f8d6 100644
--- a/dev-ruby/em-proxy/Manifest
+++ b/dev-ruby/em-proxy/Manifest
@@ -1 +1 @@
-DIST em-proxy-0.1.9.gem 19456 SHA256 52d8c2c738d121920a505b4b5c35944b60e4ee8b23b85a562ae8b13aa579f3fb SHA512 c9b8c3045a7f93326facec4011aad577322e21b2a835a8569ab30b9b11fc942eb2318a603a5a0f65c7a0dde187ef1aacae02263e495d31d82bee75c750977a47 WHIRLPOOL be0f25718d3a73d14db4ee4f8dfaf7681aacfac48b6f572c6e14f4d9d96d469f58effb97b1f67b4329bb44e7de04b200e4defd0f797890d533dbf9c9df45e3db
+DIST em-proxy-0.1.9.gem 19456 BLAKE2B 9af7505c644b140b88eda3d2c56580ba732d763acef854aa97f88cec1f580046bcb8899170b8cb1ca438762c83d7abe9c15e947585c14e7e64b96aa49df310f9 SHA512 c9b8c3045a7f93326facec4011aad577322e21b2a835a8569ab30b9b11fc942eb2318a603a5a0f65c7a0dde187ef1aacae02263e495d31d82bee75c750977a47
diff --git a/dev-ruby/em-proxy/em-proxy-0.1.9.ebuild b/dev-ruby/em-proxy/em-proxy-0.1.9.ebuild
index eeaa598a9..b09e1e924 100644
--- a/dev-ruby/em-proxy/em-proxy-0.1.9.ebuild
+++ b/dev-ruby/em-proxy/em-proxy-0.1.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby24 ruby25"
 
 inherit multilib ruby-fakegem
 
diff --git a/dev-ruby/em-websocket/Manifest b/dev-ruby/em-websocket/Manifest
index 409f8d31e..5b9a9cfeb 100644
--- a/dev-ruby/em-websocket/Manifest
+++ b/dev-ruby/em-websocket/Manifest
@@ -1,2 +1 @@
-DIST em-websocket-0.3.8.gem 50688 SHA256 38927b5b978188fb78379b73bb97e62fd91173c69c5c8d8f2e7eb466580e6b76 SHA512 18d26c1881f860b74fe5fd1c444f006d6c91d1b22dfcb4e6d274eb6ea2b3962f3aa515fabae205be49cbf47e5f2f846d871d0b65cecf4c6f68b5a76509a30a83 WHIRLPOOL 97bc259fa4d84de6b2c8f5e6a98b0e40f8fcdd100937b125bec488c55ac25426a6b91d884cb9cbd1261d915b1d655c1e577ecc553a9ab5da104de737d2042d47
-DIST em-websocket-0.5.1.gem 31744 SHA256 c39e6d64352eca13aedf4f5d7009666ab7f3ddce75410b883c467cf0e5465caf SHA512 ca67da805a67ca7ff840cf58836e6abe5e7a965d50de529cc624b214a1cd8bd4b48ee469ab2266bd80040c94315d59f8fb5903bbf543240fbbe90e80bede0702 WHIRLPOOL da10cf380fae3124f7bafd19a943cca812f83242158c6cecb4a4ff6474e2d69478e7fd834eff8845068f6320f9319ab5810d37937555eb75141fff8992ed5af7
+DIST em-websocket-0.5.1.gem 31744 BLAKE2B 93109f2cb0818080e73dacc634fb332ba6e34c76ca19cd6b58f5ed91556b4da2d9c56ed7baf57f3f2b22e788c583183713b3a9047e25e9b45be8be0cb838a5dd SHA512 ca67da805a67ca7ff840cf58836e6abe5e7a965d50de529cc624b214a1cd8bd4b48ee469ab2266bd80040c94315d59f8fb5903bbf543240fbbe90e80bede0702
diff --git a/dev-ruby/em-websocket/em-websocket-0.3.8.ebuild b/dev-ruby/em-websocket/em-websocket-0.3.8.ebuild
deleted file mode 100644
index 4cc403e64..000000000
--- a/dev-ruby/em-websocket/em-websocket-0.3.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC="yard"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-#broken, not sure why
-RESTRICT="test"
-
-inherit ruby-fakegem
-
-DESCRIPTION="EventMachine based WebSocket server"
-HOMEPAGE="https://github.com/igrigorik/em-websocket"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-# Tests fail with load errors, possibly due to unfulfilled
-# dependencies. Needs ot be investigated before moved to main tree.
-#RESTRICT="test"
-
-#ruby_add_bdepend "doc? ( dev-ruby/yard )"
-#ruby_add_bdepend "test? ( dev-ruby/rspec )"
-
-ruby_add_rdepend ">=dev-ruby/eventmachine-0.12.9 >=dev-ruby/addressable-2.1.1"
diff --git a/dev-ruby/em-websocket/em-websocket-0.5.1-r1.ebuild b/dev-ruby/em-websocket/em-websocket-0.5.1-r1.ebuild
index a5228b95a..786020f7a 100644
--- a/dev-ruby/em-websocket/em-websocket-0.5.1-r1.ebuild
+++ b/dev-ruby/em-websocket/em-websocket-0.5.1-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=5
+EAPI=6
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC="yard"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/http_configuration/Manifest b/dev-ruby/http_configuration/Manifest
index 8f3c6611b..6e3fb3c7b 100644
--- a/dev-ruby/http_configuration/Manifest
+++ b/dev-ruby/http_configuration/Manifest
@@ -1 +1 @@
-DIST http_configuration-1.0.4.gem 9216 SHA256 c3536eb4a22ad9b38321587669cadef2fee01c6eb105f0d45528dcae3273d189 SHA512 184f59ca9d6f2556f61cb6033181583bf94c71258ababcaee2be9073a329179a6b63c8acefe543a9e8496816420fa3d048df9e1f0088d9d62bfa59dd45f3ba3e WHIRLPOOL 0e4e23db53671c0e5b39f50ab43511ad2f0989fb3b93d7af2005ebf9c83ef5bde9fd3a8213039a182e263d45b53ab57077304918a14184225f472c4555ff5a59
+DIST http_configuration-1.0.4.gem 9216 BLAKE2B f22e57aaa32fa5f5fc833382b92e6e7838bb5ca690fc9ccdbe13e8254ac1f508ed72db5612751e8fe3e89a34bc69952adeceea189e17a6286c155b8fe33993cc SHA512 184f59ca9d6f2556f61cb6033181583bf94c71258ababcaee2be9073a329179a6b63c8acefe543a9e8496816420fa3d048df9e1f0088d9d62bfa59dd45f3ba3e
diff --git a/dev-ruby/http_configuration/http_configuration-1.0.4.ebuild b/dev-ruby/http_configuration/http_configuration-1.0.4.ebuild
index 38dc6640a..b1c0ea4ca 100644
--- a/dev-ruby/http_configuration/http_configuration-1.0.4.ebuild
+++ b/dev-ruby/http_configuration/http_configuration-1.0.4.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby24 ruby25"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/watir-webdriver/Manifest b/dev-ruby/watir-webdriver/Manifest
index eeabc223f..55466b6f3 100644
--- a/dev-ruby/watir-webdriver/Manifest
+++ b/dev-ruby/watir-webdriver/Manifest
@@ -1,2 +1,2 @@
-DIST watir-webdriver-0.8.0.gem 86528 SHA256 86801d2c68bcaa5f87d83be64d0bdad6626fe90fda34784ef2a24ceb830f4e37 SHA512 d553009dd954f8c8408651e50b2302265e14a00d14ef07ee51daae9d8b6fc67afb435b373107959e3060024e9f5e7c152bbb58543553a9d086fa96074c249088 WHIRLPOOL 99afcbdcd71383ccc514f3066b63b5af642a67a58fd6772f4f3c32a329022e489a805a1d274f9d51a3b3243be8c19873b79363597d581afd7a78bdfc2a8d21d9
-DIST watir-webdriver-0.9.9.gem 88576 SHA256 7b5e8a652f1d512e0d6621f37693d64fae71b52c1d1895845c2cdc7901ea1258 SHA512 4c9d1d12b790eeee39151189211f6ce45710a77c13b440895fe52aba3018e1a6b539c7abb1b59140c395ee31cdaac75c30357e10b3561a5a48b99375d4e91fc2 WHIRLPOOL 97018775dce7fda9b7e2133efad47ac1b35a7731fbfc47cabe573391edf279d724dee39ad4b7d69cae6b32d5a4fed9111f17caf26d5249bfbe31198a1b2802c5
+DIST watir-webdriver-0.8.0.gem 86528 BLAKE2B c6175f3848b002ae8914eb00a3563593e7cfa596eeb41eb8659a5ebc74e7fd59fdbdb826a7dcc5db1b70b2af28ae1bf4b39bb4e7b74a93143b41f956a4c651d4 SHA512 d553009dd954f8c8408651e50b2302265e14a00d14ef07ee51daae9d8b6fc67afb435b373107959e3060024e9f5e7c152bbb58543553a9d086fa96074c249088
+DIST watir-webdriver-0.9.9.gem 88576 BLAKE2B b895f036eab1c1b8fa2d3307ee9a0bf1a55ab6e3ca3d72fead3d19ede371bd55b453216e277cb474563229d2648c736d6d4cf70e847ae7865e2d221c48830fb0 SHA512 4c9d1d12b790eeee39151189211f6ce45710a77c13b440895fe52aba3018e1a6b539c7abb1b59140c395ee31cdaac75c30357e10b3561a5a48b99375d4e91fc2
diff --git a/dev-ruby/watir-webdriver/watir-webdriver-0.8.0.ebuild b/dev-ruby/watir-webdriver/watir-webdriver-0.8.0.ebuild
index 88e9d1633..b22bb4c55 100644
--- a/dev-ruby/watir-webdriver/watir-webdriver-0.8.0.ebuild
+++ b/dev-ruby/watir-webdriver/watir-webdriver-0.8.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby24 ruby25"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/watir-webdriver/watir-webdriver-0.9.9.ebuild b/dev-ruby/watir-webdriver/watir-webdriver-0.9.9.ebuild
index 88e9d1633..b22bb4c55 100644
--- a/dev-ruby/watir-webdriver/watir-webdriver-0.9.9.ebuild
+++ b/dev-ruby/watir-webdriver/watir-webdriver-0.9.9.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby24 ruby25"
 
 inherit ruby-fakegem
 
diff --git a/net-analyzer/whatweb/Manifest b/net-analyzer/whatweb/Manifest
index 2985e256f..219149a1e 100644
--- a/net-analyzer/whatweb/Manifest
+++ b/net-analyzer/whatweb/Manifest
@@ -1,2 +1 @@
-DIST whatweb-0.4.7.tar.gz 868621 SHA256 64994ec364de188192918e15c09cd01c62c3b8d080e9777b5d785d7f55d509db SHA512 b5c80cb5f86524bc3f6a670efa2ce67653b426fb387b42f7906739d1e9481588da67004d15d91b81370bca725155736dd76856f576f3dcf0bc16ac24e54784c5 WHIRLPOOL 191049ce2cbfb582e007b2ff436224bf069acf4ac96da6d4c53a65aa7bb3792cdfe3418896c6f076085086e52f92ae531a2908217a8af76bd92ca443920c2163
-DIST whatweb-0.4.9.tar.gz 3214359 SHA256 3077d47122d7fb37e2ecb3df9c8c23cb7b54a094bb076e06327fd32ad5f49eb4 SHA512 1a4dc79206ae399affa6c5da4432e82f44d6535b5836fe3c1254a29e2d2243bc93d5580b94b6b97d3659c815fd3f9b0505b816a0a98039cbd586d5c47e19b2a2 WHIRLPOOL 32c1f4d1bab1fb81419349a24a20e8856ac851411e86f30b8d9d470d164d917e9c3953cfb47d71c1b96e1d8cae91f773e80c25463c195153d9e4ea8cc163f839
+DIST whatweb-0.4.9.tar.gz 3214359 BLAKE2B 540537429721ae497b930c7adc27c3a3ae7d6f8c0c97bcb02cacbc4615c910fba0b61fbad938fcbed3db1fe24989afc8e3f0df69b202ef7ae27d712e766056c9 SHA512 1a4dc79206ae399affa6c5da4432e82f44d6535b5836fe3c1254a29e2d2243bc93d5580b94b6b97d3659c815fd3f9b0505b816a0a98039cbd586d5c47e19b2a2
diff --git a/net-analyzer/whatweb/whatweb-0.4.7-r5.ebuild b/net-analyzer/whatweb/whatweb-0.4.7-r5.ebuild
deleted file mode 100644
index c0efcb6e3..000000000
--- a/net-analyzer/whatweb/whatweb-0.4.7-r5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Next generation web scanner, identifies what software websites are running"
-HOMEPAGE="http://www.morningstarsecurity.com/research/whatweb"
-#Actual SRC_URI has broken WAF on it that prevents wget from downloading so we mirror
-# Pentoo issue 62
-#SRC_URI="http://www.morningstarsecurity.com/downloads/${P}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="json"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	json? ( dev-ruby/json )"
-
-#future rdepend:
-#dns: em-resolv-replace
-#mongodb: bison bson_ext mongo rchardet
-
-src_prepare() {
-	# fix install
-	sed -i 's|plugins-disabled||g' Makefile || die
-	sed -i 's|$(DOCPATH)/$(NAME)|$(DOCPATH)/${PF}|g' Makefile || die
-	sed -i -e 's:#!/usr/bin/env ruby:#!/usr/bin/env ruby18:' whatweb || die
-}
-
-src_compile() {
-	# do nothing
-	true
-}
-
-src_install() {
-	dodir /usr/share/doc/"${PF}"
-	DESTDIR="${D}" emake install || die "install failed"
-	dodoc CHANGELOG README TODO whatweb.xsl || die
-}
diff --git a/net-analyzer/whatweb/whatweb-0.4.7_p20160611.ebuild b/net-analyzer/whatweb/whatweb-0.4.7_p20160611.ebuild
deleted file mode 100644
index 4a0009b05..000000000
--- a/net-analyzer/whatweb/whatweb-0.4.7_p20160611.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-inherit ruby-ng git-r3
-
-DESCRIPTION="Next generation web scanner, identifies what software websites are running"
-HOMEPAGE="http://www.morningstarsecurity.com/research/whatweb"
-EGIT_REPO_URI="https://github.com/urbanadventurer/WhatWeb.git"
-EGIT_COMMIT="f467aa2f154aea83b6b58aec85107ba3fa3eb635"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="json"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	json? ( dev-ruby/json )"
-
-#future rdepend:
-#dns: em-resolv-replace
-#mongodb: bison bson_ext mongo rchardet
-
-S="${WORKDIR}/${P}"
-
-ruby-ng_src_prepare() {
-	# fix installation
-	sed -i 's|plugins-disabled||g' Makefile || die
-	sed -i 's|$(DOCPATH)/$(NAME)|$(DOCPATH)/${PF}|g' Makefile || die
-}
-
-ruby-ng_src_install() {
-	dodir /usr/share/doc/"${PF}"
-	DESTDIR="${D}" emake install
-	dodoc CHANGELOG README whatweb.xsl
-}
diff --git a/net-analyzer/whatweb/whatweb-0.4.8_pre20161009.ebuild b/net-analyzer/whatweb/whatweb-0.4.8_pre20161009.ebuild
deleted file mode 100644
index cc17a68ec..000000000
--- a/net-analyzer/whatweb/whatweb-0.4.8_pre20161009.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23"
-inherit ruby-ng git-r3
-
-DESCRIPTION="Next generation web scanner, identifies what software websites are running"
-HOMEPAGE="http://www.morningstarsecurity.com/research/whatweb"
-EGIT_REPO_URI="https://github.com/urbanadventurer/WhatWeb.git"
-EGIT_COMMIT="039768f41a6cd45ec70c89b81616b669bc92ac0f"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="json"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	json? ( dev-ruby/json )"
-
-#future rdepend:
-#dns: em-resolv-replace
-#mongodb: bison bson_ext mongo rchardet
-
-S="${WORKDIR}/${P}"
-
-ruby-ng_src_prepare() {
-	# fix installation
-	sed -i 's|plugins-disabled||g' Makefile || die
-	sed -i 's|$(DOCPATH)/$(NAME)|$(DOCPATH)/${PF}|g' Makefile || die
-	eapply_user
-}
-
-ruby-ng_src_install() {
-	dodir /usr/share/doc/"${PF}"
-	DESTDIR="${D}" emake install
-	dodoc CHANGELOG README whatweb.xsl
-}
diff --git a/www-apps/arachni/Manifest b/www-apps/arachni/Manifest
index 96bf9d777..1e591d60b 100644
--- a/www-apps/arachni/Manifest
+++ b/www-apps/arachni/Manifest
@@ -1 +1 @@
-DIST arachni-1.4.tar.gz 2066668 SHA256 a07ca52f0e4484fbe016182e9f11c2437e980086e417f48da6d2ba11d15d1851 SHA512 af16d77e24d82575c03a080d6e2291c6db0f0015cc73ac067fd83c229fe4b3a1f12d07f43cda9e95eba9a3f5e4402bd202fb5c9c3715c58b3ba6b2003119f818 WHIRLPOOL 47b25a51b304b6050ad4eba2bd6e4fe38c90de5b857369c7109309047b5e96064b138207e4c49099686f95f0f468762c6c8bd2df1b8b5e3f89edf3952e260cc2
+DIST arachni-1.4.tar.gz 2066668 BLAKE2B a5a3cdc226f868fb4165387cda8a1314390cf3ed4e09357246d162903003a99115f85f97f84e17e5076afb62a46c0e1b8ce79a8c395f2027b706af8701fbdb12 SHA512 af16d77e24d82575c03a080d6e2291c6db0f0015cc73ac067fd83c229fe4b3a1f12d07f43cda9e95eba9a3f5e4402bd202fb5c9c3715c58b3ba6b2003119f818
diff --git a/www-apps/arachni/arachni-1.4.ebuild b/www-apps/arachni/arachni-1.4.ebuild
index 13ea92a93..f94129359 100644
--- a/www-apps/arachni/arachni-1.4.ebuild
+++ b/www-apps/arachni/arachni-1.4.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
+EAPI=6
 
-USE_RUBY="ruby21"
+USE_RUBY="ruby24"
 
 inherit eutils ruby-ng
 
diff --git a/www-apps/beef/beef-0.4.7.0_p20180720-r2.ebuild b/www-apps/beef/beef-0.4.7.0_p20180720-r2.ebuild
index c8fe3d4cd..12a1770f4 100644
--- a/www-apps/beef/beef-0.4.7.0_p20180720-r2.ebuild
+++ b/www-apps/beef/beef-0.4.7.0_p20180720-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 
 #Warning: add one ruby at a time
-USE_RUBY="ruby23"
+USE_RUBY="ruby24"
 inherit eutils ruby-ng
 
 #default fails, looks too complex