gentoo auto-resync : 18:09:2024 - 12:11:36

4 files changed, 7 insertions, 143 deletions

diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 329664500c95..efd017303301 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -1,11 +1,7 @@
-DIST i18n-1.13.0.tar.gz 74591 BLAKE2B e8b2a624c6ea02f030eacbbdf1ca9722d23785e51f31f5dd4a640f8ab74dfafc99131773619a5e2af724c7bcdbc0e63989b1552c148137bf15cf436f340c3c96 SHA512 4c2dc75ccb09ace90a5845f4c1325f0cb144c69b06b72a35728674deea5d869ed94fa5b18cf6b56d434cbad7e528150dedbb10ed91a6d15b7e05758117cf427e
 DIST i18n-1.14.1.tar.gz 74855 BLAKE2B b01b5fefd5033352455110e4fda3d567a5033c6bb732dd11519a3859a3cc4d57bd4229ea3346f2e680575f6ac4d7038d4bcbfd0ea314d2e8b08f26858ffd22f6 SHA512 89a293c00c7e62e802823d8011142a0786268b4c8341a9e389182988f1372655b4c5410ee10d6632af2fee645fbbf2feda2ccc4669d59d44640d3fa2c34b9e86
-DIST i18n-1.14.3.tar.gz 74899 BLAKE2B aaf2041763a5c089972384bc6b5fa139cda05dfaf8ed48c4552ff83f3f114ae53dec2bf1564e8ea5e345f45cf37145eb1eb05c0f4c9fb3cbb3631d55c4c15396 SHA512 8b730dccb3584d55509be4cb0bda3fd9ffb0d2c943eb22ee592e408748bf2e3c0a98fce6ceb002093a6774d073b9a762d95589e89518e4a023f35b51d5db2ad2
-DIST i18n-1.14.4.tar.gz 74949 BLAKE2B 5b55c0d6434eec11ac2b7bc39c896381bf9f274f98a1012264a96dc2432a7ad7bababc5bb0c0980b8aeb9b644a933814a48eeef5a53825aeee553ed9631d3778 SHA512 929117b02babbc51c1dcf1643429cdef35d64d54fac7fd5d5603b85305b6e84f3cecfb4f28cf16fc708eb6252a25a22e05ac50d9a9c6def0f0ac6996b9ace7fa
 DIST i18n-1.14.5.tar.gz 75739 BLAKE2B 10af6c88e5ab4d50dee156b944795525f4d79035f3c2369b379f70d7fa48b84cc26fe0855017b378b7c94f8b4ecdc37dd122f536d2b54c595d70c5c731ba5c64 SHA512 b6c6e333fff38228136ce55a75f466b4885542973e96eea0cbfb5c2ea1dd4780847e59b10090f8ecbc4aeb0de67258dcdbfc1812369b8d9f1d7597468f756677
-EBUILD i18n-1.13.0.ebuild 1591 BLAKE2B ea1197e974b539b9861a04f809c0277a8fdfe8331d2c73016cc57c2efd018912c431cbed27c6dca62c8503e0192df260dd1258cab9bbd4d29c61719b55ae6ed7 SHA512 825d2ac960c86ca7f5ff0ff8e750ed1ee2d42cee19c6cbda3daf5c0f426369abcc11a3da1e70bae27b946317dcf97985ca0539b3a894c2dc2985884279be0c11
+DIST i18n-1.14.6.tar.gz 75978 BLAKE2B e2c56a8600b94b91a32481c4f24bd8b47aee118aee87da0012ddd95e9d01a6c0db489fa0528ca0a9a37ec49124d41f4322eb09f0828f0a53c268d02da1c3b7d5 SHA512 5713e6e2576c16698333058bae3f1758ab71bc040c7feab2d3b51dfc6faa7a76539c6916dd3807e429e53b1a3bf22064cea7eb7b9dd731ddb9a04f06615803a6
 EBUILD i18n-1.14.1.ebuild 1695 BLAKE2B a21e4b6b3eb8b6ebaf189c615a28948c5062dbabd8c6b777bb3f68631d49e38feed116cbd243dd80b1b6a2cc522af125502565117a49db8bfebb4a16b91b766a SHA512 f760c42f7316637bfd934b8734c606ff2cf99c5f7d5c4f5f15fe9303329332873a2fa49e5d89f5e38ed8c50e850c6acd8a8e606614bf38d57171aef40c007fa7
