gentoo resync : 08.05.2018

3 files changed, 6 insertions, 38 deletions

diff --git a/dev-ruby/rack-test/Manifest b/dev-ruby/rack-test/Manifest
index 6c05762906d7..1f639a4c4979 100644
--- a/dev-ruby/rack-test/Manifest
+++ b/dev-ruby/rack-test/Manifest
@@ -1,10 +1,9 @@
 DIST rack-test-0.6.3.gem 23552 BLAKE2B d494f7fa3d2f7ed6fc6d33e507c445990613425826ec2e3d059d978b09d316ab93685aa5fd00ea89d00002ec7ec242f7fa64a42ce214fa7e9c40334d7e7a3750 SHA512 a5ad0f20130eedc153515127d2483cb1322c230ab772307943ec6eb295706f3aab26c8599cba69323b3cdc5692b284ba0609d8db957ade7085a95d94ccdf8b41
 DIST rack-test-0.7.1.tar.gz 24492 BLAKE2B 594fa05287399425557f579c871accdd268c463e77bef3e86f2141f5c5d824abc2a245a636390e0957cafb2db86a5483f9de2f13571b5c44a506f93122fcd2f0 SHA512 2b202d1f485fa2aa927d2c599e0b3bde08f5d93b6e8a36ccee5b5e064acfd0979154de8db8639bfb78f3ab038b006305379389889239dbee13020b72f060a8db
-DIST rack-test-0.8.2.tar.gz 24830 BLAKE2B 730581f654501faf0aa243675738e67a8b1cc5cce9df3040b40cdaf00bd9c3fd2feee11656442aa413132a268d971b34732626e27924ecd32fee30ac6ca6d211 SHA512 3012c1f294835473605e2f648af0cc19b9d4bc5963d507a0beae31782ea84c613bfc43a1995f8808174d468206aa9c66953cbc1ff83e9e7876142594115d063d
 DIST rack-test-0.8.3.tar.gz 24842 BLAKE2B ea02ce5e5a460c43b0299e3b6e3412efb1be8991ee14f924e7b2b8fb995917aad1cd809240a6389226b0a6f356ba94534082637aa7ad7f4ac4c93b86277dcf23 SHA512 ae2afd43e8b6643acdc7b4988df7dea5a5f00231df92127841aa52cb89c0a1891e13e5d6f321acbd95ce86b7372b340f0f863f01e500ae7643699c27077b767c
+DIST rack-test-1.0.0.tar.gz 26188 BLAKE2B e1df3e0d0e9cb8757bc898a2780a45f808921638a01a9ade0c8ac3233745992fbec1780ca36d4595e5a89bf124dcec0fc74fc33e9b22c46723e851aa371a73b8 SHA512 e654a10359b771607eb5295f574ac4a7b42afafc9a85c65e87a54559db1b5221b6e4b5ace18db05acfec1f381caa93c4b3be1912c3f08fbb74861d6053a2d242
 EBUILD rack-test-0.6.3.ebuild 959 BLAKE2B 97f7f0ba6f376e50991dadf70c745069b295c03e0a2f139307b089d4287e9c2419d2c0e26f22b746c102efb229df4287c35db85e8020df69f8e9e5e067047fdc SHA512 732544b35298ca4b7a5124ef0ecb55a1df59ec39a4b7a60285f31744c2005156bb26243ee17bab495bd1d5887e652295bd0e6d348e05d79f128685b7e045056e
 EBUILD rack-test-0.7.1.ebuild 1059 BLAKE2B 9d13171c4cc3a4f5d991223278d96d194929b8af8dcf3208e624cbf20240cd5147f601beac94a8fbd4f5c1eb2c852b277b085296efbfba7fd24ef7e1bfc9d344 SHA512 f3e08c4654026b85322107f60a21197ff07cc4c67a498e03478f4a168e82fd58bd014fe5f0a176d30c0fbbbeac9033b9b992c4f9c5f6b470a36878bcd12a559c
