gentoo resync : 03.03.2021

7 files changed, 14 insertions, 149 deletions

diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 0250167df944..052fae5ec9be 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,13 +1,9 @@
-DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
-DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-EBUILD actionpack-5.2.4.3-r1.ebuild 2268 BLAKE2B f3ecf79de396092c66fdc725f7b1b0d52586668b909a86efc1dedd92bb22fb3bb4a64ab0d5890f78d741c89dc265ef9bbf17a165e1fddffb0467e5fd5ce7ccbb SHA512 d7fa7356f01699f7c8535125928853965d900df6326892df060f6bba4d51af6e68ccfa70a35dc8bc1cf779ca67a71d047a0bf10e6340bc7a1fd5f6bbb58dcda4
-EBUILD actionpack-5.2.4.4.ebuild 2268 BLAKE2B f3ecf79de396092c66fdc725f7b1b0d52586668b909a86efc1dedd92bb22fb3bb4a64ab0d5890f78d741c89dc265ef9bbf17a165e1fddffb0467e5fd5ce7ccbb SHA512 d7fa7356f01699f7c8535125928853965d900df6326892df060f6bba4d51af6e68ccfa70a35dc8bc1cf779ca67a71d047a0bf10e6340bc7a1fd5f6bbb58dcda4
-EBUILD actionpack-5.2.4.5.ebuild 2269 BLAKE2B 13890237dc32e2682f3a94aa80a9ddc63102fef522ba1c2880e6805577dbac2b53339e5fdde71fd2723bb5cd1537f74e0be8feca5f6aa73704fa854b552c94ad SHA512 3ca8c9b3b2f3883ac292f9a4614437417ba746c257a18d5ca9ff468a13c3708fbd54ff5e06501e531c156fd70cbb99dbe5c5de9f6fc49576c74adc325b3c9faf
-EBUILD actionpack-6.0.3.4.ebuild 1867 BLAKE2B e23587cf2bec7b8fff7f8f8fa217fba7eae6f2955f44501c88795094569c12bc6be1a54600108ca2dacceb97edd7eb16983ea034d0c5231548cb322204436d85 SHA512 096ceb76f013fabdd05136d83eac3652ec7d771d8b2965f2081d84002e5a02dd38bee2b39c50b38ccc5798ac289e5a36b908a94f6b84f62f80a537c4cdafb7eb
-EBUILD actionpack-6.0.3.5.ebuild 1867 BLAKE2B e536544512465af065b47e64e719baf844e15a25ecbd30aeda19dab33e9d856a656a8d6e105c68ff1568ebff7a8106cb6408a8efb14919c7559565b418c671cb SHA512 6d5cc33adc3e788469ba91547bb868d38a1c6b3aea1bc62dd5baddd0b5bb80316b23121d4e95386d1f797cad7fb011df7ab3f4aae6bc412935e4e2eb8b950fbc
-EBUILD actionpack-6.1.2.1.ebuild 2048 BLAKE2B 2cd1e84e158c82068815fb5ee4b1f2ca551962c1d64a7cadff5119396e7409454b2787c6ede97367a36b8c1552bd730d8d80705f5315df02d82cf7b944573e41 SHA512 a79c19dc327d6382987bec5bd8657b20f2a2083d22803186919e1a75d2bc7b7873f627a8eda9ce705ec2ef030706ea9cf590be37aad0258a9cd1c97ffeeba761
+DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
+EBUILD actionpack-5.2.4.5.ebuild 2217 BLAKE2B a6c65fb3bceb9176abbab2950749f5172f0a90e7d4cc002f8685519f56b69a0f3f949052aa515eeea6cef63c4f532ef7bf68a48b23f38451ba30566a09601185 SHA512 363e0a19a734ad23c9d7a500a42072a6073046dd8deaa7fed4db20a4476f76ca4cf1714c97836001445795e4ee2f28a73f52b48fae1384b8b6b77db7f81e3b3e
+EBUILD actionpack-6.0.3.5.ebuild 1816 BLAKE2B b902dac6018601ef750da4e242fd2ac8860bc160ecb85d4f9446942f15339afa2f2a087b5168d7f92c9bf4583b58eb601be1e36c07af3cb7f3cdd728d3820666 SHA512 bb99bc2c41925cadaaba9b979077823d1375dde7af3f869dfdd7566d90b51d66ea16dbe7d8409f93102bf90a5d3f6243fbcd68a341b1e6ac8e481061272982d4
+EBUILD actionpack-6.1.2.1.ebuild 1997 BLAKE2B 0c4c7223136d8ad54a947da1eb191eba6ef7b85493cb6ab02b2c2fe956821c8e498dc61bcaa86d33a1fbd8e679b00b5166f3d6f1d553ce89afe87d4bb59499ff SHA512 b3815fbf26534cab8988ae02e5e3b87cdb19cccd0ad5c7c4a93167eb55b41feb374b91a1ca64b89930b389648d0c24812eb7bdd1cc1f470079193dd3c1374128
+EBUILD actionpack-6.1.3.ebuild 1997 BLAKE2B 0c4c7223136d8ad54a947da1eb191eba6ef7b85493cb6ab02b2c2fe956821c8e498dc61bcaa86d33a1fbd8e679b00b5166f3d6f1d553ce89afe87d4bb59499ff SHA512 b3815fbf26534cab8988ae02e5e3b87cdb19cccd0ad5c7c4a93167eb55b41feb374b91a1ca64b89930b389648d0c24812eb7bdd1cc1f470079193dd3c1374128
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-5.2.4.3-r1.ebuild b/dev-ruby/actionpack/actionpack-5.2.4.3-r1.ebuild
deleted file mode 100644
index 82275986ee8f..000000000000
--- a/dev-ruby/actionpack/actionpack-5.2.4.3-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	|| ( 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
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${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
-
-	sed -e '1i gem "activemodel", "~> 5.2.0"' \
-		-e '1i gem "actionview", "~> 5.2.0"' \
-		-e '1i gem "railties", "~> 5.2.0"' \
-		-i test/abstract_unit.rb || 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
-
-	# Avoid broken tests already fixed upstream
-	sed -i -e '/cookie syntax resilience/askip "broken test"' test/dispatch/request_test.rb || die
-	sed -i -e '/test_keeps_original_headers_behavior/askip "broken test"' test/dispatch/ssl_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-5.2.4.4.ebuild b/dev-ruby/actionpack/actionpack-5.2.4.4.ebuild
deleted file mode 100644
index 82275986ee8f..000000000000
--- a/dev-ruby/actionpack/actionpack-5.2.4.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	|| ( 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
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${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
-
-	sed -e '1i gem "activemodel", "~> 5.2.0"' \
-		-e '1i gem "actionview", "~> 5.2.0"' \
-		-e '1i gem "railties", "~> 5.2.0"' \
-		-i test/abstract_unit.rb || 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
-
-	# Avoid broken tests already fixed upstream
-	sed -i -e '/cookie syntax resilience/askip "broken test"' test/dispatch/request_test.rb || die
-	sed -i -e '/test_keeps_original_headers_behavior/askip "broken test"' test/dispatch/ssl_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-5.2.4.5.ebuild b/dev-ruby/actionpack/actionpack-5.2.4.5.ebuild
index 4a54b4247f07..7d43f2a0a814 100644
--- a/dev-ruby/actionpack/actionpack-5.2.4.5.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.2.4.5.ebuild
@@ -21,7 +21,7 @@ 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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -29,7 +29,7 @@ RUBY_S="rails-${PV}/${PN}"
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	~dev-ruby/actionview-${PV}
-	|| ( dev-ruby/rack:2.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
+	dev-ruby/rack:2.2
 	>=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.3.5.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.5.ebuild
index 2ee9f0b1be6d..e35e318f6c89 100644
--- a/dev-ruby/actionpack/actionpack-6.0.3.5.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.0.3.5.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.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
+	dev-ruby/rack:2.2
 	>=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.1.2.1.ebuild b/dev-ruby/actionpack/actionpack-6.1.2.1.ebuild
index c74100ff90f3..74a56ac801f5 100644
--- a/dev-ruby/actionpack/actionpack-6.1.2.1.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.1.2.1.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.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
+	dev-ruby/rack:2.2
 	>=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.4.ebuild b/dev-ruby/actionpack/actionpack-6.1.3.ebuild
index e2f269cbd09b..74a56ac801f5 100644
--- a/dev-ruby/actionpack/actionpack-6.0.3.4.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ RUBY_S="rails-${PV}/${PN}"
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	~dev-ruby/actionview-${PV}
-	|| ( dev-ruby/rack:2.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
+	dev-ruby/rack:2.2
 	>=dev-ruby/rack-test-0.6.3:*
 	>=dev-ruby/rails-html-sanitizer-1.2.0:1
 	dev-ruby/rails-dom-testing:2
@@ -56,4 +56,7 @@ all_ruby_prepare() {
 
 	# 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
+
+	# Avoid tests depending on an unreleased version of selenium-webdriver
+	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
 }