gentoo resync : 15.12.2019

3 files changed, 70 insertions, 8 deletions

diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 8baca548cdf9..5776854b7738 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,11 +1,13 @@
 DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
-DIST rails-5.1.7.tgz 6146668 BLAKE2B 494a12d79037010333c06d14573474f0d0c1e62ce5252e8fbe4eb4c6935dc660614c2ff29fd168bbc66d74bfa64b92abb84d02645cb3b2950db5c166111b7b19 SHA512 6595eb19f174c9e46a937d6028d9bb2bfdcda06f35ec2a0499bc5deff05d8cfc8f8fc725e664496d3b431c8724141a1410201b57945b98ca211aea15c990d621
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
+DIST rails-5.2.4.tgz 8822605 BLAKE2B 541332dab5acd358ba3c3ad660b25cec77050b44fba00f46bb3a6e0846ebede36cf4dc7d13f9269ba14ce4174bb81a342f0407672dc6f9372b7cc0ddd0eb66bd SHA512 bee783a0c8e24441f0fbe011392774684fa1390df837c6f85a17975ae72b8c60bea90998f36742c413eecffe125b6a606b0d920855231f910e8073fe28d44a13
 DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d46a736ccb747614d6c1fd56d4aaba2f2f32d48d81772cfd4db671d94a67cd3ffa395f29bf2de1f148fa57ed SHA512 3a2259fe2b3ffd0ddc9128e1aa58af57006b8410120a3629926b95fbe60b8658edab77929e26d9323c61a1855a4379e73f1ddbe875324b068a9e8bdde6ca55e6
 DIST rails-6.0.1.tgz 18551750 BLAKE2B 03349639ae114b82573e5e4063600b07b24274a0f5a81021bf347c650214e0f59fbb1676b9ad580de5a2d6e4dc85cc2702511c32d11a088ef663f26d8d55041e SHA512 ad6667a958663a8d260896c6b7fd589b657383f0d4f217c9bc0e993d6eac67c32fa41d54a9edf9b1f4e01ae78826f49a862b0069d59b3c1de2b950522b3ecf10
+DIST rails-6.0.2.tgz 18555652 BLAKE2B 27b775a8e9285d9d8501fd2115b5a4a68ef0df1afe0f237c32158fc3c4fa950916b725ececda2e9cabd199a2cef4f7c0421b4fdd27e5b28952f738ab99d48097 SHA512 f394d272771ae8eeba2878c7d8eace93a7eefae95f12b34704939f3f91201633da8cb8721999eec0c9729dd72841ef026fbdb7d814d5a0f31cd1f0fd6310a872
 EBUILD actionview-4.2.11.1.ebuild 1585 BLAKE2B c001b8c56264e3d1969bf8c07c54ae6580cde982b38147c4c15eb1320e4ccd4228f1b554dc80c1f04150d6e14dedd25687e9d3707881532eba44286e9cbfec61 SHA512 c7de03ec6a2865e763be290f1f76cbcee866a20d49f3aaf44ff4f040ac0e5a878ce94083eca8d5817b30908997c25e82b4ccd84569ac770affc30e8f7169c5d8
-EBUILD actionview-5.1.7.ebuild 1877 BLAKE2B 2a1be3acaa314ed7ae85062f0c425b9c1402e8fca365341f76087bbf0a76bcc56102eacd84f8924326f428b99c83d92498a1ed99a2789e8e02162d25216bda61 SHA512 36af5a0630c889fffd2767740075c1d07ab51fc36c169a5fb8dce5e6a9dc3101856b007cfe52448e080cacc814fc938e940ee927b4cd1021db688932af4f40ef
 EBUILD actionview-5.2.3.ebuild 1733 BLAKE2B e63d86214aed2a50ed7e759c615f5ff8e8a89fe070e09227fafbc39af565c537f1f4010d1cccbff57c79dfac89b9bb2128cd6779d17c1b10e17b450a498e5bac SHA512 b91c7cf9893601564fc9ad9ca1f23048a8ec36631ed57a02c1d8850decd583135dea306ad4e8158dc669475f037ff850ad3e454d3fb16b91d4ef78556058738a
