gentoo auto-resync : 13:11:2024 - 03:02:42

5 files changed, 74 insertions, 136 deletions

diff --git a/dev-ruby/irb/Manifest b/dev-ruby/irb/Manifest
index 56508758b2ec..9d5483652d88 100644
--- a/dev-ruby/irb/Manifest
+++ b/dev-ruby/irb/Manifest
@@ -1,13 +1,10 @@
+AUX irb-1.14.1-test-encoding.patch 2823 BLAKE2B 5eb5d5ae6b21c454b2481e9de9c6e2bfff410bbf222dc0dc7808390d1d8e4d354c8c2a26f8013daaef242f7113436dafceffa47a1f19ac091f9382885341c9c9 SHA512 56b91787340d4b6818b24bc2222e35fcdaac86de15d59e3eb1b13f509d88730a2b37bdc54432436b2ca9bbc2c67c94d609b6c75d8826374d9ed37326b41a18dc
 DIST irb-1.11.1.tar.gz 128341 BLAKE2B ec2ebfd31b7d784668ed043d32b86bc0f77481b250170911332f4b9810f0ee5245ec65aac4d2fa4fc94f49c5d3fa59dd7c3a709f712d9f7f4c1ed6ddd7f0e2b3 SHA512 6b8eaf41410d43f4ab47961b56ce054f93e134e5cba51a08294baaa6de149a209e243a9cf649091f3176adfd0c22943fe222b61b0ab1215e0822d7007c154f17
-DIST irb-1.13.0.tar.gz 137615 BLAKE2B 234debdc8c523876236270af41263b746d79cfded7944862ba7b229aa8e8408bb1efaffb8569b208ba96d8b139d4e0f9ab93e439a6715d7f4bc01e9cff5ac567 SHA512 894549b4fc2f57cfd34a9abc313d14e790728c61602a2b48f1fcb67e69505514191c04fc9e27251a79d2aeeb92ffc9b7ea4c18a4be57aa6d0f3e65881ced3b35
-DIST irb-1.13.1.tar.gz 138024 BLAKE2B 294ef0b9413836dd9db1316e6716c47d44356a988b80c8f7465ece5b0169834f6df8c1a3061b68a9c6115d83ba4c630070220eb2ba5ec5ccae87b7ae677bb038 SHA512 63f71bac1a51bb8c022c0e32f396b6a28e53be2652e27cfd0f025cd02a6878d934ddcbc6ccd7760a06f24d8811f6c24fc2404b4a89d67e6dbd3342b2300d28ad
 DIST irb-1.13.2.tar.gz 139168 BLAKE2B 7dee24a02ad251e92c667c09a14af1e630bcd514c76290d146182c149cc083a394317ab7a1c46b6e0c34b84983e318d3e59b4ae74c63a17ce03d2677183135e0 SHA512 7d1e4c67ee5b43d37869ad37ec4cf356efe62d51f8a2205144c9d02a1157d23223a1453fef9016d85786c98445f11ff905eafef2f3dcdcf3432df75476076b57
 DIST irb-1.14.0.tar.gz 140463 BLAKE2B 26092629ff55ffbe8ce3728764abd07733f3bc86c7dfd13617b02139e3cf5269737a3147a5a62210c4d9dc3039cb8dc44bd29fb0e1f933c14cde0ac34bad3aec SHA512 221057d6a99edc71ddef1e1c3eccfc9efa4a80d2a49f801072c71a5a74e2f3ff53afc9696760bebdc9aabf9924b7919ffbc49163e0a7f08941407877aa05adc5
 DIST irb-1.14.1.tar.gz 141610 BLAKE2B e9c77a2b200059f14934d354a401f24624f209c36665f80cef5d245b1477fc44bbc6fa48b437308714cbc1d8422647611f615163b25d03388aa8732ec27a5ea0 SHA512 bee8392c3e19a5e540c27b60f2694789f6c83805da940470f8724cabc87a1e736fef574191b792fbb488992bb5f0c65aada19e9c191941e4e9b5adf3d072ae68
 EBUILD irb-1.11.1.ebuild 1499 BLAKE2B be961edbf0aa8457c2763a67bf89c6455af10f15985189e3c7e43b7fd9ebfc2ba5868eb8bc435f06bcb75db435beadc6d4293cccf41a6d38811b40efd2ec6563 SHA512 92b55874f646e374b8bb0d36e0f489d7f622f01b867e5305161c34117d9d3232789f6fd9e60e6446a8d8409930f15af2bdce1904cd0e1d4fd3100768564393de
