diff --git a/app-text/cewl/cewl-9999.ebuild b/app-text/cewl/cewl-9999.ebuild
index 2b009ceab..5728b8b5b 100644
--- a/app-text/cewl/cewl-9999.ebuild
+++ b/app-text/cewl/cewl-9999.ebuild
@@ -48,6 +48,7 @@ all_ruby_install() {
 
 each_ruby_prepare() {
 	if [ -f Gemfile ]; then
+		addpredict "$(ruby_fakegem_gemsdir)/bundler.lock"
 		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
 		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
 	fi
diff --git a/dev-ruby/metasploit-model/Manifest b/dev-ruby/metasploit-model/Manifest
index f26c9d761..a2c098937 100644
--- a/dev-ruby/metasploit-model/Manifest
+++ b/dev-ruby/metasploit-model/Manifest
@@ -1,3 +1 @@
-DIST metasploit-model-3.0.0.gem 81408 BLAKE2B f70b041563636d2777e2e2c11667330a24617a6f1dd0edde3ee61f947c11fcd5a89bb0ed1e02578a676a8d4dfed5b767b9d6e3048f46b7569aed52f0359a4571 SHA512 e2d373f4639a94f3f44fd3e53f21622ed19a3f086bb97e273a05224101ba40d3eec287edb69189b32a68729b8f81d385807739933e903d842f74dd82e3015964
-DIST metasploit-model-3.1.2.gem 81920 BLAKE2B cd2bc58792bdd34636587fb29b0a2c6b5e4fc5f8bac93a838ae555fe9d1448944436b885f0e0903b6c8f450e94f1d66279e56fcb7f15ac6cb48d6705e76ead6a SHA512 9b12f6d85f74046ed7af714da469ef0e2d9b1562e5bd983d0dd617b30e0108b43cae00c9a064a52344d80bdc2f8b646dc2cb36fc3279f7b3d8eced8e11186c0e
 DIST metasploit-model-3.1.3.gem 81920 BLAKE2B 44dcb9a15506fb81eac261b072c125cddaab84775b0d807aaefc2e79b0ac4f737f0de7ff4b99dba7eef21d6bc6c8e2324c0ce163b1ddc999122f2e5e598f62b0 SHA512 603ec29b897cac2bcab886034333bdafe504bd3cd30e654ab298ae8bdb23711409aaa677a21421629e596e35e652ac4bf1381e1c8c067c4e45c6880b5c1a8db0
diff --git a/dev-ruby/metasploit-model/metasploit-model-3.0.0-r2.ebuild b/dev-ruby/metasploit-model/metasploit-model-3.0.0-r2.ebuild
deleted file mode 100644
index 9d79e7503..000000000
--- a/dev-ruby/metasploit-model/metasploit-model-3.0.0-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-inherit ruby-fakegem
-RUBY_FAKEGEM_EXTRAINSTALL="app config script spec"
-#https://github.com/rapid7/metasploit-model/issues/53
-RUBY_FAKEGEM_BINWRAP=""
-
-DESCRIPTION="Common code, such as validators and mixins"
-HOMEPAGE="https://github.com/rapid7/metasploit-model"
-SRC_URI="https://rubygems.org/gems/${P}.gem"
-
-LICENSE="BSD"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-#IUSE="development test"
-RESTRICT=test
-IUSE=""
-
-RDEPEND="${RDEPEND} !dev-ruby/metasploit-model:0"
-
-ruby_add_rdepend ">=dev-ruby/railties-5.2.2:5.2
-			>=dev-ruby/activesupport-5.2.2:5.2
-			>=dev-ruby/activemodel-5.2.2:5.2"
-ruby_add_bdepend "dev-ruby/bundler:2"
-
-all_ruby_prepare() {
-	[ -f Gemfile.lock ] && rm Gemfile.lock
-	#For now, we don't support development or testing at all
-	#if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
-		sed -i -e "/spec.add_development_dependency/d" "${PN}".gemspec || die
-	#fi
-	#if ! use test; then
-		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
-	#fi
-	#if ! use test && ! use development; then
-		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
-	#fi
-}
-
-each_ruby_prepare() {
-	if [ -f Gemfile ]
-	then
-			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-	fi
-}
diff --git a/dev-ruby/metasploit-model/metasploit-model-3.1.2.ebuild b/dev-ruby/metasploit-model/metasploit-model-3.1.2.ebuild
deleted file mode 100644
index 781d4bf07..000000000
--- a/dev-ruby/metasploit-model/metasploit-model-3.1.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-inherit ruby-fakegem
-RUBY_FAKEGEM_EXTRAINSTALL="app config script spec"
-
-DESCRIPTION="Common code, such as validators and mixins"
-HOMEPAGE="https://github.com/rapid7/metasploit-model"
-SRC_URI="https://rubygems.org/gems/${P}.gem"
-
-LICENSE="BSD"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm64 ~x86"
-#IUSE="development test"
-RESTRICT=test
-IUSE=""
-
-RDEPEND="${RDEPEND} !dev-ruby/metasploit-model:0"
-
-ruby_add_rdepend ">=dev-ruby/railties-5.2.2:5.2
-			>=dev-ruby/activesupport-5.2.2:5.2
-			>=dev-ruby/activemodel-5.2.2:5.2"
-ruby_add_bdepend "dev-ruby/bundler:2"
-
-all_ruby_prepare() {
-	[ -f Gemfile.lock ] && rm Gemfile.lock
-	#For now, we don't support development or testing at all
-	#if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
-		sed -i -e "/spec.add_development_dependency/d" "${PN}".gemspec || die
-	#fi
-	#if ! use test; then
-		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
-	#fi
-	#if ! use test && ! use development; then
-		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
-	#fi
-}
-
-each_ruby_prepare() {
-	if [ -f Gemfile ]
-	then
-			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-	fi
-}
diff --git a/dev-ruby/metasploit-model/metasploit-model-3.1.3.ebuild b/dev-ruby/metasploit-model/metasploit-model-3.1.3.ebuild
index 781d4bf07..6a7c19cd7 100644
--- a/dev-ruby/metasploit-model/metasploit-model-3.1.3.ebuild
+++ b/dev-ruby/metasploit-model/metasploit-model-3.1.3.ebuild
@@ -45,7 +45,8 @@ all_ruby_prepare() {
 each_ruby_prepare() {
 	if [ -f Gemfile ]
 	then
-			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+		addpredict "$(ruby_fakegem_gemsdir)/bundler.lock"
+		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
 	fi
 }
diff --git a/dev-ruby/metasploit_data_models/Manifest b/dev-ruby/metasploit_data_models/Manifest
index fc3ac3637..c6a26ee1f 100644
--- a/dev-ruby/metasploit_data_models/Manifest
+++ b/dev-ruby/metasploit_data_models/Manifest
@@ -1,3 +1 @@
-DIST metasploit_data_models-4.0.2.gem 183808 BLAKE2B f61837e5003d9c244273040b246149e834b80382b76e3fe3f688eacd94ad281c670637a014a4787ecb44a86587a2fa27f38653a71524376e1cebaa2984eda827 SHA512 b9bea47e2493e7124277dfcfbc5b9de60a912c96f0bdb51a434f91b0a9869cd8cebc0d9f43fe9c343d66113e56de23f381c3c951c0d78a35f981afb319d5d6c9
-DIST metasploit_data_models-4.1.0.gem 178688 BLAKE2B 100f010204d79f1cf3bbe977fda58e404608e9e94e2469884cc0a8518e63f59391fdfcb7ff507ca4c5cd6be66d696a8a30a509afa154405973ad5112d86e9e10 SHA512 9078abe0bffe8c52b17f7713566b0a26444576371c15d9dd6fa3d3b737684893223cff9d80b53baaab2ed99415a9ead54f1961d3b3fe54a97c8e65db77c135ea
 DIST metasploit_data_models-4.1.1.gem 178688 BLAKE2B e05d45ee04d6da7d31d5a0233c92c75985b7680a9bc6ae6455cbf1278324070081dc8af62426c30969a289b48d79a86bf82eeef840cfe6d9007a52139b2e973a SHA512 8c78630515a1404c142961f99b9b51624fa06e8590c1bda201d6d9bb1567d6b25844763bfce0a101f7590ed12198087cb80778d32ef7add8d67fa9d3d1f13f56
diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-4.0.2-r1.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-4.0.2-r1.ebuild
deleted file mode 100644
index 2b22e8ee8..000000000
--- a/dev-ruby/metasploit_data_models/metasploit_data_models-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db script spec"
-RUBY_FAKEGEM_GEMSPEC="${PN}".gemspec
-DESCRIPTION="The database layer for Metasploit"
-HOMEPAGE="https://github.com/rapid7/metasploit_data_models"
-SRC_URI="https://rubygems.org/gems/${P}.gem"
-
-LICENSE="BSD"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-RESTRICT=test
-#IUSE="development test"
-IUSE=""
-
-RDEPEND="${RDEPEND} !dev-ruby/metasploit_data_models:0"
-
-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-model-2.0.0
-		dev-ruby/pg:*
-		>=dev-ruby/railties-5.2.2:5.2
-		>=dev-ruby/recog-2.0.0:*"
-
-ruby_add_bdepend "dev-ruby/bundler:2"
-
-all_ruby_prepare() {
-	[ -f Gemfile.lock ] && rm Gemfile.lock
-	#if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
-	#fi
-	#if ! use test; then
-		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
-	#fi
-	#if ! use test && ! use development; then
-		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
-	#fi
-	#use the stable version of pg
-	sed -i "s/'pg', \"0.20.0\"/'pg', '0.21.0'/" metasploit_data_models.gemspec || die
-}
-
-each_ruby_prepare() {
-	if [ -f Gemfile ]
-	then
-		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-	fi
-}
-
-all_ruby_install() {
-	ruby_fakegem_binwrapper mdm_console mdm_console-${SLOT}
-}
diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-4.1.0.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-4.1.0.ebuild
deleted file mode 100644
index 20ed6886d..000000000
--- a/dev-ruby/metasploit_data_models/metasploit_data_models-4.1.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db script spec"
-RUBY_FAKEGEM_GEMSPEC="${PN}".gemspec
-DESCRIPTION="The database layer for Metasploit"
-HOMEPAGE="https://github.com/rapid7/metasploit_data_models"
-SRC_URI="https://rubygems.org/gems/${P}.gem"
-
-LICENSE="BSD"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-RESTRICT=test
-#IUSE="development test"
-IUSE=""
-
-RDEPEND="${RDEPEND} !dev-ruby/metasploit_data_models:0"
-
-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-model-3.1.0
-		dev-ruby/pg:*
-		>=dev-ruby/railties-5.2.2:5.2
-		>=dev-ruby/recog-2.0.0:*"
-
-ruby_add_bdepend "dev-ruby/bundler:2"
-
-all_ruby_prepare() {
-	[ -f Gemfile.lock ] && rm Gemfile.lock
-	#if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
-	#fi
-	#if ! use test; then
-		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
-	#fi
-	#if ! use test && ! use development; then
-		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
-	#fi
-	#use the stable version of pg
-	sed -i "s/'pg', \"0.20.0\"/'pg', '0.21.0'/" metasploit_data_models.gemspec || die
-}
-
-each_ruby_prepare() {
-	if [ -f Gemfile ]
-	then
-		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-	fi
-}
-
-all_ruby_install() {
-	ruby_fakegem_binwrapper mdm_console mdm_console-${SLOT}
-}
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 c1f4922d6..b6961fd30 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
@@ -54,6 +54,7 @@ all_ruby_prepare() {
 each_ruby_prepare() {
 	if [ -f Gemfile ]
 	then
+		addpredict "$(ruby_fakegem_gemsdir)/bundler.lock"
 		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
 		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
 	fi
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index de592db0a..18b62631a 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,3 +1 @@
-DIST metasploit-6.0.10.tar.gz 65477298 BLAKE2B c9f4828baa93c6777d8c224fbf20c6eec9733c209678bb84a12684a8be4893215a7e050a6f142cf221bda1a3dbd9d609fd2c39b5da9a33aaeb1d106b76fe0100 SHA512 c0f4201406589de7a9d0829486150ce9cb1ae01817f1d977129d293079d7cca7b292105b4db5c4775c250e4443ecb652235c7e5e36676e0cae863eca0b3e9b80
 DIST metasploit-6.0.23.tar.gz 65793513 BLAKE2B 9cf46dd73d2250b3573ddbf29ec113ff576d2e3829216925feaf48aae9e399d6640c0da012d03395253e94f710b37da4d4a764e556254bd63667230fcdfa5223 SHA512 0fc8710e56e554fbe17cb9bd65494d1129ef1cda6dd1fe048ba3d911d40af8e7f0ce74515340ee803e3d21de5f3c95b8e3a8a607e9d4ccae68a20673346b1f05
-DIST metasploit-6.0.8.tar.gz 65320402 BLAKE2B 286800444c199ffc49ad5ffa3a90a3659fda45190802f518ac654773619a256401b8ae71c5e5097b5a0730b5eab641e77380e1a06fa3f0782f86717083244737 SHA512 477c786207390a221be79e9afae23291b1743c8bbd5cf3d546bbe33ecaee0253e9ba2ecbb58c592176cca2e79d2c8c7bd773655a8e2cffb8e5739e52f8cde8e0
diff --git a/net-analyzer/metasploit/metasploit-6.0.10.ebuild b/net-analyzer/metasploit/metasploit-6.0.10.ebuild
deleted file mode 100644
index d56976b9e..000000000
--- a/net-analyzer/metasploit/metasploit-6.0.10.ebuild
+++ /dev/null
@@ -1,408 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-#never ever ever have more than one ruby in here
-#TODO: use ruby-single instead?
-USE_RUBY="ruby26"
-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"
-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"
-
-#multiple known bugs with tests reported upstream and ignored
-#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
-RESTRICT="test"
-
-#grep spec.add_runtime_dependency metasploit-framework.gemspec | sort
-RUBY_COMMON_DEPEND="virtual/ruby-ssl
-	>=dev-ruby/actionpack-5.2.2:5.2
-	>=dev-ruby/activerecord-5.2.2:5.2
-	>=dev-ruby/activesupport-5.2.2:5.2
-	dev-ruby/bcrypt-ruby
-	dev-ruby/bcrypt_pbkdf
-	dev-ruby/bit-struct
-	dev-ruby/bson
-	dev-ruby/bundler:2
-	dev-ruby/concurrent-ruby
-	dev-ruby/dnsruby
-	dev-ruby/ed25519
-	dev-ruby/em-http-request
-	dev-ruby/eventmachine
-	dev-ruby/faker:2
-	dev-ruby/faraday
-	dev-ruby/faye-websocket
-	dev-ruby/filesize:*
-	dev-ruby/hrr_rb_ssh
-	dev-ruby/irb
-	dev-ruby/jsobfu:*
-	dev-ruby/json:*
-	dev-ruby/metasm:*
-	dev-ruby/metasploit-concern
-	dev-ruby/metasploit-credential
-	dev-ruby/metasploit_data_models
-	dev-ruby/metasploit-model
-	dev-ruby/metasploit-payloads:2.0.16
-	dev-ruby/metasploit_payloads-mettle:1.0.2
-	dev-ruby/mqtt
-	dev-ruby/msgpack
-	dev-ruby/ruby-net-ldap
-	dev-ruby/net-ssh:*
-	dev-ruby/network_interface
-	dev-ruby/nokogiri
-	dev-ruby/octokit
-	dev-ruby/openssl-ccm
-	dev-ruby/packetfu
-	dev-ruby/patch_finder
-	dev-ruby/pcaprub
-	dev-ruby/pdf-reader:*
-	dev-ruby/pg:*
-	dev-ruby/railties:5.2
-	dev-ruby/rb-readline
-	dev-ruby/recog:*
-	dev-ruby/redcarpet
-	dev-ruby/rex-arch
-	dev-ruby/rex-bin_tools
-	dev-ruby/rex-core
-	dev-ruby/rex-encoder
-	dev-ruby/rex-exploitation
-	dev-ruby/rex-java
-	dev-ruby/rex-mime
-	dev-ruby/rex-nop
-	dev-ruby/rex-ole
-	dev-ruby/rex-powershell
-	dev-ruby/rex-random_identifier
-	dev-ruby/rex-registry
-	dev-ruby/rex-rop_builder
-	dev-ruby/rex-socket
-	dev-ruby/rex-sslscan
-	dev-ruby/rex-struct2
-	dev-ruby/rex-text
-	dev-ruby/rex-zip
-	dev-ruby/ruby-macho
-	dev-ruby/rubyntlm
-	>=dev-ruby/ruby_smb-2.0.0
-	dev-ruby/rubyzip:*
-	dev-ruby/sinatra
-	=dev-ruby/sqlite3-1.3*
-	dev-ruby/sshkey
-	www-servers/thin
-	dev-ruby/tzinfo:*
-	dev-ruby/warden
-	dev-ruby/windows_error
-	dev-ruby/xdr
-	dev-ruby/xmlrpc
-	java? ( dev-ruby/rjb )
-	nexpose? ( dev-ruby/nexpose )
-	oracle? ( dev-ruby/ruby-oci8 )
-	pcap? ( dev-ruby/pcaprub:*
-		dev-ruby/network_interface )
-	development? ( dev-ruby/fivemat
-			dev-ruby/pry
-			dev-ruby/redcarpet
-			dev-ruby/yard
-			>=dev-ruby/rake-10.0.0
-			>=dev-ruby/factory_girl-4.1.0 )"
-	#lorcon doesn't support ruby21
-	#lorcon? ( net-wireless/lorcon[ruby] )
-ruby_add_bdepend "${RUBY_COMMON_DEPEND}
-		test? ( >=dev-ruby/factory_girl-4.1.0
-			dev-ruby/fivemat
-			dev-ruby/database_cleaner
-			>=dev-ruby/rspec-2.12
-			dev-ruby/shoulda-matchers
-			dev-ruby/timecop
-			>=dev-ruby/rake-10.0.0 )
-
-"
-ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
-
-COMMON_DEPEND="dev-db/postgresql:*[server]
-	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal(-)] )
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/openssl
-	net-analyzer/nmap
-	net-libs/libpcap
-	sys-libs/zlib"
-RDEPEND+=" ${COMMON_DEPEND}
-	>=app-eselect/eselect-metasploit-0.16"
-
-RESTRICT="strip"
-
-QA_PREBUILT="
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
-	usr/lib*/${PN}${SLOT}/data/exploits/mysql/lib_mysqludf_sys_32.so
-	usr/lib*/${PN}${SLOT}/data/exploits/*
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2012-6636/armeabi/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2012-6636/mips/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2012-6636/x86/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-6282.so
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.so
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2016-4557/hello
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2019-2215/exploit
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux_dll.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux_dll.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_aarch64_linux.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/*/*/*
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/aarch64-linux-musl/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/aarch64-linux-musl/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/aarch64-linux-musl/bin/sniffer
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/armv5b-linux-musleabi/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/armv5b-linux-musleabi/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/armv5b-linux-musleabi/bin/sniffer
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/armv5l-linux-musleabi/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/armv5l-linux-musleabi/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/armv5l-linux-musleabi/bin/sniffer
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/i486-linux-musl/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/i486-linux-musl/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mips64-linux-muslsf/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mips64-linux-muslsf/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mips64-linux-muslsf/bin/sniffer
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mips64-linux-muslsf/bin/sniffer.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mipsel-linux-muslsf/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mipsel-linux-muslsf/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mipsel-linux-muslsf/bin/sniffer
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mipsel-linux-muslsf/bin/sniffer.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mips-linux-muslsf/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mips-linux-muslsf/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mips-linux-muslsf/bin/sniffer
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mips-linux-muslsf/bin/sniffer.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/powerpc64le-linux-musl/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/powerpc64le-linux-musl/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/powerpc-linux-muslsf/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/powerpc-linux-muslsf/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/s390x-linux-musl/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/s390x-linux-musl/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/x86_64-linux-musl/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/x86_64-linux-musl/bin/mettle.bin
-	"
-QA_NO_DEPCHECK="${QA_PREBUILT}"
-
-pkg_setup() {
-	if use test; then
-		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
-		su postgres -c "createuser msf_test_user -d -S -R"
-		if [ $? -ne 0 ]; then
-			su postgres -c "dropuser msf_test_user" || die
-			su postgres -c "createuser msf_test_user -d -S -R" || die
-		fi
-		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
-	fi
-	ruby-ng_pkg_setup
-}
-
-all_ruby_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
-#		rm -r msf3
-		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
-		#msf_version=${msf_version#*=}
-	fi
-}
-
-all_ruby_prepare() {
-	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
-	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
-	eapply_user
-
-	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
-#	rm -r data/cpuinfo
-
-	#remove unneeded ruby bundler versioning files
-	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
-	#we regen this file in each_ruby_prepare
-	rm Gemfile.lock
-
-	#The Gemfile contains real known deps
-	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
-	#use released packetfu
-	sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die
-	#use the stable pg
-	#https://github.com/rapid7/metasploit-framework/issues/10234
-	sed -i "s/dependency 'pg', '0.20.0'/dependency 'pg', '0.21.0'/" metasploit-framework.gemspec || die
-	#git gems are only for ruby24 support and we are not there yet
-	sed -i "/git:/d" Gemfile || die
-
-	#now we edit the Gemfile based on use flags
-	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
-	#no support for nessus right now
-	#if ! use nessus; then
-		sed -i -e "/nessus/d" metasploit-framework.gemspec || die
-	#fi
-
-	#no support for aws-sdk right now
-	#if ! use aws; then
-		sed -i -e "/aws-sdk/d" metasploit-framework.gemspec || die
-	#fi
-
-	#this version is old, remove it
-	sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
-	#even if we pass --without=blah bundler still calculates the deps and messes us up
-	if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-	fi
-	if ! use test; then
-		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
-	fi
-	if ! use test && ! use development; then
-		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
-	fi
-	#We don't need simplecov
-	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
-	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
-
-	#we need to edit the gemspec too, since it tries to call git instead of anything sane
-	#probably a better way to fix this... if I care at some point
-	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
-
-	#https://bugs.gentoo.org/show_bug.cgi?id=584522 no tzinfo-data by choice in gentoo
-	sed -i '/tzinfo-data/d' metasploit-framework.gemspec || die
-
-	#fails without faraday in Gemfile.lock
-	#despite activesupport(?) needing it, it doesn't end up there :-(
-	sed -i "/'activesupport'/a \ \ spec.add_runtime_dependency 'faraday'" metasploit-framework.gemspec
-	sed -i "/spec.add_runtime_dependency 'faraday'/d" metasploit-framework.gemspec
-
-	sed -i "s|'hrr_rb_ssh', '0.3.0.pre2'|'hrr_rb_ssh'|" metasploit-framework.gemspec
-
-	#let's bogart msfupdate
-	rm msfupdate
-	echo "#!/bin/sh" > msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"\"" >> msfupdate
-	if [[ ${PV} == "9999" ]] ; then
-		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
-		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
-		echo "else" >> msfupdate
-		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
-		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
-		echo "fi" >> msfupdate
-	else
-		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
-		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
-		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
-	fi
-	#this is set executable in src_install
-
-	#install our database.yml file before tests are run
-	cp "${FILESDIR}"/database.yml config/
-
-}
-
-each_ruby_prepare() {
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-
-	#force all metasploit executables to use desired ruby version
-	#https://dev.metasploit.com/redmine/issues/8357
-	for file in $(ls -1 msf*)
-	do
-		#poorly adapted from python.eclass
-		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
-	done
-}
-
-each_ruby_test() {
-	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
-
-	#we bogart msfupdate so no point in trying to test it
-	rm spec/msfupdate_spec.rb || die
-	#we don't really want to be uploading to virustotal during the tests
-	rm spec/tools/virustotal_spec.rb || die
-
-	# https://dev.metasploit.com/redmine/issues/8425
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
-
-	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
-	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
-}
-
-each_ruby_install() {
-	#Tests have already been run, we don't need this stuff
-	rm -r spec || die
-	rm -r test || die
-	rm Gemfile.lock || die
-
-	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
-	# should be as simple as copying everything into the target...
-	dodir /usr/lib/${PN}${SLOT}
-	cp -R * "${ED}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
-	rm -Rf "${ED}"/usr/lib/${PN}${SLOT}/documentation "${ED}"/usr/lib${PN}${SLOT}/README.md
-	fowners -R root:0 /
-
-}
-
-all_ruby_install() {
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/lib/${PN}${SLOT}/documentation"
-
-	fperms +x /usr/lib/${PN}${SLOT}/msfupdate
-
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/meterpreter"
-		SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/exploits"
-	EOF
-}
-
-pkg_postinst() {
-	elog "Before use you should run 'env-update' and '. /etc/profile'"
-	elog "otherwise you may be missing important environmental variables."
-
-	elog "You need to prepare the database by running:"
-	elog "emerge --config postgresql"
-	elog "/etc/init.d/postgresql-<version> start"
-	elog "emerge --config =metasploit-${PV}"
-
-	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
-
-	einfo
-	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
-}
-
-pkg_config() {
-	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
-	su postgres -c "createuser msf_user -D -S -R"
-	su postgres -c "createdb --owner=msf_user msf_database"
-}
diff --git a/net-analyzer/metasploit/metasploit-6.0.23.ebuild b/net-analyzer/metasploit/metasploit-6.0.23.ebuild
index bec8bcac7..539c83913 100644
--- a/net-analyzer/metasploit/metasploit-6.0.23.ebuild
+++ b/net-analyzer/metasploit/metasploit-6.0.23.ebuild
@@ -328,6 +328,7 @@ all_ruby_prepare() {
 }
 
 each_ruby_prepare() {
+	addpredict "$(ruby_fakegem_gemsdir)/bundler.lock"
 	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
 	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
 
diff --git a/net-analyzer/metasploit/metasploit-6.0.8.ebuild b/net-analyzer/metasploit/metasploit-6.0.8.ebuild
deleted file mode 100644
index e7033f144..000000000
--- a/net-analyzer/metasploit/metasploit-6.0.8.ebuild
+++ /dev/null
@@ -1,408 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-#never ever ever have more than one ruby in here
-#TODO: use ruby-single instead?
-USE_RUBY="ruby26"
-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"
-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"
-
-#multiple known bugs with tests reported upstream and ignored
-#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
-RESTRICT="test"
-
-#grep spec.add_runtime_dependency metasploit-framework.gemspec | sort
-RUBY_COMMON_DEPEND="virtual/ruby-ssl
-	>=dev-ruby/actionpack-5.2.2:5.2
-	>=dev-ruby/activerecord-5.2.2:5.2
-	>=dev-ruby/activesupport-5.2.2:5.2
-	dev-ruby/bcrypt-ruby
-	dev-ruby/bcrypt_pbkdf
-	dev-ruby/bit-struct
-	dev-ruby/bson
-	dev-ruby/bundler:2
-	dev-ruby/concurrent-ruby
-	dev-ruby/dnsruby
-	dev-ruby/ed25519
-	dev-ruby/em-http-request
-	dev-ruby/eventmachine
-	dev-ruby/faker:2
-	dev-ruby/faraday
-	dev-ruby/faye-websocket
-	dev-ruby/filesize:*
-	dev-ruby/hrr_rb_ssh
-	dev-ruby/irb
-	dev-ruby/jsobfu:*
-	dev-ruby/json:*
-	dev-ruby/metasm:*
-	dev-ruby/metasploit-concern
-	dev-ruby/metasploit-credential
-	dev-ruby/metasploit_data_models
-	dev-ruby/metasploit-model
-	dev-ruby/metasploit-payloads:2.0.12
-	dev-ruby/metasploit_payloads-mettle:1.0.2
-	dev-ruby/mqtt
-	dev-ruby/msgpack
-	dev-ruby/ruby-net-ldap
-	dev-ruby/net-ssh:*
-	dev-ruby/network_interface
-	dev-ruby/nokogiri
-	dev-ruby/octokit
-	dev-ruby/openssl-ccm
-	dev-ruby/packetfu
-	dev-ruby/patch_finder
-	dev-ruby/pcaprub
-	dev-ruby/pdf-reader:*
-	dev-ruby/pg:*
-	dev-ruby/railties:5.2
-	dev-ruby/rb-readline
-	dev-ruby/recog:*
-	dev-ruby/redcarpet
-	dev-ruby/rex-arch
-	dev-ruby/rex-bin_tools
-	dev-ruby/rex-core
-	dev-ruby/rex-encoder
-	dev-ruby/rex-exploitation
-	dev-ruby/rex-java
-	dev-ruby/rex-mime
-	dev-ruby/rex-nop
-	dev-ruby/rex-ole
-	dev-ruby/rex-powershell
-	dev-ruby/rex-random_identifier
-	dev-ruby/rex-registry
-	dev-ruby/rex-rop_builder
-	dev-ruby/rex-socket
-	dev-ruby/rex-sslscan
-	dev-ruby/rex-struct2
-	dev-ruby/rex-text
-	dev-ruby/rex-zip
-	dev-ruby/ruby-macho
-	dev-ruby/rubyntlm
-	>=dev-ruby/ruby_smb-2.0.0
-	dev-ruby/rubyzip:*
-	dev-ruby/sinatra
-	=dev-ruby/sqlite3-1.3*
-	dev-ruby/sshkey
-	www-servers/thin
-	dev-ruby/tzinfo:*
-	dev-ruby/warden
-	dev-ruby/windows_error
-	dev-ruby/xdr
-	dev-ruby/xmlrpc
-	java? ( dev-ruby/rjb )
-	nexpose? ( dev-ruby/nexpose )
-	oracle? ( dev-ruby/ruby-oci8 )
-	pcap? ( dev-ruby/pcaprub:*
-		dev-ruby/network_interface )
-	development? ( dev-ruby/fivemat
-			dev-ruby/pry
-			dev-ruby/redcarpet
-			dev-ruby/yard
-			>=dev-ruby/rake-10.0.0
-			>=dev-ruby/factory_girl-4.1.0 )"
-	#lorcon doesn't support ruby21
-	#lorcon? ( net-wireless/lorcon[ruby] )
-ruby_add_bdepend "${RUBY_COMMON_DEPEND}
-		test? ( >=dev-ruby/factory_girl-4.1.0
-			dev-ruby/fivemat
-			dev-ruby/database_cleaner
-			>=dev-ruby/rspec-2.12
-			dev-ruby/shoulda-matchers
-			dev-ruby/timecop
-			>=dev-ruby/rake-10.0.0 )
-
-"
-ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
-
-COMMON_DEPEND="dev-db/postgresql:*[server]
-	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal(-)] )
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/openssl
-	net-analyzer/nmap
-	net-libs/libpcap
-	sys-libs/zlib"
-RDEPEND+=" ${COMMON_DEPEND}
-	>=app-eselect/eselect-metasploit-0.16"
-
-RESTRICT="strip"
-
-QA_PREBUILT="
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
-	usr/lib*/${PN}${SLOT}/data/exploits/mysql/lib_mysqludf_sys_32.so
-	usr/lib*/${PN}${SLOT}/data/exploits/*
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2012-6636/armeabi/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2012-6636/mips/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2012-6636/x86/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-6282.so
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.so
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2016-4557/hello
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2019-2215/exploit
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux_dll.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux_dll.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_aarch64_linux.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/*/*/*
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/aarch64-linux-musl/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/aarch64-linux-musl/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/aarch64-linux-musl/bin/sniffer
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/armv5b-linux-musleabi/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/armv5b-linux-musleabi/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/armv5b-linux-musleabi/bin/sniffer
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/armv5l-linux-musleabi/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/armv5l-linux-musleabi/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/armv5l-linux-musleabi/bin/sniffer
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/i486-linux-musl/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/i486-linux-musl/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mips64-linux-muslsf/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mips64-linux-muslsf/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mips64-linux-muslsf/bin/sniffer
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mips64-linux-muslsf/bin/sniffer.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mipsel-linux-muslsf/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mipsel-linux-muslsf/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mipsel-linux-muslsf/bin/sniffer
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mipsel-linux-muslsf/bin/sniffer.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mips-linux-muslsf/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mips-linux-muslsf/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mips-linux-muslsf/bin/sniffer
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/mips-linux-muslsf/bin/sniffer.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/powerpc64le-linux-musl/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/powerpc64le-linux-musl/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/powerpc-linux-muslsf/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/powerpc-linux-muslsf/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/s390x-linux-musl/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/s390x-linux-musl/bin/mettle.bin
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/x86_64-linux-musl/bin/mettle
-	usr/lib*/${PN}${SLOT}/vendor/ruby/*/gems/metasploit_payloads-mettle-*/build/x86_64-linux-musl/bin/mettle.bin
-	"
-QA_NO_DEPCHECK="${QA_PREBUILT}"
-
-pkg_setup() {
-	if use test; then
-		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
-		su postgres -c "createuser msf_test_user -d -S -R"
-		if [ $? -ne 0 ]; then
-			su postgres -c "dropuser msf_test_user" || die
-			su postgres -c "createuser msf_test_user -d -S -R" || die
-		fi
-		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
-	fi
-	ruby-ng_pkg_setup
-}
-
-all_ruby_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
-#		rm -r msf3
-		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
-		#msf_version=${msf_version#*=}
-	fi
-}
-
-all_ruby_prepare() {
-	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
-	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
-	eapply_user
-
-	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
-#	rm -r data/cpuinfo
-
-	#remove unneeded ruby bundler versioning files
-	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
-	#we regen this file in each_ruby_prepare
-	rm Gemfile.lock
-
-	#The Gemfile contains real known deps
-	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
-	#use released packetfu
-	sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die
-	#use the stable pg
-	#https://github.com/rapid7/metasploit-framework/issues/10234
-	sed -i "s/dependency 'pg', '0.20.0'/dependency 'pg', '0.21.0'/" metasploit-framework.gemspec || die
-	#git gems are only for ruby24 support and we are not there yet
-	sed -i "/git:/d" Gemfile || die
-
-	#now we edit the Gemfile based on use flags
-	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
-	#no support for nessus right now
-	#if ! use nessus; then
-		sed -i -e "/nessus/d" metasploit-framework.gemspec || die
-	#fi
-
-	#no support for aws-sdk right now
-	#if ! use aws; then
-		sed -i -e "/aws-sdk/d" metasploit-framework.gemspec || die
-	#fi
-
-	#this version is old, remove it
-	sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
-	#even if we pass --without=blah bundler still calculates the deps and messes us up
-	if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-	fi
-	if ! use test; then
-		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
-	fi
-	if ! use test && ! use development; then
-		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
-	fi
-	#We don't need simplecov
-	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
-	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
-
-	#we need to edit the gemspec too, since it tries to call git instead of anything sane
-	#probably a better way to fix this... if I care at some point
-	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
-
-	#https://bugs.gentoo.org/show_bug.cgi?id=584522 no tzinfo-data by choice in gentoo
-	sed -i '/tzinfo-data/d' metasploit-framework.gemspec || die
-
-	#fails without faraday in Gemfile.lock
-	#despite activesupport(?) needing it, it doesn't end up there :-(
-	sed -i "/'activesupport'/a \ \ spec.add_runtime_dependency 'faraday'" metasploit-framework.gemspec
-	sed -i "/spec.add_runtime_dependency 'faraday'/d" metasploit-framework.gemspec
-
-	sed -i "s|'hrr_rb_ssh', '0.3.0.pre2'|'hrr_rb_ssh'|" metasploit-framework.gemspec
-
-	#let's bogart msfupdate
-	rm msfupdate
-	echo "#!/bin/sh" > msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"\"" >> msfupdate
-	if [[ ${PV} == "9999" ]] ; then
-		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
-		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
-		echo "else" >> msfupdate
-		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
-		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
-		echo "fi" >> msfupdate
-	else
-		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
-		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
-		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
-	fi
-	#this is set executable in src_install
-
-	#install our database.yml file before tests are run
-	cp "${FILESDIR}"/database.yml config/
-
-}
-
-each_ruby_prepare() {
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-
-	#force all metasploit executables to use desired ruby version
-	#https://dev.metasploit.com/redmine/issues/8357
-	for file in $(ls -1 msf*)
-	do
-		#poorly adapted from python.eclass
-		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
-	done
-}
-
-each_ruby_test() {
-	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
-
-	#we bogart msfupdate so no point in trying to test it
-	rm spec/msfupdate_spec.rb || die
-	#we don't really want to be uploading to virustotal during the tests
-	rm spec/tools/virustotal_spec.rb || die
-
-	# https://dev.metasploit.com/redmine/issues/8425
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
-
-	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
-	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
-}
-
-each_ruby_install() {
-	#Tests have already been run, we don't need this stuff
-	rm -r spec || die
-	rm -r test || die
-	rm Gemfile.lock || die
-
-	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
-	# should be as simple as copying everything into the target...
-	dodir /usr/lib/${PN}${SLOT}
-	cp -R * "${ED}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
-	rm -Rf "${ED}"/usr/lib/${PN}${SLOT}/documentation "${ED}"/usr/lib${PN}${SLOT}/README.md
-	fowners -R root:0 /
-
-}
-
-all_ruby_install() {
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/lib/${PN}${SLOT}/documentation"
-
-	fperms +x /usr/lib/${PN}${SLOT}/msfupdate
-
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/meterpreter"
-		SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/exploits"
-	EOF
-}
-
-pkg_postinst() {
-	elog "Before use you should run 'env-update' and '. /etc/profile'"
-	elog "otherwise you may be missing important environmental variables."
-
-	elog "You need to prepare the database by running:"
-	elog "emerge --config postgresql"
-	elog "/etc/init.d/postgresql-<version> start"
-	elog "emerge --config =metasploit-${PV}"
-
-	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
-
-	einfo
-	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
-}
-
-pkg_config() {
-	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
-	su postgres -c "createuser msf_user -D -S -R"
-	su postgres -c "createdb --owner=msf_user msf_database"
-}
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index af608cdff..07c7ab0c3 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -237,6 +237,7 @@ all_ruby_prepare() {
 }
 
 each_ruby_prepare() {
+	addpredict "$(ruby_fakegem_gemsdir)/bundler.lock"
 	#MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
 	#MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
 
diff --git a/net-analyzer/whatweb/Manifest b/net-analyzer/whatweb/Manifest
index e780e0b85..8cb2e3d75 100644
--- a/net-analyzer/whatweb/Manifest
+++ b/net-analyzer/whatweb/Manifest
@@ -1,2 +1 @@
-DIST whatweb-0.5.4.tar.gz 3639772 BLAKE2B 5be0afab1227c8d846dc12c7b0846af9e57a7827eea5b95be057ed19b5cd86011bfcd00d05a95fe2a08f14fa9ac048f4ae486b76a468d3a67fa2a3e29d8faaa9 SHA512 021a53927c1e9224c722d9aabe44dbae7329748737fcd44c949b5a13675fe3133ffe20800c80cbd923b68d0a3b11808c51e6c9d2726f6d9000c60934103c8de0
 DIST whatweb-0.5.5.tar.gz 3644694 BLAKE2B 264abda3e1eece992576ec57bfd79d0eb376e6503ffdf480a167eb12feb2234401e4b2e5772e7250bcbcfec9c1116a76fba69dddd35ff8d1756bbfbd572c7439 SHA512 0d1afb0eea2dab3a359d9bd80ef9884af780e28e74946dedf70e92066378be26321fd917dd4abb3e91b888b5ef87231ff4db2724daa9275f4332f21b48752b37
diff --git a/net-analyzer/whatweb/whatweb-0.5.4.ebuild b/net-analyzer/whatweb/whatweb-0.5.4.ebuild
deleted file mode 100644
index 337e321fb..000000000
--- a/net-analyzer/whatweb/whatweb-0.5.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-inherit ruby-single
-
-DESCRIPTION="Next generation web scanner, identifies what software websites are running"
-HOMEPAGE="http://www.morningstarsecurity.com/research/whatweb"
-SRC_URI="https://github.com/urbanadventurer/WhatWeb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="json"
-
-DEPEND="dev-ruby/bundler:2"
-RDEPEND="${DEPEND}
-	${RUBY_DEPS}
-	dev-ruby/addressable
-	dev-ruby/ipaddr
-	json? ( dev-ruby/json )"
-
-#future rdepend:
-#dns: em-resolv-replace
-#mongodb: bison bson_ext mongo rchardet
-
-S="${WORKDIR}/WhatWeb-${PV}"
-
-src_prepare() {
-	# fix installation
-	sed -i '/gzip/d' Makefile || die
-#	sed -i 's|plugins-disabled||g' Makefile || die
-	sed -i 's|$(DOCPATH)/$(NAME)|$(DOCPATH)/${PF}|g' Makefile || die
-	sed -i '/bundle install/d' Makefile || die
-	sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
-	sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-
-#	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-#	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-	BUNDLE_GEMFILE=Gemfile ruby -S bundle install --local || die
-	BUNDLE_GEMFILE=Gemfile ruby -S bundle check || die
-
-	eapply_user
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	dodir /usr/share/doc/"${PF}"
-	dodir /usr/bin
-	DESTDIR="${D}" emake install
-
-	dodoc CHANGELOG.md README.md whatweb.xsl
-}
diff --git a/net-analyzer/whatweb/whatweb-0.5.5.ebuild b/net-analyzer/whatweb/whatweb-0.5.5.ebuild
index 337e321fb..6003c8d72 100644
--- a/net-analyzer/whatweb/whatweb-0.5.5.ebuild
+++ b/net-analyzer/whatweb/whatweb-0.5.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
 inherit ruby-single
 
 DESCRIPTION="Next generation web scanner, identifies what software websites are running"
@@ -28,7 +28,7 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/WhatWeb-${PV}"
 
-src_prepare() {
+all_ruby_prepare() {
 	# fix installation
 	sed -i '/gzip/d' Makefile || die
 #	sed -i 's|plugins-disabled||g' Makefile || die
@@ -37,14 +37,17 @@ src_prepare() {
 	sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
 	sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
 
-#	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-#	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-	BUNDLE_GEMFILE=Gemfile ruby -S bundle install --local || die
-	BUNDLE_GEMFILE=Gemfile ruby -S bundle check || die
-
 	eapply_user
 }
 
+each_ruby_prepare() {
+	if [ -f Gemfile ]; then
+		addpredict "$(ruby_fakegem_gemsdir)/bundler.lock"
+		BUNDLE_GEMFILE=Gemfile ruby -S bundle install --local || die
+		BUNDLE_GEMFILE=Gemfile ruby -S bundle check || die
+	fi
+}
+
 src_compile() {
 	einfo "Nothing to compile"
 }
diff --git a/net-analyzer/wpscan/wpscan-3.8.15.ebuild b/net-analyzer/wpscan/wpscan-3.8.15.ebuild
index e08478442..d34bb2294 100644
--- a/net-analyzer/wpscan/wpscan-3.8.15.ebuild
+++ b/net-analyzer/wpscan/wpscan-3.8.15.ebuild
@@ -27,6 +27,7 @@ each_ruby_prepare() {
 #	sed -i "s|'activesupport', '~> 5.1'|'activesupport'|g" wpscan.gemspec
 #	sed -i -e '/activesupport/,/^-/ s:^:#:' ../metadata || die
 	sed -i -e '/s.add_development_dependency/d' wpscan.gemspec
+	addpredict "$(ruby_fakegem_gemsdir)/bundler.lock"
 	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
 	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
 }
diff --git a/net-wireless/blue_hydra/blue_hydra-1.9.15-r2.ebuild b/net-wireless/blue_hydra/blue_hydra-1.9.15-r2.ebuild
index 7e0fc9dbf..c35147b45 100644
--- a/net-wireless/blue_hydra/blue_hydra-1.9.15-r2.ebuild
+++ b/net-wireless/blue_hydra/blue_hydra-1.9.15-r2.ebuild
@@ -71,6 +71,7 @@ all_ruby_prepare() {
 each_ruby_prepare() {
 	if [ -f Gemfile ]
 	then
+		addpredict "$(ruby_fakegem_gemsdir)/bundler.lock"
 		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
 		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
 	fi
diff --git a/net-wireless/blue_hydra/blue_hydra-9999.ebuild b/net-wireless/blue_hydra/blue_hydra-9999.ebuild
index 40a83812d..4572a6858 100644
--- a/net-wireless/blue_hydra/blue_hydra-9999.ebuild
+++ b/net-wireless/blue_hydra/blue_hydra-9999.ebuild
@@ -71,6 +71,7 @@ all_ruby_prepare() {
 each_ruby_prepare() {
 	if [ -f Gemfile ]
 	then
+		addpredict "$(ruby_fakegem_gemsdir)/bundler.lock"
 		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
 		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
 	fi
diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask
index b0473d47b..7129b13ab 100644
--- a/profiles/pentoo/base/package.mask
+++ b/profiles/pentoo/base/package.mask
@@ -153,3 +153,7 @@ dev-python/brotlipy
 dev-lang/lua:0
 =net-dns/dnsmasq-2.83-r1
 =net-dns/dnsmasq-2.84
+
+#https://bugs.gentoo.org/688310#c7
+#stay on old for "bundle install --local" ZC hack
+>dev-ruby/rubygems-3.0.3
diff --git a/www-apps/beef/beef-0.5.0.0-r1.ebuild b/www-apps/beef/beef-0.5.0.0-r1.ebuild
index 1fbd52a56..461d4bfcf 100644
--- a/www-apps/beef/beef-0.5.0.0-r1.ebuild
+++ b/www-apps/beef/beef-0.5.0.0-r1.ebuild
@@ -118,6 +118,7 @@ all_ruby_prepare() {
 }
 
 each_ruby_prepare() {
+	addpredict "$(ruby_fakegem_gemsdir)/bundler.lock"
 	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
 	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
 }
diff --git a/www-apps/rda/rda-2.9.ebuild b/www-apps/rda/rda-2.9.ebuild
index f4f0f1c50..d5c1ef345 100644
--- a/www-apps/rda/rda-2.9.ebuild
+++ b/www-apps/rda/rda-2.9.ebuild
@@ -36,6 +36,7 @@ RDEPEND="mysql? ( virtual/mysql )
 
 each_ruby_prepare() {
 	if [ -f Gemfile ]; then
+		addpredict "$(ruby_fakegem_gemsdir)/bundler.lock"
 		MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
 		MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
 	fi