diff --git a/app-text/cewl/cewl-9999.ebuild b/app-text/cewl/cewl-9999.ebuild
index 5728b8b5b..ec33110cc 100644
--- a/app-text/cewl/cewl-9999.ebuild
+++ b/app-text/cewl/cewl-9999.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
 inherit ruby-ng
 
 DESCRIPTION="A custom word list generator"
 HOMEPAGE="http://www.digininja.org/projects/cewl.php"
 if [ "${PV}" = "9999" ]; then
 	inherit git-r3
-	KEYWORDS=""
 	EGIT_REPO_URI="https://github.com/digininja/CeWL.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/all/CeWL-${PV}"
 else
@@ -32,9 +31,11 @@ ruby_add_rdepend "dev-ruby/nokogiri
 		dev-ruby/mime-types:*"
 
 all_ruby_prepare() {
-	sed -i "s|require './cewl_lib'|require 'cewl_lib'|g" ${MY_P}/cewl.rb
-	sed -i "s|require_relative 'cewl_lib'|require 'cewl_lib'|g" ${MY_P}/cewl.rb
-	sed -i "s|require 'mime'|require 'mime/types'|g" ${MY_P}/cewl_lib.rb
+	sed -i "s|require './cewl_lib'|require 'cewl_lib'|g" ${MY_P}/cewl.rb || die
+	sed -i "s|require_relative 'cewl_lib'|require 'cewl_lib'|g" ${MY_P}/cewl.rb || die
+	sed -i "s|require 'mime'|require 'mime/types'|g" ${MY_P}/cewl_lib.rb || die
+	#sed -i 's|zip|rubyzip|g' ${MY_P}/Gemfile
+	rm -f ${MY_P}/Gemfile.lock
 }
 
 each_ruby_install() {
@@ -47,9 +48,8 @@ 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
+	#https://github.com/digininja/CeWL/issues/73
+	true
+	#GEM_HOME="${T}" BUNDLE_GEMFILE=${MY_P}/Gemfile ${RUBY} -S bundle install --local || die
+	#GEM_HOME="${T}" BUNDLE_GEMFILE=${MY_P}/Gemfile ${RUBY} -S bundle check || die
 }
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 6a7c19cd7..bfcd05f93 100644
--- a/dev-ruby/metasploit-model/metasploit-model-3.1.3.ebuild
+++ b/dev-ruby/metasploit-model/metasploit-model-3.1.3.ebuild
@@ -45,8 +45,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
+		GEM_HOME="${T}" BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+		GEM_HOME="${T}" BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
 	fi
 }
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 b6961fd30..17de30c07 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,9 +54,8 @@ 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
+		GEM_HOME="${T}" BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+		GEM_HOME="${T}" BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
 	fi
 }
 
