gentoo auto-resync : 12:03:2023 - 18:13:14

5 files changed, 272 insertions, 8 deletions

diff --git a/dev-ruby/eventmachine/Manifest b/dev-ruby/eventmachine/Manifest
index 663b16dd94ea..d69394b59b08 100644
--- a/dev-ruby/eventmachine/Manifest
+++ b/dev-ruby/eventmachine/Manifest
@@ -1,4 +1,7 @@
+AUX eventmachine-1.2.7-ruby3-process-status.patch 3126 BLAKE2B 8bd6bad1afc4063c3b89a8fd50382ca388d948dbe79de146c8335012f79d3fd765cc92673f7e245c396c763493325a572e72dc20451918cf41e80416c58f804e SHA512 36496db7f15de85119b6d35990aeae269c5f1c2d0969445fd68507da8089f81bd0db729c690fde3f1f0a2390bc39cd6e44a13f115d1be80898d405f2f71f1931
+AUX eventmachine-1.2.7-test-processes.patch 2141 BLAKE2B 284d65eb2742f4429ad3832ca3b554d50b266ed9ce811a51ae34959f6425946f263fcf4ddea9f9fdcdc58e1efd9f1a08cb85de0bcbdf49828de61ba43f982034 SHA512 5951197a8b11de2e45c88faee9df2964c373f49ca1712055457f8be5798a73a058e61a12ebf4d2c1da9da4ba0ad9fdb5537516f207e61bfcbfd5794c705a35de
 DIST eventmachine-1.2.7-openssl-patches.tar.bz2 14837 BLAKE2B 5f3280c053bd67c97db53814db3bbfd9bb3047d0fdae3972494a88bc9062e0f20b5684da8ba4264299a4fd5b0c159ad0d006fe78f6f1e8c0e9cdb531d98e3017 SHA512 9294ae918a51c2e7db098add3e793a2a57e40b223b7ee7113664245b5584af7b7bb180cf1dd83d0c30a316b6598a0a4507b953603c95482c42738099d33419d0
 DIST eventmachine-1.2.7.tar.gz 246402 BLAKE2B 3eee1e5fbb367c03e3d801cb705a0f95b7bbb461885f04820f57421019a3d61eecabe71309981eec35168395eb6d98a8c675bd0fb225497de511f2ce09a5df92 SHA512 768ec084903dce4c737cf564fce7886a3e7e5b7d4a89c2baea3e998130c53dc00488eaa2d8e9b0133d9e4d8fffbde80c3025403881486a7968c2d84425cc1f50
 EBUILD eventmachine-1.2.7-r3.ebuild 2854 BLAKE2B dcb66ead34bff9020c002336a70ad5a9e191285f84b33e04464ba09c209ce865aaf02a6bc77a5b0d03dda842b1606da4427c12c99c47334eb294e00704291fbb SHA512 484bc115fbf3820305c646b48302356ac2e58c432cef695bf193b718a56d50a15a685409c7b8e55e317e4e55c0d98c105939f1d1e07ca1f3c89eee95661b3c2f
