gentoo auto-resync : 19:05:2024 - 00:01:59

3 files changed, 16 insertions, 14 deletions

diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 2838dbc9876a..fd0883143ecc 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -2,13 +2,13 @@ AUX actionpack-7.0.4-rack-test-2.patch 2619 BLAKE2B f31791347de3a683270ed6720a4c
 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.0.8.3.tgz 11080686 BLAKE2B 2d13559e7b7ab752af4fee480ee51f73b4d1f39246e68513e9b63a4769eba7b82e13980ad4a04776476740aca19ed8920dab294299df1bc9cbb78eb5975ffbe1 SHA512 2054191e2bc3ca667e637ccdf3e68bcc3747715cf38f75a9a6e37a1b155286cdfbb4c987f98f3566254878991c3ab0d709ce3d4bf6ff1d4df3d34095576f1db3
 DIST rails-7.1.3.2.tgz 10914950 BLAKE2B 419e6817958efcc5dbbb47d24498decff48fca9748c9f4069bcd353a4644fa623caf79c4072db0944139ac991d14623013683f69cef3126fa63348cc0612655b SHA512 0a58e7b125eb97f94a8a75bacd421d7197e6ad78d24651aecfe82e41c024ccfa42a9de0664099f55cd6ac6a41fd7f09cdc3177ed2b809b0be7d7df1639424f9d
-DIST rails-7.1.3.tgz 10900323 BLAKE2B a83ca4ee656e93241fa0460d8df197904a4eef310cf25bce6db6167bad87c8d0644533fa6e224ec959a4e10005164e0f981e14e8b23cee14e2747117be9da712 SHA512 df1128d1403ab82d218d2057c7c86e646594f97a8c6fcf5648a66440d52e5c20a4ceb0c13e70b6153152b44f62d8a1e20f3776acff5c55bc54d006cb7da32d12
+DIST rails-7.1.3.3.tgz 10905515 BLAKE2B b2be6d8922d15478136875ac80d65fdc54bdf4a03ec17cddc20c20ae847f08fd52a2b1110ed27feb0217f4aa8dd827a8d95847e32eceaf8f5979843312f12a2a SHA512 0d108654a9ab2a9321822742906c4848508e0e4e09600c01bd5a86deeb324540bbae520a954499c4cc83bfe1246f929a581d1667f2b50c463d0bf8187f603df9
 EBUILD actionpack-6.1.7.6.ebuild 2419 BLAKE2B d652ec5ad2b0bee065bee204c45bb57ae1ebbae1f89944f538bb9ab71ec77ca9d0c2b834d64e2286f3a87f8c46bc5a8283632733453d576e733db33e61a097dd SHA512 bc5611b582041708595618c40fae7c87e264710dc854e646074f57861793cf98d23dfef06ac87b22d3e2c07af89995f63be95fbe519a6e89bb68504f05610391
 EBUILD actionpack-6.1.7.7.ebuild 2424 BLAKE2B d9941301299f839237888b75aa2090b45363767d72d95cfc6077921f8f3b81c7452c5d399fbbf16d60ed7c2038555ada628421d1c610f3128cb5002682ea6ccf SHA512 5cfaea6045368d58b1a2827dffa52e98babb6e1e08b19542083b331d216d8b7f957c0fe930f7ac50037d7824f8f818fb26cc5927fc10ba520c1809e65a9fb7f3
 EBUILD actionpack-7.0.8.1.ebuild 2299 BLAKE2B db67a7c76fd54ca950430d87f7b085ec53ccae1dc4eabf8e56a22ba887da38e8d4c711b1e596ae9f30f76cdf5b2bd1daf7cbcef86f8add04fd7b96f142bafadf SHA512 ed552fecc65e335e996d6f3f3821d9e07f120b327983e75f531c4a698b3a6cd66660df5beb0722320b76ada177477497f4cc3198ff6ca5a186ee0ee077bcd34a
-EBUILD actionpack-7.0.8.ebuild 2228 BLAKE2B ebb9826c47a64ced50a483aea1ea251b6419274b8af8b05b247cd2680e773dc7af021c97bad9ab05eff9b0de41d3f35a97524d410e42108c1cc19e6b50a42763 SHA512 f153adde6f46f2b3c8fd0eef893cab246ef20477db0569cfe4749e36ec72b2374d059cfc38a72e6fadda94fc5abe425ab243673b1172c7d0adc47400c1fcee12
+EBUILD actionpack-7.0.8.3.ebuild 2318 BLAKE2B 306242d46e17cad55c8e25559d64dfe0fe093ffab721bd53856879e197eb9908bff1494736fc08633178c5d40e477a6dec5e0bd3fc4f342468f05568d3262cf7 SHA512 e9dd2eee4cea7f8267bfd35803c7228412e6af6f6158c4912161e41b7b75f37d331be7ad6fda63664eb1a31b25d03fe96817b32596a31e3d9cea337cfed29790
 EBUILD actionpack-7.1.3.2.ebuild 2263 BLAKE2B 588bc72829c9fac49d2f04bde34e94b5c45eec3fcda97ca9ab16243b0099ca1da977c8beb3746d987ba687d5da9dc5cf286c69c6fd64472838cf2ff890110fe1 SHA512 caed6f3e733ba7bb894d22c4c2334979f70f45a72e8bb98e8b25d8c23c3880afd778619fe107c4588084238df52c7b8a1734ae2a0e1723259d54ef5af5f77837
