gentoo resync : 15.12.2019

3 files changed, 70 insertions, 9 deletions

diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 3e8242fe2971..2df36cb60003 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/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 actionpack-4.2.11.1.ebuild 1858 BLAKE2B 92cfe0735197abfb283c49b28887d421166ea56dbded2d6ce84089cd85d10c2d58ff5c53e4576094c6bfe6eda08d495cbb64e8ed5c589a675de1b9406a3d8451 SHA512 35c6071ac1d25db006886699e59bdaeaa64ec31cc70ff5cdaf41fd046d8fe87ff63ef1bb84acfba974420f3844a58fc243568ab8a2fdc201fa2add9d4dbb3981
-EBUILD actionpack-5.1.7.ebuild 1717 BLAKE2B f702eaf4b01db58bf0cce994f4c06110ef5ce41c612c7f6af33b7fb4e20097d21cf902a3b076b0837acb8dcd311536be4bb0be8a47ef93ab7cdf83085f7ba5d7 SHA512 3d81e4ebdab892c38f9405765ab59f7ecb6b2cbf8d482887f515e138cb50d193857afe475cc66dbe52f55e2d6006a75d5074e2877df8089dc03afacc6124e4b3
 EBUILD actionpack-5.2.3.ebuild 1577 BLAKE2B 488030d095bb40efcba8f2e7a83e10cc7528d17dc70ac26481016b5aaab7b4c86ffa231fc4e2572f41d7e2960488bd3b3578fbd24ae103460d0a3e954f3e57b9 SHA512 bf3a83d1c6db91e5335f74b61234d5139f880415688abea40963d39184496860b23466cf674954aa3fcae5fb6b68525bf26858d5db0fb1078fca40405428006c
+EBUILD actionpack-5.2.4.ebuild 1731 BLAKE2B 159a32575e06e41a8ca288d0f1863fb7bb6a71dfc413c3716c8a13857dc6770a7022bc9710a0777201822d6433466fe6ed1bce02407d238d294c671bc39fe57a SHA512 79f40c13fc3bbd6430f396505d5a6752c64cade17913b8beefabe7d0ee39e5b94b3faef49730e5c0d21d1355633dbf488bf12c04c20570372efee7d10eab3d38
 EBUILD actionpack-6.0.0.ebuild 1529 BLAKE2B c6aed490c08693d80719b97351decbf0ada48aa96a2891a84d2b0e2982da1d67d88b1a8d27749792cfa3e2879dd4951578659bc1a00ceb11d63c8e1fa7687fcb SHA512 a7f7229a53af94e27788a53e591f4a9e8b7ae58f1e2614e39dea3a8894d8d5305ecbcc0cadd49fac56052f9fdd3423cbdb93b8dc9757712e56a2b3905706692c
 EBUILD actionpack-6.0.1.ebuild 1529 BLAKE2B c6aed490c08693d80719b97351decbf0ada48aa96a2891a84d2b0e2982da1d67d88b1a8d27749792cfa3e2879dd4951578659bc1a00ceb11d63c8e1fa7687fcb SHA512 a7f7229a53af94e27788a53e591f4a9e8b7ae58f1e2614e39dea3a8894d8d5305ecbcc0cadd49fac56052f9fdd3423cbdb93b8dc9757712e56a2b3905706692c
+EBUILD actionpack-6.0.2.ebuild 1529 BLAKE2B c6aed490c08693d80719b97351decbf0ada48aa96a2891a84d2b0e2982da1d67d88b1a8d27749792cfa3e2879dd4951578659bc1a00ceb11d63c8e1fa7687fcb SHA512 a7f7229a53af94e27788a53e591f4a9e8b7ae58f1e2614e39dea3a8894d8d5305ecbcc0cadd49fac56052f9fdd3423cbdb93b8dc9757712e56a2b3905706692c
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-5.1.7.ebuild b/dev-ruby/actionpack/actionpack-5.2.4.ebuild
index 5f30cf305005..d623d61a409a 100644
--- a/dev-ruby/actionpack/actionpack-5.1.7.ebuild
+++ b/dev-ruby/actionpack/actionpack-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="actionpack.gemspec"
 
 RUBY_FAKEGEM_BINWRAP=""
 
-inherit ruby-fakegem versionator
+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="$(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}"
@@ -30,7 +30,7 @@ ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	~dev-ruby/actionview-${PV}
 	dev-ruby/rack:2.0
-	>=dev-ruby/rack-test-0.6.3:0.6
+	>=dev-ruby/rack-test-0.6.3:*
 	>=dev-ruby/rails-html-sanitizer-1.0.2:1
 	dev-ruby/rails-dom-testing:2
 "
@@ -39,7 +39,7 @@ ruby_add_bdepend "
 	test? (
 		dev-ruby/mocha:0.14
 		dev-ruby/bundler
-		>=dev-ruby/capybara-2.13:2
+		>=dev-ruby/capybara-2.15
 		~dev-ruby/activemodel-${PV}
 		>=dev-ruby/rack-cache-1.2:1.2
 		www-servers/puma
@@ -52,5 +52,9 @@ all_ruby_prepare() {
 		-e '/:job/,/end/ s:^:#:' \
 		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
 	rm ../Gemfile.lock || die
-	sed -i -e '1igem "rack-test", "~>0.6.3"; gem "activemodel", "~>5.1.0"; gem "railties", "~>5.1.0"' test/abstract_unit.rb || 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
 }
diff --git a/dev-ruby/actionpack/actionpack-6.0.2.ebuild b/dev-ruby/actionpack/actionpack-6.0.2.ebuild
new file mode 100644
index 000000000000..70168d023a06
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-6.0.2.ebuild
@@ -0,0 +1,55 @@
+# 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="actionpack.gemspec"
+
+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="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionview-${PV}
+	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/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
+}