diff --git a/dev-ruby/metasploit-credential/Manifest b/dev-ruby/metasploit-credential/Manifest
index e887aa3c3..802cde7df 100644
--- a/dev-ruby/metasploit-credential/Manifest
+++ b/dev-ruby/metasploit-credential/Manifest
@@ -1,3 +1,2 @@
-DIST metasploit-credential-4.0.2.gem 109568 BLAKE2B ecd8a7ff9366a79b47dc14db69ec87e44354893c67acf7cc92fc386ad04e663812552270d5cd04f2926039fcdd7ddc170ba93e12a81a152d8661975c76f6fa93 SHA512 57f857b7db710ef6e94e79849fb56af7b45b0f8b97030996cb50384b759b1e0d535391b3fd3c7aa6a530d671d109b01ca031502d0a469203fb36255c0e572289
 DIST metasploit-credential-4.0.3.gem 109568 BLAKE2B 8f3f5bbe6a119cb19a468cb19afdee45a3e384d942697354d29c0261724b03e70dfc7257ad03b895e4dd6229c21e5a7e98bcfe894ac26894846f539875f688c3 SHA512 7f3ef6096eb8256d151cca62581c9bed21f24e4ae7c2ae5680bfe839a5c00ad4a31883b95bca5dda919bb0ca3d9d11587013d84dae45de80a44377286137ad63
 DIST metasploit-credential-5.0.2.gem 110080 BLAKE2B df1932e74dc1aa8d38ec3e14812d2c4e0b3d1fcbf91ec921533d170aed0b8d99fe32aa7f3fa25c32e59e93c4b1f3d42402f98b80ca1397f813d63a1dd894117c SHA512 5dcc9f39db9d012dfecc85e73659ea8dd9b59721bdb2fbdf3dfaa9d08b21aeaef37dd77726242f28864c9db44a0806787453caa331673776c02fea6904ea55c4
diff --git a/dev-ruby/metasploit-credential/metasploit-credential-4.0.2.ebuild b/dev-ruby/metasploit-credential/metasploit-credential-4.0.2.ebuild
deleted file mode 100644
index 93b3adcca..000000000
--- a/dev-ruby/metasploit-credential/metasploit-credential-4.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db spec"
-
-DESCRIPTION="Code for modeling and managing credentials in Metasploit"
-HOMEPAGE="https://github.com/rapid7/metasploit-credential"
-
-LICENSE="BSD"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-RESTRICT=test
-
-ruby_add_rdepend "dev-ruby/metasploit-concern:3.0
-	>=dev-ruby/metasploit_data_models-3.0.0:*
-	dev-ruby/metasploit-model
-	dev-ruby/net-ssh
-	dev-ruby/pg:*
-	>=dev-ruby/railties-5.2.2:5.2
-	dev-ruby/rex-socket
-	dev-ruby/rubyntlm
-	dev-ruby/rubyzip:*"
diff --git a/dev-ruby/metasploit-credential/metasploit-credential-4.0.3.ebuild b/dev-ruby/metasploit-credential/metasploit-credential-4.0.3.ebuild
index 3229e2833..27ae10823 100644
--- a/dev-ruby/metasploit-credential/metasploit-credential-4.0.3.ebuild
+++ b/dev-ruby/metasploit-credential/metasploit-credential-4.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
@@ -15,14 +15,14 @@ DESCRIPTION="Code for modeling and managing credentials in Metasploit"
 HOMEPAGE="https://github.com/rapid7/metasploit-credential"
 
 LICENSE="BSD"
-SLOT="${PV}"
+SLOT="$(ver_cut 1-2)"
 #FIXME: Gentoo's net-ssh/rubyntlm are  not arm64
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT=test
 
 ruby_add_rdepend "dev-ruby/metasploit-concern:3.0
-	>=dev-ruby/metasploit_data_models-3.0.0:*
+	dev-ruby/metasploit_data_models:4.1
 	dev-ruby/metasploit-model
 	dev-ruby/net-ssh
 	dev-ruby/pg:*
