gentoo auto-resync : 09:10:2022 - 13:31:59

4 files changed, 7 insertions, 201 deletions

diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index c8cdf2c7d18e..e9f0facaf4e2 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,11 +1,7 @@
-DIST nanoc-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c6550378465d85e63c498c5773c1dcd49d685b7d4367488300394c2f5bf9e6a6dc6aea589617a27fe1bd6ed4a SHA512 3fe574c061d8d0dd034137800c88a34844d246e6ab9a7816aadb03cd2c43b5fe6d614f42e6b41bcd4df98be551edc69e35ca992f2d5ee8158f9c7eb3c7635750
-DIST nanoc-4.12.3.tar.gz 332692 BLAKE2B 8ae106366c66500ed06be841382bc1cc52c68ebc7ebec47a3f9dab278c7e17f886d0ce18c81ff73a83ec672353503155b447dfff5ba46f16bc2bfe891bb028a5 SHA512 737ce993c529643440d74e5072e2d63c2ce970d4d7637e7f225a79d3ac38907ced84928340d7bf5f11bcd02188b5cb1df0d4b03a8e000878ed924ab943db33a2
-DIST nanoc-4.12.5.tar.gz 333312 BLAKE2B bdc50ba2868313f7b427a8292c8614230e9dcf472c5290e8fff39917cd5cedad217acbc36ef8524254c9839d965d824a98c99f9effa1e8cfb549e387d69f1032 SHA512 2e533076f62605a701275fd7813b6dbe09c2530ad38fb86db3a5d999bccd8f5ac93cf684ac882f00d81bbe1ec8cce69d45ecef1488efe3caf22f6a6ffca300e2
 DIST nanoc-4.12.6.tar.gz 333932 BLAKE2B f5ff12ddd583c4a672c34a63b7f325a3ef6c18713f4e351482eb3c2a3dd5999b67ee0e1b7e8ab85899591824d8c47f19f3aa074790ae15f4616d589f762f2bb8 SHA512 343ec620d96ca086612c4babcadf33c4edcc39a02082f762568feaf226566c6d9b5441f53355ea03544b285e9a5ddc32aae0e67cc321b28336665d453f47b070
 DIST nanoc-4.12.7.tar.gz 333669 BLAKE2B cd222df8f68b2ead8bfb324079b2e46ca76bc427d50e97ffbcebffbd79135d6f4349a1e6922f0cb37f49b1c306ac3eb4f34f2b2c3569768b95041e8129f4e9a8 SHA512 1f5b2595f2d95b291bad30a40e8753d83c9bfa8468c6b119d0c213a385f4568fa87af5a69ea1d3487dc3331ba71ecf956dabd84b79a9e8cc01b569efc3b57140
-EBUILD nanoc-4.12.2.ebuild 2603 BLAKE2B d69f9e1b1c623ccb99fdb72f2ab4cd6577fdf43f37e43b2739edd6533433d871dfa0d44cf7a69dd7a93c227a374c3a7db15b28c302a2633cc4854ad337c4d096 SHA512 26b8222609442193e350aeeefd67c91bd4056cdaa2811c57a760b7f324c636b94782966d87691563c3e772714cb6e72a1266ea4821239770cdb9645cb75f0a8d
-EBUILD nanoc-4.12.3.ebuild 2527 BLAKE2B 09b96b0bbc47bb236f8fd8fa1f733d74c4fb0215722c21fb546e1bb3fcd2436600677dcb9c74689635d51ca7a5a47d31f63fa25049e4f622d508a91a5b00fb6e SHA512 d085f8ffee40ead07246394dc10ccaaeb9c9f680d492d88745a4aecfd1b2a660bccb7db8080b8617810b841f4b1f8deed47be7c4ad4c5ae87524baa55d37e82c
-EBUILD nanoc-4.12.5.ebuild 2535 BLAKE2B 240fb4fca27c87d502eb29340b4f233ddd8120abb05c28890e122fba40dea473ea01a6ef2ac855cfe3c8bca2818803384055dc07eb98f20973585b9f74b00d6c SHA512 cb2fd3b8c756527fdfcedcf2d31fb1ea7e1549ad2888b0fb6efdf99f4465cb1bd998936658db1139bbbcc825f0900140ba893b68083a05065f807474dfa92ea2
+DIST nanoc-4.12.9.tar.gz 336948 BLAKE2B 1ca70bf9028e8ef45df4979968bbc85933a8a51a66f8283376c1e95eac72e76fc55e4a7132b11f6d38155464fc23f27c2e456fd0cd3f618a30aa1eebc8d43887 SHA512 1e562c05057423fdf40b1d170238ea8ec4ac899c642aee693c450cc75969e595d80e34d619bd40ad9688306a698dbe244009d078a89f1cf5fa8b4158f21a25bb
 EBUILD nanoc-4.12.6.ebuild 2557 BLAKE2B beb77ed426eac0e895c2229e344406603091b208af2b19a848213cf357c7fe330113ea9ff7e82e3d6b8956c2ce9f745d862891aa7a4afdbce5fbb8d06fba91ee SHA512 05a70390259b4d36ea7c180e09ce03b2d8e616044bd3668e09dc5a1541eb4d232659de29617d8099f3319ade62996a269887a956a7515da2263c62503553b62d
 EBUILD nanoc-4.12.7.ebuild 2550 BLAKE2B de638daf868974214f06e67269a8e3c80bff4c5730f3d358809537d43df26031f4ab8614cd287f430d11f5b76c58b5d5961cc9021fcf34c391f527b2e4207ee7 SHA512 fe210c1db1b784ebf58aeceac8b0378aa6b1aac18548991e61b24ce4f3e043515e9ffdf947a464d0bcda83f48e4ef39195d35cdd63647b25ac78cee674e47156
