gentoo resync : 05.02.2020

4 files changed, 25 insertions, 69 deletions

diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 1e9f1d2f5bbe..3ab52af61aa4 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,13 +1,10 @@
 AUX rack-1.2.1-gentoo.patch 410 BLAKE2B 18246afd31b682e66a5bdd92c08bb9faed9a9fe22fade22f2c124a3a499b67794082e1bd03081c1914793003fe3c0a73b2d42f51395fc2603eb6513a3b404ece SHA512 03dba431bbdd77f87e0f26ccc6022248edbde20930254da1c55db6115dd49be5dd3f16919e15ee7baab40682b3f959b52692d5018b09ad79d4db3acb3adf6f43
 AUX rack-1.6-rewindable-ruby23.patch 1360 BLAKE2B 062c4a474959c4dce61969583b6aec1ae98acff38c1e72f5e22440c4c8938dbaa2142d70a0354948c151eede2b23ca5accadc72aeab366ca1457216d9725292a SHA512 3cb110af584cc3f767a0d3976acb66f37423559865af0726109419728ce6fbe9f484ac2340b1816ae89c1a59ca64330c1bfe4be3910bf6a8ecb05784115a1cda
-DIST rack-1.6.11.gem 230400 BLAKE2B 923a0a1ee7c3ea86c76e632764a678d47be4d4d953d3166488fdea6c198a64603017ff0bd21597dc633dbcb1f108363c52480a98ac0b80991fc4a759dd374f6f SHA512 f54d9c4d72d22c57624bb745399ac0d4f155185d01f956ad395bee2a0add6f11e8d9d25fcd330ec6aa97409ba10c2246424d067999b86f2e5cb1fd74a43c6529
 DIST rack-1.6.12.gem 230912 BLAKE2B 98a3ae6905535b284a5e723d39db7788f97c11b29506fbdb3c584c53d1dae35d1e8006724e5f63195d8407521806c53a5fcf47544b4241370a3576e6dbea0dc6 SHA512 9d0f6f44d228c1b6a7b0fbf29a1e5a2f45339b4749d563336c1729d88c3e37d6360fedde75b7cfcddcd7e051025fc50f04b594fb68d499899e96e2385478fe76
-DIST rack-2.0.6.gem 255488 BLAKE2B 7b23ad825e3e82f5010e810acde5eb6f3696489a78c3c67d7ac6cd73574236f83107b8a5fc0dbd4c932e2bf866c03208933d4e5bd78bf8d57aff02f96bccf6e8 SHA512 f1b93bbd16b7e44423c0977444183d9685e3c82e806304f304620731e5b4590920dcc363026277aa4b9ee0a2151c54570be341dcb9265517c7315ca4a504ef22
-DIST rack-2.0.7.gem 254976 BLAKE2B a005cfcfb4bbd6884c415a8604aeea5a93f2c182e8fda25a64af2393485c09e06fa16b2e5905274d3c9ae8d91c9f451d7f5949a9c3c7fb6592a210f8ce1fbbea SHA512 caefa4c3b6a76dd3f57f229fa0a6b0e1d84b7e9a029c6b473695b44467ae1400d098132b206092cd900e636af6d734117fba02ec21a90500f7fab8aa9dd84cd2
 DIST rack-2.0.8.gem 256000 BLAKE2B 30fc53abd2a9389ef00b1803d2d329b10288356fadfeaf80e0b6f7d2327b5aea058626f50d228454716007b1be0b316c6083debee98c0d0ee5eed458600f8315 SHA512 88c406cfe38c3db1a3502fc563272a99d8f2e36bfea1122cdea6b6b49b0e6b5649e1f0864161793eed83cb3d934aa260650b703bb1b059c6e56c6073c2060fb2
