gentoo auto-resync : 24:12:2023 - 13:37:40

5 files changed, 14 insertions, 125 deletions

diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index 43a741a46e7f..b40a422ec6f9 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,13 +1,9 @@
 DIST haml-5.2.2.tar.gz 129833 BLAKE2B d68c24c7a3c817d6d364b2ec92b84b4f56f4fffa48b99d17b2df27da35f50b1fb1f69b184a7b21d899c476e0d4c8ad2b940a7cb2995ec24ecdafab8ef61fe393 SHA512 1aec59fab20d8139a5dfedde2007fa8137a377a345e4d30229f9d1140d56cdf970c8ae70e2647e6a408d7fa543a16050f66a8a636efa6a6b1f91ee1ffcc136c1
 DIST haml-6.1.1.tar.gz 669644 BLAKE2B 239b3a1fe02bcd1e2981198ba7c54c71ca2af0947102fcea6cd600cc6579294856baa290589a7d3a015e54df8bcecf8e50175cf2189e8f4f9c6f9721a558bcc9 SHA512 7d732be085b41b8f0eec418600a82b51c68301081165aa636fa342ae26b74215a202a4b15e592da980d9a7fbe24bad01399f599770420133c4b6ab7523386fa5
-DIST haml-6.1.2.tar.gz 669696 BLAKE2B 81398ca33af69a1cf79cbe6d49d82ca27489584dc8c4082c079606f1f029b99e6b4c6fb350a5b50da31349ca3cbd7b7d2913e521b401634f7442e03279753e18 SHA512 c059b96111c6e477874cf37f0463dd9150d00e2e5261e9dab8251e1f66cacfa647009bf4d7ddd60fd11582c3f41ce06515f5aa448358aa58a9df2c8289660151
-DIST haml-6.1.4.tar.gz 669960 BLAKE2B ae4194a7af653e60ec1f5a494a4f8db61a53c99790a9f859cf294961d6cf2d215ad5d2dc78f61355c65935aca0d5534604f0b2fe77dcaf9d3a6cfd775c173701 SHA512 fe866b524fd2f5e85e458897642cb39a97802fdf728182ae3ca2e828931d5526e0568e771a067161610dbb600d962808f417f9dee8b08ffe4baeb71a5566f502
 DIST haml-6.2.3.tar.gz 666083 BLAKE2B 8f6c3e6b3538fdd8b6937278073d532245d7ce53bfbb81f2ebc394160af50e8022475bf7225d3e8f8846d0088120de58829dacf91864b91bab4f0ffc18479322 SHA512 28c0031b62c44cf6b057ee88ffb522d2081e92f5d70fc25999b64a59a4430acd63bb9ee4e3fc34139a1a6fe6f678cde6c3ce08b9a5ed5d433d30d661c5983b81
 DIST haml-6.3.0.tar.gz 666327 BLAKE2B 0672d39857fa0dac466bc29468a76e71d583da6637ce8534eb4d84aa4388bdc0f42d747d74cc5389bd24faf428076c13cf1897edc93317b2da7b770830d53b37 SHA512 64ee2eb7fad2e0b77307dd18a268b53a7f21b78b99a8bf80831cda9f8b6d8be983e7a23ba62942d251e7baf2c9732e38c18b842052690e5bbeb27961ca139c73
 EBUILD haml-5.2.2.ebuild 1451 BLAKE2B 7e69cae6af682922121eaa2533730e193a8d559775825cdb1df218832448e727bed7625b512602f2a2fb44ccb18f9bdf27875cb5d4ba527bad9cb809798783cc SHA512 51556e02ae68e0cbe0546ea6a0953cb1157b0f046a8add4959470e083baefe9e97a8989ca24cf730e46a0c5ee115c056a7b9937ac4f99894de1ff07598bcf5a0
 EBUILD haml-6.1.1-r1.ebuild 1611 BLAKE2B 78a927e584ca28ae8caf906d05d4ef2e4cefbb44755edc40eac42ec0f5ae4ee0eea4ca504b66513afeea7e5b226e0f654b847dc116579c9aaab650e027b2506f SHA512 4cebc604ee017ed24c4b1e4e7481dcce78cd5c0f817e3c1c9fdfe09c7b3409b12838c332bab795dcd3c02e2536ab5806586d4967f776aa2fc69ecc44331d0bb0
