From aee521a34cf2879eb3df2a3c8520ae7117f882d9 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 23 Sep 2020 10:44:37 -0400 Subject: [PATCH] deal with bundler update gentoo updated bundler 1.17.3-r1 and no longer wraps the bundler bin, now it's only shipped with 2.1.4 so we need 2.1.4 or we can't call bundler --- app-text/cewl/cewl-9999.ebuild | 2 +- dev-ruby/metasploit-model/metasploit-model-3.0.0-r1.ebuild | 2 +- .../metasploit_data_models-4.0.2.ebuild | 2 +- net-analyzer/metasploit/metasploit-6.0.6-r1.ebuild | 2 +- net-analyzer/metasploit/metasploit-9999.ebuild | 2 +- net-analyzer/whatweb/whatweb-0.5.1-r1.ebuild | 2 +- net-analyzer/whatweb/whatweb-0.5.2.ebuild | 2 +- net-analyzer/wpscan/wpscan-3.8.7.ebuild | 2 +- net-wireless/blue_hydra/blue_hydra-1.9.15-r1.ebuild | 2 +- net-wireless/blue_hydra/blue_hydra-9999.ebuild | 2 +- profiles/pentoo/base/package.mask | 3 --- scripts/pentoo-updater.sh | 5 +++++ www-apps/beef/beef-0.5.0.0.ebuild | 5 +---- 13 files changed, 16 insertions(+), 17 deletions(-) diff --git a/app-text/cewl/cewl-9999.ebuild b/app-text/cewl/cewl-9999.ebuild index d86e97e0a..3cebb3db0 100644 --- a/app-text/cewl/cewl-9999.ebuild +++ b/app-text/cewl/cewl-9999.ebuild @@ -23,7 +23,7 @@ SLOT="0" IUSE="" MY_P="CeWL-${PV}" -ruby_add_bdepend "dev-ruby/bundler" +ruby_add_bdepend "dev-ruby/bundler:2" ruby_add_rdepend "dev-ruby/nokogiri dev-ruby/spider diff --git a/dev-ruby/metasploit-model/metasploit-model-3.0.0-r1.ebuild b/dev-ruby/metasploit-model/metasploit-model-3.0.0-r1.ebuild index f77282356..9d79e7503 100644 --- a/dev-ruby/metasploit-model/metasploit-model-3.0.0-r1.ebuild +++ b/dev-ruby/metasploit-model/metasploit-model-3.0.0-r1.ebuild @@ -26,7 +26,7 @@ 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" +ruby_add_bdepend "dev-ruby/bundler:2" all_ruby_prepare() { [ -f Gemfile.lock ] && rm Gemfile.lock diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-4.0.2.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-4.0.2.ebuild index 05e7d1ebe..c65d3759f 100644 --- a/dev-ruby/metasploit_data_models/metasploit_data_models-4.0.2.ebuild +++ b/dev-ruby/metasploit_data_models/metasploit_data_models-4.0.2.ebuild @@ -32,7 +32,7 @@ ruby_add_rdepend " >=dev-ruby/railties-5.2.2:5.2 >=dev-ruby/recog-2.0.0:*" -ruby_add_bdepend "dev-ruby/bundler" +ruby_add_bdepend "dev-ruby/bundler:2" all_ruby_prepare() { [ -f Gemfile.lock ] && rm Gemfile.lock diff --git a/net-analyzer/metasploit/metasploit-6.0.6-r1.ebuild b/net-analyzer/metasploit/metasploit-6.0.6-r1.ebuild index 93b79c01b..56f46ae31 100644 --- a/net-analyzer/metasploit/metasploit-6.0.6-r1.ebuild +++ b/net-analyzer/metasploit/metasploit-6.0.6-r1.ebuild @@ -33,7 +33,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl dev-ruby/bcrypt_pbkdf dev-ruby/bit-struct dev-ruby/bson - dev-ruby/bundler:* + dev-ruby/bundler:2 dev-ruby/concurrent-ruby dev-ruby/dnsruby dev-ruby/ed25519 diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild index 8552b28fb..af608cdff 100644 --- a/net-analyzer/metasploit/metasploit-9999.ebuild +++ b/net-analyzer/metasploit/metasploit-9999.ebuild @@ -33,7 +33,7 @@ IUSE="development +java nexpose oracle +pcap test" RESTRICT="test" RUBY_COMMON_DEPEND=" - dev-ruby/bundler:* + dev-ruby/bundler:2 dev-ruby/bundler-audit " ruby_add_bdepend "${RUBY_COMMON_DEPEND}" diff --git a/net-analyzer/whatweb/whatweb-0.5.1-r1.ebuild b/net-analyzer/whatweb/whatweb-0.5.1-r1.ebuild index 82bdcb4c2..f531041f0 100644 --- a/net-analyzer/whatweb/whatweb-0.5.1-r1.ebuild +++ b/net-analyzer/whatweb/whatweb-0.5.1-r1.ebuild @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="json" -DEPEND="dev-ruby/bundler" +DEPEND="dev-ruby/bundler:2" RDEPEND="${DEPEND} ${RUBY_DEPS} dev-ruby/addressable diff --git a/net-analyzer/whatweb/whatweb-0.5.2.ebuild b/net-analyzer/whatweb/whatweb-0.5.2.ebuild index 82bdcb4c2..f531041f0 100644 --- a/net-analyzer/whatweb/whatweb-0.5.2.ebuild +++ b/net-analyzer/whatweb/whatweb-0.5.2.ebuild @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="json" -DEPEND="dev-ruby/bundler" +DEPEND="dev-ruby/bundler:2" RDEPEND="${DEPEND} ${RUBY_DEPS} dev-ruby/addressable diff --git a/net-analyzer/wpscan/wpscan-3.8.7.ebuild b/net-analyzer/wpscan/wpscan-3.8.7.ebuild index 983db99d1..303105357 100644 --- a/net-analyzer/wpscan/wpscan-3.8.7.ebuild +++ b/net-analyzer/wpscan/wpscan-3.8.7.ebuild @@ -17,7 +17,7 @@ KEYWORDS="~amd64" LICENSE="GPL-2" SLOT="0" -ruby_add_bdepend "dev-ruby/bundler" +ruby_add_bdepend "dev-ruby/bundler:2" ruby_add_rdepend " =dev-ruby/cms_scanner-0.12* " diff --git a/net-wireless/blue_hydra/blue_hydra-1.9.15-r1.ebuild b/net-wireless/blue_hydra/blue_hydra-1.9.15-r1.ebuild index 9bb8b7b5e..7e0fc9dbf 100644 --- a/net-wireless/blue_hydra/blue_hydra-1.9.15-r1.ebuild +++ b/net-wireless/blue_hydra/blue_hydra-1.9.15-r1.ebuild @@ -33,7 +33,7 @@ PDEPEND="dev-python/dbus-python ubertooth? ( net-wireless/ubertooth )" test_deps="dev-ruby/rake dev-ruby/rspec:2" -ruby_add_bdepend "dev-ruby/bundler +ruby_add_bdepend "dev-ruby/bundler:2 test? ( ${test_deps} )" ruby_add_rdepend "dev-ruby/dm-migrations dev-ruby/dm-sqlite-adapter diff --git a/net-wireless/blue_hydra/blue_hydra-9999.ebuild b/net-wireless/blue_hydra/blue_hydra-9999.ebuild index 7dddf8476..40a83812d 100644 --- a/net-wireless/blue_hydra/blue_hydra-9999.ebuild +++ b/net-wireless/blue_hydra/blue_hydra-9999.ebuild @@ -34,7 +34,7 @@ PDEPEND="dev-python/dbus-python ubertooth? ( net-wireless/ubertooth )" test_deps="dev-ruby/rake dev-ruby/rspec:2" -ruby_add_bdepend "dev-ruby/bundler +ruby_add_bdepend "dev-ruby/bundler:2 test? ( ${test_deps} )" ruby_add_rdepend "dev-ruby/dm-migrations dev-ruby/dm-sqlite-adapter diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask index bc9a3265a..4a14def9a 100644 --- a/profiles/pentoo/base/package.mask +++ b/profiles/pentoo/base/package.mask @@ -119,6 +119,3 @@ dev-java/sun-jdk #There is also libxcrypt[compat] mode in newer versions, however the required functions #are no longer provided. Masked until somebody would figure out how to by pass that >sys-libs/libxcrypt-2.4 - -#causes update failures, remove 2020-10-21 -dev-ruby/bundler:2 diff --git a/scripts/pentoo-updater.sh b/scripts/pentoo-updater.sh index f9c00886a..421966c82 100755 --- a/scripts/pentoo-updater.sh +++ b/scripts/pentoo-updater.sh @@ -434,6 +434,11 @@ main_checks() { printf "Removing pre-split numpy\n" emerge -C " 'term/ansicolor'