gentoo resync : 14.05.2020

4 files changed, 30 insertions, 22 deletions

diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 37789bdfc3a6..6048249e6f4f 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,7 +1,7 @@
-DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-EBUILD actionpack-4.2.11.1.ebuild 1858 BLAKE2B 92cfe0735197abfb283c49b28887d421166ea56dbded2d6ce84089cd85d10c2d58ff5c53e4576094c6bfe6eda08d495cbb64e8ed5c589a675de1b9406a3d8451 SHA512 35c6071ac1d25db006886699e59bdaeaa64ec31cc70ff5cdaf41fd046d8fe87ff63ef1bb84acfba974420f3844a58fc243568ab8a2fdc201fa2add9d4dbb3981
-EBUILD actionpack-5.2.4.2.ebuild 1738 BLAKE2B f7c0e1a2ae928478a0d6a378b05e9db3357ad97985c60a9783a01c467cd1aab07ec2b875a0165be1711764d50e163d70034a3e5bb49dbc262f4647f5da359e6d SHA512 eeeea7054d6516146302112fb29c50dcb73577d25ebb7beedc4b902558df24b378765dbf9603bafb9a549608263f48068b11d77581ade591097c7422f333ed20
-EBUILD actionpack-6.0.2.2.ebuild 1529 BLAKE2B 2cf61810636a3bc5e6a13af4f8d1b745aec8ada9f040e62715cc67a3752e4aec095104c8ee16461edd6cf070713b82bb5a9262b883063d12db0e779b036bef30 SHA512 e66f5210de98042015c85e565008338edc5b102e54f0b2c1d47d30e977ed35ba4f783f92db493a37d71917139f4a95c92bdaac88a00afb47f0156e4860d37429
+DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
+EBUILD actionpack-5.2.4.2.ebuild 1979 BLAKE2B d071cefe31d62e38e5aa1f672f85c00c4fbc8bf6205b392739a95aeb4d8c8a928b30aac8dca728fe58707cdd30e6aa2b3bf48a9906483d1765f9d9615015fb64 SHA512 4d5ba86d14a579d88b972dbdce6e1eb5140aaad848f49ae1b492422ecca69e7bd53cd527d95b1fdda0d340ed7b2588d8e3cb1ad96df666293ecf017bb935f1b3
+EBUILD actionpack-6.0.2.2.ebuild 1797 BLAKE2B 50ab2ddfe0dc8967b3c931ae1f5874ab838e6afc91f67c35f523c70e108b011861531ee1768c19c3d7aa8a08b5fb81f654acb302fef5d749366c7ea09de5a0a0 SHA512 be57b1597b60f2d9a77ae212ac2f802909822435451c8b7d5643068bb5881ffd683fe965ad4b40d8f29459313e3853651484aa8b24eb49651d4b047cb5d1f50f
+EBUILD actionpack-6.0.3.ebuild 1804 BLAKE2B 1860908e58163e92617fdd7a1ef3276ded9783978c8a5ff272c7fa5c802ffdfe8018ef0902db4bf6fc34b33803ad38cd0dd56239a8d991b03ebc9595e1619800 SHA512 8310464db1b657e51556aee7022afbae1a3b92bdd8104f1cd3199e7ec7b8134803af88eb514a2e7ec2425ac160779cc277930cd6fbf8b969a7fb5b7f4c25e709
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-5.2.4.2.ebuild b/dev-ruby/actionpack/actionpack-5.2.4.2.ebuild
index 7a0a34f9e5bd..92a68b49adb7 100644
--- a/dev-ruby/actionpack/actionpack-5.2.4.2.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.2.4.2.ebuild
@@ -57,4 +57,7 @@ all_ruby_prepare() {
 		-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
 }
diff --git a/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild b/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild
index f22c41d0d073..4d8bf0f9ee17 100644
--- a/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild
@@ -41,6 +41,7 @@ ruby_add_bdepend "
 		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
 	)"
@@ -52,4 +53,7 @@ all_ruby_prepare() {
 		-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-4.2.11.1.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.ebuild
index c1cad700e9a9..3ae431f685a6 100644
--- a/dev-ruby/actionpack/actionpack-4.2.11.1.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.0.3.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby25 ruby26 ruby27"
 
-RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
 RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
 
-inherit ruby-fakegem versionator
+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="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -27,32 +29,31 @@ RUBY_S="rails-${PV}/${PN}"
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	~dev-ruby/actionview-${PV}
-	>=dev-ruby/rack-1.6.0:1.6
-	>=dev-ruby/rack-test-0.6.2:0.6
-	>=dev-ruby/rails-html-sanitizer-1.0.2:1
-	>=dev-ruby/rails-dom-testing-1.0.5:1
+	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\|minitest\|mime-types\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/rake/ s/12.3/12.4/ ; /dalli/ s/2.7.7/2.7.10/' \
+	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
 
-	# Skip a failing test related to security updates in 4.2.5.1. Let's
-	# assume that this is not a bug but a test lagging a security
-	# measure.
-	sed -i -e '/test_dynamic_render_with_file/,/^  end/ s:^:#:' \
-		test/controller/render_test.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
 }