+EBUILD nanoc-4.12.9.ebuild 2563 BLAKE2B 9c7b514d74f630a479abdaa9ae5c3df170552ffe6fd2811391f34759ea7681ca19ee289258a896f3312195b9ff57894459a1121d8f3794e31bfe6988f9e3b57e SHA512 519944bb6360f64f7d1f69f97cdae18617bc9295a04c01804eeabf3c55a0e9be9ac03b659f0e129868a2d3d34c862084969bc38f3a843e7529d1da0fa038e079
 MISC metadata.xml 394 BLAKE2B 7b8c56a3dc98dbfc894dd1956390b9ea58fad15bd061590e776778af087d281e30fccdca9d5b227aad4b99ec0c370759ae501eafc58bf87cc56811cfb51b4647 SHA512 9e56f1314cf818d30c3153f5ada0ac75c70d460e9137de7146bc9af41ceebcd578de1336bebf141e41ba0969dbca332b8e06269dd61e91b7a33e207b2f6b4997
diff --git a/www-apps/nanoc/nanoc-4.12.2.ebuild b/www-apps/nanoc/nanoc-4.12.2.ebuild
deleted file mode 100644
index e7a63b661450..000000000000
--- a/www-apps/nanoc/nanoc-4.12.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="nanoc.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
-HOMEPAGE="https://nanoc.app/"
-SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="${IUSE} minimal"
-
-DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
-
-RUBY_S="${P}/nanoc"
-
-ruby_add_rdepend "!minimal? (
-	dev-ruby/mime-types:*
-	dev-ruby/rack:*
-	www-servers/adsf
-)
-	>=dev-ruby/addressable-2.5
-	>=dev-ruby/colored-1.2:0
-	www-apps/nanoc-checking:1
-	~www-apps/nanoc-cli-${PV}
-	~www-apps/nanoc-core-${PV}
-	www-apps/nanoc-deploying:1
-	>=dev-ruby/parallel-1.12:1
-	>=dev-ruby/tty-command-0.8:0
-	>=dev-ruby/tty-which-0.4:0
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	dev-ruby/asciidoctor
-	dev-ruby/fuubar
-	dev-ruby/haml
-	dev-ruby/maruku
-	>=dev-ruby/mocha-0.13
-	dev-ruby/minitest
-	dev-ruby/mustache
-	dev-ruby/pry
-	dev-ruby/rdoc
-	>=dev-ruby/rouge-3.5.1:2
-	dev-ruby/rubypants
-	dev-ruby/systemu
-	dev-ruby/timecop
-	dev-ruby/vcr
-	dev-ruby/webmock
-	dev-ruby/yard
-)
-doc? (
-	dev-ruby/kramdown
-	dev-ruby/rdiscount
-	dev-ruby/yard
-)"
-
-all_ruby_prepare() {
-	# Avoid unneeded development dependencies
-	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
-	sed -i -e '/coverall/I s:^:#:' \
-		-e '/rubocop/ s:^:#:' Rakefile || die
-
-	echo "-r ./spec/spec_helper.rb" > .rspec || die
-
-	# Avoid basepath issues when generating gemspec
-	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid tests requiring a network connection or make assumptions
-	# about the local network environment.
-	rm -f test/checking/checks/test_{css,html}.rb spec/nanoc/cli/commands/view_spec.rb || die
-
-	# Avoid tests for unpackaged dependencies
-	rm spec/nanoc/filters/less_spec.rb \
-	   test/filters/test_{markaby,rainpress}.rb || die
-
-	# Avoid non-fatal failing tests due to specifics in the environment
-	#sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
-	#sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
-	sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
-}
diff --git a/www-apps/nanoc/nanoc-4.12.3.ebuild b/www-apps/nanoc/nanoc-4.12.3.ebuild
deleted file mode 100644
index 83061c10b1d7..000000000000
--- a/www-apps/nanoc/nanoc-4.12.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="nanoc.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
-HOMEPAGE="https://nanoc.app/"
-SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="${IUSE} minimal"
-
-DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
-
-RUBY_S="${P}/nanoc"
-
-ruby_add_rdepend "!minimal? (
-	dev-ruby/mime-types:*
-	dev-ruby/rack:*
-	www-servers/adsf
-)
-	>=dev-ruby/addressable-2.5
-	>=dev-ruby/colored-1.2:0
-	www-apps/nanoc-checking:1
-	~www-apps/nanoc-cli-${PV}
-	~www-apps/nanoc-core-${PV}
-	www-apps/nanoc-deploying:1
-	>=dev-ruby/parallel-1.12:1
-	>=dev-ruby/tty-command-0.8:0
-	>=dev-ruby/tty-which-0.4:0
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	dev-ruby/asciidoctor
-	dev-ruby/fuubar
-	dev-ruby/haml
-	dev-ruby/maruku
-	>=dev-ruby/mocha-0.13
-	dev-ruby/minitest
-	dev-ruby/mustache
-	dev-ruby/pry
-	dev-ruby/rdoc
-	>=dev-ruby/rouge-3.5.1:2
-	dev-ruby/rubypants
-	dev-ruby/systemu
-	dev-ruby/timecop
-	dev-ruby/vcr
-	dev-ruby/webmock
-	dev-ruby/yard
-)
-doc? (
-	dev-ruby/kramdown
-	dev-ruby/rdiscount
-	dev-ruby/yard
-)"
-
-all_ruby_prepare() {
-	# Avoid unneeded development dependencies
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
-	sed -i -e '/coverall/I s:^:#:' \
-		-e '/rubocop/ s:^:#:' Rakefile || die
-
-	echo "-r ./spec/spec_helper.rb" > .rspec || die
-
-	# Avoid basepath issues when generating gemspec
-	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid tests requiring a network connection or make assumptions
-	# about the local network environment.
-	rm -f test/checking/checks/test_{css,html}.rb spec/nanoc/cli/commands/view_spec.rb || die
-
-	# Avoid tests for unpackaged dependencies
-	rm spec/nanoc/filters/less_spec.rb \
-	   test/filters/test_{markaby,rainpress}.rb || die
-
-	# Avoid non-fatal failing tests due to specifics in the environment
-	#sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
-	#sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
-	sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
-}
diff --git a/www-apps/nanoc/nanoc-4.12.5.ebuild b/www-apps/nanoc/nanoc-4.12.9.ebuild
index 4b5b89e2b6f2..cdc5ce7a4da8 100644
--- a/www-apps/nanoc/nanoc-4.12.5.ebuild
+++ b/www-apps/nanoc/nanoc-4.12.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
@@ -67,7 +67,7 @@ doc? (
 all_ruby_prepare() {
 	# Avoid unneeded development dependencies
 	sed -i -e '/simplecov/I s:^:#:' \
-		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+		-e '/codecov/I s:^:#:' test/helper.rb ../common/spec/spec_helper_head_core.rb || die
 	sed -i -e '/coverall/I s:^:#:' \
 		-e '/rubocop/ s:^:#:' Rakefile || die
 
@@ -84,9 +84,10 @@ all_ruby_prepare() {
 	rm spec/nanoc/filters/less_spec.rb \
 	   test/filters/test_{markaby,rainpress}.rb || die
 
+	# Avoid tests that are specific to haml 6.x which is currently not packaged
+	sed -i -e '/test_filter_\(with_proper_indentation\|error\)/askip "haml 6"' test/filters/test_haml.rb || die
+
 	# Avoid non-fatal failing tests due to specifics in the environment
-	#sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
-	#sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
 	sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
 }