gentoo auto-resync : 25:02:2024 - 11:40:31

4 files changed, 30 insertions, 27 deletions

diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index f8c949697501..2320e1dd2b29 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,14 +1,14 @@
 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-6.1.7.6.tgz 11040086 BLAKE2B 8b5311752952403cf8eae31b5d8e8d376c4b449f512e86df66b3e921375ffa3ea11e15f1d74a7f8ec9179ff70c32a6d4f8de75be5f92fe6315ee97164e22d2d0 SHA512 c4163565b2324ce97317d252f3d9e2e673a12b6ae7f54571645c958ce30221f1b357887ade80e46abdd47a422736b9946e49850d52ffd72d8acc87f35224e69f
+DIST rails-6.1.7.7.tgz 11041447 BLAKE2B 3f59325aa86d3b7d6e0773b9eb2b895a26b644109be8df0b0d9abbab8e6c77f76d316c717ecce4e2d79d3247559504a7452a8037d2d52a6cf95fbacd7f8b8612 SHA512 f9af4eebb3bffec78832f92be6158c71c147e265b54e8e368a06c762bfd1a7992256b3e9286aeb59eee69ba56be28d381a715eb13f99b9babfd9b7ce8051e210
+DIST rails-7.0.8.1.tgz 11089378 BLAKE2B 5d92087402d8aa2b86759ec92c44091a7a0f8a22959e0510f10417f88e54f9e1e6a14c4e9519033cd63bdd1f54f72b91bff8a3318a3264c39311317fb67e8b63 SHA512 74f467f7d3e5ec88560448e206a8f0cdf55bad60dd9eac019224fce86a766ee9d0c4afbd4eaae30dacfe34beebcff6aa9d3c5c99be9c8ad5c385817fe409afc8
 DIST rails-7.0.8.tgz 11073254 BLAKE2B 2aee047a365acb0890ef3afbccfe323fedccf7b54214aa1c2f92b7a7aaa64c275c1e03f8f97e6a2e30281224ba30703d18b40aeee9b4e7fb6f035a4a7716a054 SHA512 0e9feb5bd0360868c3109152d8ea414b65d36d33a5dbb96b199cfa6c4335800d6c392e0fbcbfa453a02fd75924a297a65caf04948895de53db43700478dbeb11
-DIST rails-7.1.1.tgz 10871844 BLAKE2B 12ebcb567f9a8eca58fa0a9c066a8c9c904130a514daa079be4625e0b0ef0ab5744d3dfbff01a146c9053a36ecb77e4f4d381ce8167ec511badcbba7f090b499 SHA512 9a18dc102acaaa1e66aa437ea3de2cc41acd04b7a52792fb686e88f14111a0e32e25a6d093f26badfdca2a932cf458720cbdb1efbcc00c766157741ea99a32f1
-DIST rails-7.1.2.tgz 10893031 BLAKE2B 5a91d15e02171ff94d8a09894425bffcf35fc73a40e6bdc16a549d780c152ebd96e67e015af66d4115313d66450ac17b62dd55a7b5a5d10b3d52f215b5d58c1c SHA512 91bb3887ace7d90159052c397797101043565f7b52520832a865fc0b2df11b69162a3a70943b839fb1d26fd8ffe177b3e542e743df04067371f90a11973bdaca
+DIST rails-7.1.3.2.tgz 10914950 BLAKE2B 419e6817958efcc5dbbb47d24498decff48fca9748c9f4069bcd353a4644fa623caf79c4072db0944139ac991d14623013683f69cef3126fa63348cc0612655b SHA512 0a58e7b125eb97f94a8a75bacd421d7197e6ad78d24651aecfe82e41c024ccfa42a9de0664099f55cd6ac6a41fd7f09cdc3177ed2b809b0be7d7df1639424f9d
 DIST rails-7.1.3.tgz 10900323 BLAKE2B a83ca4ee656e93241fa0460d8df197904a4eef310cf25bce6db6167bad87c8d0644533fa6e224ec959a4e10005164e0f981e14e8b23cee14e2747117be9da712 SHA512 df1128d1403ab82d218d2057c7c86e646594f97a8c6fcf5648a66440d52e5c20a4ceb0c13e70b6153152b44f62d8a1e20f3776acff5c55bc54d006cb7da32d12
