gentoo resync : 28.04.2021

6 files changed, 71 insertions, 8 deletions

diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index de9a69a06e78..e37fd7927d41 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,9 +1,11 @@
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
+DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 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.5.ebuild 2026 BLAKE2B 47d1e7d489971c98b738a21bc674bb99eeaa31c44d9fec6cdce1ecbccea546d89c950998fff1f1edb5432ac45fc13312fa7112c22a96ffd2eeb7ab96d34a584e SHA512 5dd6bd174328f5943fcd1408252b2cf32fe431a06e0ec0bbb0cc79d28f76a9c0a8034cb22c19cfdcfb3d1f67319c94b75d1b4f511f09a1130b54f8b7f7205aa1
-EBUILD activestorage-6.1.2.1.ebuild 1991 BLAKE2B 1aaf65836d58a871248bac82389bce47cb511c42b95e921c19e5b1c1bc1a1b8c1da662c43677b29932a851637e66ea9ab5acb99916536b8f93823e9b0748081c SHA512 9bd7b2242b09f5be1114b2b5d4e8507980e7c635511f2d9eab85a87e83ccf37b917748f2c35fa866f8cb381bbec79ca03ceee65ad293836ae2422556056493ce
-EBUILD activestorage-6.1.3.ebuild 2106 BLAKE2B f9c415ba867e3594af3aeafd7bdd3e399163fb3b466f763cc9cfb74ce5dc0e0db0b19352331eba7ada08d0ac457bba0e5ef2d32770c3f1e919cf38b74478004f SHA512 528854b949536fe23471a368582907b0a79d4a7faa88cd8668c416699a797d028ad58484df40454f478dbff2260c5a63f2ac4f649e0e28a5e00bd655486bb5b9
+EBUILD activestorage-5.2.4.5.ebuild 1950 BLAKE2B c84cfaf29709d53196d6228fb09bfb187e52724f2e8d792a64b39c1fbe8d72670b486870a870d6819af6ef5c21a9d4a91c6f8cb3da3a2b9b307c60b655055b7f SHA512 a74a871b1d6e1f2a1d9c7f0df9ee501ed67b4c0212ef5531124bbe2c06bb521084bfd6426c626cd1d8725e0ada4ff56e9706086db0c87aa1a7cbba195166d65d
+EBUILD activestorage-6.0.3.5.ebuild 2006 BLAKE2B e5b8e6b63ef12cadf6dfa29dba4a7c8119ebe568d135554136564e18ce728ea426207328856d773678de7bb17a6f54f0227cbde1af2526afb317c9d5623ff2a0 SHA512 5655aaae7e5985feae47f045db4f99090e65b4cba7fcf4fa92122c493fe3722f5bb8808d0919dd47ec0652e0a6979c3f1eed666b4f735a90a29e9199c0c93e62
+EBUILD activestorage-6.1.2.1.ebuild 1971 BLAKE2B 9b50b0730f55fe990f227dd86fc3e45cbcd14d264ac7425a3273be6616e2c2a43bf02fa3224e384d4412568c1b4a10e65c5453e074212aa2e505d7fd0f4fa28f SHA512 91eb4f9275ff68a0a3f07ad7084be8330ba3e6697206f26601cf0ccdec15c0e12d4ecf23b2bad2c56020f08b7fbdc3122e583a606e3e57c08dd5575f3d361e74
+EBUILD activestorage-6.1.3.1.ebuild 2074 BLAKE2B 9990f1bc96733d48b6aa487122db56e48cb9aee5fcc2f4f2ae770497309c4ec1cfb9beace6dcd9198dd40d2e07075bd13659a15e6e51d94b4eac606750b91fda SHA512 6126ff26e7bbf049bf219ff497d6b95160c77576c770e627f74c65ffb84ff38fbb7390a331575faf2a1e859a9f4b6a2cc3ae1e09ddd9033f010f9b23cc8c57a3
+EBUILD activestorage-6.1.3.ebuild 2086 BLAKE2B e4ef3d63655930d6e045603ab2c04540b809162e83fcc1529937e516b91459f8a607359211624cb44c3f02b44c458084d61df28631be017b364585bc75ef80aa SHA512 6324329a4c3791e2c80dd9e8b0f28443c27c71bfc6834d10fe00773e0272b8248094a797682fc80849253825b46b75bdec3fdb5b4855d32d97078a60b0b89fbc
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activestorage/activestorage-5.2.4.5.ebuild b/dev-ruby/activestorage/activestorage-5.2.4.5.ebuild
index cdaa776c69fb..6d033ca351e7 100644
--- a/dev-ruby/activestorage/activestorage-5.2.4.5.ebuild
+++ b/dev-ruby/activestorage/activestorage-5.2.4.5.ebuild
@@ -33,7 +33,7 @@ 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*
+	>=dev-ruby/marcel-0.3.1:0
 "
 
 ruby_add_bdepend "
diff --git a/dev-ruby/activestorage/activestorage-6.0.3.5.ebuild b/dev-ruby/activestorage/activestorage-6.0.3.5.ebuild
index 7d7b414a3494..971e835a54f3 100644
--- a/dev-ruby/activestorage/activestorage-6.0.3.5.ebuild
+++ b/dev-ruby/activestorage/activestorage-6.0.3.5.ebuild
@@ -33,7 +33,7 @@ DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-vide
 ruby_add_rdepend "
 	~dev-ruby/actionpack-${PV}:*
 	~dev-ruby/activerecord-${PV}:*
-	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
+	>=dev-ruby/marcel-0.3.1:0
 "
 
 ruby_add_bdepend "
diff --git a/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild b/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild
index d60ab6bbc543..cca8924b1b51 100644
--- a/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild
+++ b/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild
@@ -33,7 +33,7 @@ DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-vide
 ruby_add_rdepend "
 	~dev-ruby/actionpack-${PV}:*
 	~dev-ruby/activerecord-${PV}:*
-	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
+	>=dev-ruby/marcel-0.3.1:0
 "
 
 ruby_add_bdepend "
diff --git a/dev-ruby/activestorage/activestorage-6.1.3.1.ebuild b/dev-ruby/activestorage/activestorage-6.1.3.1.ebuild
new file mode 100644
index 000000000000..6064db838572
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-6.1.3.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_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
+
+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 media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activejob-${PV}:*
+	~dev-ruby/activerecord-${PV}:*
+	~dev-ruby/activesupport-${PV}:*
+	dev-ruby/marcel:1.0
+	>=dev-ruby/mini_mime-1.0.2 =dev-ruby/mini_mime-1.0*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/image_processing-1.2:0
+		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 -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\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
+			-e '/dalli/ s/2.7.7/2.7.9/' \
+			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
+			-i ../Gemfile || die
+		rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/activestorage/activestorage-6.1.3.ebuild b/dev-ruby/activestorage/activestorage-6.1.3.ebuild
index 121a1854f8fa..926cc2421e97 100644
--- a/dev-ruby/activestorage/activestorage-6.1.3.ebuild
+++ b/dev-ruby/activestorage/activestorage-6.1.3.ebuild
@@ -35,7 +35,7 @@ ruby_add_rdepend "
 	~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/marcel-0.3.1:0
 	>=dev-ruby/mimemagic-0.3.2 =dev-ruby/mimemagic-0.3*
 "