gentoo resync : 25.12.2017

3 files changed, 2 insertions, 41 deletions

diff --git a/dev-ruby/concurrent-ruby/Manifest b/dev-ruby/concurrent-ruby/Manifest
index 132c5448a8e4..d03aaaeebaf2 100644
--- a/dev-ruby/concurrent-ruby/Manifest
+++ b/dev-ruby/concurrent-ruby/Manifest
@@ -1,5 +1,3 @@
-DIST concurrent-ruby-1.0.4.tar.gz 1299941 BLAKE2B 1c540f811f590bc420ef8b8feb8ed9625549e923162bdee8afe1a8a9bc41d148718f954ecc85eea587282e05fa36107a2498bc11099bb9ef4af52d43e3b74557 SHA512 f905cc1b42b100fb961d774fc7cf5cb19d4f6fa1342ae782b9a018a8fb84f0d7cfe954f809645d6f485ac01247a5207fbc6b11e051dc9dd7fdd679793ba6a47d
 DIST concurrent-ruby-1.0.5.tar.gz 1307802 BLAKE2B 2eee2afdd33e2609608e9389847de380eb895c2193746b1190ea96ca8bb67eaccd8d141bc2071006afbd971f078e5b6452d1e62624892c0fce2c12b8ac9fa28b SHA512 fdf7324b56bb37b4a79dc89882354e452ee838a097f522fb906c20a06856303cfbbae16f2500255cbfb4bba33ee1b3b3ee8facf3d0156e976add64209e349da6
-EBUILD concurrent-ruby-1.0.4.ebuild 1235 BLAKE2B 0db8a9f0481fedc65d5878f371f4881dae093200370ba60c3f228d4c541d32939501f357b06e8d1404d6763a4a560c1ba254cbb375075ee74a1656499a7225ae SHA512 23f89beedb123cb0a09ad845900cd8570fac95fcd0dbd5eaabe06db60f6dd7336e731f41f03b0bfe7f57f65159e0ace8d06437969260c51ab4997331391e4848
-EBUILD concurrent-ruby-1.0.5.ebuild 1255 BLAKE2B fdd1ce259c5b1ca6cf9d4f3eabb969f695f2f3dfe8e02cb802ae1b42bb43310957c95e4810127994f094f2135050674218d4b71f50d4245869ea9454ddb44c45 SHA512 3d558793f9cd57c15d5e39ff05485dab708b744b2f4b8ef2f87c9118ce4841976ff9e15a0e525ac9e6bd3609c70b5cd38c07ca7beacbde3b5c1ee4c2048a65a9
+EBUILD concurrent-ruby-1.0.5.ebuild 1254 BLAKE2B f0f0e144988ccd53fbb436ba89793e791a78feeb9c42a3d4f10730d842dc46fd4aa621eb30898102249156ad897b0cba7391356306a7fc730b8171a0131e5258 SHA512 91427a384f52557e177e555a2ba24ab465ff4c63d41e45e79bdb15d23d4a90436b55fdf223710350232cf256a791a9d229534374ba3982d982ab7afb235440f7
 MISC metadata.xml 358 BLAKE2B 4af4b67d3a6beab61cb05090b0f0a0a7802af67231fce103d84c2a475f9e65324a511f5a1c8b9df808a929281811de7b5f62a680688dd89c25ad75424bc5f2a8 SHA512 64e69249d1082b41905c309e159ad7eb8045af1c89ecc77cf119ed6014d40e83ca81bfe8938b5eaf5119fe12c02f1b1613ccc885770c897be06769af40dca85f
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.4.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.4.ebuild
deleted file mode 100644
index 7dd19e1de65c..000000000000
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Modern concurrency tools including agents, futures, promises, thread pools, more"
-HOMEPAGE="https://github.com/ruby-concurrency/concurrent-ruby"
-SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.7.4 )"
-
-all_ruby_prepare() {
-	# Remove edge files as defined in support/file_map.rb
-	rm -rf {lib,spec}/concurrent/{actor,channel,edge}* \
-	   lib/concurrent/{concurrent-edge,lazy_register.rb} \
-		spec/concurrent/lazy_register_spec.rb || die
-	sed -i -e '/concurrent-edge/ s:^:#:' spec/spec_helper.rb || die
-
-	# Remove specs for the ext gem
-	rm -rf spec/concurrent/atomic || die
-
-	sed -i -e '/file_map/d' -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
index dab18d0aff68..62a3d16b6ab3 100644
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.7.4 )"