-EBUILD activerecord-6.1.7.4.ebuild 3488 BLAKE2B 76fc2821f7a865a10e9d9b46712af6631ae7cd53cb7f1b50f352fae8be26d64bbfeb62ec5b2e9c00d6e0450c3992b5ecc72f42506f518dbf53cd168de0e76127 SHA512 5f67f94abffb73833625ee9b701acb98d67faae28e7c3c02e12e9df3ce2ab4132284b2d50ec3ad0ab37289c3bc4a41a1c5a34f0a4aed525a9605d34eb188d350
 EBUILD activerecord-6.1.7.6.ebuild 3490 BLAKE2B 0630f53c636c16b5813279bf84497cc0aee818af62250ef1903cf345d6aa3404bf87cb16b8f196d1c910fa411ed382e273b22f04d339c13d64aee70f278d375b SHA512 63f7e42970cc1bfdf4b7d9c4410b08ee290d9e22a27211574d76c7c9094f15734f1a41667b817cb6b049015490348d6aee637cb73cb8a03ce3307d8fd3df22b3
+EBUILD activerecord-6.1.7.7.ebuild 3506 BLAKE2B d905d7b7a96d3931960e2e9987aee7415596c2b4fbc6ed93155fbb184230df7bd4b9f54c39596d548c9a917e864a7679d7eb386575f2b33d4080d29f18ac8dcc SHA512 699ed74fc3b25f8d050e0d5c8e9e1fb62fa8081a896e3f3e2637c1b128cd17795f5ffcd9160483d34766c3e7505f98b32fc470da881d0def28821d7973fe5d4d
+EBUILD activerecord-7.0.8.1.ebuild 3536 BLAKE2B fb676f16328dc656a6c7445bdda97e51cf74398a7a7a4d5d2484c880e5e2b9437281b5589807ec21724bfe4dfc8c46f2e33a2f47737fb88ba6fdfaff9c99f499 SHA512 37fcd3ee0a4723356a1948e9d50df34ebce21f2511b1f07a4a41149c3403cfca725955a8848786c08356f83639d0f91827e5faeecb88890d7eefcc968da88ad2
 EBUILD activerecord-7.0.8.ebuild 3435 BLAKE2B c85331b9cd4f2ac18fe3c86de5c2bb620ca10d142ccf79baf02ec1f6cddbedc477440c694fd8ec8ef22f6325c49cb769b026d3fecd9f11faae1ac7a36da8614e SHA512 dfa04c398443586946ed58adc0d55fe5809c4a20476a925316db74f36d407c390dc3e1f8ba2e76688c23cedd15cdbb2d6cf92b8390fcbac3c9cf12fb60700024
-EBUILD activerecord-7.1.1.ebuild 3500 BLAKE2B f0a73ad1a2c0a49fd70ac19c1ba3cf5a336eb33b8cfc53c578492bcb7079e312952cdbeef98b646e87c83faab8803af0b04a731667296760f5a382723a677d07 SHA512 cba4c11edf1ec953997678528ba6c02b410a114d8886e712f69f5a1c7ae81b5e3378a459a1280b38f165be02d9df3526dab554a1d36176531f39d4758cadcf7b
-EBUILD activerecord-7.1.2.ebuild 3500 BLAKE2B f0a73ad1a2c0a49fd70ac19c1ba3cf5a336eb33b8cfc53c578492bcb7079e312952cdbeef98b646e87c83faab8803af0b04a731667296760f5a382723a677d07 SHA512 cba4c11edf1ec953997678528ba6c02b410a114d8886e712f69f5a1c7ae81b5e3378a459a1280b38f165be02d9df3526dab554a1d36176531f39d4758cadcf7b
+EBUILD activerecord-7.1.3.2.ebuild 3500 BLAKE2B 9e2cc0374e5e9dd4b4da28e38f4e015a55beb75260a230284d74199d1ff80448e7bcf5859a5387c19cb5540d6e10e65c72d2e29ba14ca81f37dbfe60011ea191 SHA512 5e6a8cdb91fe85dfae7cf2fd5cee3224de16dc48185502dbc75bed5524a0bfa89113eb77d7bae78027443a5bdba86e9e095355844818429633998526e449ee0c
 EBUILD activerecord-7.1.3.ebuild 3500 BLAKE2B 9e2cc0374e5e9dd4b4da28e38f4e015a55beb75260a230284d74199d1ff80448e7bcf5859a5387c19cb5540d6e10e65c72d2e29ba14ca81f37dbfe60011ea191 SHA512 5e6a8cdb91fe85dfae7cf2fd5cee3224de16dc48185502dbc75bed5524a0bfa89113eb77d7bae78027443a5bdba86e9e095355844818429633998526e449ee0c
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activerecord/activerecord-6.1.7.4.ebuild b/dev-ruby/activerecord/activerecord-6.1.7.7.ebuild
index 8ff5365b8c24..f6fed32081fc 100644
--- a/dev-ruby/activerecord/activerecord-6.1.7.4.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.1.7.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # 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"
@@ -22,13 +22,13 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="mysql postgres sqlite"
 
 RUBY_S="rails-${PV}/${PN}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-ruby32-keywords.patch