-EBUILD rack-1.6.11.ebuild 1808 BLAKE2B f86bb0cf99df2b8954e431c901468768cb501c2a500d836a1dbdfbfeddcfea07d16d3bdaa1499ed9bc9c4cbddc2cc7599ecfab8b4556c9c9bdc9b9b5cd09228f SHA512 4dc17ddf01e42fa8de9d53eac0370f4154c2f2ec7f76925d851bcc73425e078fa5f96a28fd7bb83126fe9d38c6758a054c4b8fd81a4b340d878ea01d984f250b
+DIST rack-2.1.1.tar.gz 250934 BLAKE2B d7d50c011d963dbfcd5dc456bca5711fa46c062df88f70280407cf617fde0c954f9a9453ae077dcdeeea54ac6291388420f37f25f629193112aaaa1bead6a55e SHA512 806842fdf1df332fc13d1aa8c4fa3f5bf091eaaf5db8684ad2c2de23d41955f850dad5da3ef7ca89ae5c51a0eea78e2d31b2c5465734ec949948a1fbc911427b
 EBUILD rack-1.6.12.ebuild 1696 BLAKE2B 32c4b3b7ac5eed90a5e9d65a8bc0899bb8f00f1f285a1a4392bed213a00896fb4dcc8dd3ff6b0e89cc09276b4add25e44d0f68c11743eb5696615610030ebd5a SHA512 fb879bc94b7e264802665103f2392303dd22cadb4d4ace4416085b6fb2c515e53c33e113bd09e916bcd0c9452a55464a7f6c5d1eb2972f7ac31aa4e4f4b68446
-EBUILD rack-2.0.6.ebuild 1433 BLAKE2B bcf58be4033781371278c20ac1b002189cc6b6615c71cb83321da3320004b51e1c016b45d2d2475ea011682eaa6a9778cb2c91b8013218b5a8c0f1f0be876e46 SHA512 c6822eccbf21be1927613dd7ec7d4c0dde4dec743b0be4230be64f5ee5fe92d267083c1136d5763f6352c961cbf47773130042afa54b2bea303b9541e06fc8b6
-EBUILD rack-2.0.7.ebuild 1434 BLAKE2B daee063f7659acc881f7f299690b296a4d2e4cfc6abd05115802ea72437fb2302c67d5377a503b696f5acead58160a86c461f7f489d3492db3aa278bc6b83db6 SHA512 9998ccd98eca4414869edac9ae4c88cd96e961cf6b85f4b465b9eecb5d96bc3650eaec48f90416fda16ec5230dc8bdec63f0e324a46d6f69095f5ad0b080dcf3
+EBUILD rack-2.0.8-r1.ebuild 1413 BLAKE2B f37d1550e98bde46d4c9be01f65d3ad26094f2f20a36c34463788a9a6d5b41675363ea3f17882e56588e37b91dfa0432893d7f7850e11a7bf8106bf9936dd24a SHA512 18c1e3f9005ec097dac587e7fbe7faccf93098325407183037d72f398cf9fda6c81efb67023d2e4dfacb4a30f7ec2237bbbbc4d5280e0a53f9355c93f8a40077
 EBUILD rack-2.0.8.ebuild 1387 BLAKE2B 134d5c1dd981d3d595d50129a809f9124d3ca0236de01170e5e87abb66e168a46b8e588c5f4494da0d6e28385142f8c8cc714af0de83d91db96789dd70341bec SHA512 5a4f927a4557f76e5b9ffc739588b833fedee1798c197171e562852fcd53f6095486c643b0ca3fc6cc35d2ab0f30d919f3f3c6eedea60058db8433f067f044ae
