gentoo resync : 25.08.2020

4 files changed, 23 insertions, 79 deletions

diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index f5eb3bf79a2f..b7ee7766f477 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,11 +1,7 @@
 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 actionview-5.2.4.3-r1.ebuild 1956 BLAKE2B 909175946e12cbe49620f7791ebce270c0e9815368941f1f9a12cf481d5c2d505a515fd57e7c36c211bacbbd133f1f5b3d5fdcb5fdf831a61c1be0063087e59b SHA512 7d6a55945a2080120c4fa47f1e37f552701321c9fbd1007a45404d62afca15e5383cf141df3f905ca5f37e6baef3005ee1d527ad3440957a5184f945acd0851e
 EBUILD actionview-5.2.4.3.ebuild 1895 BLAKE2B 411ae4e3059ee9cd7634be51eda0fe3de03609fc2e02c9757de3bb0bc209b1167555e62590216050a9143b2fe9a5b98adfdb866b2b172594eb0884bbb050b314 SHA512 ef2e2dd6eb2b442bc7ab850219fb35c4a33782904c0af25535745d540edfaae1b1196455a950fbbb239e9cd667d0c31524248156f85204a71bd121c8b4f68c88
-EBUILD actionview-6.0.2.2.ebuild 1716 BLAKE2B def5b4aff4c34cc23077f578502c1be5302ae61e47da05a80f31424466d98aab251899bebb9113d5874b4b165f7c262543d51e76036e9b8628e8838bddcb8479 SHA512 cc55750d80c42f34946a9991c2e8871d6dbb6da46db03a49fa63d4a9d49cca8304af3d28749908480c46918901b299c4573fa0e7b4b735594fdeec03b8ca05c3
-EBUILD actionview-6.0.3.1.ebuild 2060 BLAKE2B dc8334de7fc4060f26538a2e38febe929b0f7ddcb31370ca12e2e0d22aeabfcb425d672618ced6203b9928d5e1806b25aae74d3140c022c20711623c59827e36 SHA512 f8adaefd266ed0cd234765e74de8f587f6025c55203d2c7517bd040c4a416627452b33144a6210d0e0a226e98b5c20cc05d2203233ba193dcf42e06748eea304
+EBUILD actionview-6.0.3.2-r1.ebuild 2120 BLAKE2B ea715d222ecef835a5d545d6ec6227b1569a42050534d82829ab0f1206a328d914faa394d037f1d42e8aadbaa18f8df8b7b9fb46c2abd85e3c5eaacee04fed65 SHA512 667abd20fb2dbe1e6115d80c805fc4a93e2047ca28b6406934ad185af3c806457d8bba08a211c73ff03a0ce12236a5c20a2de31bb5acbd11a031e26422858838
 EBUILD actionview-6.0.3.2.ebuild 2060 BLAKE2B dc8334de7fc4060f26538a2e38febe929b0f7ddcb31370ca12e2e0d22aeabfcb425d672618ced6203b9928d5e1806b25aae74d3140c022c20711623c59827e36 SHA512 f8adaefd266ed0cd234765e74de8f587f6025c55203d2c7517bd040c4a416627452b33144a6210d0e0a226e98b5c20cc05d2203233ba193dcf42e06748eea304
-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-6.0.2.2.ebuild b/dev-ruby/actionview/actionview-5.2.4.3-r1.ebuild
index 7cb9b269205c..e9beb5d5a203 100644
--- a/dev-ruby/actionview/actionview-6.0.2.2.ebuild
+++ b/dev-ruby/actionview/actionview-5.2.4.3-r1.ebuild
@@ -1,19 +1,21 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=6
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26"
 
-RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
 RUBY_FAKEGEM_BINWRAP=""
 
-inherit ruby-fakegem
+inherit ruby-fakegem eapi7-ver
 
 DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
 HOMEPAGE="https://github.com/rails/rails/"
@@ -21,7 +23,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 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -30,7 +32,7 @@ ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
 	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
+	>=dev-ruby/rails-html-sanitizer-1.0.3:1
 	dev-ruby/rails-dom-testing:2
 "
 
@@ -39,7 +41,7 @@ ruby_add_bdepend "
 		dev-ruby/mocha
 		~dev-ruby/actionpack-${PV}
 		~dev-ruby/activemodel-${PV}
-		~dev-ruby/activerecord-${PV}
+		~dev-ruby/railties-${PV}
 	)"
 
 all_ruby_prepare() {
@@ -50,7 +52,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
+	# 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-6.0.3.1.ebuild b/dev-ruby/actionview/actionview-6.0.3.2-r1.ebuild
index 0e67c4aa83c1..a6b9c0c833ab 100644
--- a/dev-ruby/actionview/actionview-6.0.3.1.ebuild
+++ b/dev-ruby/actionview/actionview-6.0.3.2-r1.ebuild
@@ -11,6 +11,8 @@ RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
 RUBY_FAKEGEM_BINWRAP=""
 
 inherit ruby-fakegem
@@ -40,6 +42,7 @@ ruby_add_bdepend "
 		~dev-ruby/actionpack-${PV}
 		~dev-ruby/activemodel-${PV}
 		~dev-ruby/activerecord-${PV}
+		~dev-ruby/railties-${PV}
 		dev-ruby/sqlite3
 	)"
 
diff --git a/dev-ruby/actionview/actionview-6.0.3.ebuild b/dev-ruby/actionview/actionview-6.0.3.ebuild
deleted file mode 100644
index 0b4fd032262f..000000000000
--- a/dev-ruby/actionview/actionview-6.0.3.ebuild
+++ /dev/null
@@ -1,63 +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="${PN}.gemspec"
-
-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="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=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
-		~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 '/: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
-}