gentoo resync : 15.12.2019

3 files changed, 57 insertions, 7 deletions

diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 606f27c6b3e4..6716664d2f06 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/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 activejob-4.2.11.1.ebuild 1070 BLAKE2B bdd6e12043c4ee89a5efe8477e44d0d40d15a6f8f14952d9059fc2380f8c4a4e94365057673e16b2f08ee15df2a5b401215b1bd3f1ec6ca6a4584698d6933cda SHA512 6e9cc9d8e3097bbd6e0fbf3fd57a5b40d7abcf43482e1df2a9c104acab407b4818508580953f713aea500dca6a2a192b64935a2c4d506a1f229a756468af2196
-EBUILD activejob-5.1.7.ebuild 1092 BLAKE2B c15aa9687bb0058e15d7841c2a8eda4c51161641163e074126ef724386d93b694d7110a183912efe8809f6dd74fb4ad1deb599ff6031771e4a019a2971e06845 SHA512 cbe36a5bafabae30dcf372190dca67639e50b795ba07589b85aabcaa844a8279dfb36d16ad07da110db56ff74eb4e1ec5c70b491377425483df3b4406fd30141
 EBUILD activejob-5.2.3.ebuild 1095 BLAKE2B c20b0752adf82a1f80058c695b1d5795a94a04fbbf91ce5eb15ff6c76a3a5b5457d7862bc9658af15012f7b21d89f84a67bd55d44b446cb5673f4dbfaf4d412a SHA512 bc80304fff0a768b70f3eced836dedc9da6e0c272165f77093e941be9eaffecbf0c2af189bc519641ad45bff6acf465e743b2526db13d90ae5292a0e8c42b645
+EBUILD activejob-5.2.4.ebuild 1095 BLAKE2B c20b0752adf82a1f80058c695b1d5795a94a04fbbf91ce5eb15ff6c76a3a5b5457d7862bc9658af15012f7b21d89f84a67bd55d44b446cb5673f4dbfaf4d412a SHA512 bc80304fff0a768b70f3eced836dedc9da6e0c272165f77093e941be9eaffecbf0c2af189bc519641ad45bff6acf465e743b2526db13d90ae5292a0e8c42b645
 EBUILD activejob-6.0.0.ebuild 1117 BLAKE2B a41bf151f699a5fb56642cd2af01cb6ba39e1af0e7cdc28cc968a0881d5bc7d602bf3d6a46d52106a05e33b6908c46c6df275d9917caadc13b37db2042a0a356 SHA512 8964dae9b582df42b73e4385b5e6db5b66baf165b81970c7deae2d4aafc0f144e3270013c07e44ae9a9bc148e09992d2df0c234430ddbb25c86fb41d38516db4
 EBUILD activejob-6.0.1.ebuild 1117 BLAKE2B a41bf151f699a5fb56642cd2af01cb6ba39e1af0e7cdc28cc968a0881d5bc7d602bf3d6a46d52106a05e33b6908c46c6df275d9917caadc13b37db2042a0a356 SHA512 8964dae9b582df42b73e4385b5e6db5b66baf165b81970c7deae2d4aafc0f144e3270013c07e44ae9a9bc148e09992d2df0c234430ddbb25c86fb41d38516db4
+EBUILD activejob-6.0.2.ebuild 1117 BLAKE2B a41bf151f699a5fb56642cd2af01cb6ba39e1af0e7cdc28cc968a0881d5bc7d602bf3d6a46d52106a05e33b6908c46c6df275d9917caadc13b37db2042a0a356 SHA512 8964dae9b582df42b73e4385b5e6db5b66baf165b81970c7deae2d4aafc0f144e3270013c07e44ae9a9bc148e09992d2df0c234430ddbb25c86fb41d38516db4
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activejob/activejob-5.1.7.ebuild b/dev-ruby/activejob/activejob-5.2.4.ebuild
index e6d793b9c644..7bf1fc416045 100644
--- a/dev-ruby/activejob/activejob-5.1.7.ebuild
+++ b/dev-ruby/activejob/activejob-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,14 +13,14 @@ RUBY_FAKEGEM_BINWRAP=""
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
-inherit ruby-fakegem versionator
+inherit ruby-fakegem eapi7-ver
 
 DESCRIPTION="Job framework with pluggable queues"
 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)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
@@ -33,7 +33,7 @@ ruby_add_rdepend "
 
 ruby_add_bdepend "
 	test? (
-		>=dev-ruby/mocha-0.14.0:0.14
+		dev-ruby/mocha
 	)"
 
 all_ruby_prepare() {
@@ -41,5 +41,6 @@ all_ruby_prepare() {
 	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
 
 	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' Rakefile || die
+	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
+		-e 's/delayed_job//' Rakefile || die
 }
diff --git a/dev-ruby/activejob/activejob-6.0.2.ebuild b/dev-ruby/activejob/activejob-6.0.2.ebuild
new file mode 100644
index 000000000000..c516554b8fe8
--- /dev/null
+++ b/dev-ruby/activejob/activejob-6.0.2.ebuild
@@ -0,0 +1,47 @@
+# 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=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Job framework with pluggable queues"
+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/globalid-0.3.6
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+
+	# Remove all currently unpackaged queues.
+	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
+		-e 's/delayed_job//' Rakefile || die
+	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
+}