-EBUILD rack-test-0.8.2.ebuild 1059 BLAKE2B 9d13171c4cc3a4f5d991223278d96d194929b8af8dcf3208e624cbf20240cd5147f601beac94a8fbd4f5c1eb2c852b277b085296efbfba7fd24ef7e1bfc9d344 SHA512 f3e08c4654026b85322107f60a21197ff07cc4c67a498e03478f4a168e82fd58bd014fe5f0a176d30c0fbbbeac9033b9b992c4f9c5f6b470a36878bcd12a559c
 EBUILD rack-test-0.8.3-r1.ebuild 1150 BLAKE2B a243633049097f3d7ddb3054a4fe752d3a394dd32350e53de8889fedc158de5ebbd1e9bbcf016a683a6d4636e37a71f277b59f8aff3b8da6fbf85d8fc6455c23 SHA512 4d8d31998f3c42a2c2fe64fcbc1a2c328e0f0b068b5caa75c9a736f1eb2b991fe81ad98ac49d21f09edb97ec51f58d9a78b165bbd6fa1738ee189f152b0841b0
-EBUILD rack-test-0.8.3.ebuild 1059 BLAKE2B 9d13171c4cc3a4f5d991223278d96d194929b8af8dcf3208e624cbf20240cd5147f601beac94a8fbd4f5c1eb2c852b277b085296efbfba7fd24ef7e1bfc9d344 SHA512 f3e08c4654026b85322107f60a21197ff07cc4c67a498e03478f4a168e82fd58bd014fe5f0a176d30c0fbbbeac9033b9b992c4f9c5f6b470a36878bcd12a559c
+EBUILD rack-test-1.0.0.ebuild 1143 BLAKE2B 6c2349179b80a907b79dbc7664b3ce7490da9f4a857aaf70a25dcfcc679c702d3cb84f0b2d56d29b6f7d33abd9210dfd77fd5719c28e972495f3a65588a9ace0 SHA512 bad849eee444b4f21b42f85e5d2b8a1bd94d9d42ff1ffc9ae9fe48368f1313e52850bac164e667af57905c44d59a7fbd0dd7e3a2f49702585d5193abbe238708
 MISC metadata.xml 343 BLAKE2B 3d64a9d71f8ea0b1af70404e282f27ba4028ccada49dd94cc54f3517a939749d1d98cf1e08c85ce1e4481971b007f88dd40b7bb9609b4879cfcceb55519f97fa SHA512 8f9aa1b7be720aa89aff9ada3782e3b7098edd7181203d78a56fd6576ff3d2cfb812557158a30353eabff9084f6cd148222f4d7cd39b7cf0073c4f9da0aacd0d
diff --git a/dev-ruby/rack-test/rack-test-0.8.3.ebuild b/dev-ruby/rack-test/rack-test-0.8.3.ebuild
deleted file mode 100644
index 17244a49bd63..000000000000
--- a/dev-ruby/rack-test/rack-test-0.8.3.ebuild
+++ /dev/null
@@ -1,34 +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"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit versionator ruby-fakegem
-
-DESCRIPTION="Rack::Test is a small, simple testing API for Rack apps"
-HOMEPAGE="https://github.com/rack-test/rack-test"
-SRC_URI="https://github.com/rack-test/rack-test/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~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_rdepend ">=dev-ruby/rack-1.0:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "
-	test? ( >=dev-ruby/sinatra-1.2.6 =dev-ruby/rack-1* )"
-
-all_ruby_prepare() {
-	rm Gemfile* || die
-	sed -i -e '/bundler/d' -e '/[Cc]ode[Cc]limate/d' \
-		-e '1igem "rack", "~>1.0"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rack-test/rack-test-0.8.2.ebuild b/dev-ruby/rack-test/rack-test-1.0.0.ebuild
index 17244a49bd63..9097ac5cbdac 100644
--- a/dev-ruby/rack-test/rack-test-0.8.2.ebuild
+++ b/dev-ruby/rack-test/rack-test-1.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
@@ -31,4 +31,7 @@ all_ruby_prepare() {
 	rm Gemfile* || die
 	sed -i -e '/bundler/d' -e '/[Cc]ode[Cc]limate/d' \
 		-e '1igem "rack", "~>1.0"' spec/spec_helper.rb || die
+
+	# Use correct version
+	sed -i -e 's/0.8.2/0.8.3/' lib/rack/test/version.rb || die
 }