gentoo auto-resync : 18:12:2022 - 19:46:22

3 files changed, 102 insertions, 0 deletions

diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 976fd607ad4e..5801d2a4390a 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -1,4 +1,6 @@
+AUX slim-4.1.0-temple.patch 1651 BLAKE2B b979b550ad138ddac448f974b3a96ca5c7b32f1586e0d3eb3581ece3fc398035bb4c6b32082a7366b946d29054ccdafa61b38adac5ff782991c070e161738aa1 SHA512 db3d64781003830fb98e331248fdaade0ee9076c6e452b06195d2cbbc6bbe7ed55c1da6c41e8ac0df9341f9c637e5cdc79142b7444f832eff870b8ea1a2b1dcb
 DIST slim-4.1.0.gem 103424 BLAKE2B 87de8411d6284569ac56366d4e2f3ee351c6908001cbda2926312f25c1c39520662371e826493d1346722bb507348bd8c117f3b0447b433bdb406435b80a70e2 SHA512 a929edcd1b194bc6abddf5757e0e942835f6c5e1555aa7bf021b0e850d74c9777637a2a0eafbdf2de7f0f0574eb03866c562826c656adcc0517cc4bfcb5ca897
 EBUILD slim-4.1.0-r2.ebuild 1785 BLAKE2B 576b623cf8b8f0ede858565f7cf0d0a28a822ed2ece843cf6aaa8bf0dbd5fd809d9249284569fec3725e6413cf5b8f4c810df1d9029c86f7a9a047e5e7934089 SHA512 9aa258af506af1008782cb7eb74f57cb176a1a1f61ec96ebbe1c4ec4d4b7e856b2b6053014426debb023704bae592ddfea45c6ae6841b52f4b8392e6b55cd45e
+EBUILD slim-4.1.0-r3.ebuild 2133 BLAKE2B 34d882a7dead6daa4253f3742caa376a452c5a9ecf2779331c06d83cac50b956e33077d48c399c7fe138ae87d1264b176afd270efea78dd31c92c33b32aca663 SHA512 7beaef9a08c0aff94801617360260d4891bf495ec39978e1d20ebcfaf435a773e55542de18a6e2ca6fd1b0d184a9685502576d1ffb48d5ec0a8da4931afb672d
 EBUILD slim-4.1.0.ebuild 1653 BLAKE2B c706e322135b0a78d2bc2fcbeb0fbaadf8c44bf4635850043b3281c560f7075ef1e8692cac6ca7df3a28f88bc176b068d1ee9e745fe88a50f89ae7f8dab62bc4 SHA512 2be3514f16ee6fd78dc2a28f2b88c737011acc7a8abaf9281cd36e2ceb3eaabdb579bf0d230cd67a88401bc2486b22037d7a31b77b5564dd1e4cee1eeb369624
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/slim/files/slim-4.1.0-temple.patch b/dev-ruby/slim/files/slim-4.1.0-temple.patch
new file mode 100644
index 000000000000..c8c939cd6933
--- /dev/null
+++ b/dev-ruby/slim/files/slim-4.1.0-temple.patch
@@ -0,0 +1,39 @@
+From 45a8087bbdde309703db3860a160bab3fdb8c14a Mon Sep 17 00:00:00 2001
+From: Takashi Kokubun <takashikkbn@gmail.com>
+Date: Tue, 25 Oct 2022 09:25:18 -0700
+Subject: [PATCH] Support temple 0.9.1+ (#894)
+
+---
+ slim.gemspec               | 2 +-
+ test/core/test_commands.rb | 6 +++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/slim.gemspec b/slim.gemspec
+index 0bbc7ae4..095dafd5 100644
+--- a/slim.gemspec
++++ b/slim.gemspec
+@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
+ 
+   s.required_ruby_version = '>=2.0.0'
+ 
+-  s.add_runtime_dependency('temple', ['>= 0.7.6', '< 0.9'])
++  s.add_runtime_dependency('temple', ['>= 0.7.6', '!= 0.9.0'])
+   s.add_runtime_dependency('tilt', ['>= 2.0.6', '< 2.1'])
+ end
+diff --git a/test/core/test_commands.rb b/test/core/test_commands.rb
+index 7cf8e838..15a77dd7 100644
+--- a/test/core/test_commands.rb
++++ b/test/core/test_commands.rb
+@@ -58,7 +58,11 @@ def test_rails
+     prepare_common_test DYNAMIC_TEMPLATE, '--rails' do |out, err|
+       assert err.empty?
+ 
+-      assert out.include? %Q{@output_buffer = ActiveSupport::SafeBuffer.new;}
++      if Gem::Version.new(Temple::VERSION) >= Gem::Version.new('0.9')
++        assert out.include? %Q{@output_buffer = output_buffer || ActionView::OutputBuffer.new;}
++      else
++        assert out.include? %Q{@output_buffer = ActiveSupport::SafeBuffer.new;}
++      end
+       assert out.include? %Q{@output_buffer.safe_concat(("<p>Hello "#{STRING_FREEZER}));}
+       assert out.include? %Q{@output_buffer.safe_concat(((::Temple::Utils.escape_html((name))).to_s));}
+       assert out.include? %Q{@output_buffer.safe_concat(("!</p>"#{STRING_FREEZER}));}
diff --git a/dev-ruby/slim/slim-4.1.0-r3.ebuild b/dev-ruby/slim/slim-4.1.0-r3.ebuild
new file mode 100644
index 000000000000..6e762dea8710
--- /dev/null
+++ b/dev-ruby/slim/slim-4.1.0-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_RECIPE_DOC="rake"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A template language aiming to reduce the syntax to the essential parts"
+HOMEPAGE="http://slim-lang.com/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+SLOT="$(ver_cut 1)"
+IUSE="doc"
+
+ruby_add_rdepend ">=dev-ruby/tilt-2.0.6:* =dev-ruby/tilt-2.0*:*
+	>=dev-ruby/temple-0.7.6:0.7
+	!!<dev-ruby/slim-3.0.9-r1"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )"
+
+ruby_add_bdepend "test? ( dev-ruby/redcarpet dev-ruby/sassc )"
+
+all_ruby_prepare() {
+	eapply "${FILESDIR}/${P}-temple.patch"
+
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# This sinatra code expects tests to be installed but we strip those.
+	sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
+
+	# Add missing include, bug 816573
+	sed -i -e "1irequire 'ostruct'" test/core/test_code_evaluation.rb || die
+
+	# Avoid tests for things we don't have. The builder test does not pass with tilt 2.x
+	sed -i -e '/test_wip_render_with_asciidoc/,/^  end/ s:^:#:' \
+		-e '/test_render_with_wiki/,/^  end/ s:^:#:' \
+		-e '/test_render_with_creole/,/^  end/ s:^:#:' \
+		-e '/test_render_with_builder/,/^  end/ s:^:#:' \
+		-e '/test_render_with_org/,/^  end/ s:^:#:' test/core/test_embedded_engines.rb || die
+
+	# Avoid test failing due to tilt providing yet another markdown implementation
+	sed -i -e '/test_render_with_markdown/askip "new tilt version"' test/core/test_embedded_engines.rb || die
+	sed -i -e '/test_no_translation_of_embedded/askip "new tilt version"' test/translator/test_translator.rb || die
+
+	sed -i -e '/s\.files/ s/git ls-files/find . -type f -print/' \
+		-e '/s\.executables/ s:git ls-files -- bin/\*:find bin -type f -print:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	sed -i -e '/Open3/ s:ruby:'${RUBY}':' test/core/test_commands.rb || die
+}