gentoo auto-resync : 23:08:2023 - 09:48:32

3 files changed, 17 insertions, 8 deletions

diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 25103a58d838..98d26f898456 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,10 +1,10 @@
 AUX activerecord-6.1.7.4-ruby32-keywords.patch 1673 BLAKE2B 326d324657a7a69389e7d04285b7fb0325547e95d497398e90c6a94ee3160d947d47f94be6b2fc69370846239e88ab7094c69a98af56d2cb0521478fe28e7e67 SHA512 66e2541996007093b703a3eb8174099065c2ddb84a635ebcc822e6d2bafb557c0544ac900eb1245c8992f7a5e84f4e7c737125d0ee57416e3f25e3f82ad56294
 DIST rails-6.1.7.4.tgz 11038583 BLAKE2B 737044b6f92f2555fd9374e0b0fef7e26e53e2ac2103f1e3d89124929416aeda1295adfa7493471472c6ff0fbb057dea0bd9c184bbb45ae572185b98c399177f SHA512 caa7e2a79f747befb5f6f17adec1cc43530dbb35741775b2ebdcf59476efecd277dad025073a4b519a35754367cca04290c24bb8d8ae4235fda696ead531a94f
-DIST rails-7.0.5.1.tgz 11077848 BLAKE2B 17dc2527b762d242c1cc141b5480c0917c8eafb53c55d3034d5af272e9be5760f6c3e16ce1a60041f11af4f99da23e79ff46e9f9fe88412932f2524bf057c478 SHA512 5053ed666cede0bfeb7a534f248538406a1bf5afe0d5ee9e285b4eeb3158566fdd665c7a20012833e6927e7dbb3d881361a5d7f8ce7e326f8e3faf5d571da3e7
-DIST rails-7.0.6.tgz 11090672 BLAKE2B 87d3c1d37f0af4c6a9590d9e38cf1674c59b01b1e15d9883e4d303935b13c48cf9a53d9b3db63490a515b035ba500c6db9b938c329ee82f3adf9eb5897a69fe7 SHA512 93d91d25117e01460d3bd9bdd21743d19f377487a4cd2d0cd22f4d9deba524451033c83f52515270ff823b6c26306fe30be8c360bb527c59a789c04dd5fc1dac
+DIST rails-6.1.7.6.tgz 11040086 BLAKE2B 8b5311752952403cf8eae31b5d8e8d376c4b449f512e86df66b3e921375ffa3ea11e15f1d74a7f8ec9179ff70c32a6d4f8de75be5f92fe6315ee97164e22d2d0 SHA512 c4163565b2324ce97317d252f3d9e2e673a12b6ae7f54571645c958ce30221f1b357887ade80e46abdd47a422736b9946e49850d52ffd72d8acc87f35224e69f
+DIST rails-7.0.7.2.tgz 11085454 BLAKE2B 05574b6df7e28e409949fb311110fd7137d61c31072b394f950a180135201132f3cf9c5cca8f76c661827d7a5e807bfc4b0c97a449b8941115cbe3a0f2f84f62 SHA512 41fad11bd272ea21f7d15d855da04230f0801d9926f6ce3300754f1b2b9d691f18e55855b1a71e44faaf483b397b02ac11c75eb415b7c8976868bc9aefe5b005
 DIST rails-7.0.7.tgz 11071730 BLAKE2B 215642609be86bd9977dc2cdb09a76c64e99260359d0a60aa411a5df572d7699a5f9959ea8aa0ff116ad75110db060436abcfb17da689b1a6aa819fd56373279 SHA512 75f952dfe4d9abc1473dfb017e42daec6358a45efad14a3b39a1b2dc5fec566757c2225fe920a4e872e896966cfb1d4b6e1c40c93d2043aec3bf5bd25ff7c956
 EBUILD activerecord-6.1.7.4.ebuild 3488 BLAKE2B 76fc2821f7a865a10e9d9b46712af6631ae7cd53cb7f1b50f352fae8be26d64bbfeb62ec5b2e9c00d6e0450c3992b5ecc72f42506f518dbf53cd168de0e76127 SHA512 5f67f94abffb73833625ee9b701acb98d67faae28e7c3c02e12e9df3ce2ab4132284b2d50ec3ad0ab37289c3bc4a41a1c5a34f0a4aed525a9605d34eb188d350
