gentoo resync : 21.06.2020

7 files changed, 23 insertions, 105 deletions

diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index d4c01d66263a..f7b840f43a72 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,15 +1,13 @@
 DIST rack-1.6.12.gem 230912 BLAKE2B 98a3ae6905535b284a5e723d39db7788f97c11b29506fbdb3c584c53d1dae35d1e8006724e5f63195d8407521806c53a5fcf47544b4241370a3576e6dbea0dc6 SHA512 9d0f6f44d228c1b6a7b0fbf29a1e5a2f45339b4749d563336c1729d88c3e37d6360fedde75b7cfcddcd7e051025fc50f04b594fb68d499899e96e2385478fe76
-DIST rack-2.0.8.gem 256000 BLAKE2B 30fc53abd2a9389ef00b1803d2d329b10288356fadfeaf80e0b6f7d2327b5aea058626f50d228454716007b1be0b316c6083debee98c0d0ee5eed458600f8315 SHA512 88c406cfe38c3db1a3502fc563272a99d8f2e36bfea1122cdea6b6b49b0e6b5649e1f0864161793eed83cb3d934aa260650b703bb1b059c6e56c6073c2060fb2
 DIST rack-2.0.9.gem 256512 BLAKE2B 7da7b239e5679a2f6d19626cbaf8b4ec02a7ce7ffd086732925963ac6fe0397f180548c6065abdbe8d55de802583d7dd09de38da0d4d695559456d852d2b3d4c SHA512 5b56d1aa7bcca11c631f8205605e71f9c661ec9ea7694a16f32f6fdb493cf015d184f924fdf342abebacfbb185e367c9e6dd1288ffe9dabaf4e6566b8853a191
-DIST rack-2.1.1.tar.gz 250934 BLAKE2B d7d50c011d963dbfcd5dc456bca5711fa46c062df88f70280407cf617fde0c954f9a9453ae077dcdeeea54ac6291388420f37f25f629193112aaaa1bead6a55e SHA512 806842fdf1df332fc13d1aa8c4fa3f5bf091eaaf5db8684ad2c2de23d41955f850dad5da3ef7ca89ae5c51a0eea78e2d31b2c5465734ec949948a1fbc911427b
 DIST rack-2.1.3.tar.gz 251662 BLAKE2B 8e9adc9ab2f8e66db61d39b3b73c1cbe692965ca1ae3131ac269a21fac43c0caca58a7c19a35d2edb70f053c7156b4e7663aadf3014af331e57f6bba780ee59b SHA512 997ebae3db270515881639792ba30b14ac173f86b548304d36dbe0f865fe7b5d8fdd25bc9f791d35ce70c353939722aeae0cd348486ca56a928a692937bfae8d
+DIST rack-2.1.4.tar.gz 251772 BLAKE2B 9dbd1ac1dade5935a3819b8c23e492b3e637ed2fc99a95ad0592d40501ea4171433ac4bba08a6031cd77521f4ae0f430ea60394c51b7c5f25cd9e82b72067ba8 SHA512 ce36902125171d2c9baffdd85a171237b9262a47115f043ce96486fb60fcd77826ae28d9416c43a3549db657a3da1c7be45f14842e4b343517f23dab82abd81a
 DIST rack-2.2.2.tar.gz 277961 BLAKE2B 5823084cb8b2f66bf46f46d460e93ffc1817371d0cffd711675f5c84e934c5ac5d2a8818d7665eba2490f672344995e3ac54ac8b1dc6d891e800d049ad0db92f SHA512 d0d27d091584b6cabafaa1d1053e013bc28ac0dc7da7b5bf28e528f5479091db1c896052a4ffe75be22011d3bc35c41ce73514a47e66b28ff8d3b723c46fd42c
+DIST rack-2.2.3.tar.gz 278045 BLAKE2B 2182ab6ee2ca0e40bd131dc96cf15d7e1015570a0702c2419e50da9eae6afedc0f1543a2fdc1fb32022a65788ab486b7add688c8bf201ad46a3d101b6e625a8b SHA512 0daefd1fd7d1c83a5aaf0e8a3c0d734f805f6718c3f2d20673e78242f10fa99c24f8e8d480cb7f0ee299d96a4b691e4a19c967785de946dc863e9b78e0c3ac53
 EBUILD rack-1.6.12.ebuild 1691 BLAKE2B 27974bc4f722c22e14cab0486e18c45ea52840898e4db6979f337fa0efdf77f8d160d73ac42ddc668b7fc41c6d726ed9f6e0533f3632483670ab44a9b71e14c7 SHA512 2c68b3554715800a3d4c299d9c655618b369540925922418bc6d233da6d363a39d2eccc72d652900e4da8154a0dfeef2896cd40819e23096cdbf7396d5497f34
