gentoo auto-resync : 29:03:2023 - 15:53:38

3 files changed, 2 insertions, 88 deletions

diff --git a/dev-ruby/eventmachine/Manifest b/dev-ruby/eventmachine/Manifest
index d69394b59b08..02f786cdbe85 100644
--- a/dev-ruby/eventmachine/Manifest
+++ b/dev-ruby/eventmachine/Manifest
@@ -2,6 +2,5 @@ AUX eventmachine-1.2.7-ruby3-process-status.patch 3126 BLAKE2B 8bd6bad1afc4063c3
 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
-EBUILD eventmachine-1.2.7-r4.ebuild 2967 BLAKE2B 80969dd286ace84396106a6d1bccd946a4f3ae8d3511efaec2cad61bb90ddccd0911bc1bafac4a3e93d26fc71a330a257eef9c563ffa0c80a6c20b1a6f26ae40 SHA512 60b7a4bcfa9e9f107a8c2ddda0876f1f89c7744a6b966283aa6ba7724437597d0e97af3b927247fe7bce0ca41418c590fc755bfa592884533283a4bea4e60826
+EBUILD eventmachine-1.2.7-r4.ebuild 2965 BLAKE2B 80f59c9119319584806b453ae6268b0e0f1bc2f49d5a9caa0c0bc6d5a7ab5fd87233bcf14afa614189f7384631176c6840a0bf5e257712871a80bca1c0ca27ec SHA512 2bfcf6e994c36aa2638b819655dc221aac99e7bac52ca7763d9e339d61ff5ade1d3fc51ae76758764043d5fb5c79a569dfd675e62b9b6e6e848653388869dc69
 MISC metadata.xml 704 BLAKE2B fd774ca077cac2af22f013c93bc5f84919c935ea85824b4da271228d448606a6bc6906667fa6b1caa3128291fe8d22ef16aecf9c35b5926add8ed8ea0d433be2 SHA512 8fd3aae0e956312c522cffafccde0914b477c3ef16d30317431feed1c1315a9d6abadb7ab7c6a9b25410f980f1d3ff6cff5998dbfbf19b75c5072b177c8d8e3e
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7-r3.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7-r3.ebuild
deleted file mode 100644
index 268f40c9d2c3..000000000000
--- a/dev-ruby/eventmachine/eventmachine-1.2.7-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-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/
-)
-
-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/eventmachine-1.2.7-r4.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7-r4.ebuild
index 482bba2d56f2..5929734388cb 100644
--- a/dev-ruby/eventmachine/eventmachine-1.2.7-r4.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.2.7-r4.ebuild
@@ -23,7 +23,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-openssl-
 
 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"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"