gentoo resync : 15.12.2019

3 files changed, 52 insertions, 8 deletions

diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 2191f1a57a4c..25ac8e29367e 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/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 activemodel-4.2.11.1.ebuild 1636 BLAKE2B 670d133746729c900586c4238698548c8aedcc90f670c3d80d20d1841d4123d71f010189ef21673e3575b5d2c1b181eac6c7439571a29aa0d7e881b583ecf3e9 SHA512 2dc483fc464c85303f605d7acfe07775f1fb6242a2e5e7f8f9e659f781a80431f70c8c79dceb15af5c1b6f39fc003a52ebc4cedcc9e1aa4bf6af0ef7526550a9
-EBUILD activemodel-5.1.7.ebuild 1125 BLAKE2B 1f92fd1e19eda6dc3ba38734baad6d9388241825a8e898da6829a4d8e2c01f54d308c68299a5e6f9ed74eab0742cbfd4a6eb08519890bd5930aec4cffaf88aac SHA512 c40da93b518c332a26ede7ebc71bec1104fda3746be11f4b994561a1d6dda3632cf212449bd7952aa2233e44cca1b3d284c5f9221aee71a3775abf0e9f4613ff
 EBUILD activemodel-5.2.3.ebuild 1040 BLAKE2B f57fa78d010743e04236bc091070ac556dfd161813c6747589e0042e2562ec4b8fbf3b88bcfab7c8c29fd25404357c03f19b7ac4090694db48a4f6c248209cca SHA512 64b2f7f9df07a28bd4a6ac1a82f0f092daddcc7f7278c9b39bb282b13948c2a9943b2efd70dc546ec70a746f1c465dfed688d80d58b0f6abc2c7d7b914f973db
+EBUILD activemodel-5.2.4.ebuild 1041 BLAKE2B a830367c50e7c995902420221b1e61e11d5db10d36d56dd02ddbadf574b2912da234e6e541a0fdc13229ae97dd96a3449d7fee9540ef2678624b13cf4efe6854 SHA512 44d2f0df9eef71538574997f40bbb42ffd5785edd8159758d8c360edd99ef2d26412ccc6c79a7930273b9e31a05ecf1b1e249d11395f7ce9c5ee8edcee5200e8
 EBUILD activemodel-6.0.0.ebuild 938 BLAKE2B 9cf309f472b0563018af85706b35eb296c0cdb15e635a8b1975f08664a66f1ae07e622448ddda9f674f7385b08e7eb24c48b5f919189f4c5a91409c79a2ef79c SHA512 cbcfc6d89fe80c47a7fa4869d34e78d9609dce43512dc0985c649f73e16dd57c6b19103efa76b9529360b596a8ed8b21a9dfc2cd24748b8b155bddab7c22ad40
 EBUILD activemodel-6.0.1.ebuild 938 BLAKE2B 9cf309f472b0563018af85706b35eb296c0cdb15e635a8b1975f08664a66f1ae07e622448ddda9f674f7385b08e7eb24c48b5f919189f4c5a91409c79a2ef79c SHA512 cbcfc6d89fe80c47a7fa4869d34e78d9609dce43512dc0985c649f73e16dd57c6b19103efa76b9529360b596a8ed8b21a9dfc2cd24748b8b155bddab7c22ad40
+EBUILD activemodel-6.0.2.ebuild 938 BLAKE2B 9cf309f472b0563018af85706b35eb296c0cdb15e635a8b1975f08664a66f1ae07e622448ddda9f674f7385b08e7eb24c48b5f919189f4c5a91409c79a2ef79c SHA512 cbcfc6d89fe80c47a7fa4869d34e78d9609dce43512dc0985c649f73e16dd57c6b19103efa76b9529360b596a8ed8b21a9dfc2cd24748b8b155bddab7c22ad40
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activemodel/activemodel-5.1.7.ebuild b/dev-ruby/activemodel/activemodel-5.2.4.ebuild
index 0b0b685e4ad1..025609c0e43d 100644
--- a/dev-ruby/activemodel/activemodel-5.1.7.ebuild
+++ b/dev-ruby/activemodel/activemodel-5.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
@@ -13,15 +13,15 @@ RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
 
 RUBY_FAKEGEM_BINWRAP=""
 
-inherit ruby-fakegem versionator
+inherit ruby-fakegem eapi7-ver
 
 DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
 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}"
@@ -34,11 +34,11 @@ ruby_add_bdepend "
 	test? (
 		~dev-ruby/railties-${PV}
 		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
+		dev-ruby/mocha
 		>=dev-ruby/bcrypt-ruby-3.1.7
 	)"
 
 all_ruby_prepare() {
 	# Set test environment to our hand.
-	sed -i -e '/load_paths/d ; 1igem "activesupport", "~>5.1.6" ; gem "railties", "~>5.1.6"' test/cases/helper.rb || die "Unable to remove load paths"
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
 }
diff --git a/dev-ruby/activemodel/activemodel-6.0.2.ebuild b/dev-ruby/activemodel/activemodel-6.0.2.ebuild
new file mode 100644
index 000000000000..b95a885ddc2c
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-6.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+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}:*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		dev-ruby/test-unit:2
+		dev-ruby/mocha
+		>=dev-ruby/bcrypt-ruby-3.1.7
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}