gentoo resync : 15.12.2019

3 files changed, 80 insertions, 7 deletions

diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index a4e1fd482d97..562afceb3c19 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/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 railties-4.2.11.1.ebuild 1707 BLAKE2B c4ee99a40cbeef43d8ab63134f581c01be1b8c6d27a10dc7368a6ef837c515309712e9e3d37fb153975360cba76e66ebf09dd056d486e9a5948c75c8fa862b7e SHA512 c8a68a17c8cc293bc7259751414f245ace596385c39a77da025ee85c17eb065bbc1528f8b173f132893f61f5c09f91f227452cb6f1343484d967e3d16a533e5e
-EBUILD railties-5.1.7.ebuild 1660 BLAKE2B bed1ab8e8b3b1c5156ae053b72f0c888cf85a0307d0f3a6800cf34acbbfa59cbedbb9d2d1f68e40f8449c8f87088d742b3bd5abb3404de11eaf56bb167b25ca5 SHA512 cda33f5aa0cb200582ec11fa671c303c92c065c57c5f0e202bb5d3446e76a8a254a3dfe7e27d516d68699fa87f27158e79e63b269d61a47168c185c28a19a3b2
 EBUILD railties-5.2.3.ebuild 1652 BLAKE2B de5e82b9c34953edaf43299181d8b1bd6aad486eb9421fe41cb0979c794dee9dd562c662af426797bea8540ae6042cdda3b3e5834408b97f53fce5b8c26e60d0 SHA512 856bf234affa5517e0db7bdbb92fb2b3f81ad50512f72d862797af429477145dbf4e8fd27cf70c50b2e0ae1e0f5b199f518221723ab4aa16ab91d752ff7afb3b
+EBUILD railties-5.2.4.ebuild 1653 BLAKE2B 84ec2a844e9db6f6eac5eabe79f1ffbce0a1cd5f3f63c0bd6cccf436f9b1b719a01763ef0030fb2b98e95db8a5650869126cd06a52ae92349e26e68ab7fbfbd3 SHA512 a69bb96847bafcf46607156b68670f2de8ea305f15287cdd09ac45ee01898cf97142c7240463ed2a32152fb797502efa32ea992167d6c1ae05fcdfbd55608cd6
 EBUILD railties-6.0.0.ebuild 1600 BLAKE2B f66699a4d5f3e625f217c106bae60ea8e36834dbfb6fccb973fd3a7251fec8ec4fd3c6c384bd04bf279979e1c5b7f396627c0eaeb6d69d4b34f2a1ac64317aef SHA512 ce47a29dd3945887d8f83ea26dfcba55d3c0dfa590af9e3d0ab28eb6596cfffa37020c0a8f4404d95123c77868df68f0709d056e07e8b4b590642bf20e52b6ef
 EBUILD railties-6.0.1.ebuild 1600 BLAKE2B f66699a4d5f3e625f217c106bae60ea8e36834dbfb6fccb973fd3a7251fec8ec4fd3c6c384bd04bf279979e1c5b7f396627c0eaeb6d69d4b34f2a1ac64317aef SHA512 ce47a29dd3945887d8f83ea26dfcba55d3c0dfa590af9e3d0ab28eb6596cfffa37020c0a8f4404d95123c77868df68f0709d056e07e8b4b590642bf20e52b6ef
+EBUILD railties-6.0.2.ebuild 1600 BLAKE2B f66699a4d5f3e625f217c106bae60ea8e36834dbfb6fccb973fd3a7251fec8ec4fd3c6c384bd04bf279979e1c5b7f396627c0eaeb6d69d4b34f2a1ac64317aef SHA512 ce47a29dd3945887d8f83ea26dfcba55d3c0dfa590af9e3d0ab28eb6596cfffa37020c0a8f4404d95123c77868df68f0709d056e07e8b4b590642bf20e52b6ef
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/railties/railties-5.1.7.ebuild b/dev-ruby/railties/railties-5.2.4.ebuild
index d7469965e2b7..1c1cb32c5fa2 100644
--- a/dev-ruby/railties/railties-5.1.7.ebuild
+++ b/dev-ruby/railties/railties-5.2.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST="test:regular"
 RUBY_FAKEGEM_TASK_DOC=""
@@ -13,15 +13,15 @@ RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
 RUBY_FAKEGEM_BINDIR="exe"
 RUBY_FAKEGEM_BINWRAP=""
 
-inherit ruby-fakegem versionator
+inherit ruby-fakegem eapi7-ver
 
 DESCRIPTION="Tools for creating, working with, and running Rails applications"
 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}"
@@ -31,7 +31,7 @@ RUBY_S="rails-${PV}/${PN}"
 # investigation.
 RESTRICT="test"
 
-RDEPEND+=">=app-eselect/eselect-rails-0.23"
+RDEPEND+=">=app-eselect/eselect-rails-0.24"
 
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
diff --git a/dev-ruby/railties/railties-6.0.2.ebuild b/dev-ruby/railties/railties-6.0.2.ebuild
new file mode 100644
index 000000000000..2a48f0757623
--- /dev/null
+++ b/dev-ruby/railties/railties-6.0.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+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}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-eselect/eselect-rails-0.24"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	>=dev-ruby/thor-0.20.3
+	>=dev-ruby/rake-0.8.7
+	dev-ruby/method_source
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/actionview-${PV}
+		dev-ruby/mocha:0.14
+	)"
+
+all_ruby_prepare() {
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}