-EBUILD actionpack-7.1.3.ebuild 2267 BLAKE2B 79472afc5c7bb68eae84b3f3635c50da25de7f920d826fb015cf1ded599e4d646237bfeb52c44609fd56f2f94aad52b0028f51381e63a1ed626e70dd121030e1 SHA512 a92dc0900c1eb3867890fde6a7f89349c623324b76b05d7441cf751fc0abb4dd8c1071790ae6ff2c6e2ad4c7d4e40ec238f8ba8feb2fb07a107e0adf136d60dc
+EBUILD actionpack-7.1.3.3.ebuild 2304 BLAKE2B 8c193d878638a0b40ad6a275699f0491f03a693b3b32b6640c151a9249c3f14817b981adde6e59e6df74cbdf95eea86f43d048c453df816f955cbe78eeceeb1f SHA512 2bc0cab8869b34ddf756d17902419acd60616416abafe0ab37fb2aae4b99cd5ff6587833a7feb3ed50fd1bac62f09053c8d725379a5d9bb96040eeede1e9446d
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actionpack/actionpack-7.0.8.ebuild b/dev-ruby/actionpack/actionpack-7.0.8.3.ebuild
index 3deadbaecbba..bf3a73b339b6 100644
--- a/dev-ruby/actionpack/actionpack-7.0.8.ebuild
+++ b/dev-ruby/actionpack/actionpack-7.0.8.3.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
@@ -22,7 +22,7 @@ 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=""
+IUSE="test"
 
 RUBY_S="rails-${PV}/${PN}"
 
@@ -53,12 +53,14 @@ all_ruby_prepare() {
 
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
 		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+		-e '/group :doc/,/^end/ s:^:#:' \
+		-i ../Gemfile || die
 	rm ../Gemfile.lock || die
 
-	sed -i -e '3igem "rack", "<3"; gem "minitest", "<5.16"' test/abstract_unit.rb || die
+	sed -e '3igem "rack", "<3"; gem "minitest", "<5.16"; gem "railties", "~> 7.0.0"; gem "activemodel", "~> 7.0.0"; require "ostruct"' \
+		-i test/abstract_unit.rb || die
 
 	# Use different timezone notation, this changed at some point due to an external dependency changing.
 	sed -e 's/-0000/GMT/' \
diff --git a/dev-ruby/actionpack/actionpack-7.1.3.ebuild b/dev-ruby/actionpack/actionpack-7.1.3.3.ebuild
index 320ea8fe809b..d50b5a2aa4a3 100644
--- a/dev-ruby/actionpack/actionpack-7.1.3.ebuild
+++ b/dev-ruby/actionpack/actionpack-7.1.3.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -39,7 +39,7 @@ ruby_add_rdepend "
 
 ruby_add_bdepend "
 	test? (
-		dev-ruby/mocha:0.14
+		dev-ruby/mocha
 		dev-ruby/bundler
 		>=dev-ruby/capybara-3.26
 		~dev-ruby/activemodel-${PV}
@@ -47,7 +47,7 @@ ruby_add_bdepend "
 		>=dev-ruby/rack-cache-1.2:1.2
 		dev-ruby/selenium-webdriver:4
 		www-servers/puma
-		<dev-ruby/minitest-5.16:*
+		dev-ruby/minitest:5
 	)"
 
 all_ruby_prepare() {
@@ -58,8 +58,8 @@ all_ruby_prepare() {
 		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
 	rm ../Gemfile.lock || die
 
-	# Fix errors loading rack/session with rack 3.0.
-	sed -i -e '2igem "rack-session"' test/abstract_unit.rb || die
+	# Fix errors loading rack/session with rack 3.0 and missing OpenStruct
+	sed -i -e '2igem "rack-session"; require "ostruct"' test/abstract_unit.rb || die
 
 	# Use different timezone notation, this changed at some point due to an external dependency changing.
 	sed -e 's/-0000/GMT/' \