gentoo auto-resync : 23:06:2024 - 00:11:30

15 files changed, 21 insertions, 603 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index cdabcc276378..769d21430174 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 7477dd3dad6d..ec1c15ebcdc9 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,4 +1,3 @@
-AUX hugo-0.118.2-skip-some-tests.patch 2164 BLAKE2B 356a2b9b87a618178dd54bd066166761dd6bd670749c25bfc351ea9eeccdc5ae62211f5b0a7a61012f163925b536c820b8387db9d96f3371af50032a395d1f52 SHA512 329a36f69e8b279bb1fb431414b40b394ae1679b077bee3ff1c02ade257173cb9b53f671753ba66ad55565b00e26388b218055ce2a3c8274d03c860cffa7ecbd
 AUX hugo-0.121.0-unbundle-libwebp-and-libsass.patch 1541 BLAKE2B 37abecfdb87ff25f28730ac8cba4f9674e5dd46ef0f1152911ced81d894cb334903e6d09b948feb965e6ca466d17289b201f0118b8b6d4147f82bd4fe4a3db9d SHA512 0025d6e69893ce88fd3f6b508f223b4604e54791ca4a635e2cde786a83b78a25265ed07f586e115d0923363f2b73c82528717375b2008593f29d3bd8f5dc98a7
 AUX hugo-0.123.0-skip-some-tests.patch 2214 BLAKE2B 418bc4c0eb04355e57420fc47930d154d1f019160607c8ac5e7e2707263c851403902cac7fbc85b297ffca294ce88b75dbd8b0c9507e8c12e7a7913e10137a79 SHA512 26f0f9a33661cebaeaf3fc1e02e83d50c219448012bb361fd08e9a4f9e1dac6a9bda86942506622560a9df74613fd8290e6b8c053ec946073d3db5de2c70e063
 DIST hugo-0.124.1-vendor.tar.xz 6740828 BLAKE2B e34cb50eeb22da5f50c8ba7e1318d0f080e6df36f2f1a80e1567d4ccfdd30e4e2ad2153a87c7a18a1d2d6f1e746b5b6c1008d33e41e1900a7e94a42618c5e526 SHA512 2f59a7f2ab199bac5ebf69139b7cc6dd14dc07eab9be39fc39ee5fa41d3332000082407612528d8215a4ebc3a908f28816b19672a28b00bcbad275bea0a9ad35
