gentoo resync : 29.12.2022

2 files changed, 12 insertions, 15 deletions

diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index f08ec7172b5a..7f6b706f4c28 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,9 +1,9 @@
-DIST nanoc-4.11.12.tar.gz 310160 BLAKE2B ef34bf6d28d5a9287053a939ef14bc59f99bde003d7bbcd7eee861ab882a6beaa48812137c8ad87fe464d27e371cfd40022467f8d10ac5f85ff16ef19215e340 SHA512 0503d0a6a0cf1ca9a9c57b831f320abb5102a3e7aa82c016d1f72c4d9f614ef53a0e4df30d50e05a98107fecacae4d70dfa5ee5c15910d575bc30df411430863
 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
-EBUILD nanoc-4.11.12.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
+DIST nanoc-4.12.6.tar.gz 333932 BLAKE2B f5ff12ddd583c4a672c34a63b7f325a3ef6c18713f4e351482eb3c2a3dd5999b67ee0e1b7e8ab85899591824d8c47f19f3aa074790ae15f4616d589f762f2bb8 SHA512 343ec620d96ca086612c4babcadf33c4edcc39a02082f762568feaf226566c6d9b5441f53355ea03544b285e9a5ddc32aae0e67cc321b28336665d453f47b070
 EBUILD nanoc-4.12.2.ebuild 2602 BLAKE2B 3d4ea73021b5fbff30c9ace8db0419a47be7017fd7770ea8e3596c1ff8408fabf45b5998bd3f86553a9d24393b75ffbc96363ed6981c80f2c0fd4bb8c7d68dd7 SHA512 55c25a24e2c0593cf8c18fcb574648cdf03e9f2470ab899b68dfaa4b5b3d36c3e7bbe526b43756863da5e90451129e7d55cd7b3dd69d40b5a4116cc71e648a14
 EBUILD nanoc-4.12.3.ebuild 2526 BLAKE2B 7d4e688c97a6128c88998e58cea369c2c477758abf1e14c46e181784789ba7aecee6e73f46eed152dad0b874193cc0f614d0ef037d12a82f14b062efd1ec10ea SHA512 01ef7a2360d5911ea712c5cb6ad037f322803669de85495c5bb18fbaad00f5b8957f6105b7e8a80d5b4705092bf1f3bf2ead1ce9c18dd1186fd14f74a8959a59
 EBUILD nanoc-4.12.5.ebuild 2534 BLAKE2B b050122de47295ece8340b901d0c5659af8d21fb8ca1c8c82e7177de75817ac0dbbae5b44531ce48719439e96e9b44442757961381464171102b071a95bfae42 SHA512 6254cd60fd6c6cdf4bc50e2f46540f7cd61d699f3f50012a0081320f1463899d9ce24765d1775238febdae83388a9e0198273b9c375ebd7a0658111880b556e1
+EBUILD nanoc-4.12.6.ebuild 2556 BLAKE2B a7fdfdc2dcf4363155c13a07cad0c1d2330d4847b209aa39f353eadf086321cc42e92abf2490ce2d95e31d2f39b757163a0119d04ba78a49ae87cecab09a6b95 SHA512 37d42b65c527a777c7877d730b1d84cbdd94d150f695863493d3f098624570236342744c727cc211ccebf3b06c604df76420ce852b38120e07aa5e481c090039
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc/nanoc-4.11.12.ebuild b/www-apps/nanoc/nanoc-4.12.6.ebuild
index de28a28b1206..0e4fee9a9436 100644
--- a/www-apps/nanoc/nanoc-4.11.12.ebuild
+++ b/www-apps/nanoc/nanoc-4.12.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
@@ -30,13 +30,12 @@ ruby_add_rdepend "!minimal? (
 )
 	>=dev-ruby/addressable-2.5
 	>=dev-ruby/colored-1.2:0
-	>=dev-ruby/cri-2.15:0
+	>=www-apps/nanoc-checking-1.0.2:1
+	~www-apps/nanoc-cli-${PV}
 	~www-apps/nanoc-core-${PV}
+	www-apps/nanoc-deploying:1
 	>=dev-ruby/parallel-1.12:1
-	>=dev-ruby/tomlrb-1.2:1
 	>=dev-ruby/tty-command-0.8:0
-	>=dev-ruby/tty-file-0.7:0
-	>=dev-ruby/tty-platform-0.2:0
 	>=dev-ruby/tty-which-0.4:0
 "
 
@@ -67,9 +66,8 @@ doc? (
 
 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
+		-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
 
@@ -83,13 +81,12 @@ all_ruby_prepare() {
 	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/deploying/fog_spec.rb \
-	   spec/nanoc/filters/less_spec.rb \
+	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 '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
 }