Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2025-12-06 08:25:01 +01:00
Code Issues Projects Releases Wiki Activity

deal with bundler update

Browse source 
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
This commit is contained in:
Rick Farina (Zero_Chaos) 2020-09-23 10:44:37 -04:00
parent 242312e974
commit aee521a34c
No known key found for this signature in database
GPG key ID: A29433C0AA431DDC
13 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app-text/cewl/cewl-9999.ebuild
View file

@ -23,7 +23,7 @@ SLOT="0"
IUSE="" IUSE=""
MY_P="CeWL-${PV}" MY_P="CeWL-${PV}"
ruby_add_bdepend "dev-ruby/bundler" ruby_add_bdepend "dev-ruby/bundler:2"
ruby_add_rdepend "dev-ruby/nokogiri ruby_add_rdepend "dev-ruby/nokogiri
dev-ruby/spider dev-ruby/spider

2
dev-ruby/metasploit-model/metasploit-model-3.0.0-r1.ebuild
View file

@ -26,7 +26,7 @@ RDEPEND="${RDEPEND} !dev-ruby/metasploit-model:0"
ruby_add_rdepend ">=dev-ruby/railties-5.2.2:5.2 ruby_add_rdepend ">=dev-ruby/railties-5.2.2:5.2
>=dev-ruby/activesupport-5.2.2:5.2 >=dev-ruby/activesupport-5.2.2:5.2
>=dev-ruby/activemodel-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() { all_ruby_prepare() {
[ -f Gemfile.lock ] && rm Gemfile.lock [ -f Gemfile.lock ] && rm Gemfile.lock

2
dev-ruby/metasploit_data_models/metasploit_data_models-4.0.2.ebuild
View file

@ -32,7 +32,7 @@ ruby_add_rdepend "
>=dev-ruby/railties-5.2.2:5.2 >=dev-ruby/railties-5.2.2:5.2
>=dev-ruby/recog-2.0.0:*" >=dev-ruby/recog-2.0.0:*"
ruby_add_bdepend "dev-ruby/bundler" ruby_add_bdepend "dev-ruby/bundler:2"
all_ruby_prepare() { all_ruby_prepare() {
[ -f Gemfile.lock ] && rm Gemfile.lock [ -f Gemfile.lock ] && rm Gemfile.lock

2
net-analyzer/metasploit/metasploit-6.0.6-r1.ebuild
View file

@ -33,7 +33,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
dev-ruby/bcrypt_pbkdf dev-ruby/bcrypt_pbkdf
dev-ruby/bit-struct dev-ruby/bit-struct
dev-ruby/bson dev-ruby/bson
dev-ruby/bundler:* dev-ruby/bundler:2
dev-ruby/concurrent-ruby dev-ruby/concurrent-ruby
dev-ruby/dnsruby dev-ruby/dnsruby
dev-ruby/ed25519 dev-ruby/ed25519

2
net-analyzer/metasploit/metasploit-9999.ebuild
View file

@ -33,7 +33,7 @@ IUSE="development +java nexpose oracle +pcap test"
RESTRICT="test" RESTRICT="test"
RUBY_COMMON_DEPEND=" RUBY_COMMON_DEPEND="
dev-ruby/bundler:* dev-ruby/bundler:2
dev-ruby/bundler-audit dev-ruby/bundler-audit
" "
ruby_add_bdepend "${RUBY_COMMON_DEPEND}" ruby_add_bdepend "${RUBY_COMMON_DEPEND}"

2
net-analyzer/whatweb/whatweb-0.5.1-r1.ebuild
View file

@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86" KEYWORDS="~amd64 ~x86"
IUSE="json" IUSE="json"
DEPEND="dev-ruby/bundler" DEPEND="dev-ruby/bundler:2"
RDEPEND="${DEPEND} RDEPEND="${DEPEND}
${RUBY_DEPS} ${RUBY_DEPS}
dev-ruby/addressable dev-ruby/addressable

2
net-analyzer/whatweb/whatweb-0.5.2.ebuild
View file

@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86" KEYWORDS="~amd64 ~x86"
IUSE="json" IUSE="json"
DEPEND="dev-ruby/bundler" DEPEND="dev-ruby/bundler:2"
RDEPEND="${DEPEND} RDEPEND="${DEPEND}
${RUBY_DEPS} ${RUBY_DEPS}
dev-ruby/addressable dev-ruby/addressable

2
net-analyzer/wpscan/wpscan-3.8.7.ebuild
View file

@ -17,7 +17,7 @@ KEYWORDS="~amd64"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
ruby_add_bdepend "dev-ruby/bundler" ruby_add_bdepend "dev-ruby/bundler:2"
ruby_add_rdepend " ruby_add_rdepend "
=dev-ruby/cms_scanner-0.12* =dev-ruby/cms_scanner-0.12*
" "

2
net-wireless/blue_hydra/blue_hydra-1.9.15-r1.ebuild
View file

@ -33,7 +33,7 @@ PDEPEND="dev-python/dbus-python
ubertooth? ( net-wireless/ubertooth )" ubertooth? ( net-wireless/ubertooth )"
test_deps="dev-ruby/rake dev-ruby/rspec:2" 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} )" test? ( ${test_deps} )"
ruby_add_rdepend "dev-ruby/dm-migrations ruby_add_rdepend "dev-ruby/dm-migrations
dev-ruby/dm-sqlite-adapter dev-ruby/dm-sqlite-adapter

2
net-wireless/blue_hydra/blue_hydra-9999.ebuild
View file

@ -34,7 +34,7 @@ PDEPEND="dev-python/dbus-python
ubertooth? ( net-wireless/ubertooth )" ubertooth? ( net-wireless/ubertooth )"
test_deps="dev-ruby/rake dev-ruby/rspec:2" 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} )" test? ( ${test_deps} )"
ruby_add_rdepend "dev-ruby/dm-migrations ruby_add_rdepend "dev-ruby/dm-migrations
dev-ruby/dm-sqlite-adapter dev-ruby/dm-sqlite-adapter

