gentoo resync : 14.05.2020

3 files changed, 32 insertions, 25 deletions

diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 949aadc5883c..7f0f48b95b37 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,7 +1,7 @@
-DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-EBUILD activesupport-4.2.11.1.ebuild 2386 BLAKE2B ae9c03406916c3f16fcd077ef49eea1f10123428af93f1b5e6739a28b1ca741e98b4572fc5643c27b7a8b3efc24bb038f2452df5ea90dc829477affc78a7b0d6 SHA512 b753886b2478c5b54a1800b47096f63ec68489dddb1ca68d72b15f192d6c8a4e345235a76395e6f5c2c3bdd662ea07ba723ac0a025103820afd308a5c9cd18e6
+DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
 EBUILD activesupport-5.2.4.2.ebuild 2523 BLAKE2B 7cef7564cbc0c057d76cf74f4dd5382a738ea204f1dadf0367fa70e30f6e8f002e252c446bbd342352e476f98623b534db00734dc4658c68145c51ad1d30b945 SHA512 158df77044882eb0fdbfdf7fb0349d74812187cc668fff6af4f44f7ee2ffbb31e1076569f19125048baec407ef6797b35ac21cdce52325a92d1feff3b0bc7922
-EBUILD activesupport-6.0.2.2.ebuild 2396 BLAKE2B 61e908e5176d0297f6ec16cd2dcf6ceab9145addc4124489bd99f8d244509eb5496927b5fb130b121662428610d355939afcff1e9672ddcb3f5f2e80348ab770 SHA512 11c3c6478918250fbb13513f813a2354ac2fa78798b91e29ab136e1ef05e50a9f229940d5218b6b9c2954adf87e204e34d62c2ceaf2a95c64d724fc0fd55f25e
+EBUILD activesupport-6.0.2.2.ebuild 2402 BLAKE2B 8176f2d7e911e93fd8d813dd35d5731795dca4d32d57dbacb7d5677699a339a16821d73902f476552c73659f4049169ed4472f6e5de9591f60cc1ff226116449 SHA512 cfcc9789d8e70cf5f567fa3d3ed47fd924c38e5e1af24bf0f6f299b392d545e25ba03e27f366e01678899d6c12088e18f6ba5ca06953f39ec71092ccfea892ae
+EBUILD activesupport-6.0.3.ebuild 2517 BLAKE2B d138806cbe294858b40360af25615ead52a0ed7f1eadb77ccaf6344f18b8616365f19d1548e5fe5a5748700ad9e75c34123421ebf9d57892331aa0174b8bc9b2 SHA512 30d49e2ab7c3334bdf253d4c9f866937e493d693f43d7a450c2103156baab04a918dcdfee67db159002841db3979f0e9a9ab898ad75eba6e4518a1a629e6b942
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-6.0.2.2.ebuild b/dev-ruby/activesupport/activesupport-6.0.2.2.ebuild
index 493768eb5237..29e908aae235 100644
--- a/dev-ruby/activesupport/activesupport-6.0.2.2.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.0.2.2.ebuild
@@ -19,7 +19,7 @@ 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 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-4.2.11.1.ebuild b/dev-ruby/activesupport/activesupport-6.0.3.ebuild
index 4424d718299a..bf4536107f91 100644
--- a/dev-ruby/activesupport/activesupport-4.2.11.1.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.0.3.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
@@ -13,33 +11,36 @@ RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
 
 RUBY_FAKEGEM_BINWRAP=""
 
-inherit ruby-fakegem versionator
+inherit ruby-fakegem
 
 DESCRIPTION="Utility Classes and Extension to the Standard Library"
 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
 
 ruby_add_rdepend "
-	>=dev-ruby/i18n-0.7:0.7
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	dev-ruby/i18n:1
 	>=dev-ruby/tzinfo-1.1:1
 	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/thread_safe-0.3.4:0"
+	>=dev-ruby/zeitwerk-2.1.8:2
+"
 
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
 ruby_add_bdepend "test? (
 	>=dev-ruby/dalli-2.2.1
 	>=dev-ruby/nokogiri-1.4.5
 	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.0.5:3
 	dev-ruby/rack
-	dev-ruby/mocha:0.14
+	dev-ruby/mocha
 	)"
 
 all_ruby_prepare() {
@@ -48,19 +49,25 @@ 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\|minitest\|mime-types\|sprockets\|stackprof\|rack-cache\|sqlite\)/ s:^:#:" \
+	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\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
 		-e '/:job/,/end/ s:^:#:' \
 		-e '/group :doc/,/^end/ s:^:#:' \
 		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '/rake/ s/12.3/12.4/ ; /dalli/ s/2.7.7/2.7.10/' \
 		-e '5igem "builder"; gem "rack"' ../Gemfile || die
 	rm ../Gemfile.lock || die
+	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
 
-	# Avoid test that fails with Minitest 5.4 since that already defines
-	# a string E in its TestCase.
-	rm test/core_ext/marshal_test.rb || die
-	sed -i -e '/test_const_missing_in_anonymous_modules/askip "gentoo minitest"' test/dependencies_test.rb || die
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
 
-	# Avoid test crashing newer versions of minitest
-	rm -f test/autoload_test.rb test/core_ext/object/json_cherry_pick_test.rb test/core_ext/object/json_gem_encoding_test.rb || die
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
 }