-EBUILD activerecord-7.0.5.1.ebuild 3101 BLAKE2B 666871e475868c88db150d84eb79dc1c0e3f9b36e6f8910fb2e440c883e92ff06365c6835f9d507dd913d37f8b1365259df955adb722629d59766c9556282fea SHA512 83b21e2ebfb98bca4d94e512b963e4abe0b52d604370064cdef181847f93207af649f1c5f72fa19aa35c03863018b80c42fe46047e27895e0399390d5e136b28
-EBUILD activerecord-7.0.6.ebuild 3251 BLAKE2B 0d2f471a99e614b053fd89050a8743e078bae1fd978519f38f1813fe47778485e042dd513f70a64d6f9c16a913b3226f72c7da159f727fc7d9ed7aa38539ac64 SHA512 d6c7157cc42c5bac400b3aec7283e36a851f50376bc856ee1bfafd0033b075a44818a235dae9b9c92378d0384967a947d8a88961d3fbfaa4717115ddf173cc61
+EBUILD activerecord-6.1.7.6.ebuild 3491 BLAKE2B 9354a1c493babf1304af6021a7ca96cebe3bd4351063fb49a565cbe493b721b26dd5f5bb862673b817ed6cca6eb37662aee8eba2ad7236dfa983f6abb20a2c9d SHA512 9c8ba49a7131b1dffe71047a44595e73f79fe0df4f714270c64b90f020358048b0a8cefcaca5fdc34c4076c5866237a7ba457a4f31e90d23b9df366b4a31a61d
+EBUILD activerecord-7.0.7.2.ebuild 3255 BLAKE2B 92536882f92f1dc80e12c2c747effc37a08e329c64afa0cb863062682b019b285bd8ffd9a559b2e93b9f2eb514ca54d9d855cb3a8b8907ca4823913164c5fe17 SHA512 c04ddc5e7107c3e16d0a2e55166bd73d7baa93c0a5a11f14bd0f8bae0d48e97b73b6801a3f69b457c42b1f212c076c3d70280ddc9ff760f76cf9f391f01366cd
 EBUILD activerecord-7.0.7.ebuild 3255 BLAKE2B 92536882f92f1dc80e12c2c747effc37a08e329c64afa0cb863062682b019b285bd8ffd9a559b2e93b9f2eb514ca54d9d855cb3a8b8907ca4823913164c5fe17 SHA512 c04ddc5e7107c3e16d0a2e55166bd73d7baa93c0a5a11f14bd0f8bae0d48e97b73b6801a3f69b457c42b1f212c076c3d70280ddc9ff760f76cf9f391f01366cd
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activerecord/activerecord-7.0.5.1.ebuild b/dev-ruby/activerecord/activerecord-6.1.7.6.ebuild
index 2768501d2c50..41a42dc05ddc 100644
--- a/dev-ruby/activerecord/activerecord-7.0.5.1.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.1.7.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32"
 
 # this is not null so that the dependencies will actually be filled
 RUBY_FAKEGEM_TASK_TEST="test"
@@ -27,6 +27,10 @@ IUSE="mysql postgres sqlite"
 
 RUBY_S="rails-${PV}/${PN}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.7.4-ruby32-keywords.patch
+)
+
 ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	sqlite? ( >=dev-ruby/sqlite3-1.4 )
@@ -35,7 +39,6 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 
 ruby_add_bdepend "
 	test? (
-		dev-ruby/benchmark-ips
 		dev-ruby/bundler
 		~dev-ruby/actionpack-${PV}
 		~dev-ruby/railties-${PV}
@@ -62,7 +65,8 @@ all_ruby_prepare() {
 	# earlier that implicitly required it.
 	sed -i -e '$agem "json"' ../Gemfile || die
 
-	sed -i -e '3igem "rack", "<3"; gem "minitest", "<5.16"' test/cases/helper.rb || die
+	# Load correct rails version
+	sed -i -e '2igem "activemodel", "~> 6.1.0"; gem "activejob", "~> 6.1.0"; gem "railties", "~> 6.1.0"; gem "minitest", "<5.16"' test/cases/helper.rb || die
 
 	# Avoid single tests using mysql or postgres dependencies.
 	rm test/cases/invalid_connection_test.rb || die
@@ -73,6 +77,10 @@ all_ruby_prepare() {
 	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
 		test/cases/associations/has_many_associations_test.rb
 
+	# Avoid tests that no longer work with newer sqlite versions
+	rm -f test/cases/adapters/sqlite3/explain_test.rb || die
+	sed -i -e '/test_references_stays_as_integer_column/askip "Fails on case difference"' test/cases/migration/compatibility_test.rb || die
+
 	# Avoid test failing to bind limit length in favor of security release
 	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
 
diff --git a/dev-ruby/activerecord/activerecord-7.0.6.ebuild b/dev-ruby/activerecord/activerecord-7.0.7.2.ebuild
index f2051bbee6fc..a97cec8b0444 100644
--- a/dev-ruby/activerecord/activerecord-7.0.6.ebuild
+++ b/dev-ruby/activerecord/activerecord-7.0.7.2.ebuild
@@ -77,7 +77,8 @@ all_ruby_prepare() {
 	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
 
 	# Avoid test failing related to rubygems
-	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
+	sed -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' \
+		-i test/cases/tasks/sqlite_rake_test.rb || die
 
 	# Avoid test requiring specific locales
 	sed -i -e '/test_unicode_input_casting/askip "Requires specific locales"' test/cases/binary_test.rb || die