diff --git a/dev-ruby/metasploit-credential/metasploit-credential-5.0.2.ebuild b/dev-ruby/metasploit-credential/metasploit-credential-5.0.2.ebuild
index aac0b89cd..6b3e7757d 100644
--- a/dev-ruby/metasploit-credential/metasploit-credential-5.0.2.ebuild
+++ b/dev-ruby/metasploit-credential/metasploit-credential-5.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
@@ -15,14 +15,14 @@ DESCRIPTION="Code for modeling and managing credentials in Metasploit"
 HOMEPAGE="https://github.com/rapid7/metasploit-credential"
 
 LICENSE="BSD"
-SLOT="${PV}"
+SLOT="$(ver_cut 1-2)"
 #FIXME: Gentoo's net-ssh/rubyntlm are  not arm64
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT=test
 
 ruby_add_rdepend "dev-ruby/metasploit-concern:4.0
-	>=dev-ruby/metasploit_data_models-5.0.0:*
+	dev-ruby/metasploit_data_models:5.0
 	dev-ruby/metasploit-model
 	dev-ruby/net-ssh
 	dev-ruby/pg:*
diff --git a/dev-ruby/metasploit-model/metasploit-model-4.0.2.ebuild b/dev-ruby/metasploit-model/metasploit-model-4.0.2.ebuild
index 8168ca593..c2f14a72d 100644
--- a/dev-ruby/metasploit-model/metasploit-model-4.0.2.ebuild
+++ b/dev-ruby/metasploit-model/metasploit-model-4.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://rubygems.org/gems/${P}.gem"
 
 LICENSE="BSD"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 #IUSE="development test"
 RESTRICT=test
 IUSE=""
diff --git a/dev-ruby/metasploit-payloads/Manifest b/dev-ruby/metasploit-payloads/Manifest
index bb07caa73..593b9caf0 100644
--- a/dev-ruby/metasploit-payloads/Manifest
+++ b/dev-ruby/metasploit-payloads/Manifest
@@ -1,7 +1,2 @@
-DIST metasploit-payloads-2.0.12.gem 12241920 BLAKE2B 5ca5acfbfe60aafe6c043b7946c4c7a2d75475326c797b3984ffc78310d6df226b21b0db9d5760bdd833508b3df362ebbd70fd73d9c458176ced0a085b4c916b SHA512 d4817806d6843207d05f888832d6f6d555816d29e5fe4edfac4b7395958962860ab004d7431fdb2f5501d1f71e4f8504fdb231a1afc655f05964a5caa6732d01
-DIST metasploit-payloads-2.0.16.gem 12245504 BLAKE2B e8fc47289c89238fbfcf36ad1eef7b5ea874eb179f9e4deda4dedf133d64987499d8a18d0feda5d0bc20f80688d79ecf4ad3c5f190c8c72f647e50bd6cdd5474 SHA512 ee33c7df9a7154bf3062e0ce108fcfb9276a233864836156888c9fb12f2efa4303170cb9628ac4aebbb7ebe6c4b0e26bc6b9b476eb0b976996c21cabea8bc744
-DIST metasploit-payloads-2.0.19.gem 12245504 BLAKE2B 8953e854cf3973213658518c24a53b14de5f6ac5d9471380a373ff4840280b39e6a4d677f4ac5e0c575d8d81a224bd11cc52321293ca4f3aac9d80185958f749 SHA512 c813e2d327c0e06b26d2f95a249b0128a1dbfc2c6926057f7c02d3b8bae72b983354a2986bd2843d1137673e450ed936119f3c65fe00555bcef1fb82f6469fe0
-DIST metasploit-payloads-2.0.24.gem 12244480 BLAKE2B 6f01f4a2372de454307efe107f4b725697ca9f1b9dd24b1daa0d94d825529ed43201a406758fe8f47d794726c6cb68eecacfe8f3c6b7dbfc5f63e4eb25391c30 SHA512 8b608ff6c5efbe6e18cae7138765c3611ec314a19acade78fc41fc3568877867727894a7a3710d4aaa514811e123be75159dcb94133e1613815b6f3a830b8f4f
-DIST metasploit-payloads-2.0.25.gem 12244480 BLAKE2B 8e1a826ee57b21ba4fa94cc95e31e0fab88120296703172cf59be15ea089383238c3f6fa854259ea5c8d2c99093e6556ed26a47ba8b043da9e455b2619151026 SHA512 741e9860651361f25ce8f7a9776720272931520b738fd5b42c11e3c5f7d4c8820eb07b768943e580a2fa81ea17d42353fc0e167f812615b659c6293e55c84375
 DIST metasploit-payloads-2.0.45.gem 12250112 BLAKE2B 6055aafa10b9fe6192eee0b626c6ab1b8c63f5cd2448793ad6c0ebf9b36cd4887fec33d8bdf2e3815a3cc083904bdb376cd181dae0fe82fadd87d34efa61e46d SHA512 9ce5d2dacfcc7012ee7f498ad90e40c49e4461d3d7c5367553b29c9f7acc5f0834c5a7642c3a88775caff7e8aa6539cdaf033f468a1fc8d671a3a8abf402b1f5
