gentoo resync : 21.07.2018

3 files changed, 2 insertions, 92 deletions

diff --git a/dev-ruby/eventmachine/Manifest b/dev-ruby/eventmachine/Manifest
index a8a8e6913b1b..33ee7ef61ea5 100644
--- a/dev-ruby/eventmachine/Manifest
+++ b/dev-ruby/eventmachine/Manifest
@@ -1,5 +1,3 @@
-DIST eventmachine-1.2.0.1.gem 241152 BLAKE2B f7df9888ba9f3ef731099124ce7cf2b6b396f57dc948feb828f015f2b33426348c87f2443fc6f678e94550167241c2ae154f3679b13b3b7e1bdb6bcdae6cfaab SHA512 a861a2c5172b7cf2720bdb54f52ea96c311c10efdb2f54970054901674e044a72307a5b32210efbbdb78d0472a9b3fb6e898640e1c0b406bdad8b581970e30aa
 DIST eventmachine-1.2.7.tar.gz 246402 BLAKE2B 3eee1e5fbb367c03e3d801cb705a0f95b7bbb461885f04820f57421019a3d61eecabe71309981eec35168395eb6d98a8c675bd0fb225497de511f2ce09a5df92 SHA512 768ec084903dce4c737cf564fce7886a3e7e5b7d4a89c2baea3e998130c53dc00488eaa2d8e9b0133d9e4d8fffbde80c3025403881486a7968c2d84425cc1f50
-EBUILD eventmachine-1.2.0.1.ebuild 2774 BLAKE2B 49a46edecc1b6da43cf90d5da669818ecef2722450f5245651976421ba5c0ea77db4a7269df8c66d35ec780be4acdda49add7a0fdc6aff06fde47e6a5de08bb8 SHA512 9f8132929ec7ef0b4c121d0456baf88dcd3943aafda51cbeb5fb5214ddaa01423022250ed6aae6194358cd2215d1c51f3f1e3ee20034f63d86d890130ffd63b9
-EBUILD eventmachine-1.2.7.ebuild 2811 BLAKE2B 4b132e0712a7bd8e50bc5c4a0fe35cf8b0b8bcdf49b65a9df52deaf4525c59d76da04da429fda97360781a0da817dbf6fab84c27a999189246a09e48bcec9bad SHA512 e04154068c33c09281c662095046df7ebbf61f01548dc74d0605090c33eb09d4d1c6be2c82f7e9bfd576a8903d5453dde1a172c8161621f4888f56860da84216
+EBUILD eventmachine-1.2.7.ebuild 2809 BLAKE2B 2e7ec8bc8eaa96fc9c55c6bb48353c2c05d89bd955d474cb0e7ff1680f01de062638a3d87af871e06953a545f73480d90e6d572b2f8a53e50b3843b747e3f93d SHA512 e886821a5af97d2e5771d50160b417a0bcd2a3ca3d9484ee174ab0b1d8f01e48ef112c2fa5b8b0bb2ca0263cf4cfa388629ae93057b75cf7483d808b4e82bd05
 MISC metadata.xml 523 BLAKE2B c8c4dc99c1560b2dc7233a194f0892bf86397594daf3896408d080632dda52cae3fef16654e2a35340bc0746befab669071ff9de7707fcbd92583472aa52f73d SHA512 622ac8cdd832ad49db828fefc3c9ab089e1d7e3795e369778591b4f572a647a99d4625fb9a3624189d0521a8daa9d2360bfe01fd905e8d106b83e244d900e509
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.0.1.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.0.1.ebuild
deleted file mode 100644
index 600e79ac5697..000000000000
--- a/dev-ruby/eventmachine/eventmachine-1.2.0.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23"
-
-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="http://rubyeventmachine.com"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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
-
-	# fix test issue - upstream b96b736b39261f7d74f013633cc7cd619afa20c4
-	sed -i -e 's/DEBUG/BROADCAST/g' tests/test_set_sock_opt.rb || die
-	sed -i -e "/omit_/d" tests/test_*.rb || 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
-	sed -i -e '/test_ipv6_tcp_client_with_ipv6_google_com/aomit "network"' tests/test_ipv6.rb || die
-	# don't test unsecure and obsolete protocols
-	sed -i -e 's/sslv2 sslv3//' \
-		-e '/\(test_any_to_v3\|test_v3_to_any\|test_v3_to_v3\|test_v3_with_external\)/aomit "obsolete"' \
-		tests/test_ssl_protocols.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}" || die "emake failed for ${extdir}"
-		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
-
-	insinto /usr/share/doc/${PF}/
-	doins -r examples || die "Failed to install examples"
-}
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild
index 68b8c3ce8508..db8dc33c6ed5 100644
--- a/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eventmachine/eventmachine/archive/v${PV}.tar.gz -> $
 
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="${DEPEND}