diff --git a/www-apps/hugo/files/hugo-0.118.2-skip-some-tests.patch b/www-apps/hugo/files/hugo-0.118.2-skip-some-tests.patch
deleted file mode 100644
index 66b5bac5ef87..000000000000
--- a/www-apps/hugo/files/hugo-0.118.2-skip-some-tests.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 416992cf1404a78560a5e718a584c5fa1f2f9143 Mon Sep 17 00:00:00 2001
-From: tastytea <tastytea@tastytea.de>
-Date: Fri, 8 Sep 2023 20:01:03 +0200
-Subject: [PATCH] skip some tests
-
-reasons:
-  - needs to be in a git repo
-  - needs special test dependencies
-  - requires network access
----
- modules/client_test.go                                  | 4 ++++
- resources/resource_factories/create/integration_test.go | 1 +
- 2 files changed, 5 insertions(+)
-
-diff --git a/modules/client_test.go b/modules/client_test.go
-index 75e3c2b08..235d6ed32 100644
---- a/modules/client_test.go
-+++ b/modules/client_test.go
-@@ -68,6 +68,7 @@ github.com/gohugoio/hugoTestModules1_darwin/modh2_2@v1.4.0 github.com/gohugoio/h
- 	}
- 
- 	c.Run("All", func(c *qt.C) {
-+		c.Skip("Test dependencies not available")
- 		client, clean := newClient(c, func(cfg *ClientConfig) {
- 			cfg.ModuleConfig = DefaultModuleConfig
- 		}, defaultImport)
-@@ -107,6 +108,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor
- 	})
- 
- 	c.Run("IgnoreVendor", func(c *qt.C) {
-+		c.Skip("Test dependencies not available")
- 		client, clean := newClient(
- 			c, func(cfg *ClientConfig) {
- 				cfg.ModuleConfig = DefaultModuleConfig
-@@ -125,6 +127,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor
- 	})
- 
- 	c.Run("NoVendor", func(c *qt.C) {
-+		c.Skip("Test dependencies not available")
- 		mcfg := DefaultModuleConfig
- 		mcfg.NoVendor = "**"
- 		client, clean := newClient(
-@@ -144,6 +147,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor
- 	})
- 
- 	c.Run("VendorClosest", func(c *qt.C) {
-+		c.Skip("Test dependencies not available")
- 		mcfg := DefaultModuleConfig
- 		mcfg.VendorClosest = true
- 
-diff --git a/resources/resource_factories/create/integration_test.go b/resources/resource_factories/create/integration_test.go
-index 140c5d091..721a9fc5b 100644
---- a/resources/resource_factories/create/integration_test.go
-+++ b/resources/resource_factories/create/integration_test.go
-@@ -25,6 +25,7 @@ import (
- )
- 
- func TestGetRemoteHead(t *testing.T) {
-+	t.Skip("Requires network access")
- 
- 	files := `
- -- config.toml --
--- 
-2.41.0
-
diff --git a/www-apps/nanoc-cli/Manifest b/www-apps/nanoc-cli/Manifest
index 7dc8aa39f905..9bc34f58d284 100644
--- a/www-apps/nanoc-cli/Manifest
+++ b/www-apps/nanoc-cli/Manifest
@@ -1,11 +1,7 @@
-DIST nanoc-4.12.16.tar.gz 350823 BLAKE2B 8196589290b5120b74bd2063e60f1fad14af98f7c8ffcef0a226d28ecb3f129ab04c913ad921e64c9551965c8fe1e26da1e0f41baa64a75caa372d6796c5084b SHA512 e04a562d87250286a9fbdc0381fdc64868f87f67d1ae9ce81f0e21c13496e168cfc4936c02b3cba87e8d647ab070670a208722fd53f4265eb3674b7ba20ccebd
-DIST nanoc-4.12.17.tar.gz 350964 BLAKE2B ca19c259eac8005f2612f61b902005d43196e3e01e8bb0c7a77f9f68bc27486ad6e6e9860420817a633b9a48973f7d98689046cbdb6fe4c185ae18583168d6d2 SHA512 d5a8d3711642f65078102be9317ac2b7db3635c5ff5616d2c05fd917e5cba76a8a21ceeb0a84565723d334f8d62cb55c8097eac07c9bc30f783916c8d312b8c1
-DIST nanoc-4.12.19.tar.gz 352620 BLAKE2B 1e6f7e4b49ffd52f985c8a8e4f33401b03abf64569c719a888c603cc8cf1cc2409cf5513dccaa3517bc2d4180e60bec4060db7672d999c486bc4e2138e272946 SHA512 0118eda03479bbdc75098e789ab1095942dfc8967dc6f628e07a93826241845df253eb5701803df2386cf56aaabf6670ed3e8589dcfdcdd331a13def3b05374c
 DIST nanoc-4.12.20.tar.gz 355843 BLAKE2B 44974de8d84af651f636f369206875a42aa349f78a98d6425cea5d65cc30a5bcbbc10975493b58b87605ae5efb7748712b69e652b94a146242df8fbc3ce8cc87 SHA512 b714ac4e743be390dc1484ed29b018da51751f704667cabd8c9c8c7f937eb32863da33f5e7b53838d641e1448e582b9aa729d38df9f25c6eb21358aafd3dbd8c
 DIST nanoc-4.12.21.tar.gz 356922 BLAKE2B 7395bfdba8d27c6f60b8df072bc862c3541beafc4aa36fa5e5e6cce1d558eed462e445fe8414ec952c65840b2eab6cd3457b49a537b8197642bf3bf79074bb71 SHA512 a68af1ef19affe2188a7b4813bda24dd75d6e1c9de4465dd68271c22efb1b7af302906a58465cd177e8dd4922bd3a2292dd3059458e77f8e3e637bf63b3330b7
-EBUILD nanoc-cli-4.12.16.ebuild 2062 BLAKE2B 6390df293aea2702f3fc7c299370a4e372837b30db4c09681900f0466deb066e0dcad2bec12e1e726d1781a2fa0dd4eb57555547bc8d8c6535d0b8edb4164d31 SHA512 d1643886e5a9489d5d2b723128f6be5634f4e33644b413b0f1d8a1328964173abd4b6aa8488f91f5ceaa0943ac66a2276e636b6c8642e24e8d3bd6ab8c4aeb9a
-EBUILD nanoc-cli-4.12.17.ebuild 2055 BLAKE2B 5b713ffa9dffd9746fa9b3ab364d896e4a53877a5751001893d14190b444d1bd32ff543ab8708feb4a63633ba545cf25b832834ab75292333ad1d69786fc2ae2 SHA512 6a5cddfba422412929012ed4f794fa3184a26f5dbcc2a281144d2a7cf75542b0da9caedbbe8285a7db961a0f83121a7cf836a20979ab957593e793038179baf7
-EBUILD nanoc-cli-4.12.19.ebuild 2055 BLAKE2B 5b713ffa9dffd9746fa9b3ab364d896e4a53877a5751001893d14190b444d1bd32ff543ab8708feb4a63633ba545cf25b832834ab75292333ad1d69786fc2ae2 SHA512 6a5cddfba422412929012ed4f794fa3184a26f5dbcc2a281144d2a7cf75542b0da9caedbbe8285a7db961a0f83121a7cf836a20979ab957593e793038179baf7
+DIST nanoc-4.13.0.tar.gz 356745 BLAKE2B 55b529669937db12e820d1ed83800415a01e6e9b96b9b2be0e339e8e66d1f7a7ce6982ad3a8e6357875fc326aa96675775e8f39a01fa614d39a1f34e152e6581 SHA512 06f537a9a15ae1ec8bf94cc242dfd76fb99330fbe81ebb1375f711cf568e33579745ac571d37258666cdfd903493cd924da390b1710cef7a31d93cfa28ecb81f
 EBUILD nanoc-cli-4.12.20.ebuild 2069 BLAKE2B cf5802b66f27a9317f42f9c378a65cb2234cf298852842b3e4ff3540f468f73e20fdb0554759c2321512213d0ccb5db73ac7c287790bebbe8ffe1193bf15ffcf SHA512 fca60d06d042c71b3a08f4352811a8593f4a08e3220272f54a54d984860c9b9cbcdb929687a7f630ce0d250642db054b876d212c047aa819753780958da89e86
 EBUILD nanoc-cli-4.12.21.ebuild 2076 BLAKE2B 840c142f55e9d36a06ee3ea3443871467cce98197002ef0bc6e8635909ceb0607f42a2c476054c17459409cadd6a342c476a0a7b7780cc89cbe87130a0a1660e SHA512 c3e14ab2bc2b9d3115aa9691df4b7b3f68d19c9488b10319d57b5376fe0453d30e9e0866d929aeb85791213b714c592b6880fd595f020b14d5859303ed766147
+EBUILD nanoc-cli-4.13.0.ebuild 2076 BLAKE2B 840c142f55e9d36a06ee3ea3443871467cce98197002ef0bc6e8635909ceb0607f42a2c476054c17459409cadd6a342c476a0a7b7780cc89cbe87130a0a1660e SHA512 c3e14ab2bc2b9d3115aa9691df4b7b3f68d19c9488b10319d57b5376fe0453d30e9e0866d929aeb85791213b714c592b6880fd595f020b14d5859303ed766147
 MISC metadata.xml 394 BLAKE2B 7b8c56a3dc98dbfc894dd1956390b9ea58fad15bd061590e776778af087d281e30fccdca9d5b227aad4b99ec0c370759ae501eafc58bf87cc56811cfb51b4647 SHA512 9e56f1314cf818d30c3153f5ada0ac75c70d460e9137de7146bc9af41ceebcd578de1336bebf141e41ba0969dbca332b8e06269dd61e91b7a33e207b2f6b4997
diff --git a/www-apps/nanoc-cli/nanoc-cli-4.12.17.ebuild b/www-apps/nanoc-cli/nanoc-cli-4.12.17.ebuild
deleted file mode 100644
index 8da190b719b7..000000000000
--- a/www-apps/nanoc-cli/nanoc-cli-4.12.17.ebuild
+++ /dev/null
@@ -1,71 +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_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.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 -> nanoc-${PV}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~riscv"
-SLOT="0"
-IUSE="${IUSE} minimal"
-
-RUBY_S="nanoc-${PV}/nanoc-cli"
-
-ruby_add_rdepend "
-	>=dev-ruby/cri-2.15:0
-	>=dev-ruby/diff-lcs-1.3:0
-	~www-apps/nanoc-core-${PV}
-	>=dev-ruby/zeitwerk-2.1:2
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/rspec:3
-	dev-ruby/rspec-its
-	dev-ruby/fuubar
-	dev-ruby/minitest
-	dev-ruby/timecop
-	dev-ruby/tty-command
-	dev-ruby/yard
-	www-apps/nanoc-spec
-	www-servers/adsf
-)
-"
-
-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
-	sed -i -e '2i require "tmpdir"; require "pathname"' spec/spec_helper.rb || die
-
-	echo "-r ./spec/spec_helper.rb" > .rspec || die
-
-	sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid error handler specs failing due to different (rubygems?)
-	# output, meta_spec is affected by this.
-	rm -f spec/nanoc/cli/error_handler_spec.rb spec/meta_spec.rb || die
-
-	# Avoid test requiring a network interface
-	sed -i -e '/does not listen on non-local interfaces/askip "Needs network"' spec/nanoc/cli/commands/view_spec.rb || die
-
-	# Avoid tests requiring an additional dependency on nanoc-live
-	sed -i -e '/--live-reload is given/askip "Unpackaged nanoc-live"' spec/nanoc/cli/commands/view_spec.rb || die
-	sed -i -e '/watches with --watch/askip "Unpackaged nanoc-live"' spec/nanoc/cli/commands/compile_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
-}
diff --git a/www-apps/nanoc-cli/nanoc-cli-4.12.19.ebuild b/www-apps/nanoc-cli/nanoc-cli-4.12.19.ebuild
deleted file mode 100644
index 8da190b719b7..000000000000
--- a/www-apps/nanoc-cli/nanoc-cli-4.12.19.ebuild
+++ /dev/null
@@ -1,71 +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_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.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 -> nanoc-${PV}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~riscv"
-SLOT="0"
-IUSE="${IUSE} minimal"
-
-RUBY_S="nanoc-${PV}/nanoc-cli"
-
-ruby_add_rdepend "
-	>=dev-ruby/cri-2.15:0
-	>=dev-ruby/diff-lcs-1.3:0
-	~www-apps/nanoc-core-${PV}
-	>=dev-ruby/zeitwerk-2.1:2
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/rspec:3
-	dev-ruby/rspec-its
-	dev-ruby/fuubar
-	dev-ruby/minitest
-	dev-ruby/timecop
-	dev-ruby/tty-command
-	dev-ruby/yard
-	www-apps/nanoc-spec
-	www-servers/adsf
-)
-"
-
-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
-	sed -i -e '2i require "tmpdir"; require "pathname"' spec/spec_helper.rb || die
-
-	echo "-r ./spec/spec_helper.rb" > .rspec || die
-
-	sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid error handler specs failing due to different (rubygems?)
-	# output, meta_spec is affected by this.
-	rm -f spec/nanoc/cli/error_handler_spec.rb spec/meta_spec.rb || die
-
-	# Avoid test requiring a network interface
-	sed -i -e '/does not listen on non-local interfaces/askip "Needs network"' spec/nanoc/cli/commands/view_spec.rb || die
-
-	# Avoid tests requiring an additional dependency on nanoc-live
-	sed -i -e '/--live-reload is given/askip "Unpackaged nanoc-live"' spec/nanoc/cli/commands/view_spec.rb || die
-	sed -i -e '/watches with --watch/askip "Unpackaged nanoc-live"' spec/nanoc/cli/commands/compile_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
-}
diff --git a/www-apps/nanoc-cli/nanoc-cli-4.12.16.ebuild b/www-apps/nanoc-cli/nanoc-cli-4.13.0.ebuild
index af4e0e04f214..60ae596b20e0 100644
--- a/www-apps/nanoc-cli/nanoc-cli-4.12.16.ebuild
+++ b/www-apps/nanoc-cli/nanoc-cli-4.13.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
@@ -15,8 +15,8 @@ HOMEPAGE="https://nanoc.app/"
 SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> nanoc-${PV}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~riscv"
 SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 IUSE="${IUSE} minimal"
 
 RUBY_S="nanoc-${PV}/nanoc-cli"
@@ -25,6 +25,7 @@ ruby_add_rdepend "
 	>=dev-ruby/cri-2.15:0
 	>=dev-ruby/diff-lcs-1.3:0
 	~www-apps/nanoc-core-${PV}
+	dev-ruby/pry
 	>=dev-ruby/zeitwerk-2.1:2
 "
 
diff --git a/www-apps/nanoc-core/Manifest b/www-apps/nanoc-core/Manifest
index e58f9422b5ce..7b254ffe145c 100644
--- a/www-apps/nanoc-core/Manifest
+++ b/www-apps/nanoc-core/Manifest
@@ -1,12 +1,8 @@
 AUX nanoc-core-4.12.2-contracts.patch 543 BLAKE2B 374bc86e4351627693d85517f24a82505454eb3eb52c6b12be1681e5bcc4f7a299b98ea72edca42a26e8d121219e6a76afe636b9b08da44e334c10f9fb5be47b SHA512 e8bfcfa6e49439734f6fe760dc46d5eaf6dee9d79a0be83e65dd450a769e0745422d76bf4067d475921b83a4534c9868aca9ef23f2a1fe6ff3ac7ba4b15fe3f6
-DIST nanoc-core-4.12.16.tar.gz 350823 BLAKE2B 8196589290b5120b74bd2063e60f1fad14af98f7c8ffcef0a226d28ecb3f129ab04c913ad921e64c9551965c8fe1e26da1e0f41baa64a75caa372d6796c5084b SHA512 e04a562d87250286a9fbdc0381fdc64868f87f67d1ae9ce81f0e21c13496e168cfc4936c02b3cba87e8d647ab070670a208722fd53f4265eb3674b7ba20ccebd
-DIST nanoc-core-4.12.17.tar.gz 350964 BLAKE2B ca19c259eac8005f2612f61b902005d43196e3e01e8bb0c7a77f9f68bc27486ad6e6e9860420817a633b9a48973f7d98689046cbdb6fe4c185ae18583168d6d2 SHA512 d5a8d3711642f65078102be9317ac2b7db3635c5ff5616d2c05fd917e5cba76a8a21ceeb0a84565723d334f8d62cb55c8097eac07c9bc30f783916c8d312b8c1
-DIST nanoc-core-4.12.19.tar.gz 352620 BLAKE2B 1e6f7e4b49ffd52f985c8a8e4f33401b03abf64569c719a888c603cc8cf1cc2409cf5513dccaa3517bc2d4180e60bec4060db7672d999c486bc4e2138e272946 SHA512 0118eda03479bbdc75098e789ab1095942dfc8967dc6f628e07a93826241845df253eb5701803df2386cf56aaabf6670ed3e8589dcfdcdd331a13def3b05374c
 DIST nanoc-core-4.12.20.tar.gz 355843 BLAKE2B 44974de8d84af651f636f369206875a42aa349f78a98d6425cea5d65cc30a5bcbbc10975493b58b87605ae5efb7748712b69e652b94a146242df8fbc3ce8cc87 SHA512 b714ac4e743be390dc1484ed29b018da51751f704667cabd8c9c8c7f937eb32863da33f5e7b53838d641e1448e582b9aa729d38df9f25c6eb21358aafd3dbd8c
 DIST nanoc-core-4.12.21.tar.gz 356922 BLAKE2B 7395bfdba8d27c6f60b8df072bc862c3541beafc4aa36fa5e5e6cce1d558eed462e445fe8414ec952c65840b2eab6cd3457b49a537b8197642bf3bf79074bb71 SHA512 a68af1ef19affe2188a7b4813bda24dd75d6e1c9de4465dd68271c22efb1b7af302906a58465cd177e8dd4922bd3a2292dd3059458e77f8e3e637bf63b3330b7
-EBUILD nanoc-core-4.12.16.ebuild 2003 BLAKE2B d0cdfa9d5456afc5fde9b8b6404ce062d71c5dca772de46f3f464fafc08bb65c6f5c23d0b3b9a56b983352816961bd68ab581ebbb999a7736a427644bdf91d93 SHA512 769caf2aec3c746569c44acd2d165ff1a015fbe0dd97703b264132986e3752b97763f26f2b1ad95d7839a8949d3a0734234ea4d7812fa18d5b35845723332811
-EBUILD nanoc-core-4.12.17.ebuild 1996 BLAKE2B f950a1f3d711875ebf4069327b293993d62d2b6c468315a8e2f1f8127273cd82d7a3802f34604a4dc229a3640c47149ef9c84e671b6691481294bd8f87d72a2d SHA512 2a593619c27decfc978cea58ea1db901ff8eaed8931f3ca6071ed597a66372bbeda6e38411281d146582e82cf8e828d81745a68f2d982c81878cfa86b606ee0b
-EBUILD nanoc-core-4.12.19.ebuild 2020 BLAKE2B c672f8d640f3f1e35d2f87ce7ddc586f686e314e633782274ffd433e61d2c7bd9b8a684994f7e524760e1c06407b32050c02e9a81935d6a0e0e5be006a7dda44 SHA512 a0e3e75a95c82a57073a5be7380c1908835e096e716add5d6748a0244fdfbc743f680db2da3c391bb95a99031e59ff96731b2af4dab7bb4e3e0f26e0de2e9bd6
+DIST nanoc-core-4.13.0.tar.gz 356745 BLAKE2B 55b529669937db12e820d1ed83800415a01e6e9b96b9b2be0e339e8e66d1f7a7ce6982ad3a8e6357875fc326aa96675775e8f39a01fa614d39a1f34e152e6581 SHA512 06f537a9a15ae1ec8bf94cc242dfd76fb99330fbe81ebb1375f711cf568e33579745ac571d37258666cdfd903493cd924da390b1710cef7a31d93cfa28ecb81f
 EBUILD nanoc-core-4.12.20.ebuild 2018 BLAKE2B acfc6eed37736ceb95bd69e092c086fc988ece8ee5190b402b21a7e6bf9a4f62e82a5e78c542052b476ddd36e00d756fc37aca7df295ca67bffa8b28b9ea0e89 SHA512 218943d5743ad05a98d9fc3e645a8edc42bdc2839e8759d8d690f821b2342f6af70a12fce0ff586b4c2ed366f2d07e74cb49bf529f9ec362b60a7f18b236ea29
 EBUILD nanoc-core-4.12.21.ebuild 2025 BLAKE2B bbb92817a4e4f39243265fb2a135e8d3690ef76963c886d95d5a48d8ffd74d46746c8a10c63d72a99ad6add119519850ab5fe85a34ff9bad1418aaee3e1ecd42 SHA512 4332ae5cf1d7f515f7d63c3133cbc1a45c72523720548fb01402a98cca77d6f2b1d0ec056cfbb7b14afe4638d99718da236f9ab2e97974d7c38d4125c5d43081
+EBUILD nanoc-core-4.13.0.ebuild 2025 BLAKE2B bbb92817a4e4f39243265fb2a135e8d3690ef76963c886d95d5a48d8ffd74d46746c8a10c63d72a99ad6add119519850ab5fe85a34ff9bad1418aaee3e1ecd42 SHA512 4332ae5cf1d7f515f7d63c3133cbc1a45c72523720548fb01402a98cca77d6f2b1d0ec056cfbb7b14afe4638d99718da236f9ab2e97974d7c38d4125c5d43081
 MISC metadata.xml 394 BLAKE2B 7b8c56a3dc98dbfc894dd1956390b9ea58fad15bd061590e776778af087d281e30fccdca9d5b227aad4b99ec0c370759ae501eafc58bf87cc56811cfb51b4647 SHA512 9e56f1314cf818d30c3153f5ada0ac75c70d460e9137de7146bc9af41ceebcd578de1336bebf141e41ba0969dbca332b8e06269dd61e91b7a33e207b2f6b4997
diff --git a/www-apps/nanoc-core/nanoc-core-4.12.16.ebuild b/www-apps/nanoc-core/nanoc-core-4.12.16.ebuild
deleted file mode 100644
index 136a919ee393..000000000000
--- a/www-apps/nanoc-core/nanoc-core-4.12.16.ebuild
+++ /dev/null
@@ -1,77 +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_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.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 ~riscv"
-SLOT="0"
-IUSE="${IUSE} minimal"
-
-DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
-
-RUBY_S="nanoc-${PV}/nanoc-core"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.1:1
-	dev-ruby/ddmetrics:1
-	dev-ruby/ddplugin:1
-	>=dev-ruby/immutable-ruby-0.1:0
-	>=dev-ruby/json_schema-0.19:0
-	>=dev-ruby/memo_wise-1.5:1
-	dev-ruby/psych:0
-	dev-ruby/slow_enumerator_tools:1
-	>=dev-ruby/tty-platform-0.2:0
-	>=dev-ruby/zeitwerk-2.1:2
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/rspec:3
-	dev-ruby/rspec-its
-	dev-ruby/fuubar
-	dev-ruby/minitest
-	dev-ruby/timecop
-	dev-ruby/tty-command
-	dev-ruby/yard
-	www-apps/nanoc-spec
-)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.12.2-contracts.patch" )
-
-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 -e '/coverall/I s:^:#:' \
-		-e '/rubocop/ s:^:#:' \
-		-i Rakefile || die
-	sed -i -e '2i require "tmpdir"; require "pathname"; gem "psych", "~> 4.0"' spec/spec_helper.rb || die
-
-	echo "-r ./spec/spec_helper.rb" > .rspec || die
-
-	sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Use useable tmp dir
-	sed -i -e "s:/tmp/whatever:${T}/whatever:" spec/nanoc/core/checksummer_spec.rb || die
-
-	# Avoid circular dependency on www-apps/nanoc
-	sed -i -e '/.all_outdated/,/^  end/ s:^:#:' spec/nanoc/core/feature_spec.rb || die
-	rm -f spec/nanoc/core_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
-}
diff --git a/www-apps/nanoc-core/nanoc-core-4.12.17.ebuild b/www-apps/nanoc-core/nanoc-core-4.12.17.ebuild
deleted file mode 100644
index 80ccfe943d17..000000000000
--- a/www-apps/nanoc-core/nanoc-core-4.12.17.ebuild
+++ /dev/null
@@ -1,77 +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_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.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 ~riscv"
-SLOT="0"
-IUSE="${IUSE} minimal"
-
-DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
-
-RUBY_S="nanoc-${PV}/nanoc-core"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.1:1
-	dev-ruby/ddmetrics:1
-	dev-ruby/ddplugin:1
-	>=dev-ruby/immutable-ruby-0.1:0
-	>=dev-ruby/json_schema-0.19:0
-	>=dev-ruby/memo_wise-1.5:1
-	dev-ruby/psych:0
-	dev-ruby/slow_enumerator_tools:1
-	>=dev-ruby/tty-platform-0.2:0
-	>=dev-ruby/zeitwerk-2.1:2
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/rspec:3
-	dev-ruby/rspec-its
-	dev-ruby/fuubar
-	dev-ruby/minitest
-	dev-ruby/timecop
-	dev-ruby/tty-command
-	dev-ruby/yard
-	www-apps/nanoc-spec
-)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.12.2-contracts.patch" )
-
-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 -e '/coverall/I s:^:#:' \
-		-e '/rubocop/ s:^:#:' \
-		-i Rakefile || die
-	sed -i -e '2i require "tmpdir"; require "pathname"; gem "psych", "~> 4.0"' spec/spec_helper.rb || die
-
-	echo "-r ./spec/spec_helper.rb" > .rspec || die
-
-	sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Use useable tmp dir
-	sed -i -e "s:/tmp/whatever:${T}/whatever:" spec/nanoc/core/checksummer_spec.rb || die
-
-	# Avoid circular dependency on www-apps/nanoc
-	sed -i -e '/.all_outdated/,/^  end/ s:^:#:' spec/nanoc/core/feature_spec.rb || die
-	rm -f spec/nanoc/core_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
-}
diff --git a/www-apps/nanoc-core/nanoc-core-4.12.19.ebuild b/www-apps/nanoc-core/nanoc-core-4.13.0.ebuild
index fc14ee3a29aa..533f9c0a4c8c 100644
--- a/www-apps/nanoc-core/nanoc-core-4.12.19.ebuild
+++ b/www-apps/nanoc-core/nanoc-core-4.13.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
@@ -15,8 +15,8 @@ HOMEPAGE="https://nanoc.app/"
 SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~riscv"
 SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 IUSE="${IUSE} minimal"
 
 DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
@@ -24,6 +24,7 @@ DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
 RUBY_S="nanoc-${PV}/nanoc-core"
 
 ruby_add_rdepend "
+	dev-ruby/base64:0.2
 	>=dev-ruby/concurrent-ruby-1.1:1
 	dev-ruby/ddmetrics:1
 	dev-ruby/ddplugin:1
@@ -58,7 +59,7 @@ all_ruby_prepare() {
 	sed -e '/coverall/I s:^:#:' \
 		-e '/rubocop/ s:^:#:' \
 		-i Rakefile || die
-	sed -i -e '2i require "tmpdir"; require "pathname"; gem "psych", "~> 4.0"' spec/spec_helper.rb || die
+	sed -i -e '2i require "tmpdir"; require "pathname"' spec/spec_helper.rb || die
 
 	echo "-r ./spec/spec_helper.rb" > .rspec || die
 
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 371fc9702c49..128a617a512c 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,11 +1,7 @@
-DIST nanoc-4.12.16.tar.gz 350823 BLAKE2B 8196589290b5120b74bd2063e60f1fad14af98f7c8ffcef0a226d28ecb3f129ab04c913ad921e64c9551965c8fe1e26da1e0f41baa64a75caa372d6796c5084b SHA512 e04a562d87250286a9fbdc0381fdc64868f87f67d1ae9ce81f0e21c13496e168cfc4936c02b3cba87e8d647ab070670a208722fd53f4265eb3674b7ba20ccebd
-DIST nanoc-4.12.17.tar.gz 350964 BLAKE2B ca19c259eac8005f2612f61b902005d43196e3e01e8bb0c7a77f9f68bc27486ad6e6e9860420817a633b9a48973f7d98689046cbdb6fe4c185ae18583168d6d2 SHA512 d5a8d3711642f65078102be9317ac2b7db3635c5ff5616d2c05fd917e5cba76a8a21ceeb0a84565723d334f8d62cb55c8097eac07c9bc30f783916c8d312b8c1
-DIST nanoc-4.12.19.tar.gz 352620 BLAKE2B 1e6f7e4b49ffd52f985c8a8e4f33401b03abf64569c719a888c603cc8cf1cc2409cf5513dccaa3517bc2d4180e60bec4060db7672d999c486bc4e2138e272946 SHA512 0118eda03479bbdc75098e789ab1095942dfc8967dc6f628e07a93826241845df253eb5701803df2386cf56aaabf6670ed3e8589dcfdcdd331a13def3b05374c
 DIST nanoc-4.12.20.tar.gz 355843 BLAKE2B 44974de8d84af651f636f369206875a42aa349f78a98d6425cea5d65cc30a5bcbbc10975493b58b87605ae5efb7748712b69e652b94a146242df8fbc3ce8cc87 SHA512 b714ac4e743be390dc1484ed29b018da51751f704667cabd8c9c8c7f937eb32863da33f5e7b53838d641e1448e582b9aa729d38df9f25c6eb21358aafd3dbd8c
 DIST nanoc-4.12.21.tar.gz 356922 BLAKE2B 7395bfdba8d27c6f60b8df072bc862c3541beafc4aa36fa5e5e6cce1d558eed462e445fe8414ec952c65840b2eab6cd3457b49a537b8197642bf3bf79074bb71 SHA512 a68af1ef19affe2188a7b4813bda24dd75d6e1c9de4465dd68271c22efb1b7af302906a58465cd177e8dd4922bd3a2292dd3059458e77f8e3e637bf63b3330b7
-EBUILD nanoc-4.12.16.ebuild 2899 BLAKE2B 8a3868ab6ea631c9668e053cc6b2a21feff9a87169334822a7fc1aeebe7046d82b671d2720531d1d994f1c93efc4dc8ddf281c9c3f1b8b5c15a8879bafa4686e SHA512 1e44edf9e5af7c5cfb83d9986eebf34f30957013f5009e6960c71df8c30a0715ac86245671944631037fe8a5c4c17ca58fc255bc227d5fab1a2c9fe9eca7aae6
-EBUILD nanoc-4.12.17.ebuild 2892 BLAKE2B 7ba0bb2bc726b040dff935971ec816d80e90fd9a870b373e922c81aeda631f2bddecf77b6dbf8c06959ea6019246b322a98d62f9f079e02bd35693771a19579b SHA512 e0a26308c772837fb62d5ea5f853da2d17379cb5ffc06ad9a5430e5e700c0a2b11a70939f231a4979384b5be90653a7c4cf63537c8b971ef4d0a9ae90e76b341
-EBUILD nanoc-4.12.19.ebuild 2894 BLAKE2B 120a560b1502f06f9396f36af97b6d2a9122d1992ff282d7116baecb23d572ec079ef8ad1519d58fec7bdc8a48cb90349372bfab2cabb8cee898b5119e3e33d8 SHA512 93951408596911f7d8b848fcc9c73bef4feba1166f69b7a9c4d71a1a2933bd0a6456606ffebd8f73682721fd0d5bf7fb2026765c75cbe677e2d64ac6857f69d1
+DIST nanoc-4.13.0.tar.gz 356745 BLAKE2B 55b529669937db12e820d1ed83800415a01e6e9b96b9b2be0e339e8e66d1f7a7ce6982ad3a8e6357875fc326aa96675775e8f39a01fa614d39a1f34e152e6581 SHA512 06f537a9a15ae1ec8bf94cc242dfd76fb99330fbe81ebb1375f711cf568e33579745ac571d37258666cdfd903493cd924da390b1710cef7a31d93cfa28ecb81f
 EBUILD nanoc-4.12.20.ebuild 2935 BLAKE2B 2b53eedefbe991f31b45d66a9c0767ea1c59081e28908955c5ad1e6790eca294506ed376f4cff26419f71b6f23b254e23a4b03f6b45882525fb3adf25d8b22d8 SHA512 0379e6f4a7d466bc0361c43064500886d41eea38ebfc4d8684b2b4044efda072aabb89fb1d4a0ccaff5bb32e68a1a30da1a1405e2661b3d5e0a3d001ee9e211d
 EBUILD nanoc-4.12.21.ebuild 2942 BLAKE2B 54815ec0a07f54d81ce83360c3e863095da475595d1478597286b8b2775e462c261e1a51f549c85912784ee2397987b8e02e79f4782efc5f3144d9e4d721eb9a SHA512 9886a3008414d5a926f53b73a2acfcb7ef8b7130d2d6dc50826d74ba2a18910165005181d049b3db46ad9f43fe333c9a2bdaa4b7f4799ff7bf24532d0d5dd9c6
+EBUILD nanoc-4.13.0.ebuild 2638 BLAKE2B b2fb6638465faaf067f2b971e9cba0874a2c2b3113d7773dbfadae550bd8a648e9fccd590a5ca1be2f0e96807a54c7c8e8204af93494d757978154940e4116c0 SHA512 2116d4f92367ac4780826e696c4a7bc0a32249ac0f4fcf4bd4a65d6013d61bc22e81147fe52391fe3c1f82c645a531537ba95bc5f8578e22f741d73b16e77c6a
 MISC metadata.xml 394 BLAKE2B 7b8c56a3dc98dbfc894dd1956390b9ea58fad15bd061590e776778af087d281e30fccdca9d5b227aad4b99ec0c370759ae501eafc58bf87cc56811cfb51b4647 SHA512 9e56f1314cf818d30c3153f5ada0ac75c70d460e9137de7146bc9af41ceebcd578de1336bebf141e41ba0969dbca332b8e06269dd61e91b7a33e207b2f6b4997
diff --git a/www-apps/nanoc/nanoc-4.12.16.ebuild b/www-apps/nanoc/nanoc-4.12.16.ebuild
deleted file mode 100644
index 96152932c2bc..000000000000
--- a/www-apps/nanoc/nanoc-4.12.16.ebuild
+++ /dev/null
@@ -1,103 +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_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.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/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:^:#:' test/helper.rb ../common/spec/spec_helper_head_core.rb || die
-	sed -i -e '/coverall/I s:^:#:' \
-		-e '/rubocop/ s:^:#:' Rakefile || die
-	sed -i -e '2igem "psych", "~> 4.0"' test/helper.rb || 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 or obsolete dependencies
-	rm spec/nanoc/filters/less_spec.rb \
-	   test/filters/test_{erubis,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 -e '124askip "ordering issues"' -e '168askip "ordering issues"' \
-		-i spec/nanoc/data_sources/filesystem_spec.rb || die
-	sed -e '/def test_default_encoding/,/^  end/ s:^:#:' \
-		-i test/orig_cli/commands/test_create_site.rb || die
-
-	# Fix deprecated minitest constant
-	sed -i -e 's/MiniTest/Minitest/' test/rule_dsl/test_rules_collection.rb || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
-}
diff --git a/www-apps/nanoc/nanoc-4.12.19.ebuild b/www-apps/nanoc/nanoc-4.12.19.ebuild
deleted file mode 100644
index a79a4d304195..000000000000
--- a/www-apps/nanoc/nanoc-4.12.19.ebuild
+++ /dev/null
@@ -1,103 +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_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.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/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:^:#:' test/helper.rb ../common/spec/spec_helper_head_core.rb || die
-	sed -i -e '/coverall/I s:^:#:' \
-		-e '/rubocop/ s:^:#:' Rakefile || die
-	# sed -i -e '2igem "psych", "~> 4.0"' test/helper.rb || 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 or obsolete dependencies
-	rm spec/nanoc/filters/less_spec.rb \
-	   test/filters/test_{erubis,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 -e '124askip "ordering issues"' -e '168askip "ordering issues"' \
-		-i spec/nanoc/data_sources/filesystem_spec.rb || die
-	sed -e '/def test_default_encoding/,/^  end/ s:^:#:' \
-		-i test/orig_cli/commands/test_create_site.rb || die
-
-	# Fix deprecated minitest constant
-	sed -i -e 's/MiniTest/Minitest/' test/rule_dsl/test_rules_collection.rb || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
-}
diff --git a/www-apps/nanoc/nanoc-4.12.17.ebuild b/www-apps/nanoc/nanoc-4.13.0.ebuild
index a4a5b6c23b41..beab24ca753f 100644
--- a/www-apps/nanoc/nanoc-4.12.17.ebuild
+++ b/www-apps/nanoc/nanoc-4.13.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
@@ -15,8 +15,8 @@ HOMEPAGE="https://nanoc.app/"
 SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~amd64"
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE="${IUSE} minimal"
 
 DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
@@ -30,7 +30,7 @@ ruby_add_rdepend "!minimal? (
 )
 	>=dev-ruby/addressable-2.5
 	>=dev-ruby/colored-1.2:0
-	>=www-apps/nanoc-checking-1.0.2:1
+	>=www-apps/nanoc-checking-1.0.5:1
 	~www-apps/nanoc-cli-${PV}
 	~www-apps/nanoc-core-${PV}
 	www-apps/nanoc-deploying:1
@@ -51,12 +51,14 @@ ruby_add_bdepend "test? (
 	dev-ruby/pry
 	dev-ruby/rdoc
 	>=dev-ruby/rouge-3.5.1:2
+	dev-ruby/rspec-its
 	dev-ruby/rubypants
 	dev-ruby/systemu
 	dev-ruby/timecop
 	dev-ruby/vcr
 	dev-ruby/webmock
 	dev-ruby/yard
+	www-apps/nanoc-spec
 )
 doc? (
 	dev-ruby/kramdown
@@ -70,7 +72,6 @@ all_ruby_prepare() {
 		-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
-	sed -i -e '2igem "psych", "~> 4.0"' test/helper.rb || die
 
 	echo "-r ./spec/spec_helper.rb" > .rspec || die
 
@@ -89,13 +90,8 @@ all_ruby_prepare() {
 	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 -e '124askip "ordering issues"' -e '168askip "ordering issues"' \
-		-i spec/nanoc/data_sources/filesystem_spec.rb || die
 	sed -e '/def test_default_encoding/,/^  end/ s:^:#:' \
 		-i test/orig_cli/commands/test_create_site.rb || die
-
-	# Fix deprecated minitest constant
-	sed -i -e 's/MiniTest/Minitest/' test/rule_dsl/test_rules_collection.rb || die
 }
 
 each_ruby_test() {