-EBUILD haml-6.1.2.ebuild 1607 BLAKE2B c370cf85f1f35831f8ec35a3d1bd6bc0e1f9e41cf0ad3eba639af4ad394507f737fd55dd9d29bbc236e3a995a633e4f16cc771392658b5213d22b7793de36301 SHA512 3adb55b0165cffe45ddc84de30675075a378c3dff533328a2bd144d325705eb5a5ab0c993ab4a76c0ca93f824c6f0bd6af76227891d7b5e7dbe7b2c1de233cdc
-EBUILD haml-6.1.4.ebuild 1600 BLAKE2B fb81a92258504eb0feb922b57475372fdc68ed5a9a606bcd41d6147f1b424f10206c602a9fb7e761b4ce67a83ab132ddd87ae6172dc4c924259f4bedcd1049a7 SHA512 fb634c30b0af3bf3d39b2a3f1982dd306132c0827a7b4ee91e361dd0cc71bfbd8e252a2ac5f02245a03ac3afbfb239f9233e4f0fe38ceb3c418de3135f3bb465
-EBUILD haml-6.2.3.ebuild 1426 BLAKE2B fef69074b3d39dac1334567221f81d31a9fc0637715e551791ba312da43c18cd7babdcefff3a23302ec21d79dbae382c9780f254866931da28485c0c94b69c76 SHA512 0f0c9c54556646120eecece52154ef4ac6906592de97fd315eb8be267f4af9d8bb11b0dbc4e92ba6821643b79f6805bafae1c10a8db46083de3f8fad69755caa
-EBUILD haml-6.3.0.ebuild 1426 BLAKE2B fef69074b3d39dac1334567221f81d31a9fc0637715e551791ba312da43c18cd7babdcefff3a23302ec21d79dbae382c9780f254866931da28485c0c94b69c76 SHA512 0f0c9c54556646120eecece52154ef4ac6906592de97fd315eb8be267f4af9d8bb11b0dbc4e92ba6821643b79f6805bafae1c10a8db46083de3f8fad69755caa
+EBUILD haml-6.2.3.ebuild 1679 BLAKE2B de044ba409a6df48f95f84ea7d117c2bc92c2dc2d6b975215d72b446c1b62a664988c297006599b20404ce7bb5fe191dddd1b2e8dbea2cf910c3ea06317e6a00 SHA512 ab348560f3990191de81aa37837af9ee04eebfc13bc1750acadba1bacc3c02e30d6f406b67674758fd0ea89f3fc761c28d43d0a40d1f5cd35907e3d05db51d7c
+EBUILD haml-6.3.0.ebuild 1681 BLAKE2B c2b25f3e5f3c1975645b330cb29a0ee7a23b83d43a5cc3925ac801598a669e9e9f5855f3bb35787e11d3a11939ffdf57e84329c787b46281f226d28631f60154 SHA512 9de873a045d9d7cbcd05699a7ce94f4b7983abb2f53c2eb0e1cdc41d454c2fe72ef3a7c5e069dc7d79c9e82a8ddc8722037593c9d571aa0ea54391cf79410820
 MISC metadata.xml 384 BLAKE2B 49a1ec969b1de2c61646aef404bcb19961d7f7b6b8c0324c1f447c8847adb0d3667e653b4273ed1c7e177e7e5216e6275a7c664ee6917ecb48e69d89554a33c6 SHA512 047f50785afcb708d07a770c38e40d7c8be01455832f01bbd006608eb18af8a8470a21ab0c57b7304ad4e2be39121310d0feb1ac64163a1b5e4c1cbf61cb8bfb
