gentoo resync : 28.04.2019

3 files changed, 2 insertions, 62 deletions

diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index 19a4fa5ecce2..76ac303c9b37 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -1,7 +1,5 @@
 DIST thor-git-0.19.4.tgz 88733 BLAKE2B 8be54310cc4bf4a0308e6b103832831b89285003bb22a679986cd02636aaee57a25aa606f3e99bf532961a4e1d3625c46bfdb874a09f66cab85a21e5f7ed22d6 SHA512 a5cc52b23806e6104b12f924324960f2567bcd6c73b72ad47c33da222201b0377e7677b996698774de8adf3eff551926393785323ecf46cb59d72eb0e5b05aa0
-DIST thor-git-0.20.0.tgz 91758 BLAKE2B 86e4079a86a9c65852e710e40e49e915afe5522512f061ecc62aed48acc08a5397cc82d45cff7c4b1dd549ec57d8699b9afe7c391ac9ab838d1ba9100f1f058a SHA512 aa5344c94cad7c33dd0582409dbcf9bd109bf97b37131357a4cc8a66317acf8781460e8fe5532b301a74521010be59bb34ac1c68bc01ad3140bfe73fedc2a451
 DIST thor-git-0.20.3.tgz 94786 BLAKE2B a27ef27d9d375c1f5ab1b065f6ee5b635dab3b43cac7915ae24771e7a9e24189b8c3df8936bf6ad333f0660e4e36ff73372746afc227972f1745dc993b90c85f SHA512 368cedd9584fcdecf8f5feb9b727aa283b37747e8200f8629aaa762f8e3a59dafe6ee1e7c60ef2b43b2a16b319842b10d0f3face12ba8dded4b6211640db7f44
 EBUILD thor-0.19.4.ebuild 1155 BLAKE2B db1b5e8f9f73f8638aea3ead1a1cc7e754a829c8be39d8179aa5a7b9af1ce50349191bff14e2a8c52d0f3e54e64cd60d7eb486c55b6316f951e4660c3f7826e9 SHA512 74b73fbce42e3fc78572b5d9723fdeb6d00fea7544583540bce034265ce27744c4cfa86b346331d1db051c6858a420afcac5ca027ed9d4fc987d7e9a424c47b6
-EBUILD thor-0.20.0.ebuild 1437 BLAKE2B 2402abd3eb5b17bbd577f0a77df7d95b51a38e023555b0f39136cc9e3d3a0e53b80ba375a3851c4ffd037d5341f1d6606583c7339429a436df2c140ca9b6d990 SHA512 90e2e05922022ed356d7c81812cfadef0ec1fff1f0f9680edf9c039d33cdebc44128f31408df83e1eee7cd1696cfa267ec239bfd9dd0941dd16d7daeb299fda6
-EBUILD thor-0.20.3.ebuild 1434 BLAKE2B 4195ce295cb435a9c627d99a5293d4e473947650659cfe48759ada070537465bb4008faf05f77fd7f2d33acfc162f45f655fd36bd37dbd865ce6cca550bf16a6 SHA512 bed3115b8a2689a73451dc6940d4ec2044a7677d1d1b91233d191d21dc86788951f4aca1a359b505bb201185ccbeaf5b40e45ab82b69a93c918976f265d7da67
+EBUILD thor-0.20.3.ebuild 1433 BLAKE2B 44073f770cbb4fc0c927d7108829238202879e28cad4a68044d47dc50d9a01d878adc8b8425b4de004e7e07ed1b396e2e4c077ab68c36bad4b1297121dd9456b SHA512 7c564aa7b567c3030efedd3d523605dd25fd3ad043e4b4f54cb2c3b970918cab056d4fced7231e8f7a7ae1d2355903521fdffc645d3604d5cb94b4122a09d0da
 MISC metadata.xml 680 BLAKE2B d4b03ac058de229b055e01ee99da7745a8fc67200979f626b55d6156d573269bb260c42ef44d6dd3b391a3e06d46844ef3fcd7cdd1f0d4053957c00bcfb1fd27 SHA512 d4938ad6ec003fe17d09274f39a2526c84d69d447b1e8063e9301000b776496fb3f8fd6d7e596791d9f8d05714e856d6a6d8df2c5c4747420e3221edf48ab264
diff --git a/dev-ruby/thor/thor-0.20.0.ebuild b/dev-ruby/thor/thor-0.20.0.ebuild
deleted file mode 100644
index 60e9b5f02184..000000000000
--- a/dev-ruby/thor/thor-0.20.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_BINWRAP="thor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A scripting framework that replaces rake and sake"
-HOMEPAGE="http://whatisthor.com/"
-
-SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc"
-
-USE_RUBY="ruby22 ruby23 ruby24" ruby_add_bdepend "
-	test? (
-		dev-ruby/childlabor
-		dev-ruby/webmock
-	)"
-
-all_ruby_prepare() {
-	# Remove rspec default options (as we might not have the last
-	# rspec).
-	rm .rspec || die
-
-	# Remove Bundler
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Thorfile || die
-
-	# Remove mandatory coverage collection using simplecov which is not
-	# packaged.
-	sed -i -e '/require .simplecov/,/^  end/ s:^:#:' spec/helper.rb || die
-
-	# Avoid a spec that requires UTF-8 support, so LANG=C still works,
-	# bug 430402
-	sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby25)
-			einfo "Skipping tests due to circular dependencies"
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec spec || die
-			;;
-	esac
-}
diff --git a/dev-ruby/thor/thor-0.20.3.ebuild b/dev-ruby/thor/thor-0.20.3.ebuild
index 1b44a1408aae..8f4a9e1875a4 100644
--- a/dev-ruby/thor/thor-0.20.3.ebuild
+++ b/dev-ruby/thor/thor-0.20.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="doc"
 
 USE_RUBY="ruby23 ruby24 ruby25" ruby_add_bdepend "