gentoo resync : 16.04.2022

3 files changed, 12 insertions, 60 deletions

diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index e80e46f15766..ac29d991d254 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,11 +1,9 @@
 DIST cucumber-rails-1.8.0.gem 43008 BLAKE2B ac2fbc89ea952add031429b281986de37b3a8511e398b34d49435c70221b3c454589c51acd5b1fcecdf0285a8e446d4c2c0e0a77216eb78f8fa222086fb6db36 SHA512 757f50719309418353cf1e6b42902ce6166806d2e2a9cd1a27842ffde3d8ce61af97de12f4ffa9e31a50693cc8c40ece9a74e5ec91973096e77860b56034d439
-DIST cucumber-rails-2.2.0.gem 136704 BLAKE2B 660037bb5938ad01aa0b1188e5e48522f9932662d6578f1c0a107cdacbd5cf8527e48b6ddb2c91d975577a71db0259a7250d762004ef0a49ebc063f45103aab0 SHA512 ca8a0ce9c9cdb1306b6a5f8e3d9ba68a2beb3d0a35a58fd6c51ba3ce76e2104045b2768054d27bb4bfcd437534aeb6d39fa2be87396f3a4084c0044201e96252
-DIST cucumber-rails-2.3.0.tar.gz 39492 BLAKE2B 73c45db7b3b445804b29814fa7add1ee5d66ea75bf3bd7b19456cef38340adc37f6129911a49d7e9996bf20299e31511e51758e18d9f8ffdb53fa9ea320aad42 SHA512 fee78784bd21084271c611073bce8b399783a2ce1900bf12a27cd8b70edbedc525b501d5d71856ad42f19174664d95d97bd4adf75b1791af60bc237a9f16e00d
 DIST cucumber-rails-2.4.0.tar.gz 41130 BLAKE2B abe10f72aad684691f863a7aeb952a7e45c945d22e1998dbd860ff47808c253607d6502fdb9dbcb1d573a0e3d615859ab56b9e34eabc5de33ff3c47483f8314d SHA512 b57134227e807da4f64d5d8d1435e597f28adab27f2f4d7148b8e997cedf721916dfa73de5a226953827053db2dbc3f3300a88f71d72327514585ae9fada9e0c
 DIST cucumber-rails-2.5.0.tar.gz 42030 BLAKE2B 96279b72c597bcb40eebb2270ee996c08fd599f257b91beea50f84cb0cf221258bb5fec4f91ce6a2400d865763072bdd47c1b4c4a03b35b5e35e6384ab3f31fa SHA512 cb689beac565d0b193ebcfb0ce4d673cad2d50fe8db5718fda6779d08d5458e2234ccb5a1ff13eaf22b3048c9a10b4dd6148cfdedf841dd0b41366059acb0b67
+DIST cucumber-rails-2.5.1.tar.gz 42456 BLAKE2B 91448ce88fdfed2e219a6c46b7915deeccb5678ceaaf57db06fc1348facff756b0c1dd67f6d8bcbc1b36ba555ca2d31167fa20c8b5f48138c018ef5d2f65bafc SHA512 2bb1748d9710998f974fc253ae03595d8e972593423d027840d2b437a0f13a60ec0df3cc2fb7d6e30c0003d414d093e4fd3c398e0fa27441ccb431f308f89405
 EBUILD cucumber-rails-1.8.0.ebuild 1162 BLAKE2B e331bb87a4aae973e0f25ce575ac117512d52287509bb63c0e2e9a8ecf89d019ae78c2545ceb9a0ba0926ed81ae06ac200442ba04dda4990436f6bf984e552a2 SHA512 b4b3d19e60f972ade1730d87982121eb7fd3ef0514a7242f1a6909faa87ef7f24528c06ba798b4b73e9c1f875f2af0d0791d38b3f457d54f8321d78a248afaa6