-MISC metadata.xml 524 BLAKE2B d3048a3c18741a93c913e9424e3d080ac9a68e568d201e313f6c81ec2b0b6851885989674dcf2fa3902152e0b93681b1e14330f8073b17ce389081884e168c21 SHA512 59fcb4e1c2cf8cedd8f1b09e8dfbe9a6687f8f581d115bcb905a9263aeff44171f824c7dae24bcd046d4a7a2a930e9e4aa204ef163bc8ab1b15c5874f36ce457
+EBUILD eventmachine-1.2.7-r4.ebuild 2967 BLAKE2B 80969dd286ace84396106a6d1bccd946a4f3ae8d3511efaec2cad61bb90ddccd0911bc1bafac4a3e93d26fc71a330a257eef9c563ffa0c80a6c20b1a6f26ae40 SHA512 60b7a4bcfa9e9f107a8c2ddda0876f1f89c7744a6b966283aa6ba7724437597d0e97af3b927247fe7bce0ca41418c590fc755bfa592884533283a4bea4e60826
+MISC metadata.xml 704 BLAKE2B fd774ca077cac2af22f013c93bc5f84919c935ea85824b4da271228d448606a6bc6906667fa6b1caa3128291fe8d22ef16aecf9c35b5926add8ed8ea0d433be2 SHA512 8fd3aae0e956312c522cffafccde0914b477c3ef16d30317431feed1c1315a9d6abadb7ab7c6a9b25410f980f1d3ff6cff5998dbfbf19b75c5072b177c8d8e3e
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7-r4.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7-r4.ebuild
new file mode 100644
index 000000000000..482bba2d56f2
--- /dev/null
+++ b/dev-ruby/eventmachine/eventmachine-1.2.7-r4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="docs/*.md CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="eventmachine.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb ext/fastfilereader/extconf.rb)
+RUBY_FAKEGEM_EXTRAINSTALL=(examples)
+
+inherit ruby-fakegem
+
+DESCRIPTION="EventMachine is a fast, simple event-processing library for Ruby programs"
+HOMEPAGE="https://github.com/eventmachine/eventmachine"
+SRC_URI="https://github.com/eventmachine/eventmachine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# Collection of upstream patches to fix compatibility with newer OpenSSL
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-openssl-patches.tar.bz2"
+
+LICENSE="|| ( GPL-2 Ruby-BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="${DEPEND}
+	dev-libs/openssl:0="
+RDEPEND="${RDEPEND}
+	dev-libs/openssl:0="
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+
+PATCHES=(
+	# Collection of upstream patches (rebased by Fedora, thanks!) to
+	# fix (mostly test) compatibility with >= OpenSSL 1.1.1.
+	"${WORKDIR}"/all/patches/
+	# Backport upstream changes for ruby 3
+	"${FILESDIR}"/${P}-test-processes.patch
+	"${FILESDIR}"/${P}-ruby3-process-status.patch
+)
+
+all_ruby_prepare() {
+	# Remove package tasks to avoid dependency on rake-compiler.
+	rm rakelib/package.rake || die
+
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+	# Remove the resolver tests since they require network access and
+	# the localhost test fails with an IPv6 localhost.
+	rm tests/test_resolver.rb || die
+
+	# Needs a tty
+	rm tests/test_kb.rb || die
+
+	# Avoid tests that require network access
+	sed -e '/test_bind_connect/,/^  end/ s:^:#:' \
+		-e '/test_invalid_address_bind_connect_src/,/^  end/ s:^:#:' \
+		-e '/test_invalid_address_bind_connect_dst/,/^  end/ s:^:#:' \
+		-i tests/test_basic.rb || die
+	sed -e '/test_ipv6_udp_local_server/,/^    end/ s:^:#:' \
+		-e '/test_ipv6_tcp_local_server/,/^    end/ s:^:#:' \
+		-i tests/test_ipv6.rb || die
+	sed -e '/test_for_real/,/^    end/ s:^:#:' -i tests/test_pending_connect_timeout.rb || die
+	sed -e '/test_connect_timeout/,/^  end/ s:^:#:' -i tests/test_unbind_reason.rb || die
+	sed -e '/test_cookie/,/^  end/ s:^:#:' \
+		-e '/test_http_client/,/^  end/ s:^:#:' \
+		-e '/test_version_1_0/,/^  end/ s:^:#:' \
+		-i tests/test_httpclient.rb || die
+	sed -e '/test_get/,/^  end/ s:^:#:' \
+		-e '/test_https_get/,/^  end/ s:^:#:' \
+		-i tests/test_httpclient2.rb || die
+
+	# Avoid test that deliberately triggers a C++ exception which causes
+	# a SEGFAULT. This does not appear to happen upstream (on travis).
+	rm tests/test_exc.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -S testrb-2 tests/test_*.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+}
diff --git a/dev-ruby/eventmachine/files/eventmachine-1.2.7-ruby3-process-status.patch b/dev-ruby/eventmachine/files/eventmachine-1.2.7-ruby3-process-status.patch
new file mode 100644
index 000000000000..f836d3ff076e
--- /dev/null
+++ b/dev-ruby/eventmachine/files/eventmachine-1.2.7-ruby3-process-status.patch
@@ -0,0 +1,94 @@
+From daeb121fb5600cc0f4fc604fbf7d742578f26483 Mon Sep 17 00:00:00 2001
+From: MSP-Greg <Greg.mpls@gmail.com>
+Date: Sat, 12 Jun 2021 22:37:37 -0500
+Subject: [PATCH] Fixes for Process::Status changes in Ruby 3
+
+---
+ ext/extconf.rb   |  3 +++
+ ext/rubymain.cpp | 36 ++++++++++++++++++++++++++++++------
+ 2 files changed, 33 insertions(+), 6 deletions(-)
+
+diff --git a/ext/extconf.rb b/ext/extconf.rb
+index 0fb654104..ce83c0028 100644
+--- a/ext/extconf.rb
++++ b/ext/extconf.rb
+@@ -138,6 +138,9 @@ def find_openssl_library
+   add_define "HAVE_KQUEUE" if have_header("sys/event.h") && have_header("sys/queue.h")
+ end
+ 
++# Add for changes to Process::Status in Ruby 3
++add_define("IS_RUBY_3_OR_LATER") if RUBY_VERSION > "3.0"
++
+ # Adjust number of file descriptors (FD) on Windows
+ 
+ if RbConfig::CONFIG["host_os"] =~ /mingw/
+diff --git a/ext/rubymain.cpp b/ext/rubymain.cpp
+index 5da5c8b25..36018c63d 100644
+--- a/ext/rubymain.cpp
++++ b/ext/rubymain.cpp
+@@ -85,7 +85,24 @@ static VALUE Intern_proxy_target_unbound;
+ static VALUE Intern_proxy_completed;
+ static VALUE Intern_connection_completed;
+ 
+-static VALUE rb_cProcStatus;
++static VALUE rb_cProcessStatus;
++
++#ifdef IS_RUBY_3_OR_LATER
++struct rb_process_status {
++    rb_pid_t pid;
++    int status;
++    int error;
++};
++
++static const rb_data_type_t rb_process_status_type = {
++    .wrap_struct_name = "Process::Status",
++    .function = {
++        .dfree = RUBY_DEFAULT_FREE,
++    },
++    .data = NULL,
++    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
++};
++#endif
+ 
+ struct em_event {
+ 	uintptr_t signature;
+@@ -553,11 +570,18 @@ static VALUE t_get_subprocess_status (VALUE self UNUSED, VALUE signature)
+ 
+ 	if (evma_get_subprocess_status (NUM2BSIG (signature), &status)) {
+ 		if (evma_get_subprocess_pid (NUM2BSIG (signature), &pid)) {
+-			proc_status = rb_obj_alloc(rb_cProcStatus);
+ 
++#ifdef IS_RUBY_3_OR_LATER
++			struct rb_process_status *data = NULL;
++			proc_status = TypedData_Make_Struct(rb_cProcessStatus, struct rb_process_status, &rb_process_status_type, data);
++			data->pid = pid;
++			data->status = status;
++#else
++			proc_status = rb_obj_alloc(rb_cProcessStatus);
+ 			/* MRI Ruby uses hidden instance vars */
+-			rb_iv_set(proc_status, "status", INT2FIX(status));
+-			rb_iv_set(proc_status, "pid", INT2FIX(pid));
++			rb_ivar_set(proc_status, rb_intern_const("status"), INT2FIX(status));
++			rb_ivar_set(proc_status, rb_intern_const("pid"), INT2FIX(pid));
++#endif
+ 
+ #ifdef RUBINIUS
+ 			/* Rubinius uses standard instance vars */
+@@ -572,7 +596,7 @@ static VALUE t_get_subprocess_status (VALUE self UNUSED, VALUE signature)
+ #endif
+ 		}
+ 	}
+-
++	rb_obj_freeze(proc_status);
+ 	return proc_status;
+ }
+ 
+@@ -1431,7 +1455,7 @@ extern "C" void Init_rubyeventmachine()
+ {
+ 	// Lookup Process::Status for get_subprocess_status
+ 	VALUE rb_mProcess = rb_const_get(rb_cObject, rb_intern("Process"));
+-	rb_cProcStatus = rb_const_get(rb_mProcess, rb_intern("Status"));
++	rb_cProcessStatus = rb_const_get(rb_mProcess, rb_intern("Status"));
+ 
+ 	// Tuck away some symbol values so we don't have to look 'em up every time we need 'em.
+ 	Intern_at_signature = rb_intern ("@signature");
diff --git a/dev-ruby/eventmachine/files/eventmachine-1.2.7-test-processes.patch b/dev-ruby/eventmachine/files/eventmachine-1.2.7-test-processes.patch
new file mode 100644
index 000000000000..51e2a48c6f55
--- /dev/null
+++ b/dev-ruby/eventmachine/files/eventmachine-1.2.7-test-processes.patch
@@ -0,0 +1,73 @@
+From ec27b6250c2a00b4f2720abd86669e194ca016ac Mon Sep 17 00:00:00 2001
+From: MSP-Greg <Greg.mpls@gmail.com>
+Date: Fri, 21 May 2021 11:24:15 -0500
+Subject: [PATCH] Update test_processes.rb
+
+---
+ tests/test_processes.rb | 35 +++++++++++++++++++++++++++--------
+ 1 file changed, 27 insertions(+), 8 deletions(-)
+
+diff --git a/tests/test_processes.rb b/tests/test_processes.rb
+index eb21a6cec..9546022e7 100644
+--- a/tests/test_processes.rb
++++ b/tests/test_processes.rb
+@@ -32,23 +32,42 @@ def setup
+     end
+ 
+     def test_em_system
++      out, status = nil, nil
++
+       EM.run{
+-        EM.system('ls'){ |out,status| $out, $status = out, status; EM.stop }
++        EM.system('ls'){ |_out,_status| out, status = _out, _status; EM.stop }
+       }
+ 
+-      assert( $out.length > 0 )
+-      assert_equal(0, $status.exitstatus)
+-      assert_kind_of(Process::Status, $status)
++      assert(out.length > 0 )
++      assert_kind_of(Process::Status, status)
++      assert_equal(0, status.exitstatus)
++    end
++
++    def test_em_system_bad_exitstatus
++      status = nil
++      sys_pid = nil
++
++      EM.run{
++        sys_pid = EM.system('exit 1'){ |_out,_status| status = _status; EM.stop }
++      }
++
++      assert_kind_of(Process::Status, status)
++      refute_equal(0, status.exitstatus)
++      assert_equal sys_pid, status.pid
+     end
+ 
+     def test_em_system_pid
+-      $pids = []
++      status = nil
++      sys_pid = nil
+ 
+       EM.run{
+-        $pids << EM.system('echo hi', proc{ |out,status|$pids << status.pid; EM.stop })
++        sys_pid = EM.system('echo hi', proc{ |_out,_status| status = _status; EM.stop })
+       }
+ 
+-      assert_equal $pids[0], $pids[1]
++      refute_equal(0, sys_pid)
++      assert_kind_of(Process::Status, status)
++      refute_equal(0, status.pid)
++      assert_equal sys_pid, status.pid
+     end
+ 
+     def test_em_system_with_proc
+@@ -57,8 +76,8 @@ def test_em_system_with_proc
+       }
+ 
+       assert( $out.length > 0 )
+-      assert_equal(0, $status.exitstatus)
+       assert_kind_of(Process::Status, $status)
++      assert_equal(0, $status.exitstatus)
+     end
+ 
+     def test_em_system_with_two_procs
diff --git a/dev-ruby/eventmachine/metadata.xml b/dev-ruby/eventmachine/metadata.xml
index 9a6d487f6b15..21498041991b 100644
--- a/dev-ruby/eventmachine/metadata.xml
+++ b/dev-ruby/eventmachine/metadata.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-<longdescription>
-Ruby/EventMachine is a fast, simple event-processing library for Ruby programs. It lets you write network clients and servers without handling sockets- all you do is send and receive data. Single-threaded socket engine- scalable and FAST!
-</longdescription>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">eventmachine/eventmachine</remote-id>
+    <remote-id type="rubygems">eventmachine</remote-id>
+  </upstream>
+  <longdescription>
+    Ruby/EventMachine is a fast, simple event-processing library for
+    Ruby programs. It lets you write network clients and servers without
+    handling sockets- all you do is send and receive
+    data. Single-threaded socket engine- scalable and FAST!
+  </longdescription>
 </pkgmetadata>