-DIST metasploit-payloads-2.0.46.gem 12250112 BLAKE2B 1cf997a2097e1b9ab30c2f8d78a66ae625eafedb12d2f5bebae1b93f6f207e2589d52a5d5d8e3aa87e9847247f6c47019410ee6af782d72b0c915b9222f6df9d SHA512 5df96950aef72963c7e6f37eb577abbfffceda5cb16ca75a8b267a5dd02d046f0e97933a9f72cd13ae7112bb87e4c4b58a58db8b3e95674677f88c918a4fca66
+DIST metasploit-payloads-2.0.47.gem 12250112 BLAKE2B 0394bca40421fe009ad8909362941af53423fdd24e84e1c48ed54e3886f1b49be13282441a67b9769a1cb96e78146cd253e6bb34a6d3c29e80f19c4607bbd674 SHA512 e3db44bd8a1c2204d00ac11540ef693bdd1cd632d9958f0e4a01cd9b9a694d6dd71a46f4e1a87ab75a210aa1ffbe71ec150b288bf754f09f7873f43cba7a83d2
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-2.0.16.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-2.0.16.ebuild
deleted file mode 100644
index cc3083d60..000000000
--- a/dev-ruby/metasploit-payloads/metasploit-payloads-2.0.16.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
-HOMEPAGE="https://rubygems.org/gems/metasploit-payloads"
-
-LICENSE="BSD"
-
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-#no tests
-RESTRICT="test strip"
-
-QA_PREBUILT="
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
-	"
-
-src_install() {
-	ruby-ng_src_install
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs"
-	EOF
-}
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-2.0.19.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-2.0.19.ebuild
deleted file mode 100644
index cc3083d60..000000000
--- a/dev-ruby/metasploit-payloads/metasploit-payloads-2.0.19.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
-HOMEPAGE="https://rubygems.org/gems/metasploit-payloads"
-
-LICENSE="BSD"
-
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-#no tests
-RESTRICT="test strip"
-
-QA_PREBUILT="
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
-	"
-
-src_install() {
-	ruby-ng_src_install
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs"
-	EOF
-}
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-2.0.24.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-2.0.24.ebuild
deleted file mode 100644
index cc3083d60..000000000
--- a/dev-ruby/metasploit-payloads/metasploit-payloads-2.0.24.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
-HOMEPAGE="https://rubygems.org/gems/metasploit-payloads"
-
-LICENSE="BSD"
-
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-#no tests
-RESTRICT="test strip"
-
-QA_PREBUILT="
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
-	"
-
-src_install() {
-	ruby-ng_src_install
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs"
-	EOF
-}
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-2.0.25.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-2.0.25.ebuild
deleted file mode 100644
index cc3083d60..000000000
--- a/dev-ruby/metasploit-payloads/metasploit-payloads-2.0.25.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
-HOMEPAGE="https://rubygems.org/gems/metasploit-payloads"
-
-LICENSE="BSD"
-
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-#no tests
-RESTRICT="test strip"
-
-QA_PREBUILT="
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
-	"
-
-src_install() {
-	ruby-ng_src_install
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs"
-	EOF
-}
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-2.0.46.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-2.0.46.ebuild
deleted file mode 100644
index cc3083d60..000000000
--- a/dev-ruby/metasploit-payloads/metasploit-payloads-2.0.46.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
-HOMEPAGE="https://rubygems.org/gems/metasploit-payloads"
-
-LICENSE="BSD"
-
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-#no tests
-RESTRICT="test strip"
-
-QA_PREBUILT="
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
-	"
-
-src_install() {
-	ruby-ng_src_install
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs"
-	EOF
-}
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-2.0.12.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-2.0.47.ebuild
similarity index 100%
rename from dev-ruby/metasploit-payloads/metasploit-payloads-2.0.12.ebuild
rename to dev-ruby/metasploit-payloads/metasploit-payloads-2.0.47.ebuild
diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-4.1.1.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-4.1.1.ebuild
index 17de30c07..4622810ab 100644
--- a/dev-ruby/metasploit_data_models/metasploit_data_models-4.1.1.ebuild
+++ b/dev-ruby/metasploit_data_models/metasploit_data_models-4.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby26"
 
 inherit ruby-fakegem
 
