gentoo auto-resync : 29:08:2023 - 10:04:54

3 files changed, 7 insertions, 67 deletions

diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 3be51a540be7..3370f3e6e215 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -1,8 +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
 DIST slim-5.1.0.gem 100352 BLAKE2B 19d0bea76a932d18a39fab30d0b1f2cd4f8f2eba108d79d2992112b568461cbc854a99d70b6ea97622e1928db7f33434221a054d77c5d3fa989da639fae176e5 SHA512 2cc39659a5c36cf37e3eea240f5326552fac0be8a42ff6bfe62837467bb77f8841b34d838d5a6945ff7195eb1e59842c64e04944d6882d132819f1ffbf609f50
 DIST slim-5.1.1.gem 100864 BLAKE2B ea5c469702dca808bdc0555044a8d6a5a0b34e8d5b03a9c97e6e31ccb169725be6f76fc1f252d14673e92a53ac1a42caf023a3d1bacb66c4091710f8e9772c1a SHA512 935d488ad11478b28d51125ddbf7f0cb81f7791587bb69c7ead434eacf44c309958459dcff7228b6562b8972d6cb7125f3d451d21bfa2ded2f7ee1b55703d1f4
-EBUILD slim-4.1.0-r4.ebuild 2132 BLAKE2B f3cf006a609dec8388a77b578f6c5af6e7ae268eb374f51cc9aeb288040dddfa1ad634782655e74718d3f79d2dd60663ca2938f4fba80f3798d48d848afbf1fc SHA512 5753cb009fe5461f5750742e01a8f340aa9ba64a027d6979d3aebe68f0feda595bebf7aa7ad93bf47fe10082d5f17e113b125f43ed90cf9d6b308efb738fbc50
 EBUILD slim-5.1.0-r1.ebuild 2236 BLAKE2B 7507a967daeb1f4eb8c0d7beb8ded4d51d57c81b902dd98b45e4fb79dda227f6edf00874fb17023189b374f4747acccc964bb8d6cf4bf284a535255e4e0c9e03 SHA512 c7f67bc8b78a1749dacd0e039f1ab0016e7b834ddc6bddbde2a539ebad7643dc33d09016945cef51430bb8ec45796154cd657bc178562080003bd69292cf7bdf
-EBUILD slim-5.1.1.ebuild 2230 BLAKE2B 93f7391eb3c4f2789764e7bb023e97f32209b6d1394bbe8ff73b794ccd6dfdccdb3cc6588b6df0b58b78115b6f1802a9bd03e0ce46ae32434a986abcbfef310a SHA512 b4ee7dfce4f040931f104503ca0342781ad951cb4c8901ce1dcdfe382b79f62905fc7c616f61f47c00173fc2b5a000047913d8a864dba7ca46d1209f0febc65a
+EBUILD slim-5.1.1.ebuild 2343 BLAKE2B 401902d64fbe95670891be202cf4f3257a59651ad188d828f56a0f786351e57e9a01d59b6d8a4ec3d235b901419aed523830bd78ab9f3e5aab04d655ad1a9acf SHA512 e9498be0362105251ecde4d929e8f6d6f1b6801d193e45ba7a517b7e84f38afe7b8503a809e3658624aa686d35d3bf547a70f69510d8bfa8041bb758bc0336ec
 MISC metadata.xml 328 BLAKE2B 278b8ae81f02f38eb7a70fe1f6649cfcaa5a256ecdeaafdd1231b18050fb9b1a7e36d332ba6165867565ecc7d19ea425966d35a739950c170f151ad927ab57ed SHA512 21ea066ca55a1422879792472cc5b07a87332e5eb204b1311a5a63cbe9f33296a9ef48cba2491a50064baa3760a18285cec51882c3ca885a7cce2453a4e2234a
diff --git a/dev-ruby/slim/slim-4.1.0-r4.ebuild b/dev-ruby/slim/slim-4.1.0-r4.ebuild
deleted file mode 100644
index 9ede38c06816..000000000000
--- a/dev-ruby/slim/slim-4.1.0-r4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 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="https://slim-template.github.io/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
-IUSE="doc"
-
-ruby_add_rdepend "
-	!dev-ruby/slim:5
-	>=dev-ruby/tilt-2.0.6:* =dev-ruby/tilt-2.0*:*
-	>=dev-ruby/temple-0.7.6:0.7
-"
-
-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
-}
diff --git a/dev-ruby/slim/slim-5.1.1.ebuild b/dev-ruby/slim/slim-5.1.1.ebuild
index a5c1188a4aa0..c914625d9a54 100644
--- a/dev-ruby/slim/slim-5.1.1.ebuild
+++ b/dev-ruby/slim/slim-5.1.1.ebuild
@@ -28,7 +28,8 @@ ruby_add_rdepend "
 	>=dev-ruby/tilt-2.1.0:*
 	>=dev-ruby/temple-0.10.0:0.7
 "
-# sass tests are currently disabled: https://github.com/slim-template/slim/commit/bd9d4601cd8142aa9fdbc0d87c9f9132a9a56cda
+# sass tests are currently disabled:
+# https://github.com/slim-template/slim/commit/bd9d4601cd8142aa9fdbc0d87c9f9132a9a56cda
 ruby_add_bdepend "
 	doc? (
 		dev-ruby/yard
@@ -38,6 +39,7 @@ ruby_add_bdepend "
 		dev-ruby/minitest:5
 		dev-ruby/kramdown:2
 		dev-ruby/redcarpet
+		dev-ruby/sassc
 		>=dev-ruby/test-unit-3.5
 	)
 "
@@ -62,6 +64,9 @@ all_ruby_prepare() {
 	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
 
+	# Fix minitest deprecation
+	sed -i -e 's/MiniTest/Minitest/' test/literate/helper.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
 }