+EBUILD actionview-5.2.4.ebuild 1926 BLAKE2B 56ea64e3458a7a377ce4d079349956c81fd9a44f2d21ad452a68948a569ff6e011b0d3d54322bae60407da42ff86b7fecc0dc8faca0afa18f2b2bd2ca2b10999 SHA512 c90fa173a8a0d7bb6c61859acb8e5738d81e2c5dde28ae2d5b35f1b83f7a894c7428fefd2d5f180d49cce884bdd9a5438adb409e0e7bc3d6ecb4e0fd6de821a7
 EBUILD actionview-6.0.0.ebuild 1716 BLAKE2B 437a45380f8cdb3145716f885ed9462949e5cb81c13a24efd1ccc1c911c532c8d6c23ced51e11c4bbf211abe2b19d730f763ecf2abf01ecd49f163a099862fe4 SHA512 616317f0ff6f282890aa3899d883412f1d6e8b4a38b0ae295aecdd24cfcc6deb294ad297c8403308366022d00077268f320aa0cd95dbde1dfe5405132dcd2d52
 EBUILD actionview-6.0.1.ebuild 1716 BLAKE2B 437a45380f8cdb3145716f885ed9462949e5cb81c13a24efd1ccc1c911c532c8d6c23ced51e11c4bbf211abe2b19d730f763ecf2abf01ecd49f163a099862fe4 SHA512 616317f0ff6f282890aa3899d883412f1d6e8b4a38b0ae295aecdd24cfcc6deb294ad297c8403308366022d00077268f320aa0cd95dbde1dfe5405132dcd2d52
+EBUILD actionview-6.0.2.ebuild 1716 BLAKE2B 437a45380f8cdb3145716f885ed9462949e5cb81c13a24efd1ccc1c911c532c8d6c23ced51e11c4bbf211abe2b19d730f763ecf2abf01ecd49f163a099862fe4 SHA512 616317f0ff6f282890aa3899d883412f1d6e8b4a38b0ae295aecdd24cfcc6deb294ad297c8403308366022d00077268f320aa0cd95dbde1dfe5405132dcd2d52
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionview/actionview-5.1.7.ebuild b/dev-ruby/actionview/actionview-5.2.4.ebuild
index ab072aff349c..b38d2dd2f542 100644
--- a/dev-ruby/actionview/actionview-5.1.7.ebuild
+++ b/dev-ruby/actionview/actionview-5.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -13,15 +13,15 @@ RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
 RUBY_FAKEGEM_BINWRAP=""
 
-inherit ruby-fakegem versionator
+inherit ruby-fakegem eapi7-ver
 
 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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -36,7 +36,7 @@ ruby_add_rdepend "
 
 ruby_add_bdepend "
 	test? (
-		dev-ruby/mocha:0.14
+		dev-ruby/mocha
 		~dev-ruby/actionpack-${PV}
 		~dev-ruby/activemodel-${PV}
 	)"
@@ -53,5 +53,9 @@ all_ruby_prepare() {
 	# most likely related to test environment setup.
 	rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
 
-	sed -i -e '1igem "activerecord", "~>5.1.0"; gem "actionpack", "~>5.1.0"; gem "railties", "~>5.1.0"' test/abstract_unit.rb || die
+	sed -e '1igem "actionpack", "~> 5.2.0"' \
+		-e '1igem "activemodel", "~> 5.2.0"' \
+		-e '1igem "activerecord", "~> 5.2.0"' \
+		-e '1igem "railties", "~> 5.2.0"' \
+		-i test/abstract_unit.rb || die
 }
diff --git a/dev-ruby/actionview/actionview-6.0.2.ebuild b/dev-ruby/actionview/actionview-6.0.2.ebuild
new file mode 100644
index 000000000000..744251922335
--- /dev/null
+++ b/dev-ruby/actionview/actionview-6.0.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 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="${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
+}