gentoo resync : 29.12.2022

3 files changed, 3 insertions, 96 deletions

diff --git a/dev-ruby/eventmachine/Manifest b/dev-ruby/eventmachine/Manifest
index 9514b3d105d9..a1209e9c9187 100644
--- a/dev-ruby/eventmachine/Manifest
+++ b/dev-ruby/eventmachine/Manifest
@@ -1,5 +1,4 @@
 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-r1.ebuild 2769 BLAKE2B 2780a6076e53f5937ad819f42b80bccd82fb1aae37294d251c4a7cd99ca7d3de9c035397b6385dde3dc7c503bd0f89b09666e90a1263ae6db223beabb0be9c5c SHA512 3596eac9b5d44c565dd346f89e45b3dfa4e0a673af0f67d2a0dd54efddb5759c77b37fb0e899ea762d4a525509a088ba44c907e3e81e9f6a39a1eb2aa8b84cdb
-EBUILD eventmachine-1.2.7-r3.ebuild 2852 BLAKE2B addf84993bc7122148912cc550734b3ab2d43214c4583147cd2b8b5b5a4b29fe2f9a6b4f5998f2edd844746d34149d6f3148904d315f96198657d4f056a239f9 SHA512 a5b8845770ea55dd0180ed74f1bcd28d19c44bfe1ea6894bc1f69853ca770a761308cf360daa4005b883e104287a3230afa5cf0c9b6cde59bca0ce3d29b05d79
+EBUILD eventmachine-1.2.7-r3.ebuild 2850 BLAKE2B 401ee016ff46e9b0985c9657cc957ba18cbedd99934ae2789a6d1f43ba9e38ac4fbd5153f86b9ce219755ff8c7f8b61ed02ba3510a763cb9f7337954fa7745e9 SHA512 dd4027b40d63f06296e9d1b5450ba3badcc8681d89d0c0d92f68a34fb02f628c3f462ae9cf43dffc0677f55fb2f9912740917c9b68731ff9504db858df24442e
 MISC metadata.xml 524 BLAKE2B d3048a3c18741a93c913e9424e3d080ac9a68e568d201e313f6c81ec2b0b6851885989674dcf2fa3902152e0b93681b1e14330f8073b17ce389081884e168c21 SHA512 59fcb4e1c2cf8cedd8f1b09e8dfbe9a6687f8f581d115bcb905a9263aeff44171f824c7dae24bcd046d4a7a2a930e9e4aa204ef163bc8ab1b15c5874f36ce457
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7-r1.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7-r1.ebuild
deleted file mode 100644
index b3220823080d..000000000000
--- a/dev-ruby/eventmachine/eventmachine-1.2.7-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="docs/*.md README.md"
-
-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"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="${DEPEND}
-	dev-libs/openssl:0"
-RDEPEND="${RDEPEND}
-	dev-libs/openssl:0="
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Remove package tasks to avoid dependency on rake-compiler.
-	rm rakelib/package.rake || 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 -i -e '/test_bind_connect/,/^  end/ s:^:#:' \
-		tests/test_basic.rb || die
-	sed -i -e '/test_\(cookie\|http_client\|version_1_0\)/,/^  end/ s:^:#:' \
-		tests/test_httpclient.rb || die
-	sed -i -e '/test_\(get\|https_get\)/,/^  end/ s:^:#:' \
-		tests/test_httpclient2.rb || die
-	sed -i -e '/test_connect_timeout/,/^  end/ s:^:#:' \
-		tests/test_unbind_reason.rb || die
-	sed -i -e '/test_for_real/,/^    end/ s:^:#:' \
-		tests/test_pending_connect_timeout.rb || die
-	rm -f tests/test_{get_sock_opt,set_sock_opt,idle_connection}.rb || die
-
-	# Avoid tests for insecure SSL versions that may not be available
-	sed -i -e '/test_any_to_v3/,/^    end/ s:^:#:' \
-		-e '/test_v3_/,/^    end/ s:^:#:' \
-		-e '/test_tlsv1_required_with_external_client/aomit "sslv3"' \
-		tests/test_ssl_protocols.rb || die
-
-	# Avoid test that deliberately triggers a C++ exception which causes
-	# a SEGFAULT. This does not appear to happen upstream (on travis).
-	rm -f tests/test_exc.rb || die
-}
-
-each_ruby_configure() {
-	for extdir in ext ext/fastfilereader; do
-		pushd $extdir
-		${RUBY} extconf.rb || die "extconf.rb failed for ${extdir}"
-		popd
-	done
-}
-
-each_ruby_compile() {
-	for extdir in ext ext/fastfilereader; do
-		pushd $extdir
-		# both extensions use C++, so use the CXXFLAGS not the CFLAGS
-		emake V=1 CFLAGS="${CXXFLAGS} -fPIC" archflag="${LDFLAGS}"
-		popd
-		cp $extdir/*.so lib/ || die "Unable to copy extensions for ${extdir}"
-	done
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb-2 tests/test_*.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7-r3.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7-r3.ebuild
index ce7cdf3ce6ad..b49f277c998d 100644
--- a/dev-ruby/eventmachine/eventmachine-1.2.7-r3.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.2.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-openssl-
 
 LICENSE="|| ( GPL-2 Ruby )"
 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 )"