gentoo resync : 29.12.2022

6 files changed, 194 insertions, 2 deletions

diff --git a/dev-ruby/sprockets/Manifest b/dev-ruby/sprockets/Manifest
index 9312e9e9068a..2101a2e9cfd1 100644
--- a/dev-ruby/sprockets/Manifest
+++ b/dev-ruby/sprockets/Manifest
@@ -1,6 +1,11 @@
+AUX sprockets-3.7.2-erb-deprecation.patch 1073 BLAKE2B 12821e697afb59cdfc4a05fa6ff6331f09b8a37fa0c9bd86827470e2b53235cb324e16eda49228f516d35c0dba5a5e1a57d6619a592a15377a77933973b9cb02 SHA512 2ede438a48f7ea7e51f8a69349d4417cefe86c4c236d5382ba4dde81e58ac167e6c36dc1eac77e99d9742b7314f38f23d92eae7dd7849e14970127a897839366
+AUX sprockets-3.7.2-kwargs.patch 829 BLAKE2B 406a79b455e18464e4f8e1028785f0c4d399430ce2fcbce83ffc4a66274e75f2d6e5fac3bfc49656aee35ebfcae5bbc59ca5770f5ddd961c8c4f0632467069c3 SHA512 1df64a17fae52832459ff2eb0a33e1bb3622d645037b035f5414179e2358c0a7306bdcfd8c7a80f4700d72983987d8febe7e5f0d4fb9875c9d8bf880476206f4
 DIST sprockets-3.7.2-git.tgz 369053 BLAKE2B 3c40de921d82b2f5c71e3ecaa114576293946352415da1195e60cdda6363066a6be05474eb7842ab1122e29fa6c19fd2f7a38fb0a7cf9972de0640eeb29d03f0 SHA512 bc7d79ba696a072644852b7a3a73ce086d297662309deb1d00318ad453f50ac6e494e6489632cb282795de2f334700155cfd21cc80be638dc471a3215422591f
 DIST sprockets-4.0.2-git.tgz 418502 BLAKE2B 0ae8d0e47708967a4208af852f21baf9d00c4216660b081170d7f68631ee1129fb78341e6012664fc519a0f330fac23203e314c1831d7031af50844e6b91c1f0 SHA512 f733b96c78be6466b63999aa7dc900af653a5b35f6482d84c41edf47f22b093231003f8874eee2ab31e2a2cfb7049a8109a314b51a0ef36ba30d5f6e8bd81f66
+DIST sprockets-4.1.0-git.tgz 421796 BLAKE2B 8544f8299a5abe8ef89a47d7849fd54f5a04eb623cacc316c2c4656b291c55879f1519d2f3628921af1eee64e67451a15d50d68d1dd93e84a95a833e76994667 SHA512 af964e614f414886cd737888119449b6d2829a41965ba7ab82806e3887ec6eadacc947a19e34568c5f418da7cf47175bd0cb0f4f402bd6e2db41f684ed0cc8e4
 EBUILD sprockets-3.7.2-r1.ebuild 1682 BLAKE2B 7a7a1851e0b5c7de0c211592bc80bdfff9045fdca7608f268ed682f8653f4b0fcf88ef757d38f7a9ea10e7f2956abe64abf6bb705b1705155fd6a57e9c68f6b3 SHA512 fc014d59ab8d05ec967a562ae35d75a2e37d8f85b45d2c0053c08682608161830318ebf62a892f4359b81bb8618cd77459626adc3a441aa6d45b681cb85fa9bc
+EBUILD sprockets-3.7.2-r2.ebuild 1736 BLAKE2B 12f784b4877082a54e1f52dc43e4e152b3052dfe1f623c2d1bd2b00d73952878222680112aa61e0030f030ed7a31c1ad84165b17e633293a400a35942ccd647a SHA512 bcad6e5fe0a4d5b4e7ac62ecb4e237432303e1d4cf1885ddeaac9fc05caf994853b9c3e49e0e4409dff74bf8487dec3f048fb62f359a9d6f516e4296e3c4ba48
 EBUILD sprockets-3.7.2.ebuild 1664 BLAKE2B 8281c517276e6e2535700784ffce12701b799fe2870b429fbba995155272da13bd97e310487c57636c036601694ddb2c731f95bdd2cc60ce548264593d2650a1 SHA512 e7abb4c060749720a0e1c6052118a2433d564aff59a9dc36c0ec5f61d3dad784186a08921f1637998150e5b4af9396a9d74c868ec42949deee952ae8dd5d3d45
