gentoo resync : 14.05.2020

3 files changed, 36 insertions, 22 deletions

diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 9343d4ca8a49..409cc9244d3a 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/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 actionview-4.2.11.1.ebuild 1585 BLAKE2B c001b8c56264e3d1969bf8c07c54ae6580cde982b38147c4c15eb1320e4ccd4228f1b554dc80c1f04150d6e14dedd25687e9d3707881532eba44286e9cbfec61 SHA512 c7de03ec6a2865e763be290f1f76cbcee866a20d49f3aaf44ff4f040ac0e5a878ce94083eca8d5817b30908997c25e82b4ccd84569ac770affc30e8f7169c5d8
-EBUILD actionview-5.2.4.2.ebuild 1883 BLAKE2B 6fb8130be8e082310b011cc90241106a51c326bee49471d27c0ef967dee1ba1b8b903a1ebf408557efbee860bc53535d1242d5c36feb4e7cb175954cf38c6f69 SHA512 528c32e4cc542841c5961e00d60025884d634a89f90ca4d64922a9aeaba71e073b4d201126e59d6529c94a316ccdd3e3cf4dd2170c45a992cf6cb26df88fd2ef
+DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
+EBUILD actionview-5.2.4.2.ebuild 1895 BLAKE2B 411ae4e3059ee9cd7634be51eda0fe3de03609fc2e02c9757de3bb0bc209b1167555e62590216050a9143b2fe9a5b98adfdb866b2b172594eb0884bbb050b314 SHA512 ef2e2dd6eb2b442bc7ab850219fb35c4a33782904c0af25535745d540edfaae1b1196455a950fbbb239e9cd667d0c31524248156f85204a71bd121c8b4f68c88
 EBUILD actionview-6.0.2.2.ebuild 1716 BLAKE2B def5b4aff4c34cc23077f578502c1be5302ae61e47da05a80f31424466d98aab251899bebb9113d5874b4b165f7c262543d51e76036e9b8628e8838bddcb8479 SHA512 cc55750d80c42f34946a9991c2e8871d6dbb6da46db03a49fa63d4a9d49cca8304af3d28749908480c46918901b299c4573fa0e7b4b735594fdeec03b8ca05c3
+EBUILD actionview-6.0.3.ebuild 2041 BLAKE2B 65ce0091086d912239b2a0f16e13e7c169c292e1878c49687f309a886fc25109574b99f5141dc43e40f806e0eec7de15cbf482b923513debdb4bfb526b51a19f SHA512 3b123d5ac94d05d6020d85e7175d27978ec6b21a5c0b710fe85311f000c620fbda2a6015530108edd60f14a000574869eb3ea2918a9355fb697eab5d187bee4e
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionview/actionview-5.2.4.2.ebuild b/dev-ruby/actionview/actionview-5.2.4.2.ebuild
index 76df6e724c6e..87622071e472 100644
--- a/dev-ruby/actionview/actionview-5.2.4.2.ebuild
+++ b/dev-ruby/actionview/actionview-5.2.4.2.ebuild
@@ -49,12 +49,13 @@ all_ruby_prepare() {
 		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
 	rm ../Gemfile.lock || die
 
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
-	sed -e '1igem "actionpack", "~> 5.2.0"' \
-		-e '1igem "activemodel", "~> 5.2.0"' \
-		-e '1igem "railties", "~> 5.2.0"' \
+	# Avoid activerecord integration tests because they are very sensitive to the specifics
+	# of the environment.
+	sed -i -e 's/, "test:integration:active_record"//' Rakefile || die
+
+	sed -e '2igem "actionpack", "~> 5.2.0"' \
+		-e '2igem "activemodel", "~> 5.2.0"' \
+		-e '2igem "railties", "~> 5.2.0"' \
+		-e '/active_record/ s:^:#:' \
 		-i test/abstract_unit.rb || die
 }
diff --git a/dev-ruby/actionview/actionview-4.2.11.1.ebuild b/dev-ruby/actionview/actionview-6.0.3.ebuild
index 56b477c633e8..0b4fd032262f 100644
--- a/dev-ruby/actionview/actionview-4.2.11.1.ebuild
+++ b/dev-ruby/actionview/actionview-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="${PN}.gemspec"
 
-inherit ruby-fakegem versionator
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
 
 DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
 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,24 +29,35 @@ RUBY_S="rails-${PV}/${PN}"
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubis-2.7.0
-	>=dev-ruby/rails-html-sanitizer-1.0.3:1
-	>=dev-ruby/rails-dom-testing-1.0.5:1
+	>=dev-ruby/erubi-1.4:0
+	>=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/mocha
 		~dev-ruby/actionpack-${PV}
 		~dev-ruby/activemodel-${PV}
+		~dev-ruby/activerecord-${PV}
 	)"
 
 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\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/rake/ s/12.3/12.4/ ; /dalli/ s/2.7.7/2.7.10/' \
 		-e '/:job/,/end/ s:^:#:' \
 		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
 	rm ../Gemfile.lock || die
+
+	# Avoid tests failing due to missing logger setup in activerecord,
+	# most likely related to test environment setup.
+	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
+
+	# Fix loading of activerecord integration tests. This avoids loading
+	# activerecord twice and thus redefining constants leading to
+	# failures. Bug #719342
+	sed -e '/abstract_unit/arequire "active_record/fixtures"' \
+		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
+		-i test/active_record_unit.rb || die
 }