@@ -14,9 +14,9 @@ HOMEPAGE="https://github.com/rapid7/metasploit_data_models"
 SRC_URI="https://rubygems.org/gems/${P}.gem"
 
 LICENSE="BSD"
-SLOT="${PV}"
+SLOT="$(ver_cut 1-2)"
 #FIXME: Gentoo's recog is not arm64 ready
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~x86"
 RESTRICT=test
 #IUSE="development test"
 IUSE=""
@@ -27,7 +27,7 @@ ruby_add_rdepend "
 		>=dev-ruby/activerecord-5.2.2:5.2[postgres]
 		>=dev-ruby/activesupport-5.2.2:5.2
 		dev-ruby/arel-helpers
-		>=dev-ruby/metasploit-concern-2.0.0
+		dev-ruby/metasploit-concern
 		>=dev-ruby/metasploit-model-3.1.0
 		dev-ruby/pg:*
 		>=dev-ruby/railties-5.2.2:5.2
diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-5.0.1.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-5.0.1.ebuild
index fc5419c38..850ffe1bb 100644
--- a/dev-ruby/metasploit_data_models/metasploit_data_models-5.0.1.ebuild
+++ b/dev-ruby/metasploit_data_models/metasploit_data_models-5.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby26"
 
 inherit ruby-fakegem
 
@@ -14,9 +14,9 @@ HOMEPAGE="https://github.com/rapid7/metasploit_data_models"
 SRC_URI="https://rubygems.org/gems/${P}.gem"
 
 LICENSE="BSD"
-SLOT="${PV}"
+SLOT="$(ver_cut 1-2)"
 #FIXME: Gentoo's recog is not arm64 ready
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~x86"
 RESTRICT=test
 #IUSE="development test"
 IUSE=""
@@ -27,7 +27,7 @@ ruby_add_rdepend "
 		dev-ruby/activerecord:6.0[postgres]
 		dev-ruby/activesupport:6.0
 		dev-ruby/railties:6.0
-		>=dev-ruby/metasploit-concern-2.0.0
+		dev-ruby/metasploit-concern
 		>=dev-ruby/metasploit-model-3.1.0
 		dev-ruby/arel-helpers
 		dev-ruby/pg:*