-EBUILD i18n-1.14.3.ebuild 1650 BLAKE2B 62461105fb78aed7c2280656d081d0cf5cc45c1f2805e23285f57a029f83a7d28feedea58d7e6c081a0174af5e781522998d9261a915fce2543a560bbbdb4775 SHA512 a8a94487d8dcabca59a6d156f16696d9c7a03fffdee21516b0a7d6912c2bdeb5cfc62ae4cf94993083acead313e47e06c2364c366910469493aa5b3fda0b1a77
-EBUILD i18n-1.14.4.ebuild 1650 BLAKE2B 62461105fb78aed7c2280656d081d0cf5cc45c1f2805e23285f57a029f83a7d28feedea58d7e6c081a0174af5e781522998d9261a915fce2543a560bbbdb4775 SHA512 a8a94487d8dcabca59a6d156f16696d9c7a03fffdee21516b0a7d6912c2bdeb5cfc62ae4cf94993083acead313e47e06c2364c366910469493aa5b3fda0b1a77
 EBUILD i18n-1.14.5.ebuild 1505 BLAKE2B de73dadffd883c4f2a637d93f3ebe099b3e348ef1f48f44fd646f80af311240b874162566f70297cd202ffd4956f9fa38a1c99dda772b036ab620875384430ba SHA512 d3ad5eb9e4352269e066e8a484de6077ca698c51308d5c96dd1a49557f127bcd45a0735a9cc07377beb187389a5f94bb89e82ecc741b131e8ce6ade2ef969f82
+EBUILD i18n-1.14.6.ebuild 1505 BLAKE2B de73dadffd883c4f2a637d93f3ebe099b3e348ef1f48f44fd646f80af311240b874162566f70297cd202ffd4956f9fa38a1c99dda772b036ab620875384430ba SHA512 d3ad5eb9e4352269e066e8a484de6077ca698c51308d5c96dd1a49557f127bcd45a0735a9cc07377beb187389a5f94bb89e82ecc741b131e8ce6ade2ef969f82
 MISC metadata.xml 341 BLAKE2B 71b36ea4e85348d38b1eafe8a235485a9dd9cac8a62961f041a98f4ac94d1a67ad33997aa796baabbfcc4cdbed8a66aa401b96d0d3b61dcb0546ca3d75f66e18 SHA512 819e827fb7d63f46970810acbb8a94f40cd3d72563a1b2e013d34041b78bee73e74634b3c6b2ef791da624a091af0ebdeb4d816b8697914b72c70fb087775d63
diff --git a/dev-ruby/i18n/i18n-1.13.0.ebuild b/dev-ruby/i18n/i18n-1.13.0.ebuild
deleted file mode 100644
index 403d191f1a34..000000000000
--- a/dev-ruby/i18n/i18n-1.13.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/ruby-i18n/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-# We need mocha:1.0 which corresponds to the Gemfiles used in each_ruby_test
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-5.1
-	dev-ruby/bundler
-	>=dev-ruby/minitest-5.14:5
-	>=dev-ruby/mocha-1.7.0:1.0
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' -e '3igem "json"' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby32)
-			versions="6.1 7.0"
-			;;
-		*ruby31)
-			versions="6.1 7.0"
-			;;
-		*ruby30)
-			versions="6.0 6.1 7.0"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.14.4.ebuild b/dev-ruby/i18n/i18n-1.14.4.ebuild
deleted file mode 100644
index c0da1cda43e5..000000000000
--- a/dev-ruby/i18n/i18n-1.14.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/ruby-i18n/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-ruby_add_rdepend "
-	dev-ruby/concurrent-ruby:1
-	>=dev-ruby/racc-1.7:0
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/activesupport-5.1
-		dev-ruby/bundler
-		>=dev-ruby/minitest-5.14:5
-		dev-ruby/mocha:2
-		dev-ruby/test_declarative
-	)
-"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e '3igem "json"' -e '4igem "racc"' gemfiles/* || die
-
-	# Use mocha 2 to avoid minitest deprecation issues.
-	sed -i -e 's:mocha/setup:mocha/minitest:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby33)
-			versions="7.0 7.1"
-			;;
-		*ruby32)
-			versions="6.1 7.0 7.1"
-			;;
-		*ruby31)
-			versions="6.1 7.0 7.1"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.14.3.ebuild b/dev-ruby/i18n/i18n-1.14.6.ebuild
index c0da1cda43e5..3daace5d00e6 100644
--- a/dev-ruby/i18n/i18n-1.14.3.ebuild
+++ b/dev-ruby/i18n/i18n-1.14.6.ebuild
@@ -35,14 +35,11 @@ ruby_add_bdepend "
 all_ruby_prepare() {
 	rm -f gemfiles/*.lock || die
 
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e '3igem "json"' -e '4igem "racc"' gemfiles/* || die
-
-	# Use mocha 2 to avoid minitest deprecation issues.
-	sed -i -e 's:mocha/setup:mocha/minitest:' test/test_helper.rb || die
+	# Remove optional unpackaged oj gem.
+	# Make mocha dependency more lenient.
+	sed -e '/oj/ s:^:#:' \
+		-e '/mocha/ s/2.1.0/2.1/' \
+		-i gemfiles/* || die
 }
 
 each_ruby_test() {