diff --git a/dev-ruby/haml/haml-6.1.2.ebuild b/dev-ruby/haml/haml-6.1.2.ebuild
deleted file mode 100644
index 90cefede012b..000000000000
--- a/dev-ruby/haml/haml-6.1.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTENSIONS=(ext/haml/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/haml"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby web page templating engine"
-HOMEPAGE="https://haml.info/"
-SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-IUSE="doc test"
-
-ruby_add_rdepend ">=dev-ruby/temple-0.8.2 dev-ruby/thor dev-ruby/tilt:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5.15
-		dev-ruby/nokogiri
-		>=dev-ruby/railties-6.0
-		>=dev-ruby/activemodel-6.0
-		>=dev-ruby/actionpack-6.0
-		dev-ruby/unindent
-	)
-	doc? (
-		dev-ruby/yard
-	)"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/bundler/ s:^:#: ; /Bundler/,/end/ s:^:#:' Rakefile || die
-	# minitest hack just to match rails/activesupport
-	sed -i \
-		-e "/require 'minitest\/autorun'/igem 'minitest', '< 5.16'" \
-		-e '/bundler/I s:^:#:' \
-		-e '/simplecov/I s:^:#:' \
-		test/test_helper.rb || die
-	# Remove tests that fails when RedCloth is available
-	rm -f test/haml/filters/markdown_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -rtest_helper -e 'Dir["test/haml/**/*_test.rb"].each { require _1 }' || die
-}
diff --git a/dev-ruby/haml/haml-6.1.4.ebuild b/dev-ruby/haml/haml-6.1.4.ebuild
deleted file mode 100644
index 87b992e5e5ee..000000000000
--- a/dev-ruby/haml/haml-6.1.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTENSIONS=(ext/haml/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/haml"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby web page templating engine"
-HOMEPAGE="https://haml.info/"
-SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-IUSE="doc test"
-
-ruby_add_rdepend ">=dev-ruby/temple-0.8.2 dev-ruby/thor dev-ruby/tilt:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5.15
-		dev-ruby/nokogiri
-		>=dev-ruby/railties-6.0
-		>=dev-ruby/activemodel-6.0
-		>=dev-ruby/actionpack-6.0
-		dev-ruby/unindent
-	)
-	doc? (
-		dev-ruby/yard
-	)"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/bundler/ s:^:#: ; /Bundler/,/end/ s:^:#:' Rakefile || die
-	# minitest hack just to match rails/activesupport
-	sed -i \
-		-e "/require 'minitest\/autorun'/igem 'minitest', '< 5.16'" \
-		-e '/bundler/I s:^:#:' \
-		-e '/simplecov/I s:^:#:' \
-		test/test_helper.rb || die
-	# Remove tests that fails when RedCloth is available
-	rm -f test/haml/filters/markdown_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -rtest_helper -e 'Dir["test/haml/**/*_test.rb"].each { require _1 }' || die
-}
diff --git a/dev-ruby/haml/haml-6.2.3.ebuild b/dev-ruby/haml/haml-6.2.3.ebuild
index a4ac5c0cb899..bf2b489c8e40 100644
--- a/dev-ruby/haml/haml-6.2.3.ebuild
+++ b/dev-ruby/haml/haml-6.2.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 IUSE="doc test"
 
@@ -49,6 +49,11 @@ all_ruby_prepare() {
 		test/test_helper.rb || die
 	# Remove tests that fails when RedCloth is available
 	rm -f test/haml/filters/markdown_test.rb || die
+	# Remove tests that require coffee-script (does not work with x32
+	# and coffee-script is obsolete anyway).
+	rm -f test/haml/filters/coffee_test.rb || die
+	sed -e '/describe.*coffee filter/,/^    end/ s:^:#:' \
+		-i test/haml/line_number_test.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/haml/haml-6.3.0.ebuild b/dev-ruby/haml/haml-6.3.0.ebuild
index a4ac5c0cb899..1f9d7e635988 100644
--- a/dev-ruby/haml/haml-6.3.0.ebuild
+++ b/dev-ruby/haml/haml-6.3.0.ebuild
@@ -49,6 +49,12 @@ all_ruby_prepare() {
 		test/test_helper.rb || die
 	# Remove tests that fails when RedCloth is available
 	rm -f test/haml/filters/markdown_test.rb || die
+
+	# Remove tests that require coffee-script (does not work with x32
+	# and coffee-script is obsolete anyway).
+	rm -f test/haml/filters/coffee_test.rb || die
+	sed -e '/describe.*coffee filter/,/^    end/ s:^:#:' \
+		-i test/haml/line_number_test.rb || die
 }
 
 each_ruby_test() {