-EBUILD sprockets-4.0.2.ebuild 2066 BLAKE2B 7467de86a0015c3dc9eccd769877fac7d12e04e8658f90c326025ce860d245af7542121f22043dbdc6e1d41dea3dfd91d13d1af7f062fe1d016217dc37d88d41 SHA512 0f854b2a38b4b34104b9af99cbb115d58ae7615b78675d142d64fd5077e054cbe6071faa41bb33b4ec5f9d653124937d74307c15c974be0d3c29597394350cbe
+EBUILD sprockets-4.0.2.ebuild 2073 BLAKE2B 83ca1f1c975ec2f0e84dbdd3b988da08f767ae7773989fc0bed64c75c95e9b8f8dd6ac2f32c53da642b50f1c74bd16d2297e7c9e1622cb33d9e70f1eb872d546 SHA512 934e726b1b3711301bdbe0783d87239965270371b0f80fa910b7483fac24829faf98880b1ef1e205371127e7e629495240f243cba2ee77774cec364063ed5f1f
+EBUILD sprockets-4.1.0.ebuild 2090 BLAKE2B cc6c680b76936346259b71f6d06478dfb242f49a90156f7e9836e4115f27d3c715676d8d8cb93c937f8d0b4d3b1095b75e2d652acb479205671d45d4c0678d2a SHA512 b1892932bdcfd23820bf43bcb269684f89c906fb17883baf27ae4178f8a5d48dbef3abf2685328b3ef156c0613daf30867279dc2c1a068f73e3066b70d87110b
 MISC metadata.xml 342 BLAKE2B 227ac77350fe458144d05c09bef5156a9f7c06154b8aba9902f1611b7f3e22b5409231cfb0a44af0d6f5d87138a0d71eb230d8827773830b508d91848f5a8cb0 SHA512 ee0cc0cfbfed5e9e61386b885714cf26a3ca1e2e94b820859ea1b08f82fe3ab5bf13c5a4764dd2b4ca48d668f22e493d76a39cb48a8d3c784b55b78cbfc02ec3
