gentoo resync : 28.04.2018

3 files changed, 2 insertions, 85 deletions

diff --git a/dev-ruby/eventmachine/Manifest b/dev-ruby/eventmachine/Manifest
index 013ece7badc9..66c2c7317438 100644
--- a/dev-ruby/eventmachine/Manifest
+++ b/dev-ruby/eventmachine/Manifest
@@ -1,5 +1,3 @@
-DIST eventmachine-1.0.9.1.gem 235008 BLAKE2B d19fea338daeebf1c7c4ca64de7643ff46e455feb500979c1de96d1806d379c337f70189039d700889eb2ef416b35cd45f298656abe6c5ef79ba2da4dba0ffb8 SHA512 5cbc178c604fe9a21850c298f7a5b6f904573f5e1db9e07fee599c5700841c52ec0311a6e50192eff9c1bb45cf30a9dd81d2150fe9d04cabd24cc7c9c32c5df0
 DIST eventmachine-1.2.0.1.gem 241152 BLAKE2B f7df9888ba9f3ef731099124ce7cf2b6b396f57dc948feb828f015f2b33426348c87f2443fc6f678e94550167241c2ae154f3679b13b3b7e1bdb6bcdae6cfaab SHA512 a861a2c5172b7cf2720bdb54f52ea96c311c10efdb2f54970054901674e044a72307a5b32210efbbdb78d0472a9b3fb6e898640e1c0b406bdad8b581970e30aa
-EBUILD eventmachine-1.0.9.1.ebuild 2439 BLAKE2B b18994687da59fc0ed75fb1e96463b10b671325960491d3fff8691f287fabe1a8fdd1604d7dcc5c0d14876aacfe778084f65d74bae83f3ad0d4b608aeab4b15f SHA512 a94a37275262e2b30a753e31fa5090bba3fd6ec1b05651fc6bd6e2a5ceb1d893c46d1643ce11dcf5ec1cd78be7616f4191d7e2e44f90d3183e8cd36d9d3d9379
-EBUILD eventmachine-1.2.0.1.ebuild 2775 BLAKE2B 8a4aa28d361184b996a1faf654a14ed96587101fe9d1687ba87d898df9877f25ce1a2cf3ab8b23af6d7290c9e79bc1a2916b1fc7b89d84daecca7ac3670820fc SHA512 595085177d653dc93d4a7a5a6e7a2aabb21d46497bff147d13d27fb1091e9068c01786533a8a00d5992c9d10a86b03fcd1eebb6b5c353749a70fb579373d25d8
+EBUILD eventmachine-1.2.0.1.ebuild 2774 BLAKE2B 49a46edecc1b6da43cf90d5da669818ecef2722450f5245651976421ba5c0ea77db4a7269df8c66d35ec780be4acdda49add7a0fdc6aff06fde47e6a5de08bb8 SHA512 9f8132929ec7ef0b4c121d0456baf88dcd3943aafda51cbeb5fb5214ddaa01423022250ed6aae6194358cd2215d1c51f3f1e3ee20034f63d86d890130ffd63b9
 MISC metadata.xml 523 BLAKE2B c8c4dc99c1560b2dc7233a194f0892bf86397594daf3896408d080632dda52cae3fef16654e2a35340bc0746befab669071ff9de7707fcbd92583472aa52f73d SHA512 622ac8cdd832ad49db828fefc3c9ab089e1d7e3795e369778591b4f572a647a99d4625fb9a3624189d0521a8daa9d2360bfe01fd905e8d106b83e244d900e509
diff --git a/dev-ruby/eventmachine/eventmachine-1.0.9.1.ebuild b/dev-ruby/eventmachine/eventmachine-1.0.9.1.ebuild
deleted file mode 100644
index 7f0b8880d3c2..000000000000
--- a/dev-ruby/eventmachine/eventmachine-1.0.9.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="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
-}
-
-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 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.0.1.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.0.1.ebuild
index af902ccb1330..600e79ac5697 100644
--- a/dev-ruby/eventmachine/eventmachine-1.2.0.1.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.2.0.1.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="${DEPEND}