gentoo resync : 08.10.2021

4 files changed, 2 insertions, 121 deletions

diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index 527dad2fc0e9..89f0c5ddb5a5 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,8 +1,5 @@
 DIST haml-5.1.2.tar.gz 126059 BLAKE2B 5d805f29c28d0f6355f7b79e5724ec1639a808cfae75c26633edddcc82d964a48dbc1654b780fb706529ca22abcaba953a1af6f483386c336035c079a719e585 SHA512 405976de297bfdbd6f010442d940205c404f057a54cd7162feb400b1831af3e4e60fd05a637a2f480204428512ca7dd66c02aca22b0006d6d515c06968eb08a3
-DIST haml-5.2.1.tar.gz 129795 BLAKE2B f561d8969fd4b49f1bbbf943c612a5cd3205a1b3a1ef544b4939dec5746d6e04b438f8bf69a320b95455fb15ab5a8d6c4c7ffef0aeec3d0698d46e6ef0d37e34 SHA512 b7a034604346b6e62f7cf13cce5582d53d81644bd4fc3b178b4c1e175fbea2160a562a6a2b539d810288ccfbca2d12099694a314d9df4286aac33ed1e0e22fa5
 DIST haml-5.2.2.tar.gz 129833 BLAKE2B d68c24c7a3c817d6d364b2ec92b84b4f56f4fffa48b99d17b2df27da35f50b1fb1f69b184a7b21d899c476e0d4c8ad2b940a7cb2995ec24ecdafab8ef61fe393 SHA512 1aec59fab20d8139a5dfedde2007fa8137a377a345e4d30229f9d1140d56cdf970c8ae70e2647e6a408d7fa543a16050f66a8a636efa6a6b1f91ee1ffcc136c1
-EBUILD haml-5.1.2-r1.ebuild 1680 BLAKE2B cb73b65a6f73e3e555a34b4f59800ef7338eb3ef0ac3e40b9b64b6252781b1f715b4bf9ceb2a12fdec6bdbcd5830b2f5efd3b72cc388d8333e1dab180d24e809 SHA512 06ca53ab7ed464657aed8c5b4c09d7357ac47e58f9f38c922d4addf257e3d7e16506244fab6328112f93e8004f675bdee49ea02abe97d894b937e251095e1f19
 EBUILD haml-5.1.2.ebuild 1659 BLAKE2B e9a2581d41907f0b6a587829ce8243e57c9f4582ad09f4e90eeaf02bcddf2704c9f96a0a384a14cefb9b4a1d93979df7a398cf7e69d1bd7e7b9bb42ed9b34aae SHA512 dba0fa00d2eb9b29acdcb2e707132b9a8f23a25e254cce611e04dad239eb8f8f885801cf52212880105f176fa96a0ac7e31337d3c59f2cf38a528855db241d38
-EBUILD haml-5.2.1.ebuild 1674 BLAKE2B b282fa4a7f509f560e41770f3fabc73c0203ee48f82a10ad6673565dc10ad2fb71d750f260e2a98b41fbe00d290059ecbd500fc8628e2bbe443b985223f14ed7 SHA512 24eb0d0616e6de073391615c1ea15261230c7f60da21cd2e8087ca1c90215a0fed91259063d1da09129a3a31020f174f09bb56b4271730327960dae629df1a87
-EBUILD haml-5.2.2.ebuild 1675 BLAKE2B a33ecf2b28be5ef1e5073d11de6cb336edf9ff8b86432cd2b01bc17b1d8ab783316efbfe4c138339ac6a3ac946f47058b188c9bb1e55e089cc2b7f170ee482bb SHA512 10872d599561b70f2ccefea97a8415eb4b51caa7704cf27e9e224345016cb9bbc3af62aecec1b026647f819eeb38c946072da216f9d1ae2fac963c4f8d526400
+EBUILD haml-5.2.2.ebuild 1669 BLAKE2B f9bab14614d5fa67e8e9cdc29aa7507fbb81e6e5de8ba5ac1b42771cc9ae8a2832fb8f19901c4bf868dcea8378a2ac074798ec7c79a764bb03cf536c0f10e6cd SHA512 6ac9525b3e78f94bea80ee7a2f5cad2067f0cbde043133df53f3d55f58bd8e9a055454dc4539c7ab4b53fd3b22480e834bbfd4ee89ae32ac8e33a655ce302be7
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/haml/haml-5.1.2-r1.ebuild b/dev-ruby/haml/haml-5.1.2-r1.ebuild
deleted file mode 100644
index b90ecb0360da..000000000000
--- a/dev-ruby/haml/haml-5.1.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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_TASK_TEST="MT_NO_PLUGINS=true test"
-RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-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="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="doc test"
-
-RDEPEND="${RDEPEND} !!<dev-ruby/haml-4.0.7-r2"
-
-ruby_add_rdepend ">=dev-ruby/temple-0.8.0 dev-ruby/tilt:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-		dev-ruby/nokogiri
-		dev-ruby/railties:6.0
-		dev-ruby/activemodel:6.0
-		dev-ruby/actionpack:6.0
-	)
-	doc? (
-		dev-ruby/yard
-		>=dev-ruby/maruku-0.7.2-r1
-	)"
-
-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
-	sed -i -e '/bundler/I s:^:#:' \
-		-e 's/gem "minitest"/gem "minitest", "~>5.0"/'\
-		-e '1igem "actionpack", "~>6.0.0"'\
-		-e '1igem "activesupport", "~>6.0.0"; gem "activemodel", "~>6.0.0"'\
-		-e '1igem "railties", "~>6.0.0"'\
-		test/test_helper.rb || die
-	# Remove test that fails when RedCloth is available
-	sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,/^  end/ s/^/#/"\
-		test/filters_test.rb || die
-}
diff --git a/dev-ruby/haml/haml-5.2.1.ebuild b/dev-ruby/haml/haml-5.2.1.ebuild
deleted file mode 100644
index 9c7af1f851bc..000000000000
--- a/dev-ruby/haml/haml-5.2.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true RUBYLIB=lib test"
-RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-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/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="doc test"
-
-RDEPEND="${RDEPEND} !!<dev-ruby/haml-4.0.7-r2"
-
-ruby_add_rdepend ">=dev-ruby/temple-0.8.0 dev-ruby/tilt:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-		dev-ruby/nokogiri
-		dev-ruby/railties:6.0
-		dev-ruby/activemodel:6.0
-		dev-ruby/actionpack:6.0
-	)
-	doc? (
-		dev-ruby/yard
-		>=dev-ruby/maruku-0.7.2-r1
-	)"
-
-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
-	sed -i -e '/bundler/I s:^:#:' \
-		-e '/simplecov/I s:^:#:' \
-		-e '1igem "actionpack", "~>6.0.0"'\
-		-e '1igem "activesupport", "~>6.0.0"; gem "activemodel", "~>6.0.0"'\
-		-e '1igem "railties", "~>6.0.0"'\
-		test/test_helper.rb || die
-	# Remove test that fails when RedCloth is available
-	sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,/^  end/ s/^/#/"\
-		test/filters_test.rb || die
-}
diff --git a/dev-ruby/haml/haml-5.2.2.ebuild b/dev-ruby/haml/haml-5.2.2.ebuild
index 30d93b2b370b..5a429930f3d2 100644
--- a/dev-ruby/haml/haml-5.2.2.ebuild
+++ b/dev-ruby/haml/haml-5.2.2.ebuild
@@ -21,7 +21,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 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="doc test"