diff --git a/dev-ruby/metasploit_payloads-mettle/Manifest b/dev-ruby/metasploit_payloads-mettle/Manifest
index 05122a658..ef53d11e6 100644
--- a/dev-ruby/metasploit_payloads-mettle/Manifest
+++ b/dev-ruby/metasploit_payloads-mettle/Manifest
@@ -1,4 +1 @@
-DIST metasploit_payloads-mettle-1.0.2.gem 22206464 BLAKE2B 2c9c16436e5e6620284cc4544d794f0d99f317fa501b245df2ba3a8c999c53624a1e150e4a1b2f525468b7c0a02557ee23d7576697c699851c8e047b71d08461 SHA512 9f1f841f3ae2bb7b6576b5eb99ab0c79c3a600169b210a7782b7cf4175af31da922bf6ac7e0d8a513ae0ebc95279997696ccf42cb5df9d90d9b33d433a6722d5
-DIST metasploit_payloads-mettle-1.0.3.gem 22211072 BLAKE2B 961039f96eafd4ddfeae2b3ff8ebfa6e5d5e9933ae0b877cd097ecf89fba4f87adfe2c28d53e30b9c3f620d28bdd99fdd71dd82dc270a902fdd5148d65c78d92 SHA512 8c18dcf7264f9b574970dcd023062e7d84e14e42ae9930be36927ee06630a37b5c1e90ff722832a5b77883e86daea80e6bf8d2f466375bb790a3c4f3c4b83243
-DIST metasploit_payloads-mettle-1.0.4.gem 22211584 BLAKE2B 19cc9425eb9c122ec13ba55f601e0103bc1e0547b7be7af2e0970b4c9cb6632cd257d3a8ac711e490e749a242eda806545aadb7a81e54e2b2af0d0c4c45753c2 SHA512 46876de43a7eb720be2ef178033abc59ae775d5f8f1d0fbea74452a50099e8098c813f98643c4da05c745334b9ce0d882708f6e555898a0dbf891d3441e3e9a8
-DIST metasploit_payloads-mettle-1.0.9.gem 22332928 BLAKE2B 1d95155e22c77d0b0fc32655990f1d7ba4c438a726a41c0888673fde5a4ddb325e5f619a846c5de44915d9248195872802e93887c2287edd0db9d9b3580a6554 SHA512 9870abc9322a8efaa724855723c3e6744003ef1e9c713787797c4685e0ca66ebd714282a5f55772fecc0aae083f36ef054e20a554400c24f26eef42494797ced
+DIST metasploit_payloads-mettle-1.0.10.gem 22333440 BLAKE2B a10b65260b8b53dabc5bc311f919bfb84173590a4d58392947539f15dac6953f3df61c05cf62408168b6ab4bcee6a85713c4128f7cffcfcc5f6956564cfc0eeb SHA512 d26e9e7dcba47a22baae257e60060ff7c0f38a0fe3f67feb1e59125ef82b80d313ad8697c2d8cc464cd82c545a012921dfaaa3d0e82ea66f1128c5404c0c8654
diff --git a/dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-1.0.2.ebuild b/dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-1.0.10.ebuild
similarity index 96%
rename from dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-1.0.2.ebuild
rename to dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-1.0.10.ebuild
index 6422730b9..6444c8212 100644
--- a/dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-1.0.2.ebuild
+++ b/dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-1.0.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -17,7 +17,7 @@ HOMEPAGE="https://rubygems.org/gems/metasploit_payloads-mettle"
 LICENSE="BSD"
 
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 #no tests
diff --git a/dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-1.0.3.ebuild b/dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-1.0.3.ebuild
deleted file mode 100644
index 6422730b9..000000000
--- a/dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-1.0.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="build"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compiled binaries for Metasploit's next-gen Meterpreter"
-HOMEPAGE="https://rubygems.org/gems/metasploit_payloads-mettle"
-
-LICENSE="BSD"
-
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-#no tests
-RESTRICT="test strip"
-
-QA_PREBUILT="
-	usr/lib*/ruby/gems/*/gems/${P}/build/aarch64-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/aarch64-linux-musl/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/armv5b-linux-musleabi/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/armv5b-linux-musleabi/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/armv5l-linux-musleabi/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/armv5l-linux-musleabi/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/i486-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/i486-linux-musl/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips64-linux-muslsf/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips64-linux-muslsf/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips64-linux-muslsf/bin/sniffer
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips64-linux-muslsf/bin/sniffer.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mipsel-linux-muslsf/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/mipsel-linux-muslsf/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mipsel-linux-muslsf/bin/sniffer
-	usr/lib*/ruby/gems/*/gems/${P}/build/mipsel-linux-muslsf/bin/sniffer.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips-linux-muslsf/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips-linux-muslsf/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips-linux-muslsf/bin/sniffer
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips-linux-muslsf/bin/sniffer.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/powerpc64le-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/powerpc64le-linux-musl/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/powerpc-linux-muslsf/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/powerpc-linux-muslsf/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/s390x-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/s390x-linux-musl/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/x86_64-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/x86_64-linux-musl/bin/mettle.bin
-	"
-
-src_install() {
-	ruby-ng_src_install
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${P}/build"
-	EOF
-}
diff --git a/dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-1.0.4.ebuild b/dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-1.0.4.ebuild
deleted file mode 100644
index 6422730b9..000000000
--- a/dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-1.0.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="build"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compiled binaries for Metasploit's next-gen Meterpreter"
-HOMEPAGE="https://rubygems.org/gems/metasploit_payloads-mettle"
-
-LICENSE="BSD"
-
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-#no tests
-RESTRICT="test strip"
-
-QA_PREBUILT="
-	usr/lib*/ruby/gems/*/gems/${P}/build/aarch64-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/aarch64-linux-musl/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/armv5b-linux-musleabi/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/armv5b-linux-musleabi/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/armv5l-linux-musleabi/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/armv5l-linux-musleabi/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/i486-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/i486-linux-musl/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips64-linux-muslsf/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips64-linux-muslsf/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips64-linux-muslsf/bin/sniffer
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips64-linux-muslsf/bin/sniffer.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mipsel-linux-muslsf/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/mipsel-linux-muslsf/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mipsel-linux-muslsf/bin/sniffer
-	usr/lib*/ruby/gems/*/gems/${P}/build/mipsel-linux-muslsf/bin/sniffer.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips-linux-muslsf/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips-linux-muslsf/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips-linux-muslsf/bin/sniffer
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips-linux-muslsf/bin/sniffer.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/powerpc64le-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/powerpc64le-linux-musl/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/powerpc-linux-muslsf/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/powerpc-linux-muslsf/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/s390x-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/s390x-linux-musl/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/x86_64-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/x86_64-linux-musl/bin/mettle.bin
-	"
-
-src_install() {
-	ruby-ng_src_install
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${P}/build"
-	EOF
-}
diff --git a/dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-1.0.9.ebuild b/dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-1.0.9.ebuild
deleted file mode 100644
index 6422730b9..000000000
--- a/dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-1.0.9.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="build"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compiled binaries for Metasploit's next-gen Meterpreter"
-HOMEPAGE="https://rubygems.org/gems/metasploit_payloads-mettle"
-
-LICENSE="BSD"
-
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-#no tests
-RESTRICT="test strip"
-
-QA_PREBUILT="
-	usr/lib*/ruby/gems/*/gems/${P}/build/aarch64-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/aarch64-linux-musl/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/armv5b-linux-musleabi/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/armv5b-linux-musleabi/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/armv5l-linux-musleabi/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/armv5l-linux-musleabi/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/i486-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/i486-linux-musl/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips64-linux-muslsf/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips64-linux-muslsf/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips64-linux-muslsf/bin/sniffer
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips64-linux-muslsf/bin/sniffer.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mipsel-linux-muslsf/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/mipsel-linux-muslsf/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mipsel-linux-muslsf/bin/sniffer
-	usr/lib*/ruby/gems/*/gems/${P}/build/mipsel-linux-muslsf/bin/sniffer.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips-linux-muslsf/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips-linux-muslsf/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips-linux-muslsf/bin/sniffer
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips-linux-muslsf/bin/sniffer.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/powerpc64le-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/powerpc64le-linux-musl/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/powerpc-linux-muslsf/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/powerpc-linux-muslsf/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/s390x-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/s390x-linux-musl/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/x86_64-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/x86_64-linux-musl/bin/mettle.bin
-	"
-
-src_install() {
-	ruby-ng_src_install
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${P}/build"
-	EOF
-}
diff --git a/dev-ruby/reline/Manifest b/dev-ruby/reline/Manifest
index c4af59516..2402036d7 100644
--- a/dev-ruby/reline/Manifest
+++ b/dev-ruby/reline/Manifest
@@ -1,3 +1,4 @@
 DIST reline-0.1.10.gem 58880 BLAKE2B 6aba8c88d8b608b1acdcaa7fc677b8331881d2da24fc6c8f4d065609c3a2996fc7c3364c6d9b9f3054e7146dcd6eafccb82c65b2e7c9e264ff01f61c1c144201 SHA512 79956b5efb79b9ace1bfd0acdef026af13a670525c273f326d08c250fdf9131e71ee5df0569f34c7415a421ea64cdecf1abc5c9e71c09ea52927269c7b8d0a64
 DIST reline-0.1.5.gem 41472 BLAKE2B 35543e6f7bc1fb225893072a2333be15832cb0fdb026a3521562e19bec38225656b24591960036c40ac8b527cd783b8468ca5dcc9b3793d5a37ff4b4d5220ee9 SHA512 c44f7620b38db7799f7507ca9303a0e97144dbfaffa3914b256809762a3a0fa32c13d84729ea64d972e571496dbd33635e31abb8d548991ad8259f6614d1d088
 DIST reline-0.1.9.gem 43520 BLAKE2B 6f1698faa8c0ef839b4ff17791b5e695dce42bf511c4e82e10ac93a47a6e0300b65d5044a21ef8bb08c36d945f1479efb5bf8df7d79bb33afe24c8b6e6ad18b1 SHA512 07d2de37ba2c9fe28f849823354a733e1ff7d5ad2faf45ef03f51320861b53e4d0a8734ca32042063dcc58d2e89f447802cd737a21d7b772820fb12119607075
+DIST reline-0.2.5.gem 47616 BLAKE2B b54a3f2cf4772da71a3a1105c08060fa1237ef565ba93dd4edd17d591e931a0e4d85b1e1d3fc7141173ab6c6b133e8ed7a7d1e5e6dd2210d2808f378534e83aa SHA512 85b770e995deea7e2d3f86523750461ff78a70f11b06a0826b979b35b2b9412d415611edd8503a480e4f1303fa4af5e543c9e85b1f76499a2fe67b0e31cf6e33
diff --git a/dev-ruby/reline/reline-0.2.5.ebuild b/dev-ruby/reline/reline-0.2.5.ebuild
new file mode 100644
index 000000000..cc1a89199
--- /dev/null
+++ b/dev-ruby/reline/reline-0.2.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Alternative GNU Readline or Editline implementation by pure Ruby"
+HOMEPAGE="https://github.com/ruby/reline/"
+
+KEYWORDS="amd64 arm64 x86"
+LICENSE="Ruby"
+SLOT="0"
+
+ruby_add_rdepend "
+	dev-ruby/io-console
+"
diff --git a/dev-ruby/ruby-oci8/Manifest b/dev-ruby/ruby-oci8/Manifest
new file mode 100644
index 000000000..a718aa461
--- /dev/null
+++ b/dev-ruby/ruby-oci8/Manifest
@@ -0,0 +1 @@
+DIST ruby-oci8-2.2.9.gem 336896 BLAKE2B 60fb88c4c1034f7ba1730095ba10a7232d46991dbf9f55b15bd757e22fe946980aa73d99535543391cd509fedf5c8163c4333f5092d64cfbbe74e5c7ceb7b90a SHA512 f6a7244c1173a03e40e3fa696ea1cf350687515d2d605264a9fab1d1cf44d5a6f39dcbf78291ae0e37e362da9351c545afc74f9c86fa2ec662e15a126b913290
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.2.9.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.2.9.ebuild
new file mode 100644
index 000000000..0467e8d02
--- /dev/null
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.2.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby26"
+
+inherit multilib ruby-fakegem
+
+RUBY_FAKEGEM_EXTRADOC="NEWS README.md ChangeLog"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+DESCRIPTION="A Ruby library for Oracle OCI8"
+HOMEPAGE="https://rubygems.org/gems/ruby-oci8/"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-db/oracle-instantclient-basic"
+DEPEND="dev-db/oracle-instantclient-basic"
+
+EXT_DIR="ext/oci8"
+
+each_ruby_configure() {
+	# configure the native libraries
+	${RUBY} -C${EXT_DIR} extconf.rb --prefix="${D}/usr" || die "configure failed"
+}
+
+each_ruby_compile() {
+	# compile the native libraries
+	emake -C ${EXT_DIR} V=1 || die "could not compile native library"
+}
+
+each_ruby_install() {
+	# install the native libraries
+	emake -C ${EXT_DIR} install DESTDIR="${D}" || die "could not install native library"
+	# install the gem files
+	each_fakegem_install
+}
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index c175eb912..388d799c6 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,2 +1 @@
-DIST metasploit-6.0.23.tar.gz 65793513 BLAKE2B 9cf46dd73d2250b3573ddbf29ec113ff576d2e3829216925feaf48aae9e399d6640c0da012d03395253e94f710b37da4d4a764e556254bd63667230fcdfa5223 SHA512 0fc8710e56e554fbe17cb9bd65494d1129ef1cda6dd1fe048ba3d911d40af8e7f0ce74515340ee803e3d21de5f3c95b8e3a8a607e9d4ccae68a20673346b1f05
-DIST metasploit-6.0.46.tar.gz 66536021 BLAKE2B 39e7366eaedc5ac41dc332d06e58fa177b5f445e9403b1c2791cd1879b0c20bdd23facf7261cde7e66e3ee1bc954c0a94d9cd6f6a09bedd09796be8924cdafd7 SHA512 172cb7142c7b5787d86d509dc30d54779fa9d4fd03440ec2fc100561491e2596e2f603d8a92e48adb20deadb79ed9186d16dd7ed0a3414030db1b67782ce829c
+DIST metasploit-6.0.50.tar.gz 66572385 BLAKE2B ebede53045d56668ffc641d8bc88cdd5ac9b0fd58a5f5f04df2a770576710b3c8d9ba6b6a7da34446ce05337d405f68bbce7030bc43f108e558c7bb9811501a7 SHA512 835fc4be1ed3536e746754da445dfd832f6af381d7549a069a3251f90332337b61b8feaa4d031d023efd4b261effc0d562710a317d1326af62f4745291a40b6e
diff --git a/net-analyzer/metasploit/metasploit-6.0.46.ebuild b/net-analyzer/metasploit/metasploit-6.0.50.ebuild
similarity index 97%
rename from net-analyzer/metasploit/metasploit-6.0.46.ebuild
rename to net-analyzer/metasploit/metasploit-6.0.50.ebuild
index b2f9e36f4..3912cfe21 100644
--- a/net-analyzer/metasploit/metasploit-6.0.46.ebuild
+++ b/net-analyzer/metasploit/metasploit-6.0.50.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,14 +11,14 @@ inherit eutils ruby-ng
 ##Tags https://github.com/rapid7/metasploit-framework/releases
 MY_PV=${PV/_p/-}
 SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-#KEYWORDS="~amd64"
+KEYWORDS="~amd64"
 RUBY_S="${PN}-framework-${MY_PV}"
 SLOT="$(ver_cut 1).$(ver_cut 2)"
 
 DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 LICENSE="BSD"
-IUSE="development +java nexpose oracle +pcap test"
+IUSE="development +java oracle +pcap test"
 
 #multiple known bugs with tests reported upstream and ignored
 #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
@@ -49,12 +49,12 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/jsobfu:*
 	dev-ruby/json:*
 	dev-ruby/metasm:*
-	dev-ruby/metasploit-concern
-	>=dev-ruby/metasploit-credential-5.0.0
-	>=dev-ruby/metasploit_data_models-5.0.0
-	dev-ruby/metasploit-model
-	dev-ruby/metasploit-payloads:2.0.45
-	dev-ruby/metasploit_payloads-mettle:1.0.9
+	dev-ruby/metasploit-concern:3.0
+	dev-ruby/metasploit-credential:4.0
+	dev-ruby/metasploit_data_models:4.1
+	dev-ruby/metasploit-model:3.1
+	dev-ruby/metasploit-payloads:2.0.47
+	dev-ruby/metasploit_payloads-mettle:1.0.10
 	dev-ruby/mqtt
 	dev-ruby/msgpack
 	dev-ruby/ruby-net-ldap
@@ -90,6 +90,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/rex-struct2
 	dev-ruby/rex-text
 	dev-ruby/rex-zip
+	~dev-ruby/reline-0.2.5
 	dev-ruby/ruby-macho
 	dev-ruby/rubyntlm
 	>=dev-ruby/ruby_smb-2.0.0
@@ -107,7 +108,6 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	www-servers/puma
 	www-servers/thin
 	java? ( dev-ruby/rjb )
-	nexpose? ( dev-ruby/nexpose )
 	oracle? ( dev-ruby/ruby-oci8 )
 	pcap? ( dev-ruby/pcaprub:*
 		dev-ruby/network_interface )
@@ -260,9 +260,9 @@ all_ruby_prepare() {
 	if ! use pcap; then
 		sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die
 	fi
-	if ! use nexpose; then
-		sed -i -e "/nexpose/d" metasploit-framework.gemspec || die
-	fi
+	#if ! use nexpose; then
+	sed -i -e "/nexpose/d" metasploit-framework.gemspec || die
+	#fi
 	#no support for nessus right now
 	#if ! use nessus; then
 		sed -i -e "/nessus/d" metasploit-framework.gemspec || die
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby
index cb82f0596..76aa79edb 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-ruby
+++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby
@@ -122,7 +122,7 @@ dev-ruby/rails-dom-testing:1
 dev-ruby/sprockets:2.2
 ~app-eselect/eselect-rails-0.21
 ~dev-ruby/abstract-1.0.0
-=dev-ruby/arel-helpers-2.11*
+=dev-ruby/arel-helpers-2*
 ~dev-ruby/coveralls-0.7.1
 ~dev-ruby/database_cleaner-1.1.1
 ~dev-ruby/em-http-request-0.3.0