-EBUILD cucumber-rails-2.2.0.ebuild 1174 BLAKE2B 2f2d04492f77ee142583095bddb987dd72213f34429908e0a240308b4178db57df3b5116b85ee68844c755cd09f820a3cd2fecc45cd9027d4d24c4b3bc49c166 SHA512 c3d5a3e0407ee0122d0e44667f9fb9dc14fb47cdcd25615b86a0c8685715cb1e3dc0d0c2428637bdfbb82fa70ba54ea85773dee789ba337dad9c9f14940a4798
-EBUILD cucumber-rails-2.3.0.ebuild 1284 BLAKE2B 221dad655a92b65bcf3d6dfcdd31454ee1b0e0b8b2a41161bcda2cc4df520ff1dd5810493453020b4b93a23cf885123c329fdf622f803a8a27c5782ab67f7b58 SHA512 7a89333dde47f099520adaf4397032b954b7d6215d65fcf44851e724ca910794cd44cf7296dabbdb7d3fb75190d5e287e2dcba1ac87e206176611502d3723ea1
 EBUILD cucumber-rails-2.4.0.ebuild 1302 BLAKE2B 76f406cdf9b9dfa5986e2241b46bfa434b2a29fde25431c3b158b994a92de7cfddffe45daa024d7b2ad768f4966f50ac3dc0578bdad2ff571e43ddcebfb2d69c SHA512 924ed76623a44c61cca3d9fb29298f9a050dc47b6474b5821db3eb8a0f12b9dc073103dbab5b9bfa8b7997e8617e3d9761036e5159906743fce96a380ed7fe67
 EBUILD cucumber-rails-2.5.0-r1.ebuild 1300 BLAKE2B 69ccd976c5906d56de8bbe3965354a7cd03d5d7764659c9a20918856773f9174b9db4d3963ab5dcde657efc5901e54595feea2e96be851086e8d1762f6a003ab SHA512 507aea58a6a2bf74018755a683dd2bc02bc505500ab9cbdfcbfdcbc57f13548deaa77d882ce48038a712e9fb0be82fe4b6a162ed5e010cd8aeaa4ac6eb7bc4cd
+EBUILD cucumber-rails-2.5.1.ebuild 1307 BLAKE2B dfdd93177aca8772a7627c5843bae145c9c81edad359bfbbe99a7d31cdc433f6e2c16eea7cfa82ad805378c41b62191f2a0f61e06488c6e8c38bee5c5c87fb82 SHA512 b3a55f93a54b7fc1e7f899eac7039a88c70930d820b3f0a894368bfd7fb35668ed746eb32d0fbcd7269893387be669e51f8e73af0eca8d3a3b4e0a23fe96fcff
 MISC metadata.xml 300 BLAKE2B a639d71f26516f07d45281d1036eed4e67653b41ad4644ebee63601681a288f8de93effc46f684df4d152eb2914abfaeb745045b075127d36c1bcc6bdc67d1c7 SHA512 27af0d39315115a4483da0c3d2d84ee4c7fba5891ef61ba06c776b86bf068c4a60e3766fc8c1c522402480543919434910decee43b3847bbdcce556cd91f8473
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.2.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.2.0.ebuild
deleted file mode 100644
index 26409e65e60c..000000000000
--- a/dev-util/cucumber-rails/cucumber-rails-2.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# There are also cucumber features. They require a Rails project with
-# factory girl which we don't have packaged yet.
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-# Restrict tests since Appraisal is now mandatory to manage different
-# rails versions, even for the specs.
-RESTRICT="test"
-#ruby_add_bdepend "
-#	test? (
-#		>=dev-ruby/ammeter-0.2.2
-#		>=dev-ruby/rspec-rails-2.7.0:2
-#	)"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-3.0.2 <dev-util/cucumber-6
-	>=dev-ruby/nokogiri-1.8
-	>=dev-ruby/capybara-2.18:* <dev-ruby/capybara-4:*
-	>=dev-ruby/rails-5.0:* <dev-ruby/rails-7:*
-	>=dev-ruby/mime-types-3.2:3
-"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.3.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.5.1.ebuild
index d770fc2499c3..6bd4d98c8b7e 100644
--- a/dev-util/cucumber-rails/cucumber-rails-2.3.0.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-2.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-USE_RUBY="ruby26 ruby27"
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
 
 # There are also cucumber features. They require a Rails project with
 # factory girl which we don't have packaged yet.
@@ -36,14 +36,16 @@ RESTRICT="test"
 
 ruby_add_rdepend "
 	>=dev-ruby/capybara-2.18:* <dev-ruby/capybara-4:*
-	>=dev-util/cucumber-3.0.2 <dev-util/cucumber-7
-	>=dev-ruby/mime-types-3.2:3
-	>=dev-ruby/nokogiri-1.8
-	>=dev-ruby/rails-5.0:* <dev-ruby/rails-7:*
+	>=dev-util/cucumber-3.2 <dev-util/cucumber-8
+	>=dev-ruby/mime-types-3.3:3
+	>=dev-ruby/nokogiri-1.10
+	>=dev-ruby/rails-5.0:* <dev-ruby/rails-8:*
+	dev-ruby/rexml:3
+	>=dev-ruby/webrick-1.7:0
 "
 
 all_ruby_prepare() {
 	rm Gemfile || die
 	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/files/ s:^:#:' -e '/cucumber/ s/< 6/< 7/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e 's/2.4.0/2.5.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
 }