+EBUILD rack-2.1.1.ebuild 1416 BLAKE2B 306fe042aee8f2e79562c8fdd8375f3924a3f77484c487474a3594c806c60ff1dcec51f28d8eecce56667ea063d78c963ec8b81ac0a3a2619ad11580935c8a19 SHA512 831b559f3d8a4da43081b61ee9792c4ef558b50fb0d2e12603e0088462aa1adde4254b8371fef5f0b698de58ceb6cef1c725d2bf40c76c2fd0def1452f8537ca
 MISC metadata.xml 391 BLAKE2B 5ed2f863a5fd68cf57f25afc2c2efa63df1eb25c4e01087130f70edbbd1b79c655ff7455b73ecdd31e083cd35381331fceef52856f946d24fc3d313705fbaef3 SHA512 7ffff4c4cc64855b0c95e2364fa9cfd1e3b06946155cc8244444f5f4e450abda8d8387aabddc224b94a55ff3d5e42391970e5541923e5aae24f408113a65a5c7
diff --git a/dev-ruby/rack/rack-1.6.11.ebuild b/dev-ruby/rack/rack-1.6.11.ebuild
deleted file mode 100644
index b3501524df2d..000000000000
--- a/dev-ruby/rack/rack-1.6.11.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md KNOWN-ISSUES README.rdoc SPEC"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://rack.github.com/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch ${PN}-1.6-rewindable-ruby23.patch )
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-ruby_add_bdepend "test? ( dev-ruby/bacon )"
-
-# Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5"
-
-all_ruby_prepare() {
-	# The build system tries to generate the ChangeLog from git. Create
-	# an empty file to avoid a needless dependency on git.
-	touch ChangeLog || die
-
-	# Skip test also failing upstream in preference of making a security release available.
-	sed -i -e '/knows to prefer plaintext for non-html/,/^  end/ s:^:#:' test/spec_showexceptions.rb || die
-}
-
-each_ruby_test() {
-	# Since the Rakefile calls specrb directly rather than loading it, we
-	# cannot use it to launch the tests or only the currently-selected
-	# RUBY interpreter will be tested.
-	${RUBY} -S bacon -Ilib -w -a \
-		-q -t '^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|Rack::Server)' \
-		|| die "test failed for ${RUBY}"
-}
diff --git a/dev-ruby/rack/rack-2.0.7.ebuild b/dev-ruby/rack/rack-2.0.8-r1.ebuild
index 705fdd07effb..6ccbc9c8b581 100644
--- a/dev-ruby/rack/rack-2.0.7.ebuild
+++ b/dev-ruby/rack/rack-2.0.8-r1.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.rdoc SPEC"
 
-inherit ruby-fakegem eapi7-ver
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
 
 DESCRIPTION="A modular Ruby webserver interface"
 HOMEPAGE="https://rack.github.com/"
@@ -26,7 +28,7 @@ ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/concurrent-ruby )"
 # make them dependencies at all.
 
 # Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6"
+RDEPEND="${RDEPEND} !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6"
 
 all_ruby_prepare() {
 	# The build system tries to generate the ChangeLog from git. Create
diff --git a/dev-ruby/rack/rack-2.0.6.ebuild b/dev-ruby/rack/rack-2.1.1.ebuild
index 6e4cb7682a2a..6600d14fc888 100644
--- a/dev-ruby/rack/rack-2.0.6.ebuild
+++ b/dev-ruby/rack/rack-2.1.1.ebuild
@@ -1,32 +1,39 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.rdoc SPEC"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC"
 
-inherit ruby-fakegem eapi7-ver
+RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
+
+inherit ruby-fakegem
 
 DESCRIPTION="A modular Ruby webserver interface"
 HOMEPAGE="https://rack.github.com/"
+SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-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="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
 
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/concurrent-ruby )"
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/minitest-global_expectations
+	dev-ruby/concurrent-ruby
+)"
 
 # The gem has automagic dependencies over mongrel, ruby-openid,
 # memcache-client, thin, mongrel and camping; not sure if we should
 # make them dependencies at all.
 
 # Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6"
+RDEPEND="${RDEPEND} !<dev-ruby/rack-1.6.4-r2:1.6 !!<dev-ruby/rack-2.0.8-r1:2.0"
 
 all_ruby_prepare() {
 	# The build system tries to generate the ChangeLog from git. Create