-EBUILD rack-2.0.8-r1.ebuild 1407 BLAKE2B d08baf4d02f0ef3c14f5cff37356383d5fddfb2801b78a32f7ba535f386adfce58d8a2f4542e917c6e25da75a8e653e055d9a9f24e2273120c8f5d9322d85167 SHA512 3b57cecbc78dd1b9556fd3424236d0524d21b138c8626522829f4f067c50f277eb14c980ac357383bfdb65e7c538629ce274797ce639bf714c306e31c5645f7c
-EBUILD rack-2.0.8.ebuild 1381 BLAKE2B 1cde5b2f8dea22373c7266973dda3a90b3adbb646836cab2f967aaebe6f5e1d1df6172675471d51ad5f1299367314a8f34c7e98041110f7e7e90d406b511d5a9 SHA512 8613f7540e3b1394f2d831368cdd9f47d1afa0aeb413e91faa67ec508a6ea17e3faa6f8f941005430ebc2bca7bdd68a717f35762befb83928ee7ca157dd9bb68
-EBUILD rack-2.0.9.ebuild 1413 BLAKE2B d1570432073873d01248c10a4b52d70cb218f990bfaf69e1f7b84f134ccadde8ee9f88d8429d7fa29672d883f411ef16f578b5875ea962afbe202af07dd05508 SHA512 0849006d5d2d546a6bec72132cc13b6e56eb08469572ac1d068a3a52a3685f87d0ebb9e699a93c0987698a3f4856d06f7e608f856145edf8cbc85a2b8b072b6b
-EBUILD rack-2.1.1-r1.ebuild 1448 BLAKE2B a3bb4ef7718521399f0d66f12acff5e857412fafacdd47db1e65e71530ee4bb0cae262f711a83010b4c44beff9c0ad90865a164465d064d8a63cce1620e2b70c SHA512 d91831f8114ac1903f4416f69ca41b8e943518d65791f66f0b60006bf65d0b89d5b2830532c2dab1d45f729299c953dd5cd5983284164b6c04f91c6a7c38e001
-EBUILD rack-2.1.1.ebuild 1423 BLAKE2B abc7ab7b68a5830e8aba72e569c4d9a09c6c8a6d7e0bc26acb6c00f9e63179b208055b36f822cea0c404dd8cd5607089269e58de63cc55332fd82141cb71578d SHA512 1c91138763267d9ceeada6b678f64b2c00cdf81ba6352845267e2abb103de0edbd2463865e4f4c6bdacc8953ef23e6906cef324ab71757ffb2b99d4a4812c074
+EBUILD rack-2.0.9.ebuild 1412 BLAKE2B 0f838af184a9643f6dbc7d89ee59e671e6684b7d7aba20a6fa975769f7848bb16f272fae1e1217fc8fdb53d354fe389126562db391339b62b063325b62d39cd7 SHA512 85b7ce62c0aeb2d21953cca4ac24bc63f5abd0eca7bd3c2cc05b532df06d16e6ed221290ef7d14d4fbd5f8f6c0e23cd81749cbbd7667ba64311f060aa74ac657
 EBUILD rack-2.1.3.ebuild 1705 BLAKE2B 72a4ad7411bf6616aff6538713d0de91dca6d5666897ef6e8076694b18aff80949b3a2401a7c5889d3015ef35242657db50bd2f220daf4602b12c34570f5aaca SHA512 2443d6a83edfd1a7e4530e13b710e7cd6ebdea5b05a2027297548565614df44bf3477c4b4473dff24c40bb77fb610464c512ad1f50385c6f7815f446c1c4827b
-EBUILD rack-2.2.2.ebuild 1504 BLAKE2B fef53b4ef4c17154f295972b6f3d8738b746abc6f6a17bc24f1930e1ba1af9dd43810b8a15312b94074ce6736f6eb02d615d1a14b569e752323f63ab93acec3d SHA512 7b9684a549f8899f4d975f5198a200b2ed31f1982106d1ac4fcfd8ea9809235aa683c4746986f865b1d4ed80820a1e58408cdeff64501f4f5a3d876de429ad70
+EBUILD rack-2.1.4.ebuild 1698 BLAKE2B 19566995b14950f7d79dc361a5170ec56df9b7a8900c658de03e5f47e3344355e96733dac9113a90245545f4c7cc3d053db1ee7877acf2750c858ce17eeb6546 SHA512 f7af118477ae7fce8fccb8c25258f6357cc7159e548f1dce89f35041c6a5172eee018f425d480b0d2511859b68973f786d3963fa74e660b2ea8d5bb6cec53be8
+EBUILD rack-2.2.2.ebuild 1502 BLAKE2B cd6f06aadf0fb8b10278d166eadd10399c1c81ecb8f3b2aa7836544ea500e338a7e81c66059061820189afe1ff8875bc75d0b360bcc7281478f0af3b728e6a4b SHA512 6cf95c001c770aaac7c3202332307eabd81000f27d2a921d070e84a5d8e18f86753d0427d8ddabbe6f83379fa42cd2c607ceca245902fe8be78f4ee9bce9d837
+EBUILD rack-2.2.3.ebuild 1497 BLAKE2B d3932fbce5d80a471397e9fa049efe6433ba4a01948840526d0974681dd0d3c28fd51a8edb2dfb3cc21fdcfcb4285f08f8fe53b213e333a45c3fae75a7e3672c SHA512 9b938e6a8b68ab84cd55deefdc237c0841aeb3095a250416eebdf6170c630127a0890e6995b1d98069a49a89ae745901c97812d8e008830120799cf09cb3e914
 MISC metadata.xml 391 BLAKE2B 5ed2f863a5fd68cf57f25afc2c2efa63df1eb25c4e01087130f70edbbd1b79c655ff7455b73ecdd31e083cd35381331fceef52856f946d24fc3d313705fbaef3 SHA512 7ffff4c4cc64855b0c95e2364fa9cfd1e3b06946155cc8244444f5f4e450abda8d8387aabddc224b94a55ff3d5e42391970e5541923e5aae24f408113a65a5c7
