gentoo auto-resync : 11:10:2022 - 07:37:54

6 files changed, 63 insertions, 43 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index a224e0b898cc..a1b2bf358b18 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/activemodel-serializers-xml/Manifest b/dev-ruby/activemodel-serializers-xml/Manifest
index 4769d028c41f..f6d7d194c876 100644
--- a/dev-ruby/activemodel-serializers-xml/Manifest
+++ b/dev-ruby/activemodel-serializers-xml/Manifest
@@ -1,4 +1,3 @@
 DIST activemodel-serializers-xml-1.0.2.tgz 23321 BLAKE2B ad626402acbf3a10a9b14a19713b3855e7eab69cd02ceb63386cb11b147c4c9dbc68dd849b9421b518bc70be29009f54f5effbe734e9c8bb1c59a7d2c3286ac7 SHA512 888db4822f9ed4fd17ba93f2e03e4edc204bc14f62e3622949140a3497f56ad7cd7d49cd7f38fbf557098ceed9f2f1334093fd8493ccc82e56be15f6bf138af9
-EBUILD activemodel-serializers-xml-1.0.2-r1.ebuild 980 BLAKE2B 6dca15e488973e7b5ca94a4c9b69895e68ce9a11b256c88e7680f70c8fa3093973461575994e766dc3452360202beb5bc4b3820bf529506ad54cdc740de80869 SHA512 cdcf0667a0a92909e0334de2568e7aa06bbfba4e1294024350ab1d0113e66a8dd441889a574674058c527aaa18fce13e7927ed3f4acac8beb5bc608f4275cf62
-EBUILD activemodel-serializers-xml-1.0.2-r2.ebuild 949 BLAKE2B cae23a9806a905f289116fb505a133bcad61b43649185913fdd0147d985b5d19bae02cd4b6ea7cc5ca0358fdcec5dcb7e139fb06f32e1dc3863167288a7d9bdb SHA512 228fab2b3eb9e46f40918fcbcea6ad8a4416c6682ccdb5f10122e8f45ce870aa1ef12b89c17db4aa0fdb87dd8861ecbd60e44ca3cdc8542cdf2ff3963ef7cd12
+EBUILD activemodel-serializers-xml-1.0.2-r2.ebuild 996 BLAKE2B 4a1df763f216727b31c3bbe3832f77524e5a76ef8895c4fed3e0fcad2b8704bb73b7d209d249d42666a1f7496b636f5072d0c7197164b24863a462a6808ec877 SHA512 f3b0fec88bbc840d3353cf2ea95d7c6bbfafeb7f43b17bbf68a5a980dc562e607829bd90e998a39dd4d4bf7f49d5e535d5957fe7eefd459d7737901b19c92095
 MISC metadata.xml 360 BLAKE2B 297e031f595787aa3e1881463ba94dc84125679e31978b1efe65326496d054a90e57690cd31a6eb8c3ee802181b7513313efa16761eb2d231c9f7fe32ad13f5b SHA512 4476505bb1cbf900b4d3cfcac3413adfdba24bf4fd6e2b41962dc8fa53a514f96bf3f45ea67b235ece30c5501301fbd178b12354ce44c22efa5dd11072698a7f
diff --git a/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r1.ebuild b/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r1.ebuild
deleted file mode 100644
index dd52b160933d..000000000000
--- a/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,41 +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"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="XML serialization for your Active Model objects and Active Record models"
-HOMEPAGE="https://github.com/rails/activemodel-serializers-xml"
-SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-5:*
-	>=dev-ruby/activemodel-5:*
-	=dev-ruby/builder-3*:* >=dev-ruby/builder-3.1:*
-"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activerecord-5:*
-	dev-ruby/sqlite3
-)"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/datetime.*created_at/ s:^:#:' test/helper.rb || die
-}
diff --git a/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r2.ebuild b/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r2.ebuild
index 53a0293daf5d..80af092539bb 100644
--- a/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r2.ebuild
+++ b/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r2.ebuild
@@ -37,4 +37,6 @@ all_ruby_prepare() {
 	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	sed -i -e '/datetime.*created_at/ s:^:#:' test/helper.rb || die
+
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
 }
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index 399b12fc0a4b..c8ab73b24127 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,7 +1,9 @@
 DIST rspec-rails-4.1.2.tar.gz 156296 BLAKE2B ca454065c8fb318148e745162514b9f21aaf6050ae72981d12a23b838bc7d985350c8abd60a36c07cb5c8c8bd80dd7b97b0dcb9ab6f5fb30ec4a6d99aaf189d4 SHA512 c0555d3b0d1ea91c9460981216cb0e4d1999e712daf18e5270aa20daee9667e3e669c918204e863bea0b6a97a63a79cdb1cd261d396743fdfbcc41109211ce89
 DIST rspec-rails-5.1.1.tar.gz 157454 BLAKE2B 580a3443cfe088d4056815e3fc344f9b91e5df9ff52099942f8e74c062e6ffb8ff528e5bcb17b33684be0e6b4ce7791a1df38a7fbead0ca348567cbbf3f6a863 SHA512 68ba2af02619bcf304237e744f728772e9de889d7aba5ab5fef236d40e1c047b03bf0c199bb28074f2d4cf47e1811f241e67b56d8c362dbc8ad69e066bd3d7f0
 DIST rspec-rails-5.1.2.tar.gz 157523 BLAKE2B b500aa53f8bd965f7b95e90403d46096073780fa4e318295bffba44211cfb9d5eab36549e6fc3afc144700a8224ebe808489959a172f1d9e76c43320b7022979 SHA512 f9ef3a3812590a7cd50bd34e9e6cd9669fab24736ac7693b3fffe3f8be9b8313e31b0c7b7571a735f20bc5d9194a94c2f447e69f6491190536b6534211e1b070