diff --git a/net-analyzer/metasploit/metasploit-6.0.23.ebuild b/net-analyzer/metasploit/metasploit-6.0.23.ebuild
index bec8bcac7..7273ed43a 100644
--- a/net-analyzer/metasploit/metasploit-6.0.23.ebuild
+++ b/net-analyzer/metasploit/metasploit-6.0.23.ebuild
@@ -328,8 +328,8 @@ all_ruby_prepare() {
 }
 
 each_ruby_prepare() {
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+	GEM_HOME="${T}" MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+	GEM_HOME="${T}" 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
@@ -349,10 +349,10 @@ each_ruby_test() {
 	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
+	GEM_HOME="${T}" BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
+	GEM_HOME="${T}" 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
+	GEM_HOME="${T}" 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"
 }
 
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 07c7ab0c3..7ab782cd7 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -195,10 +195,10 @@ src_unpack() {
 	fix_gemspec
 	pushd "${S}/all" > /dev/null || die
 	${USE_RUBY} -S bundle-audit --update || true
-	#MSF_ROOT="." ${USE_RUBY} -S bundle outdated --local || true
-	#MSF_ROOT="." ${USE_RUBY} -S bundle update || true
-	#MSF_ROOT="." ${USE_RUBY} -S bundle install ${makeopts_jobs} --deployment || die
-	MSF_ROOT="." ${USE_RUBY} -S bundle install ${makeopts_jobs} --path vendor || die
+	#GEM_HOME="${T}" MSF_ROOT="." ${USE_RUBY} -S bundle outdated --local || true
+	#GEM_HOME="${T}" MSF_ROOT="." ${USE_RUBY} -S bundle update || true
+	#GEM_HOME="${T}" MSF_ROOT="." ${USE_RUBY} -S bundle install ${makeopts_jobs} --deployment || die
+	GEM_HOME="${T}" MSF_ROOT="." ${USE_RUBY} -S bundle install ${makeopts_jobs} --path vendor || die
 	popd > /dev/null || die
 }
 
@@ -237,9 +237,8 @@ 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
+	#GEM_HOME="${T}" MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+	#GEM_HOME="${T}" 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
@@ -259,10 +258,10 @@ each_ruby_test() {
 	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
+	GEM_HOME="${T}" BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
+	GEM_HOME="${T}" 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
+	GEM_HOME="${T}" 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"
 }
 
diff --git a/net-analyzer/whatweb/whatweb-0.5.5.ebuild b/net-analyzer/whatweb/whatweb-0.5.5.ebuild
index c996095d7..d31935e03 100644
--- a/net-analyzer/whatweb/whatweb-0.5.5.ebuild
+++ b/net-analyzer/whatweb/whatweb-0.5.5.ebuild
@@ -38,8 +38,8 @@ src_prepare() {
 	sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
 
 	if [ -f Gemfile ]; then
-		BUNDLE_GEMFILE=Gemfile ruby -S bundle install --local || die
-		BUNDLE_GEMFILE=Gemfile ruby -S bundle check || die
+		GEM_HOME="${T}" BUNDLE_GEMFILE=Gemfile ruby -S bundle install --local || die
+		GEM_HOME="${T}" BUNDLE_GEMFILE=Gemfile ruby -S bundle check || die
 	fi
 
 	eapply_user
diff --git a/net-analyzer/wpscan/wpscan-3.8.15.ebuild b/net-analyzer/wpscan/wpscan-3.8.15.ebuild
index d34bb2294..7e93a2875 100644
--- a/net-analyzer/wpscan/wpscan-3.8.15.ebuild
+++ b/net-analyzer/wpscan/wpscan-3.8.15.ebuild
@@ -26,8 +26,7 @@ each_ruby_prepare() {
 #https://github.com/wpscanteam/wpscan/issues/1266
 #	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
+	sed -i -e '/s.add_development_dependency/d' wpscan.gemspec || die
+	GEM_HOME="${T}" BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+	GEM_HOME="${T}" 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..24525aab0 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,8 +71,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
+		GEM_HOME="${T}" BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+		GEM_HOME="${T}" 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..cac2265c8 100644
--- a/net-wireless/blue_hydra/blue_hydra-9999.ebuild
+++ b/net-wireless/blue_hydra/blue_hydra-9999.ebuild
@@ -71,8 +71,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
+		GEM_HOME="${T}" BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+		GEM_HOME="${T}" BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
 	fi
 }
 
diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask
index 7129b13ab..b0473d47b 100644
--- a/profiles/pentoo/base/package.mask
+++ b/profiles/pentoo/base/package.mask
@@ -153,7 +153,3 @@ 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/rda/rda-2.9.ebuild b/www-apps/rda/rda-2.9.ebuild
index d5c1ef345..deaa77e38 100644
--- a/www-apps/rda/rda-2.9.ebuild
+++ b/www-apps/rda/rda-2.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 inherit ruby-single
 
@@ -33,11 +33,3 @@ RDEPEND="mysql? ( virtual/mysql )
 	dev-ruby/rack-cors
 	dev-ruby/grape-active_model_serializers
 	"
-
-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
-}