diff --git a/dev-ruby/sprockets/files/sprockets-3.7.2-erb-deprecation.patch b/dev-ruby/sprockets/files/sprockets-3.7.2-erb-deprecation.patch
new file mode 100644
index 000000000000..c433360cae52
--- /dev/null
+++ b/dev-ruby/sprockets/files/sprockets-3.7.2-erb-deprecation.patch
@@ -0,0 +1,29 @@
+From b4fbdd9dfccabcaf5aa9f6ab7f6cab430cc16999 Mon Sep 17 00:00:00 2001
+From: utilum <oz@utilum.com>
+Date: Sun, 24 Jun 2018 10:30:13 +0200
+Subject: [PATCH] backport: Deprecate safe_level of `ERB.new` in Ruby 2.6
+
+37a87ba0969d9c08e0e5d05271c7d2e6ba8aa817
+---
+ lib/sprockets/erb_processor.rb | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/lib/sprockets/erb_processor.rb b/lib/sprockets/erb_processor.rb
+index a14d1c1a8..acbd4ad63 100644
+--- a/lib/sprockets/erb_processor.rb
++++ b/lib/sprockets/erb_processor.rb
+@@ -18,7 +18,13 @@ def initialize(&block)
+     end
+ 
+     def call(input)
+-      engine = ::ERB.new(input[:data], nil, '<>')
++      match = ERB.version.match(/\Aerb\.rb \[(?<version>[^ ]+) /)
++      if match && match[:version] >= "2.2.0" # Ruby 2.6+
++        engine = ::ERB.new(input[:data], trim_mode: '<>')
++      else
++        engine = ::ERB.new(input[:data], nil, '<>')
++      end
++
+       context = input[:environment].context_class.new(input)
+       klass = (class << context; self; end)
+       klass.class_eval(&@block) if @block
diff --git a/dev-ruby/sprockets/files/sprockets-3.7.2-kwargs.patch b/dev-ruby/sprockets/files/sprockets-3.7.2-kwargs.patch
new file mode 100644
index 000000000000..3c9be7e7af01
--- /dev/null
+++ b/dev-ruby/sprockets/files/sprockets-3.7.2-kwargs.patch
@@ -0,0 +1,28 @@
+From 6e6d6a70848cf006fabf48088cb4140c6d1858e7 Mon Sep 17 00:00:00 2001
+From: pavel <pavel.rosicky@easy.cz>
+Date: Tue, 1 Oct 2019 12:29:13 +0200
+Subject: [PATCH] kwargs
+
+---
+ test/test_performance.rb | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/test_performance.rb b/test/test_performance.rb
+index c9e76c00f..f2ffde606 100644
+--- a/test/test_performance.rb
++++ b/test/test_performance.rb
+@@ -16,12 +16,12 @@ def stat(filename)
+ $dir_entires_calls = nil
+ class << Dir
+   alias_method :original_entries, :entries
+-  def entries(dirname, *args)
++  def entries(dirname, **args)
+     if $dir_entires_calls
+       $dir_entires_calls[dirname.to_s] ||= []
+       $dir_entires_calls[dirname.to_s] << caller
+     end
+-    original_entries(dirname, *args)
++    original_entries(dirname, **args)
+   end
+ end
+ 
diff --git a/dev-ruby/sprockets/sprockets-3.7.2-r2.ebuild b/dev-ruby/sprockets/sprockets-3.7.2-r2.ebuild
new file mode 100644
index 000000000000..de73a55d6b0f
--- /dev/null
+++ b/dev-ruby/sprockets/sprockets-3.7.2-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby library for compiling and serving web assets"
+HOMEPAGE="https://github.com/rails/sprockets"
+SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-erb-deprecation.patch" "${FILESDIR}/${P}-kwargs.patch" )
+
+ruby_add_rdepend "
+	dev-ruby/concurrent-ruby:1
+	>=dev-ruby/rack-1:* <dev-ruby/rack-3:*"
+
+ruby_add_bdepend "test? (
+		dev-ruby/json
+		dev-ruby/rack-test
+		=dev-ruby/coffee-script-2*
+		=dev-ruby/execjs-2*
+		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
+		dev-ruby/uglifier
+	)"
+
+all_ruby_prepare() {
+	# Avoid tests for template types that we currently don't package:
+	# eco and ejs.
+	sed -i -e '/eco templates/,/end/ s:^:#:' \
+		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
+	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
+	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.rb || die
+	sed -i -e "/bundler/d" Rakefile || die
+}
+
+each_ruby_prepare() {
+	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
+}
+
+each_ruby_test() {
+	# Make sure we have completely separate copies. Hardlinks won't work
+	# for this test suite.
+	cp -R test test-new || die
+	rm -rf test || die
+	mv test-new test || die
+
+	each_fakegem_test
+}
diff --git a/dev-ruby/sprockets/sprockets-4.0.2.ebuild b/dev-ruby/sprockets/sprockets-4.0.2.ebuild
index 1258f043e5ad..4f3532deaa62 100644
--- a/dev-ruby/sprockets/sprockets-4.0.2.ebuild
+++ b/dev-ruby/sprockets/sprockets-4.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tg
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 
diff --git a/dev-ruby/sprockets/sprockets-4.1.0.ebuild b/dev-ruby/sprockets/sprockets-4.1.0.ebuild
new file mode 100644
index 000000000000..8af84e6a868d
--- /dev/null
+++ b/dev-ruby/sprockets/sprockets-4.1.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby library for compiling and serving web assets"
+HOMEPAGE="https://github.com/rails/sprockets"
+SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/concurrent-ruby:1
+	>=dev-ruby/rack-1:* <dev-ruby/rack-3:*
+	!<dev-ruby/sprockets-3.7.2-r1:3"
+
+ruby_add_bdepend "test? (
+		dev-ruby/json
+		dev-ruby/rack-test
+		=dev-ruby/coffee-script-2*
+		=dev-ruby/execjs-2*
+		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
+		dev-ruby/sassc
+		dev-ruby/uglifier
+	)"
+
+all_ruby_prepare() {
+	# Avoid tests for template types that we currently don't package:
+	# eco and ejs.
+	sed -i -e '/eco templates/,/end/ s:^:#:' \
+		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
+	sed -i -e '/.ejs/ s:^:#:' -e '/\(es6_asset.js\|traceur.es6\)/ s:^:#:' test/test_asset.rb || die
+	sed -i -e '/compile babel source map/askip' test/test_source_maps.rb || die
+	sed -e '/change jst template namespace/askip' \
+		-e '/find_asset. does not raise an exception/askip' \
+		-e '/es6 asset/askip' \
+		-i test/test_environment.rb || die
+	rm -f test/test_require.rb test/test_{babel,closure,eco,ejs,jsminc,yui}_{compressor,processor}.rb || die
+	# Fails only within Gentoo test environment, not clear why
+	sed -i -e '/extension exporters/a skip' test/test_exporting.rb || die
+	sed -i -e "/bundler/d" Rakefile || die
+}
+
+each_ruby_prepare() {
+	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
+}
+
+each_ruby_test() {
+	# Make sure we have completely separate copies. Hardlinks won't work
+	# for this test suite.
+	cp -R test test-new || die
+	rm -rf test || die
+	mv test-new test || die
+
+	each_fakegem_test
+}