3
profiles/pentoo/base/package.mask
View file

@ -119,6 +119,3 @@ dev-java/sun-jdk
#There is also libxcrypt[compat] mode in newer versions, however the required functions #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 #are no longer provided. Masked until somebody would figure out how to by pass that
>sys-libs/libxcrypt-2.4 >sys-libs/libxcrypt-2.4
#causes update failures, remove 2020-10-21
dev-ruby/bundler:2

5
scripts/pentoo-updater.sh
View file

@ -434,6 +434,11 @@ main_checks() {
printf "Removing pre-split numpy\n" printf "Removing pre-split numpy\n"
emerge -C "<dev-python/numpy-1.17" emerge -C "<dev-python/numpy-1.17"
fi fi
removeme8=$(portageq match / '<dev-ruby/bundler-1.17.3-r1')
if [ -n "${removeme8}" ]; then
printf "Removing conflicting bundler\n"
emerge -C "<dev-ruby/bundler-1.17.3-r1"
fi
#before main upgrades, let's set a good java-vm #before main upgrades, let's set a good java-vm
set_java set_java

5
www-apps/beef/beef-0.5.0.0.ebuild
View file

@ -21,9 +21,6 @@ LICENSE="AGPL-3"
IUSE="qrcode dns geoip notifications +msf +sqlite" IUSE="qrcode dns geoip notifications +msf +sqlite"
#we use bundler in the ebuild, it must be installed first but it's not an rdepend
#ruby_add_bdepend "dev-ruby/bundler"
#ruby_add_rdepend " #ruby_add_rdepend "
#curl git build-essential openssl libreadline6-dev zlib1g zlib1g-dev libssl-dev #curl git build-essential openssl libreadline6-dev zlib1g zlib1g-dev libssl-dev
@ -59,7 +56,7 @@ RDEPEND="${RUBY_DEPS}
dev-ruby/xmlrpc )" dev-ruby/xmlrpc )"
BDEPEND="${RDEPEND} BDEPEND="${RDEPEND}
dev-ruby/bundler" dev-ruby/bundler:2"
#gem 'term-ansicolor', :require => 'term/ansicolor' #gem 'term-ansicolor', :require => 'term/ansicolor'