gentoo resync : 03.03.2021

5 files changed, 12 insertions, 136 deletions

diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 08105b111ba1..de9a69a06e78 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,13 +1,9 @@
-DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
-DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-EBUILD activestorage-5.2.4.3.ebuild 1970 BLAKE2B f0cc15b0b78d783b2c85c838959156bfac4979be631db2a7f40b177b5b08b626da65d7d504e9bdae3dc5c42dfd06a152ccfe919e63fe030760d8c530af84d523 SHA512 ceb0fd466449abb1070b94011868a44a14330e07dadd87cb0fa7e0604e152fe572d03023b460d13780a4618b88864a7d67df56f45bdeb77963feed2f18ff065b
-EBUILD activestorage-5.2.4.4.ebuild 1970 BLAKE2B f0cc15b0b78d783b2c85c838959156bfac4979be631db2a7f40b177b5b08b626da65d7d504e9bdae3dc5c42dfd06a152ccfe919e63fe030760d8c530af84d523 SHA512 ceb0fd466449abb1070b94011868a44a14330e07dadd87cb0fa7e0604e152fe572d03023b460d13780a4618b88864a7d67df56f45bdeb77963feed2f18ff065b
+DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD activestorage-5.2.4.5.ebuild 1970 BLAKE2B 2558ac6c7fee55505f9e4d11cf6ce9b55819e39c6498478486747e28108026949a4df247a15d8318cd0a659aa35f77880c9c0dc288a3dfec3d0c5dfc2939a5b7 SHA512 19afe1f48f4e800e108a1d11f239999cb0a14ba1318d5bf3076bb3a7cd2bde604ebc1035aebfbbb6444a9bce317cff337524cc007631ad4797259ab6637b6b00
-EBUILD activestorage-6.0.3.4.ebuild 2026 BLAKE2B fd9857b4ff0c70660b70c69116b1e83b56167eb19656f15c220f4ae15a02b093f3f26091fe446dba4c99538c33651d98c24cd33056f38e25b505d5c41d08718e SHA512 de586463bbf72e68bb7bbcca46e89d469a897ff9e56e141a3f9eb71a2bf4299760e6539893ecc829a5e9a20266e505ccbf847d9d0a5ed8a855da9e9bf1323b80
 EBUILD activestorage-6.0.3.5.ebuild 2026 BLAKE2B 47d1e7d489971c98b738a21bc674bb99eeaa31c44d9fec6cdce1ecbccea546d89c950998fff1f1edb5432ac45fc13312fa7112c22a96ffd2eeb7ab96d34a584e SHA512 5dd6bd174328f5943fcd1408252b2cf32fe431a06e0ec0bbb0cc79d28f76a9c0a8034cb22c19cfdcfb3d1f67319c94b75d1b4f511f09a1130b54f8b7f7205aa1
-EBUILD activestorage-6.1.2.1.ebuild 1984 BLAKE2B 7d30e15a1a477983118307aca6a409e6faf910ce16b2d10756007a9cde6ada04f37fdd3db2476465856d1b92c76c289285cc3ada5618220694360c70497f2c19 SHA512 6b5526686f652b950e75f3ae1495b9948eb161e3b7e799a0bdc4491270bc2c0bf7461490e67e9d43a926a9014fb5fd3249bed13d94159130651cbeb1597f1a5e
+EBUILD activestorage-6.1.2.1.ebuild 1991 BLAKE2B 1aaf65836d58a871248bac82389bce47cb511c42b95e921c19e5b1c1bc1a1b8c1da662c43677b29932a851637e66ea9ab5acb99916536b8f93823e9b0748081c SHA512 9bd7b2242b09f5be1114b2b5d4e8507980e7c635511f2d9eab85a87e83ccf37b917748f2c35fa866f8cb381bbec79ca03ceee65ad293836ae2422556056493ce
+EBUILD activestorage-6.1.3.ebuild 2106 BLAKE2B f9c415ba867e3594af3aeafd7bdd3e399163fb3b466f763cc9cfb74ce5dc0e0db0b19352331eba7ada08d0ac457bba0e5ef2d32770c3f1e919cf38b74478004f SHA512 528854b949536fe23471a368582907b0a79d4a7faa88cd8668c416699a797d028ad58484df40454f478dbff2260c5a63f2ac4f649e0e28a5e00bd655486bb5b9
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activestorage/activestorage-5.2.4.3.ebuild b/dev-ruby/activestorage/activestorage-5.2.4.3.ebuild
deleted file mode 100644
index 9ee08a50fdf3..000000000000
--- a/dev-ruby/activestorage/activestorage-5.2.4.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Attach cloud and local files in 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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sqlite3
-	)"
-
-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\|aws-sdk-s3\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Fix spec broken with ruby24
-		sed -i -e '35ibegin' -e '55iend' test/service/s3_service_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-5.2.4.4.ebuild b/dev-ruby/activestorage/activestorage-5.2.4.4.ebuild
deleted file mode 100644
index 9ee08a50fdf3..000000000000
--- a/dev-ruby/activestorage/activestorage-5.2.4.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Attach cloud and local files in 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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sqlite3
-	)"
-
-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\|aws-sdk-s3\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Fix spec broken with ruby24
-		sed -i -e '35ibegin' -e '55iend' test/service/s3_service_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild b/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild
index 460e95be2b1f..d60ab6bbc543 100644
--- a/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild
+++ b/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
diff --git a/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild b/dev-ruby/activestorage/activestorage-6.1.3.ebuild
index 945b8395dccf..121a1854f8fa 100644
--- a/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild
+++ b/dev-ruby/activestorage/activestorage-6.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
@@ -32,8 +32,11 @@ DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-vide
 
 ruby_add_rdepend "
 	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activejob-${PV}:*
 	~dev-ruby/activerecord-${PV}:*
+	~dev-ruby/activesupport-${PV}:*
 	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
+	>=dev-ruby/mimemagic-0.3.2 =dev-ruby/mimemagic-0.3*
 "
 
 ruby_add_bdepend "
@@ -50,10 +53,9 @@ ruby_add_bdepend "
 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\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
+		sed -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\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
 			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
+			-i ../Gemfile || die
 		rm ../Gemfile.lock || die
 }