gentoo resync : 25.08.2020

6 files changed, 4 insertions, 187 deletions

diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index e53179d2e9a7..ce3f1ce8167a 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,11 +1,5 @@
 DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
-EBUILD actionpack-5.2.4.3.ebuild 2225 BLAKE2B 37f1ded56d7bdc61511e02419af6757117451140d2a4521ea3bfa09385b7780e7d591311668be172e581ff154a79652f2c9478eb7c73f1ddb3cd87adddb05ce7 SHA512 bcba455021f751d0c878f27d1ae3ef759b8594af8889c3a60536c5c711f99a6824c7c5ea652c2d5ee8e94e36336b8c99e4dcb011254c574bce6f270a985544bd
-EBUILD actionpack-6.0.2.2.ebuild 1797 BLAKE2B 50ab2ddfe0dc8967b3c931ae1f5874ab838e6afc91f67c35f523c70e108b011861531ee1768c19c3d7aa8a08b5fb81f654acb302fef5d749366c7ea09de5a0a0 SHA512 be57b1597b60f2d9a77ae212ac2f802909822435451c8b7d5643068bb5881ffd683fe965ad4b40d8f29459313e3853651484aa8b24eb49651d4b047cb5d1f50f
-EBUILD actionpack-6.0.3.1.ebuild 1804 BLAKE2B 1860908e58163e92617fdd7a1ef3276ded9783978c8a5ff272c7fa5c802ffdfe8018ef0902db4bf6fc34b33803ad38cd0dd56239a8d991b03ebc9595e1619800 SHA512 8310464db1b657e51556aee7022afbae1a3b92bdd8104f1cd3199e7ec7b8134803af88eb514a2e7ec2425ac160779cc277930cd6fbf8b969a7fb5b7f4c25e709
-EBUILD actionpack-6.0.3.2.ebuild 1804 BLAKE2B 1860908e58163e92617fdd7a1ef3276ded9783978c8a5ff272c7fa5c802ffdfe8018ef0902db4bf6fc34b33803ad38cd0dd56239a8d991b03ebc9595e1619800 SHA512 8310464db1b657e51556aee7022afbae1a3b92bdd8104f1cd3199e7ec7b8134803af88eb514a2e7ec2425ac160779cc277930cd6fbf8b969a7fb5b7f4c25e709
-EBUILD actionpack-6.0.3.ebuild 1804 BLAKE2B 1860908e58163e92617fdd7a1ef3276ded9783978c8a5ff272c7fa5c802ffdfe8018ef0902db4bf6fc34b33803ad38cd0dd56239a8d991b03ebc9595e1619800 SHA512 8310464db1b657e51556aee7022afbae1a3b92bdd8104f1cd3199e7ec7b8134803af88eb514a2e7ec2425ac160779cc277930cd6fbf8b969a7fb5b7f4c25e709
+EBUILD actionpack-5.2.4.3-r1.ebuild 2268 BLAKE2B f3ecf79de396092c66fdc725f7b1b0d52586668b909a86efc1dedd92bb22fb3bb4a64ab0d5890f78d741c89dc265ef9bbf17a165e1fddffb0467e5fd5ce7ccbb SHA512 d7fa7356f01699f7c8535125928853965d900df6326892df060f6bba4d51af6e68ccfa70a35dc8bc1cf779ca67a71d047a0bf10e6340bc7a1fd5f6bbb58dcda4
+EBUILD actionpack-6.0.3.2-r1.ebuild 1855 BLAKE2B 85c5a127fc6499c35ca8e3af28dce3de197cc376db960355f396bfab0acd81c3b7ef51c26c3417c2f33cd5344619f8174358e28ec79dd6677def4b130657c48a SHA512 302d8500e00873b9d9825356f2c55523c1b455f6ed2fb9ad8ae11b8ea89cdfc8fbf438c16389b555d80eeeea89b3d48eb63639431d3c3b8f5afb972b2b27e0a1
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-5.2.4.3.ebuild b/dev-ruby/actionpack/actionpack-5.2.4.3-r1.ebuild
index 7c3bc467df68..82275986ee8f 100644
--- a/dev-ruby/actionpack/actionpack-5.2.4.3.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.2.4.3-r1.ebuild
@@ -29,7 +29,7 @@ RUBY_S="rails-${PV}/${PN}"
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	~dev-ruby/actionview-${PV}
-	>=dev-ruby/rack-2.0.8:2.0
+	|| ( dev-ruby/rack:2.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
 	>=dev-ruby/rack-test-0.6.3:*
 	>=dev-ruby/rails-html-sanitizer-1.0.2:1
 	dev-ruby/rails-dom-testing:2
diff --git a/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild b/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild
deleted file mode 100644
index 4d8bf0f9ee17..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.0
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.0.3.1.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.1.ebuild
deleted file mode 100644
index 3ae431f685a6..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.3.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.0
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.0.3.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.2-r1.ebuild
index 3ae431f685a6..b9f96b9946de 100644
--- a/dev-ruby/actionpack/actionpack-6.0.3.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.0.3.2-r1.ebuild
@@ -29,7 +29,7 @@ RUBY_S="rails-${PV}/${PN}"
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.0
+	|| ( dev-ruby/rack:2.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
 	>=dev-ruby/rack-test-0.6.3:*
 	>=dev-ruby/rails-html-sanitizer-1.2.0:1
 	dev-ruby/rails-dom-testing:2
diff --git a/dev-ruby/actionpack/actionpack-6.0.3.2.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.2.ebuild
deleted file mode 100644
index 3ae431f685a6..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.3.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.0
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-}