+DIST rspec-rails-6.0.0.tar.gz 161222 BLAKE2B feaff94148d8b33e17ae3de5b9636ba238381d46836bbeba8c6ddf03c1d7b84c0c9e78e13c6b5198342959433ca165c438007e45923a70cb23190d974b340506 SHA512 7b15a5f9313bb76e71a69f9158d64c662a4cef2f8aae7a20748281224a720d9f2555ec9eed3ebd3aa30ba21608d6492caf14fefdd14a84ea765a4e60439830f2
 EBUILD rspec-rails-4.1.2.ebuild 1555 BLAKE2B d97b1683244bf2bf54c19148dd5aae18eb673a79f5b3e95d33adf0636758c92200a2034b6ff070785d129ff7b5537d190321308577713c0521d4475bbd95ba01 SHA512 d7e405df0f5949eecfbd5f3c67bc440b7cbe446c11ddc2db0b93d7c7c29d0e8baf49de69052c134e47bebc2b4affaf6a9c6a6c4668491397f9f1b4177810cd5d
 EBUILD rspec-rails-5.1.1.ebuild 1623 BLAKE2B 52ef145ad123a4ab263d8a1509261a8b856e572ca4413bff111628acb2c9eefdd022d274d2b0b00ff35aaaa5cd19de2e9cbf944bde8547676fa05c51ed83c7ae SHA512 75ca634e6209b7480ca9343920b1340e02e95d8ad9a5fed06172d6bef5321f5b6af4cfdfac569e6ccce1e981c931dde9fea5aeefa6aa2a91865958cb087174ee
 EBUILD rspec-rails-5.1.2.ebuild 1630 BLAKE2B 4085ca18959ec2c8ead80b2fef8bb46c114808ac68582973d080be8880c0e587ea1c7e89802fbc2ad311c5c9391b5ccfcf8bbb59584f788ed870569a246bb675 SHA512 d0858f55d48055077fe89ccb518a461bb70f73c9416471ddbdd3ceb338d4bbf5cca59d9f20bdc2d7249cd7131ad03ca48632a8b34e61942a09441bc5ef33bdd9
+EBUILD rspec-rails-6.0.0.ebuild 1551 BLAKE2B 63b67ed2a3de16c932d5648d6f85299dca7f9a15a043867a5233fec999efefb06e2879e3e0dd40e00868ef9cb4afeefb60e72c7d2b15cbc4185f2038b670cb61 SHA512 a0f27fafecb2e63c103ca4e7416de6671c7f8fe4890289bb0140526cd55a71a6b952dca0324720e124c30ed7654db46dfa0b58b6a0526246f8958d9f6800a280
 MISC metadata.xml 344 BLAKE2B 22dcdd62747138dcdc6e21c019acb6aee50548e35a9189b0b597e603869519d1ca6ac5e6eb32cb6eafb2b313adb1b74f16d7d282d4d19bf9f7bd4913788a3137 SHA512 e6782747b02a80fe50926710100a46ec28d6f55419f2fbb0bff4ebdf1db7d4f43fda195f21570fb5e149990026dd69e3c234baac337e5a6c5fa0c8f28bd62247
diff --git a/dev-ruby/rspec-rails/rspec-rails-6.0.0.ebuild b/dev-ruby/rspec-rails/rspec-rails-6.0.0.ebuild
new file mode 100644
index 000000000000..3b74b2332a99
--- /dev/null
+++ b/dev-ruby/rspec-rails/rspec-rails-6.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+#RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RSpec's official Ruby on Rails plugin"
+HOMEPAGE="https://rspec.info/"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	|| ( dev-ruby/activesupport:7.0 dev-ruby/activesupport:6.1 )
+	|| ( dev-ruby/actionpack:7.0 dev-ruby/actionpack:6.1 )
+	|| ( dev-ruby/railties:7.0 dev-ruby/railties:6.1 )
+	>=dev-ruby/rspec-3.11:3"
+
+# Depend on the package being already installed for tests, because
+# requiring ammeter will load it, and we need a consistent set of rspec
+# and rspec-rails for that to work.
+ruby_add_bdepend "test? (
+	>=dev-ruby/capybara-2.2.0
+	>=dev-ruby/ammeter-1.1.5
+	~dev-ruby/rspec-rails-${PV}
+)"
+
+all_ruby_prepare() {
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	echo "--require spec_helper" > .rspec || die
+
+	# Avoid bundler-specific specs.
+	rm -f spec/sanity_check_spec.rb || die
+
+	# Avoid broken controller generator specs for now.
+	rm -fr spec/generators/rspec || die
+
+	# Test with a compatible rails version
+	#sed -i -e '1igem "rails", "<7.0"' spec/spec_helper.rb || die
+
+	# Fix gemspec.
+	sed -e 's/git ls-files --/find */' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}