gentoo resync : 15.12.2019

3 files changed, 59 insertions, 7 deletions

diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 076ef574fcfd..412f0103d859 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/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 actionmailer-4.2.11.1.ebuild 1668 BLAKE2B be5e490a600cd21d3e4938e65f6932a0b9728b0fd1ee95dc6a7a78124d880e2400b34761d0ac6b66e1058e61545a35f0a4f9b1ee0d66afb27ef643cd4c2b61fb SHA512 c602745eaab8bd280a4a1afc418ca2ff095dfbc14b2309831e99c2486171cd0e6bad446bfd44b43bc57ec2331f1e6b2beea9ab14581fabdf3412f0d5b44098da
-EBUILD actionmailer-5.1.7.ebuild 1369 BLAKE2B 519dbe4c1e91dda2497d31d2dad560d8d07a80b39c573d39c08b066ce6446d6baae2f99c81a5bc9815d80aff8b3e25673647bca3eda5c764b0c042adb027c4e4 SHA512 0a7d2b938d8e50210670b0e862f42b274a65dd0601596416555e842c61639c28e8bdb0a672d5c691e632f5f23e5fb2845bbbfd874cf6b3a423325d026185da2c
 EBUILD actionmailer-5.2.3.ebuild 1298 BLAKE2B 38d3fa328e458b3fe692403e834fbf491ef802fae597b1df84a439a9ec369ae81db2aa8b45b5b25d7e399422c1d038c9511679fc16cfba2350831616d1c486e8 SHA512 beb5906e5b928e38d626e60fe635ab1b53bbb710c152ed550d922a4e4070ee64026c97115e79d1e80359d74c8ae9bb5479897f453112e2256231e3975e5e39e2
+EBUILD actionmailer-5.2.4.ebuild 1419 BLAKE2B 4f8010586d24cdef0659c0da29912afbe610f74d41ee0cb0d4ed6273e0b5102c3bec45c506fc6af68631fab8ac9292622d4c98e2ac575b15c860461995d63ddc SHA512 14ab89f310a553c786db58aa15b85643442d52126d270fd2d1e8ddbb265f2aea4a4a35069711ee8e4958dd661bedbdd3ce90da79f51f56e85d9ed70379574056
 EBUILD actionmailer-6.0.0.ebuild 1249 BLAKE2B 8626347c7bf808103b83138b011c22b53f015c4a407804d5fcafc8719646731428b0a9c3373469444863c640ddabcd5074e45feb2313757bb0d342e558f35e65 SHA512 bc2b3fb71727fb676268f7d717c3a2173e5497f409ad943ab7ced8e739c1be87f715ea79d09f2ce093c36f6863731dc2455dbd3c685bb1c6a17382de95520a56
 EBUILD actionmailer-6.0.1.ebuild 1249 BLAKE2B 8626347c7bf808103b83138b011c22b53f015c4a407804d5fcafc8719646731428b0a9c3373469444863c640ddabcd5074e45feb2313757bb0d342e558f35e65 SHA512 bc2b3fb71727fb676268f7d717c3a2173e5497f409ad943ab7ced8e739c1be87f715ea79d09f2ce093c36f6863731dc2455dbd3c685bb1c6a17382de95520a56
+EBUILD actionmailer-6.0.2.ebuild 1249 BLAKE2B 8626347c7bf808103b83138b011c22b53f015c4a407804d5fcafc8719646731428b0a9c3373469444863c640ddabcd5074e45feb2313757bb0d342e558f35e65 SHA512 bc2b3fb71727fb676268f7d717c3a2173e5497f409ad943ab7ced8e739c1be87f715ea79d09f2ce093c36f6863731dc2455dbd3c685bb1c6a17382de95520a56
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailer/actionmailer-5.1.7.ebuild b/dev-ruby/actionmailer/actionmailer-5.2.4.ebuild
index c30ffb5b20a9..b254aa22526f 100644
--- a/dev-ruby/actionmailer/actionmailer-5.1.7.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-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_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
@@ -11,14 +11,14 @@ RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
 
 RUBY_FAKEGEM_BINWRAP=""
 
-inherit ruby-fakegem versionator
+inherit ruby-fakegem eapi7-ver
 
 DESCRIPTION="Framework for designing email-service layers"
 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=""
 
@@ -32,13 +32,17 @@ ruby_add_rdepend "
 	dev-ruby/rails-dom-testing:2"
 
 ruby_add_bdepend "test? (
-	dev-ruby/mocha:0.14
+	dev-ruby/mocha
 )"
 
 all_ruby_prepare() {
 	# Set test environment to our hand.
 	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d ; 1igem "railties", "~>5.1.0"; gem "activejob", "~>5.1.0"' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -e '/\/load_paths/d' \
+		-e '1igem "railties", "~> 5.2.0"' \
+		-e '1igem "actionpack", "~> 5.2.0"' \
+		-e '1igem "activejob", "~> 5.2.0"' \
+		-i test/abstract_unit.rb || die "Unable to remove load paths"
 
 	# Avoid a test failing only on attachment ordering, since this is a
 	# security release.
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.2.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.2.ebuild
new file mode 100644
index 000000000000..4f728095c7ee
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-6.0.2.ebuild
@@ -0,0 +1,46 @@
+# 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_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+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/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+	dev-ruby/rails-dom-testing:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
+}