diff --git a/dev-ruby/rack/rack-2.0.8-r1.ebuild b/dev-ruby/rack/rack-2.0.8-r1.ebuild
deleted file mode 100644
index 6a135bb50fe7..000000000000
--- a/dev-ruby/rack/rack-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.rdoc SPEC"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://rack.github.com/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 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.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
-	# an empty file to avoid a needless dependency on git.
-	touch ChangeLog || die
-
-	# Avoid development dependency
-	sed -i -e '/minitest-sprint/ s:^:#:' rack.gemspec || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/rack/rack-2.0.8.ebuild b/dev-ruby/rack/rack-2.0.8.ebuild
deleted file mode 100644
index bf5c95f62c91..000000000000
--- a/dev-ruby/rack/rack-2.0.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.rdoc SPEC"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://rack.github.com/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~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_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 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.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
-	# an empty file to avoid a needless dependency on git.
-	touch ChangeLog || die
-
-	# Avoid development dependency
-	sed -i -e '/minitest-sprint/ s:^:#:' rack.gemspec || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/rack/rack-2.0.9.ebuild b/dev-ruby/rack/rack-2.0.9.ebuild
index 40b83f590b22..e2be992f6b43 100644
--- a/dev-ruby/rack/rack-2.0.9.ebuild
+++ b/dev-ruby/rack/rack-2.0.9.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://rack.github.com/"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~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 ~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_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rack/rack-2.1.1.ebuild b/dev-ruby/rack/rack-2.1.4.ebuild
index 66993f1521dc..f3a1f3f67577 100644
--- a/dev-ruby/rack/rack-2.1.1.ebuild
+++ b/dev-ruby/rack/rack-2.1.4.ebuild
@@ -2,13 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC"
 
 RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
 
+RUBY_FAKEGEM_BINWRAP=""
+
 inherit ruby-fakegem
 
 DESCRIPTION="A modular Ruby webserver interface"
@@ -17,7 +19,7 @@ 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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
@@ -42,6 +44,12 @@ all_ruby_prepare() {
 
 	# Avoid development dependency
 	sed -i -e '/minitest-sprint/ s:^:#:' rack.gemspec || die
+
+	# Skip tests failing due to encoding
+	sed -e '/correctly escape script name with spaces/askip "encoding"' \
+		-e '/uri escape path parts/askip "encoding"' \
+		-e '/correctly escape script name/askip "encoding"' \
+		-i test/spec_directory.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/rack/rack-2.2.2.ebuild b/dev-ruby/rack/rack-2.2.2.ebuild
index a3c128baeb13..74779c85b94f 100644
--- a/dev-ruby/rack/rack-2.2.2.ebuild
+++ b/dev-ruby/rack/rack-2.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rack/rack-2.1.1-r1.ebuild b/dev-ruby/rack/rack-2.2.3.ebuild
index 003840877047..eb76611f07d1 100644
--- a/dev-ruby/rack/rack-2.1.1-r1.ebuild
+++ b/dev-ruby/rack/rack-2.2.3.ebuild
@@ -2,15 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC.rdoc"
 
 RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
 
-RUBY_FAKEGEM_BINWRAP=""
-
 inherit ruby-fakegem
 
 DESCRIPTION="A modular Ruby webserver interface"
@@ -19,7 +17,7 @@ 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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
@@ -35,7 +33,7 @@ ruby_add_bdepend "test? (
 # make them dependencies at all.
 
 # Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !<dev-ruby/rack-1.6.4-r2:1.6 !!<dev-ruby/rack-2.0.8-r1:2.0"
+RDEPEND="${RDEPEND} !<dev-ruby/rack-1.6.4-r2:1.6 !!<dev-ruby/rack-2.0.8-r1:2.0 !!<dev-ruby/rack-2.1.1-r1:2.1"
 
 all_ruby_prepare() {
 	# The build system tries to generate the ChangeLog from git. Create
@@ -43,7 +41,7 @@ all_ruby_prepare() {
 	touch ChangeLog || die
 
 	# Avoid development dependency
-	sed -i -e '/minitest-sprint/ s:^:#:' rack.gemspec || die
+	sed -i -e '/minitest-sprint/ s:^:#:' -e "s:require_relative ':require './:" rack.gemspec || die
 }
 
 each_ruby_test() {