-EBUILD irb-1.13.0.ebuild 1841 BLAKE2B ffb51a1e40dbd3e292fb31e5d998c6aab0028c4c7def1255f95ac3f0665bded1d3c3d4cf564ae1bbee9d5481df620a8beb421fe628d5eddb44dc40e295f0f429 SHA512 28e4918f4142014212e62a9f8e43d935f03e11c04a41d7e5f46cef5747c8014cca77ee6709bad4915c3339626db93f92fe7888420f596bb12e8c9f8118c6df3c
-EBUILD irb-1.13.1.ebuild 1757 BLAKE2B 164ba7527c8585c49c03ee5d18d4011337493080ab0bba0d45b8a49c0f4a1a2e29cd321e5c6df501e2a2f93179d4166dcae8fe11219265faeb8f8a9096bd7b64 SHA512 29e564fa44c27eea519d0124f99d40e26dfd9f92be946996c817a266876bb25635f2e0cd4e61e56788d0497431bacfa14ebee9d651f48881900d043e8183dbd8
 EBUILD irb-1.13.2.ebuild 1755 BLAKE2B 34c4b3988521ffa69a6289de8f10f1512b136dd94dc77037dda3c908f31f07a2b13ab221616620af9b4628958ed82db699b0ddd63fef7b8ac804348fd402b113 SHA512 3053be1f3686be52b5ab436c071054c8ed6b967603cec4d0cbafddc19caa82b4fa1ceff7c6ade21789e7c8705d623a532c43657d55c1a23f4deb03383e37bfc7
 EBUILD irb-1.14.0.ebuild 1757 BLAKE2B 164ba7527c8585c49c03ee5d18d4011337493080ab0bba0d45b8a49c0f4a1a2e29cd321e5c6df501e2a2f93179d4166dcae8fe11219265faeb8f8a9096bd7b64 SHA512 29e564fa44c27eea519d0124f99d40e26dfd9f92be946996c817a266876bb25635f2e0cd4e61e56788d0497431bacfa14ebee9d651f48881900d043e8183dbd8
-EBUILD irb-1.14.1.ebuild 1757 BLAKE2B 164ba7527c8585c49c03ee5d18d4011337493080ab0bba0d45b8a49c0f4a1a2e29cd321e5c6df501e2a2f93179d4166dcae8fe11219265faeb8f8a9096bd7b64 SHA512 29e564fa44c27eea519d0124f99d40e26dfd9f92be946996c817a266876bb25635f2e0cd4e61e56788d0497431bacfa14ebee9d651f48881900d043e8183dbd8
+EBUILD irb-1.14.1.ebuild 1809 BLAKE2B 191a6a8e1d10e0a434e665f7a2e3afe92da2dd6a14449acb083c29e046ec1768e27ea89073cfa4a0b0dfb684c8887d0e3bf2d4ce3b181ee374e5c46ab0285d11 SHA512 c9f287bafaa02ccce1c47614212f410c228c74b130410a57b788dbd0ffb76150342f12d02a428710e04c6bb3ebaa4fdb79513d5086ad1843b502c6e661c6f9e1
 MISC metadata.xml 335 BLAKE2B 6eaf8bbdf5e2083121d0c8833b616e8ccfd82715cb701266d9e1819634ccbe1e308bac8a1894559af941810c84f36c5cbc83f1aa02f48ab5ab3d0d3458fc6b85 SHA512 4240cfcb50e6d5551333400723b3ad0df9096a3b5517655279de6b3d31c6f30068e4897c79761fdbb68262681a79059349e1b4eb3f5d1e6b1855dfb6b6d54399