+	"${FILESDIR}"/${PN}-6.1.7.4-ruby32-keywords.patch
 )
 
 ruby_add_rdepend "~dev-ruby/activesupport-${PV}
@@ -66,7 +66,8 @@ all_ruby_prepare() {
 	sed -i -e '$agem "json"' ../Gemfile || 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
+	sed -e '2igem "activemodel", "~> 6.1.0"; gem "activejob", "~> 6.1.0"; gem "railties", "~> 6.1.0"; gem "minitest", "<5.16"' \
+		-i test/cases/helper.rb || die
 
 	# Avoid single tests using mysql or postgres dependencies.
 	rm test/cases/invalid_connection_test.rb || die
@@ -79,13 +80,16 @@ all_ruby_prepare() {
 
 	# 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
+	sed -e '/test_references_stays_as_integer_column/askip "Fails on case difference"' \
+		-i 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
+	sed -e '/test_too_many_binds/askip "Fails on Gentoo"' \
+		-i 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 activation monitor"' \
+		-i test/cases/tasks/sqlite_rake_test.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/activerecord/activerecord-7.1.2.ebuild b/dev-ruby/activerecord/activerecord-7.0.8.1.ebuild
index ca2c25a9e6c5..a54e5f49a275 100644
--- a/dev-ruby/activerecord/activerecord-7.1.2.ebuild
+++ b/dev-ruby/activerecord/activerecord-7.0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,13 +23,12 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="mysql postgres sqlite"
+IUSE="mysql postgres sqlite test"
 
 RUBY_S="rails-${PV}/${PN}"
 
 ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
-	>=dev-ruby/timeout-0.4.0
 	sqlite? ( >=dev-ruby/sqlite3-1.4 )
 	mysql? ( dev-ruby/mysql2:0.5 )
 	postgres? ( >=dev-ruby/pg-1.1:1 )"
@@ -39,7 +38,6 @@ ruby_add_bdepend "
 		dev-ruby/benchmark-ips
 		dev-ruby/bundler
 		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activejob-${PV}
 		~dev-ruby/railties-${PV}
 		>=dev-ruby/sqlite3-1.4.0
 		dev-ruby/mocha
@@ -52,9 +50,10 @@ all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
 	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+	sed -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
 		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+		-e '/group :doc/,/^end/ s:^:#:' \
+		-i ../Gemfile || die
 	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
 	sed -e '/bcrypt/ s/3.0.0/3.0/' \
 		-i ../Gemfile || die
@@ -64,10 +63,13 @@ all_ruby_prepare() {
 	# earlier that implicitly required it.
 	sed -i -e '$agem "json"' ../Gemfile || die
 
+	sed -e '3igem "rack", "<3"; gem "minitest", "<5.16"; gem "activejob", "~> 7.0.0"; gem "activemodel", "~> 7.0.0"; gem "railties", "~> 7.0.0"' \
+		-i test/cases/helper.rb || die
+
 	# Avoid single tests using mysql or postgres dependencies.
 	rm test/cases/invalid_connection_test.rb || die
 	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
-		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
+		-i test/cases/connection_adapters/{,legacy_}connection_handlers_multi_db_test.rb || die
 
 	# Avoid failing test that makes bad assumptions on database state.
 	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
@@ -77,8 +79,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 -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' \
-	#	-i 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
@@ -86,9 +88,6 @@ all_ruby_prepare() {
 	# Avoid test not compatible with sqlite 3.43
 	sed -e '/test_should_return_float_average_if_db_returns_such/askip "Fails with sqlite 3.43"' \
 		-i test/cases/calculations_test.rb || die
-
-	# Avoid tests requiring a full Rails setup
-	rm -f test/cases/adapters/sqlite3/dbconsole_test.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/activerecord/activerecord-7.1.1.ebuild b/dev-ruby/activerecord/activerecord-7.1.3.2.ebuild
index ca2c25a9e6c5..f64d86b79538 100644
--- a/dev-ruby/activerecord/activerecord-7.1.1.ebuild
+++ b/dev-ruby/activerecord/activerecord-7.1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8