diff --git a/dev-ruby/irb/files/irb-1.14.1-test-encoding.patch b/dev-ruby/irb/files/irb-1.14.1-test-encoding.patch
new file mode 100644
index 000000000000..4347a5b554ba
--- /dev/null
+++ b/dev-ruby/irb/files/irb-1.14.1-test-encoding.patch
@@ -0,0 +1,70 @@
+From 7f385bc19badd2100b76e8b2404be5be46306bf6 Mon Sep 17 00:00:00 2001
+From: Go <monkeywzr@gmail.com>
+Date: Sun, 20 Oct 2024 15:18:04 +0900
+Subject: [PATCH] Improve history test's encoding setting (#1022)
+
+* improve history test's encoding setting
+
+* fix missing locale error for ci and refactoring
+---
+ test/irb/test_history.rb | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/test/irb/test_history.rb b/test/irb/test_history.rb
+index 791eef1ac..15c16ed89 100644
+--- a/test/irb/test_history.rb
++++ b/test/irb/test_history.rb
+@@ -10,17 +10,20 @@
+ module TestIRB
+   class HistoryTest < TestCase
+     def setup
++      @conf_backup = IRB.conf.dup
+       @original_verbose, $VERBOSE = $VERBOSE, nil
+       @tmpdir = Dir.mktmpdir("test_irb_history_")
+       setup_envs(home: @tmpdir)
+-      @backup_default_external = Encoding.default_external
++      IRB.conf[:LC_MESSAGES] = IRB::Locale.new
++      save_encodings
+       IRB.instance_variable_set(:@existing_rc_name_generators, nil)
+     end
+ 
+     def teardown
++      IRB.conf.replace(@conf_backup)
+       IRB.instance_variable_set(:@existing_rc_name_generators, nil)
+       teardown_envs
+-      Encoding.default_external = @backup_default_external
++      restore_encodings
+       $VERBOSE = @original_verbose
+       FileUtils.rm_rf(@tmpdir)
+     end
+@@ -146,7 +149,6 @@ def test_history_concurrent_use_readline
+     end
+ 
+     def test_history_concurrent_use_not_present
+-      IRB.conf[:LC_MESSAGES] = IRB::Locale.new
+       IRB.conf[:SAVE_HISTORY] = 1
+       io = TestInputMethodWithRelineHistory.new
+       io.class::HISTORY.clear
+@@ -163,9 +165,9 @@ def test_history_concurrent_use_not_present
+ 
+     def test_history_different_encodings
+       IRB.conf[:SAVE_HISTORY] = 2
+-      Encoding.default_external = Encoding::US_ASCII
+-      locale = IRB::Locale.new("en_US.ASCII")
+-      assert_history(<<~EXPECTED_HISTORY.encode(Encoding::US_ASCII), <<~INITIAL_HISTORY.encode(Encoding::UTF_8), <<~INPUT, locale: locale)
++      IRB.conf[:LC_MESSAGES] = IRB::Locale.new("en_US.ASCII")
++      IRB.__send__(:set_encoding, Encoding::US_ASCII.name, override: false)
++      assert_history(<<~EXPECTED_HISTORY.encode(Encoding::US_ASCII), <<~INITIAL_HISTORY.encode(Encoding::UTF_8), <<~INPUT)
+         ????
+         exit
+       EXPECTED_HISTORY
+@@ -234,8 +236,7 @@ def history_concurrent_use_for_input_method(input_method)
+       end
+     end
+ 
+-    def assert_history(expected_history, initial_irb_history, input, input_method = TestInputMethodWithRelineHistory, locale: IRB::Locale.new)
+-      IRB.conf[:LC_MESSAGES] = locale
++    def assert_history(expected_history, initial_irb_history, input, input_method = TestInputMethodWithRelineHistory)
+       actual_history = nil
+       history_file = IRB.rc_file("_history")
+       ENV["HOME"] = @tmpdir
diff --git a/dev-ruby/irb/irb-1.13.0.ebuild b/dev-ruby/irb/irb-1.13.0.ebuild
deleted file mode 100644
index e298f91787cf..000000000000
--- a/dev-ruby/irb/irb-1.13.0.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_BINDIR="exe"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="irb.gemspec"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Interactive Ruby command-line tool for REPL (Read Eval Print Loop)"
-HOMEPAGE="https://github.com/ruby/irb"
-SRC_URI="https://github.com/ruby/irb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-
-# Ensure a new enough eselect-ruby is present to avoid clobbering the
-# irb bin and man page.
-ruby_add_rdepend "
-	>=dev-ruby/rdoc-4.0.0
-	>=dev-ruby/reline-0.4.2
-	!<app-eselect/eselect-ruby-20231008
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		dev-ruby/debug
-		dev-ruby/test-unit
-		dev-ruby/test-unit-ruby-core
-	)"
-
-all_ruby_prepare() {
-	sed -e 's:_relative ":"./:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Skip test requiring specific character set
-	sed -e '/test_raise_exception_with_different_encoding_containing_invalid_byte_sequence/aomit "charset"' \
-		-i test/irb/test_raise_exception.rb || die
-
-	# Skip tests requiring a working console
-	rm -f test/irb/test_debug_cmd.rb || die
-
-	# Skip tests that require the unpackaged tracer gem
-	sed -e '/test_use_tracer_enabled_when_gem_is_available/aomit "Requires tracer gem"' \
-		-i test/irb/test_tracer.rb || die
-
-	# Skip tests confused by our test path
-	sed -e '/test_backtrace_filtering/aomit "Fails due to unexpected paths"' \
-		-i test/irb/test_irb.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib ${RUBY} -S rake test || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/irb.1
-}
diff --git a/dev-ruby/irb/irb-1.13.1.ebuild b/dev-ruby/irb/irb-1.13.1.ebuild
deleted file mode 100644
index 578774e8bd35..000000000000
--- a/dev-ruby/irb/irb-1.13.1.ebuild
+++ /dev/null
@@ -1,64 +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_BINDIR="exe"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="irb.gemspec"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Interactive Ruby command-line tool for REPL (Read Eval Print Loop)"
-HOMEPAGE="https://github.com/ruby/irb"
-SRC_URI="https://github.com/ruby/irb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-
-# Ensure a new enough eselect-ruby is present to avoid clobbering the
-# irb bin and man page.
-ruby_add_rdepend "
-	>=dev-ruby/rdoc-4.0.0
-	>=dev-ruby/reline-0.4.2
-	!<app-eselect/eselect-ruby-20231008
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		dev-ruby/debug
-		dev-ruby/test-unit
-		dev-ruby/test-unit-ruby-core
-	)"
-
-all_ruby_prepare() {
-	sed -e 's:_relative ":"./:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Skip test requiring specific character set
-	sed -e '/test_raise_exception_with_different_encoding_containing_invalid_byte_sequence/aomit "charset"' \
-		-i test/irb/test_raise_exception.rb || die
-
-	# Skip tests that require the unpackaged tracer gem
-	sed -e '/test_use_tracer_enabled_when_gem_is_available/aomit "Requires tracer gem"' \
-		-i test/irb/test_tracer.rb || die
-
-	# Skip tests confused by our test path
-	sed -e '/test_backtrace_filtering/aomit "Fails due to unexpected paths"' \
-		-i test/irb/test_irb.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib ${RUBY} -S rake test || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/irb.1
-}
diff --git a/dev-ruby/irb/irb-1.14.1.ebuild b/dev-ruby/irb/irb-1.14.1.ebuild
index 578774e8bd35..32391e23f906 100644
--- a/dev-ruby/irb/irb-1.14.1.ebuild
+++ b/dev-ruby/irb/irb-1.14.1.ebuild
@@ -20,6 +20,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
+PATCHES=( "${FILESDIR}/${P}-test-encoding.patch" )
+
 # Ensure a new enough eselect-ruby is present to avoid clobbering the
 # irb bin and man page.
 ruby_add_rdepend "