gentoo resync : 16.04.2022

32 files changed, 622 insertions, 412 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 749591f1e468..940a5e5726b3 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/agendav/Manifest b/www-apps/agendav/Manifest
deleted file mode 100644
index e30f25138de9..000000000000
--- a/www-apps/agendav/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX postinstall-2.2.0-en.txt 522 BLAKE2B 5701bd5d06bf3c35953fbc62a7ba448138091d66025da2af6187c4325c9cbca412542c70f0aedb0b24bb46705934152a0777ac49810a02e2fdf5d7121a76394a SHA512 342598d5e9171ec4e838af51ae5240d321d33fd72bf23e08649fa88ce7fc03671cd656332f55c32d581ff578a90b03ab32756a551b5dd8204208319e4c982e7a
-DIST agendav-2.2.0.tar.gz 5313351 BLAKE2B 3d7f47900f0030c87fe00c187faee5c508cd740afee2a5021a38e2e2f3986207d324891fc71b53c6b8938684981933f29c7c3022179e90f3b9e5b19e2437df99 SHA512 4bf3c6152d69d8c58cea4e4377acdc30ef90d7d40946ad495715a34348051db8d2c20c60d495fb629dd9ad143836025082109c2102149ab143e98ad2ba4b191b
-EBUILD agendav-2.2.0.ebuild 1379 BLAKE2B 2973940614770cb4c752cb2a067919f26bce4506f7a2848f1f6d831299647fda6731403da6c2835c1b8f7e3055dfafd93eab1d7b41c9c395c22bbc18daed5363 SHA512 9db67206b726e23b19532f5ccf7c15925b830aa5c0c72548a953bffbbc8b11bde6f94c5d6c626263e0f5f0fc9ac0144ce1fecfaaaadeb51986d6c800694bdd8d
-MISC metadata.xml 351 BLAKE2B 0f1b342b7fee80f33ae5be382259dc793a0fa40192456e3aa1c6fffb26684f51b83c34d3b24a0960b93afb8056700e1532099ab7ba61edb3642a00f91630f266 SHA512 4b1441e48f134bbcb2f3db2f946533e00cf3498fba896da803505833ce1bbb15e46b3aaa7e2048d642798f9a43f22a6d14cfaf9566f3d189d57c15eee2ec0766
diff --git a/www-apps/agendav/agendav-2.2.0.ebuild b/www-apps/agendav/agendav-2.2.0.ebuild
deleted file mode 100644
index 80287540c33a..000000000000
--- a/www-apps/agendav/agendav-2.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit webapp
-
-DESCRIPTION="multilanguage CalDAV web client"
-HOMEPAGE="http://agendav.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~ppc64"
-
-RDEPEND=">=dev-lang/php-5.6[ctype,curl,unicode,tokenizer,xml,xmlreader,xmlwriter]
-	virtual/httpd-php
-	|| ( >=virtual/mysql-5.1 >=dev-db/postgresql-8.1 )"
-
-src_install() {
-	webapp_src_preinst
-
-	einfo "Installing web files"
-	# fix references to the rest of the application code
-	sed -i -e '/__DIR__/s:/\.\./:/../../agendav/:' web/public/index.php || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r web/public/*
-
-	einfo "Installing main files"
-	cp web/config/{default.,}settings.php || die
-	insinto "${MY_HOSTROOTDIR}/${PN}"
-	doins -r web/{app,config,lang,src,templates,var,vendor}
-
-	einfo "Installing agendavcli utility"
-	sed -i -e '/__DIR__/s:/web/:/:' agendavcli || die
-	sed -i -e '/migrations_directory/s:web/::' migrations.yml || die
-	doins migrations.yml
-	exeinto "${MY_HOSTROOTDIR}/${PN}"
-	doexe agendavcli
-
-	local f
-	for f in "${ED}"/${MY_HOSTROOTDIR}/${PN}/config/* ; do
-		webapp_configfile "${f#${ED%/}}"
-	done
-	webapp_serverowned -R "${MY_HOSTROOTDIR}"/${PN}/var
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-2.2.0-en.txt"
-	webapp_src_install
-}
diff --git a/www-apps/agendav/files/postinstall-2.2.0-en.txt b/www-apps/agendav/files/postinstall-2.2.0-en.txt
deleted file mode 100644
index 76b44064aabe..000000000000
--- a/www-apps/agendav/files/postinstall-2.2.0-en.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Next to a CalDAV server, you need access to a mysql or postgresql
-database to use agendav.
-
-Read http://docs.agendav.org/en/2.2.0/admin/installation/ for
-installation instructions of the database.  This includes loading the
-SQL statements using agendavcli utility.
-
-Next you have to edit all config files in your installation's
-  /path/to/hostroot/agendav/config.
-
-Before you can use agendav, you need to upgrade the database (you also
-need this on a new install) using:
-
-  $ /path/to/hostroot/agendav/agendavcli dbupdate
diff --git a/www-apps/agendav/metadata.xml b/www-apps/agendav/metadata.xml
deleted file mode 100644
index 5dd7fb50719f..000000000000
--- a/www-apps/agendav/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>grobian@gentoo.org</email>
-		<name>Fabian Groffen</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">adobo/agendav</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 34900cb73625..95cfea5081cf 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,8 +1,13 @@
 AUX hugo-0.92.2-link-to-webp-and-sass.patch 1426 BLAKE2B 7a518995b6f691dea6ec06e42f39d785d8b82da25a8cc5f129df0efdc0beb36fdb66084f810f6db74a2f21dadd146cdfe47da8f7917b68647b4f36da32bfb396 SHA512 64c8ef2b80fad93caca8f67632f6ce77cbcf797cc0f2f97c871d6064acd88d2ab656b35c8500fd86a00c07a955ce7298227a4f829e7507975230ea84b8afc500
+AUX hugo-0.96.0-skip-some-tests.patch 4082 BLAKE2B fe22f1c7fe5dd023c21f45b1dca71b50bb51d9ed993687fa7c654b0e0c3b59f760c4270393e7abf46c84db6d9c1e62d56bd2851541ebfd40ac2abd92c132e6e2 SHA512 8be454a559aba28022ea09003dfdac8701f86edd5805f5b15349e1bd8295aacdf81cc8522b250d7fde24b485303e277ab15bd004aba6a2a0ca2717ae824c33ca
+AUX hugo-0.96.0-unbundle-libwebp-and-libsass.patch 1558 BLAKE2B bce42fce63466424c0e3b2f7f099485cb23ea0e756fe57dfa1a062f9e0afb6ca3213d5b3048c6482e557c8399b392deaca53281866cd8d160ea20e81cb133c89 SHA512 a0ea32e10112047dd3a4536286c853c97d43c548ed4cfaa366711c45ff67960545b317f67fb2f69484b61dabe8d668a0540339a4789f43f8581afe11d611c538
 DIST hugo-0.93.3-vendor.tar.xz 4828092 BLAKE2B 4df3e876ffcc71f4caa089512510bec47f9e3aa25240ed6cc9ed9e7faef7425b3f7bdd03293023f103a0b8927ecbdf7fe3d9f36f5a66db580dfc8f0ddb9dc310 SHA512 6c93a8435552553079e856f8a74eef76e23ab7343e6e65ac83f9f1675c5fe44547f5d3f700656c0e666bc668792be38e343cfaebbfb23b5ece28ddfa0896755c
 DIST hugo-0.93.3.tar.gz 27852078 BLAKE2B 8e21fcbacc55cb304314d24f7a1258c9192655cb603e33c2ac2cac5fcc21f83045c1fc3a3ee7bd227507fd08be54e15dcd9cc9629e320bae9b41f1c87d03e163 SHA512 c65cc776588604a6ca2fbe5c4081db252ec007311eae54ed81ea65e983f1787edf6e10774d8ace82284eb7c42f6cb70650135ec44b2ddc8994ed511ba2a7d55e
 DIST hugo-0.95.0-vendor.tar.xz 4781084 BLAKE2B ead2d42b615fa838995853df38c304c63baccb109f32b5034449cb64c8edacb78e5fac615f2018e8d4acb693f83df0abaa73bc511f5ba31b3a30bdec476420b1 SHA512 941061396433a20b524694c8dd2838d84454fbee98c48aa2860881fd9b31b6d480d22f6fd54bd2e17f1f90b1c9e6c3c5813682131fd01c7d3eabc063dcbb01b2
 DIST hugo-0.95.0.tar.gz 27859168 BLAKE2B 3667ab14c19f586d0f45b76072786a49f2448367cdf4151df2b44a329a57047544dcbbe4db8774433cf2042024c17ccca3269f5eeb508392aed00d31955de55a SHA512 fbe43fc9698325c380d7e7499ee726aba448eebba087f7bdc7cdf14d01e0649869359c07fefaa9a0d9623c910523b82efc2a2b57e152d391443e2b890a29affb
+DIST hugo-0.96.0-vendor.tar.xz 4721504 BLAKE2B d8516c848be292f2097961a599450b719b2d760ad3464036929a0937ae6b401ec4b7b90df3281f11a70c4f9a7e94d74e821d78639b9cb3a335a59c5f6e645e65 SHA512 d58cbded19c5e2595838725a181e5fcdad94888f1e140e8961d9815c17d7719644483bb9bb34141c26bfccd87412632b1c896c12b85abb76c6448de3d0c8642d
+DIST hugo-0.96.0.tar.gz 27853655 BLAKE2B 8161eb31b66a9643e31967629852475496dcabd0ef04e806f0d004f3933de07553a10572c201f8b798c7c257d20d7e0e6381bb2892728f89fd3416cc768d76f2 SHA512 1dc5e9f433953a1ae378d0eeb24e0647a4c096db96a727ece39c1c4e5d3ef40033ca61aa7a9ed322234e41a116f118115e637c0342b52ee60fe47eea5718ffde
 EBUILD hugo-0.93.3.ebuild 1887 BLAKE2B f0351fc4bc20ed692378b5a8ad6ebb5622971ffca2832e50b21b39592e9dc891b8cdf4e8c7aa01cb349bfb39db9070ee8f768b17a8d30b774cec4b98f4693347 SHA512 0b345e1b12d4488660f3c8ab1baef7e886ccb57bb49c3ee177f902fafd1e9f5e2affbaeeb195f5537dfe8179f2d8fe081906343c05fe6c9e9ed5a515ab248416
 EBUILD hugo-0.95.0.ebuild 1889 BLAKE2B edaa1f15ca6ef22537b4f200c1a3e46784f6a28dae79b5c9fadd6a87a2bb50554b34d202f087e61822dd650b1613d2923989a33fd66dc67826686082822a926b SHA512 b247dd4cbc3d1df67e9608dc3ecc173886e698cbd82ad0836d7af2716d1d929440c3d43222b6435f3f6e2f9a62017819ee0313f65428c2a779d79b757d6302b0
-MISC metadata.xml 727 BLAKE2B b2632867dbfc5f0d647facb43f54ad3ae6bf5562bc7057dafca2724b4da8574603fff3ab5acf9ce9acb5dd0e20a15bcc052ee1cb5ca3b44d5e02f443c7d9ea2d SHA512 6efed4943de9dd760aac8998fa921d9e38f3ab93baae7c1a808e102619e292d7a067e6fe7c102b89fc432d422d2c8614b339490c5e234210bb219eeca22c6540
+EBUILD hugo-0.96.0.ebuild 1993 BLAKE2B 8f4e9fd025c5b55911c1313144069bae7e3bac29008901937026513867a867d87067ee3b7e668d20640e062042fe58811e9f3fb77eb3ef6cd1721323e3f0b306 SHA512 2faae5f367ac1d83b851bc8a042ab8da3363e359a359e8d84fddb93690f396b82d8775a9156bcbd6c5e5a930fa279573a7f8b37be89105eec2ad435c48a18870
+MISC metadata.xml 806 BLAKE2B 94596b9097f4f1277d81c88292eecfaab2480476807edf680350158e704226d335787029f7e898c6cc6ad0452af4266d2aedcfa38209201b48cde75efa88965e SHA512 26e3674ec6775f073d0e10f87b9bbc8364e0c4d1e946a415002bdc11aa62909b2792c6cb7a90ac163860e569fdf6ed303173887c214531f50ae63dc0f9b4e69e
diff --git a/www-apps/hugo/files/hugo-0.96.0-skip-some-tests.patch b/www-apps/hugo/files/hugo-0.96.0-skip-some-tests.patch
new file mode 100644
index 000000000000..6f09d1c39660
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.96.0-skip-some-tests.patch
@@ -0,0 +1,120 @@
+From fb829c60a028067b940aaf268362017a73d40e84 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Tue, 29 Mar 2022 22:28:13 +0200
+Subject: [PATCH] Skip some tests
+
+Reasons:
+  - Needs to be in a git repo
+  - Needs special test dependencies
+  - Needs dart-sass-embedded
+---
+ hugolib/page_test.go                                          | 1 +
+ modules/client_test.go                                        | 4 ++++
+ releaser/git_test.go                                          | 3 +++
+ .../resource_transformers/tocss/dartsass/integration_test.go  | 1 +
+ .../resource_transformers/tocss/scss/integration_test.go      | 1 +
+ 5 files changed, 10 insertions(+)
+
+diff --git a/hugolib/page_test.go b/hugolib/page_test.go
+index d29a4f8..7cdff73 100644
+--- a/hugolib/page_test.go
++++ b/hugolib/page_test.go
+@@ -1025,6 +1025,7 @@ func TestPageWithDate(t *testing.T) {
+ }
+ 
+ func TestPageWithLastmodFromGitInfo(t *testing.T) {
++	t.Skip("We are not in a git repo")
+ 	if htesting.IsCI() {
+ 		// TODO(bep) figure out why this fails on GitHub actions.
+ 		t.Skip("Skip GitInfo test on CI")
+diff --git a/modules/client_test.go b/modules/client_test.go
+index 75e3c2b..235d6ed 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/releaser/git_test.go b/releaser/git_test.go
+index ff77eb8..1f40a6f 100644
+--- a/releaser/git_test.go
++++ b/releaser/git_test.go
+@@ -20,6 +20,7 @@ import (
+ )
+ 
+ func TestGitInfos(t *testing.T) {
++	t.Skip("We are not in a git repo")
+ 	c := qt.New(t)
+ 	skipIfCI(t)
+ 	infos, err := getGitInfos("v0.20", "hugo", "", false)
+@@ -58,6 +59,7 @@ Streets #20.
+ }
+ 
+ func TestGitVersionTagBefore(t *testing.T) {
++	t.Skip("We are not in a git repo")
+ 	skipIfCI(t)
+ 	c := qt.New(t)
+ 	v1, err := gitVersionTagBefore("v0.18")
+@@ -66,6 +68,7 @@ func TestGitVersionTagBefore(t *testing.T) {
+ }
+ 
+ func TestTagExists(t *testing.T) {
++	t.Skip("We are not in a git repo")
+ 	skipIfCI(t)
+ 	c := qt.New(t)
+ 	b1, err := tagExists("v0.18")
+diff --git a/resources/resource_transformers/tocss/dartsass/integration_test.go b/resources/resource_transformers/tocss/dartsass/integration_test.go
+index a1ac1d5..fcd8bf5 100644
+--- a/resources/resource_transformers/tocss/dartsass/integration_test.go
++++ b/resources/resource_transformers/tocss/dartsass/integration_test.go
+@@ -106,6 +106,7 @@ T1: {{ $r.Content | safeHTML }}
+ }
+ 
+ func TestTransformThemeOverrides(t *testing.T) {
++	t.Skip("Needs dart-sass-embedded")
+ 	if !dartsass.Supports() {
+ 		t.Skip()
+ 	}
+diff --git a/resources/resource_transformers/tocss/scss/integration_test.go b/resources/resource_transformers/tocss/scss/integration_test.go
+index cbc7e19..f2a6034 100644
+--- a/resources/resource_transformers/tocss/scss/integration_test.go
++++ b/resources/resource_transformers/tocss/scss/integration_test.go
+@@ -111,6 +111,7 @@ moo {
+ }
+ 
+ func TestTransformThemeOverrides(t *testing.T) {
++	t.Skip("Needs dart-sass-embedded")
+ 	if !scss.Supports() {
+ 		t.Skip()
+ 	}
+-- 
+2.35.1
+
diff --git a/www-apps/hugo/files/hugo-0.96.0-unbundle-libwebp-and-libsass.patch b/www-apps/hugo/files/hugo-0.96.0-unbundle-libwebp-and-libsass.patch
new file mode 100644
index 000000000000..f9efee48cc48
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.96.0-unbundle-libwebp-and-libsass.patch
@@ -0,0 +1,44 @@
+From 0a44245bf6cfe103bb163f51f230eeccd69ab8c7 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Tue, 29 Mar 2022 21:03:15 +0200
+Subject: [PATCH] Unbundle libwebp and libsass
+
+Use libwebp and libsass from the system instead of the bundled ones.
+---
+ .../github.com/bep/golibsass/internal/libsass/a__cgo.go   | 8 ++++----
+ vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go   | 3 ++-
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
+index af51b92..6b5e78b 100644
+--- a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
++++ b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
+@@ -5,9 +5,9 @@
+ //
+ package libsass
+ 
+-// #cgo CFLAGS: -O2 -fPIC
+-// #cgo CPPFLAGS: -I../../libsass_src/include
+-// #cgo CXXFLAGS: -g -std=c++0x -O2 -fPIC
+-// #cgo LDFLAGS: -lstdc++ -lm
++// #cgo CFLAGS: -fPIC
++// #cgo CPPFLAGS: -DUSE_LIBSASS_SRC
++// #cgo CXXFLAGS: -std=c++0x -fPIC
++// #cgo LDFLAGS: -lstdc++ -lm -lsass
+ // #cgo darwin linux LDFLAGS: -ldl
+ import "C"
+diff --git a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
+index 4b105ab..33f429e 100644
+--- a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
++++ b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
+@@ -2,5 +2,6 @@
+ 
+ package libwebp
+ 
+-// #cgo linux LDFLAGS: -lm
++// #cgo linux LDFLAGS: -lm -lwebp
++// #cgo CFLAGS: -DLIBWEBP_NO_SRC
+ import "C"
+-- 
+2.35.1
+
diff --git a/www-apps/hugo/hugo-0.96.0.ebuild b/www-apps/hugo/hugo-0.96.0.ebuild
new file mode 100644
index 000000000000..50ae5b3634cf
--- /dev/null
+++ b/www-apps/hugo/hugo-0.96.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module bash-completion-r1
+
+DESCRIPTION="Fast static HTML and CSS website generator"
+HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
+SRC_URI="
+	https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://tastytea.de/files/${P}-vendor.tar.xz
+"
+
+# NOTE: To create the vendor tarball, run:
+# `go mod vendor && cd .. && tar -cJf ${P}-vendor.tar.xz ${P}/vendor`
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +sass test test-full"
+
+BDEPEND="
+	>=dev-lang/go-1.18
+	test? (
+		dev-python/docutils
+		dev-ruby/asciidoctor
+		test-full? ( app-text/pandoc )
+	)
+"
+RDEPEND="
+	media-libs/libwebp:=
+	sass? ( dev-libs/libsass:= )
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.96.0-unbundle-libwebp-and-libsass.patch"
+	"${FILESDIR}/${PN}-0.96.0-skip-some-tests.patch"
+)
+
+src_configure() {
+	export CGO_ENABLED=1
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+
+	MY_BUILDFLAGS="$(usev sass "-tags extended")"
+
+	default
+}
+
+src_compile() {
+	mkdir -pv bin || die
+	ego build -ldflags "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=gentoo:${PVR}" \
+		${MY_BUILDFLAGS} -o "${S}/bin/hugo"
+
+	bin/hugo gen man --dir man || die
+
+	mkdir -pv completions || die
+	bin/hugo completion bash > completions/hugo || die
+	bin/hugo completion fish > completions/hugo.fish || die
+	bin/hugo completion zsh > completions/_hugo || die
+
+	if use doc ; then
+		bin/hugo gen doc --dir doc || die
+	fi
+}
+
+src_test() {
+	ego test -race "./..." ${MY_BUILDFLAGS}
+}
+
+src_install() {
+	dobin bin/*
+	doman man/*
+
+	dobashcomp completions/${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/${PN}.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/_${PN}
+
+	if use doc ; then
+		dodoc -r doc/*
+	fi
+}
diff --git a/www-apps/hugo/metadata.xml b/www-apps/hugo/metadata.xml
index d3bce6b51931..c1a8bfb7f195 100644
--- a/www-apps/hugo/metadata.xml
+++ b/www-apps/hugo/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="sass">Enable SASS/SCSS support</flag>
+		<flag name="test-full">Pull optional heavier test-dependency packages</flag>
 	</use>
 	<upstream>
 	<remote-id type="github">gohugoio/hugo</remote-id>
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 0fa5f55a7778..389e4dec7cce 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,6 +1,8 @@
 DIST icingaweb2-2.10.0.tar.gz 11491028 BLAKE2B bee48e59ec7d0a564e7056986a84fda9639e61ed82ea65d35da310916e7058837fc146ee06f2c044748f72424198dc42f75b32de4b6ab39f673e2a9bbaf46966 SHA512 e26a4382970ece503c18ac9f93bb9e7ac24fd827dd84fd04352aeeff796ab58dac747840c6153cea5711d548603f219ba32aeffe76d87359ea72f2d3a598468b
+DIST icingaweb2-2.10.1.tar.gz 11490414 BLAKE2B 897d5dcb4774db42651b53937f2bf80810b9a8d3eccb10bb733ce7b083e4eeea5673ee7cab75d24602871b72d44d84f7c1a6faec28c1ff4d2bd404a7d39d7ba2 SHA512 ba77ddeb27fb0ab1c6f7a77020eb9490803e1bf2d37186c7efc06bd250301a7d50f669699196d3a3208da9d5606edc787f62f34cdd15343e2c55020b77e485d8
 DIST icingaweb2-2.9.6.tar.gz 12313930 BLAKE2B 696b882fc1bb0fd0452dca9e8b13b336181d953c05ab43c1db38073aa817496ca431dfb0f68adab0a6eae7c2238878dda98a57d8b69b2bc19ed94f1afbd26fe5 SHA512 507ce9ab8e31f0afc19de173c56e9ce2986c9c2e945ff3516e005b49a69993ccb00ec53d4c53bc0beee865cebc533b4b91b0d7707abf9d30d4cb76b7545fb6a4
 EBUILD icingaweb2-2.10.0.ebuild 2531 BLAKE2B 53f83accfd9a604c1c9ca85371379b8d6fda8df18dc0d0459a93549d3504fdd37cba3ca23deaeb7e28165fa56974d126bcc227a4f7459c4b92d885b4d2432dd1 SHA512 7fe3b7cb49979ce01fb96be9d7a887c2c540b521aac120cbc3437e371dedad178d8a9874574885845dce17642aedc1f9a7799164e5495c92aad7e5f29b6a7711
+EBUILD icingaweb2-2.10.1.ebuild 2531 BLAKE2B 53f83accfd9a604c1c9ca85371379b8d6fda8df18dc0d0459a93549d3504fdd37cba3ca23deaeb7e28165fa56974d126bcc227a4f7459c4b92d885b4d2432dd1 SHA512 7fe3b7cb49979ce01fb96be9d7a887c2c540b521aac120cbc3437e371dedad178d8a9874574885845dce17642aedc1f9a7799164e5495c92aad7e5f29b6a7711
 EBUILD icingaweb2-2.9.6.ebuild 2529 BLAKE2B 0bff09ed4258d2674a3e1ec780e6b7aa0d87cbcba5771af2ea2aae5fc10381f73f9b9434f09e3730c07d3ddcfdd2809f5b33273dd169f0c7ce808694d772c2ad SHA512 b9a0b279ac1606370ce0b238638c9a328990ffa977a50a21c61ad25b46d800e689b18c5eb8989e83a94a75a0d5afff3548989565a62bb3b6ab1551a8b17c2171
 EBUILD icingaweb2-9999.ebuild 2531 BLAKE2B 3f5f8503d3157d485a7d20ee78f92d6cd1fb8948a7ae314a796e79c0379ab9b96fb7f57589fac9ad653cfad6eae4dfa04b67ec1064cad3e9bdd5915c8bebaaeb SHA512 564852d6c04c14e98870a205a72c1ab5d2c4e712b9a71bd84112fce7d44d5652835213375ef7e684dc752be05869cd91f6f3d32168bcdbf2c37c2b44ccbcdda8
 MISC metadata.xml 444 BLAKE2B bf24467286f442770ed78cb298cd0fc1d37786b06e85bbc4b20a8c750764e7a831828ebc9b7872772f0a286b12cb67491cb1f84f189cf00e2ec59a6b921e760f SHA512 55e57997695e09ad9cc8448030e8470a0e39a1cbc610f70e29c2a68a4f287e54cb816b0cd1ceec611112849ba97225a60560b67368fb3a6ed68a73a728d61d83
diff --git a/www-apps/icingaweb2/icingaweb2-2.10.1.ebuild b/www-apps/icingaweb2/icingaweb2-2.10.1.ebuild
new file mode 100644
index 000000000000..1c12f98d4b39
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.10.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit depend.apache multilib
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
+REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+		dev-php/pecl-imagick
+		pdf? ( media-gfx/imagemagick[png] )
+		apache2-server? ( >=www-servers/apache-2.4.0 )
+		nginx? ( >=www-servers/nginx-1.7.0:* )
+		|| (
+			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+		)
+		dev-libs/icinga-php-library
+		dev-libs/icinga-php-thirdparty
+		acct-group/icingacmd
+		acct-group/icingaweb2"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
+}
+
+pkg_config() {
+	if [[ -d /etc/icingaweb2 ]] ; then
+		einfo "Updating existing installation ..."
+	else
+		einfo "Running first time setup ..."
+		einfo "Creating configuration directory ..."
+		/usr/share/${PN}/bin/icingacli setup config directory
+		einfo "Creating authentication token for web setup ..."
+		/usr/share/${PN}/bin/icingacli setup token create
+		if use apache2 ; then
+			einfo "The following might be useful for your Apache2 configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
+		fi
+		if use nginx ; then
+			einfo "The following might be useful for your NGinx configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
+		fi
+	fi
+	einfo "All done."
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r "${S}"/*
+	fperms -R a+rX "/usr/share/${PN}/public/"
+	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
+	fowners root:icingaweb2 "/usr/share/${PN}/bin/icingacli"
+}
+
+pkg_postinst() {
+	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}
diff --git a/www-apps/nanoc-checking/Manifest b/www-apps/nanoc-checking/Manifest
index aca631d25256..78554d1f222b 100644
--- a/www-apps/nanoc-checking/Manifest
+++ b/www-apps/nanoc-checking/Manifest
@@ -1,3 +1,5 @@
 DIST nanoc-checking-1.0.1.gem 10752 BLAKE2B 6f6f10cf97ab17cc328d827ab19490fa6e9d6f744594c167b4d9bf050c1288a7d5657d290402efbfa8d61d8e81550feae5022720464814e27af06d5025dfde96 SHA512 ef2b5a9c044f9bef19e4c75cc9ee99747a2ff0f8bece23c56d763f59c622488ccd980a19a3563207948fdb0d9edb91e86703778f7233bc0de76adf385c5694b0
+DIST nanoc-checking-1.0.2.gem 11264 BLAKE2B 5ac338624bd85decb52ad4d59cff466ba849bd03c4b27534db34528db3fa768c1c198461bd35614203f352426105ea541c3dd0da2dff27a8430aa600a756f1fc SHA512 29fcd816f908bd7fdc2895e549d4cd0834ac53f8fc1bf8a9cf12e385cc9a1cabcca87178014beffe6b1b9f63b68d4bfe89096234ec72d3abc37dc8cc906eff24
 EBUILD nanoc-checking-1.0.1.ebuild 589 BLAKE2B 87f1d0b73aeaf813b51eb42f2cf81ce9d53060af52eb729be73b75db8a29a603373f4a9aeab65309c6547b78ee6d5899ee108d4282f9d933cf4eee2bc4895a51 SHA512 d9f7b4cd2fd45c7b4b50fb2373afb625d0bb883bbbff88db5cb1ff742bbd37df0ac2c02cb6ba925a18ab8dbcbf8944d42525a208aba247131944e6d6d4b79893
+EBUILD nanoc-checking-1.0.2.ebuild 587 BLAKE2B a82ccafe5ba20782621f624c4f4b5fe517437f76153898c30660b35c1074863c75ac194cbe4c5dc83975d777c258b070afab12eca8f5e009f1d3a4ebd6cb2fa7 SHA512 32ed0c487f1559c84d4bc34257e775fd2afd8f497a49a9624ee1116069f97520cbed65c401dcc4c81ffa2989d8a50ba17d0fb2008b194d9a65e6a05bd8fa4e37
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-checking/nanoc-checking-1.0.2.ebuild b/www-apps/nanoc-checking/nanoc-checking-1.0.2.ebuild
new file mode 100644
index 000000000000..b82ea09aba08
--- /dev/null
+++ b/www-apps/nanoc-checking/nanoc-checking-1.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+# Upstream has specs but they are not available in the gem and the
+# repository upstream is not tagged for this.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides checking functionality for Nanoc"
+HOMEPAGE="https://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~riscv"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "
+	>=www-apps/nanoc-cli-4.12.4:0
+	>=www-apps/nanoc-core-4.12.4:0
+"
diff --git a/www-apps/nanoc-cli/Manifest b/www-apps/nanoc-cli/Manifest
index dea0b61f6929..783701fa9a98 100644
--- a/www-apps/nanoc-cli/Manifest
+++ b/www-apps/nanoc-cli/Manifest
@@ -1,5 +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
 EBUILD nanoc-cli-4.12.2.ebuild 2029 BLAKE2B fda269aacc8243a30aebe529c8b0d8cadb2db6f06408c47dd9cfe11714cbebf11ba83d646f5d4319776636add2c24dec403864ae4a49b990bc5a82aecd8b6d12 SHA512 ca60a110fa12c27a43ff232785db3a94c9121b6a86b5e6508f06ffcf3f96fffe8db077030b691e0e238099c838acbe1a049042b04ab97e5a81d98fbf2e6fc33c
 EBUILD nanoc-cli-4.12.3.ebuild 2036 BLAKE2B e621d893406f3d5140b434e8a015117265352ead95b9f5659db812dd3e5342f36ab5c4579b828a716876e7dfd7f2ff3a992e6dc4e3d1d9e681bbff17c39c4f80 SHA512 32f48b02456d3b31c716ef2cd155cc8868c89cf3c64b204c19dd9549c0b15d083d234f7565c7985028a340ec9410a4d38bdada505440504b56c86a4a3369f252
+EBUILD nanoc-cli-4.12.5.ebuild 2036 BLAKE2B e621d893406f3d5140b434e8a015117265352ead95b9f5659db812dd3e5342f36ab5c4579b828a716876e7dfd7f2ff3a992e6dc4e3d1d9e681bbff17c39c4f80 SHA512 32f48b02456d3b31c716ef2cd155cc8868c89cf3c64b204c19dd9549c0b15d083d234f7565c7985028a340ec9410a4d38bdada505440504b56c86a4a3369f252
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-cli/nanoc-cli-4.12.5.ebuild b/www-apps/nanoc-cli/nanoc-cli-4.12.5.ebuild
new file mode 100644
index 000000000000..e3d36dce2df6
--- /dev/null
+++ b/www-apps/nanoc-cli/nanoc-cli-4.12.5.ebuild
@@ -0,0 +1,70 @@
+# 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="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+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
+)
+"
+
+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-core/Manifest b/www-apps/nanoc-core/Manifest
index 9776db16e9c6..216c26ddc3ac 100644
--- a/www-apps/nanoc-core/Manifest
+++ b/www-apps/nanoc-core/Manifest
@@ -2,7 +2,9 @@ AUX nanoc-core-4.12.2-contracts.patch 543 BLAKE2B 374bc86e4351627693d85517f24a82
 DIST nanoc-core-4.11.12.tar.gz 310160 BLAKE2B ef34bf6d28d5a9287053a939ef14bc59f99bde003d7bbcd7eee861ab882a6beaa48812137c8ad87fe464d27e371cfd40022467f8d10ac5f85ff16ef19215e340 SHA512 0503d0a6a0cf1ca9a9c57b831f320abb5102a3e7aa82c016d1f72c4d9f614ef53a0e4df30d50e05a98107fecacae4d70dfa5ee5c15910d575bc30df411430863
 DIST nanoc-core-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c6550378465d85e63c498c5773c1dcd49d685b7d4367488300394c2f5bf9e6a6dc6aea589617a27fe1bd6ed4a SHA512 3fe574c061d8d0dd034137800c88a34844d246e6ab9a7816aadb03cd2c43b5fe6d614f42e6b41bcd4df98be551edc69e35ca992f2d5ee8158f9c7eb3c7635750
 DIST nanoc-core-4.12.3.tar.gz 332692 BLAKE2B 8ae106366c66500ed06be841382bc1cc52c68ebc7ebec47a3f9dab278c7e17f886d0ce18c81ff73a83ec672353503155b447dfff5ba46f16bc2bfe891bb028a5 SHA512 737ce993c529643440d74e5072e2d63c2ce970d4d7637e7f225a79d3ac38907ced84928340d7bf5f11bcd02188b5cb1df0d4b03a8e000878ed924ab943db33a2
+DIST nanoc-core-4.12.5.tar.gz 333312 BLAKE2B bdc50ba2868313f7b427a8292c8614230e9dcf472c5290e8fff39917cd5cedad217acbc36ef8524254c9839d965d824a98c99f9effa1e8cfb549e387d69f1032 SHA512 2e533076f62605a701275fd7813b6dbe09c2530ad38fb86db3a5d999bccd8f5ac93cf684ac882f00d81bbe1ec8cce69d45ecef1488efe3caf22f6a6ffca300e2
 EBUILD nanoc-core-4.11.12.ebuild 1601 BLAKE2B ab3a233a247f06871d20933a6bb29a6068eda5ae147b0c6dc26ac3bcdb42a1fb81c7bfe4d15c986fc46f7be10067d798f69a63dd2d840c9dc8dfb24924b29202 SHA512 6d11d1cbbb7465dab60af40b2c83887397ca5948b138bbe169753c5a6d5e189127cb9662c064731d555757b792a0e4351aaa062b46e3602e34ccadfd5211f665
 EBUILD nanoc-core-4.12.2.ebuild 1920 BLAKE2B 54f3f3f9651061564e236ebd37a5d48d84f3dfb37849d4c2872454ee376e478132baeddf2d78488507633ac16ffbdcb440e3e3a414f4a31c17c1ca509586a9f8 SHA512 98dff23360020f0d0ef1e351f15f4c9270b9d4d6a77b5e5fbad019c2b1134b5a795d34c9b71339fb02244c2e654b6252365ab65f485c9a6e8319fbfdca192fc9
 EBUILD nanoc-core-4.12.3.ebuild 1935 BLAKE2B e41f23641b20bbd234c59981df1bdb968764fea169c48e058886c3f81d32684f8fa09e2f1aa7a92194d936c8807cd5494b71ad06122984f0e61dbd0a055f8b52 SHA512 6f076de31c575e20d9b71703ad99bdd080adb9b3e103655ff11591a766461a36d20085c7acd37a8afe846a4365ea23b58d3f467755ef5696548d66c178c4e977
+EBUILD nanoc-core-4.12.5.ebuild 1941 BLAKE2B 703e9b630a575007537b6060daa44e1f3a6505a324d1106fc5cfabc68e61a39c420ab888d6434e6a78c2a08152a436ee79ffce9b63efd8a29f35060d8c0b638f SHA512 b6b4afb7493fc4631754f9b7fa70ca78cee405e5958cdb5c8decb22ac5544a2d8f61798c640d87267adfecad47699fc137606459b083feb2bbc36affba166f85
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-core/nanoc-core-4.12.5.ebuild b/www-apps/nanoc-core/nanoc-core-4.12.5.ebuild
new file mode 100644
index 000000000000..516b261eb552
--- /dev/null
+++ b/www-apps/nanoc-core/nanoc-core-4.12.5.ebuild
@@ -0,0 +1,75 @@
+# 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="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+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/hamster-3*
+	>=dev-ruby/json_schema-0.19:0
+	>=dev-ruby/memo_wise-1.5:1
+	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 -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+	sed -i -e '1i 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
+
+	# 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/Manifest b/www-apps/nanoc/Manifest
index 69ebdcb01f49..f08ec7172b5a 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,7 +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
 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
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc/nanoc-4.12.5.ebuild b/www-apps/nanoc/nanoc-4.12.5.ebuild
new file mode 100644
index 000000000000..ea8e757d951a
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.12.5.ebuild
@@ -0,0 +1,95 @@
+# 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.ws/"
+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:^:#:' ../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/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 78e42f026a8a..78e086571bea 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,22 +1,12 @@
 AUX php-argon2-en.txt 416 BLAKE2B 9940a3e218d1db382790f4754352594c9098eccce7426729e75471f017e15bb45b50cc885609e54817077e36d9feb4484bcff5b40c4f669ad80d4d5a643da8bc SHA512 076bbbfb9305a2608b60fb7f9802a5a455c5d049d39c8f209eadac1a306ba2015d11a30b4544d8cdf43025077a3c3087f3e9922cd9b530a08c089a7818590115
 DIST nextcloud-21.0.5.tar.bz2 127542660 BLAKE2B b6c2bc642705ba5572a74a1f473e09a7be0ad6c4937b1a15d3b29bdad652872c373b9b6ab126c1ea90f32dced3fbb34505c82a7fc9d6913e407c6e43b97fe55b SHA512 ef8796cb17e6143dc1c9ccdea56105d0d7e2138eddae228724074b6360f99d0416a3682be047955b9a84dd6a961cdbb15ccff67ee6656a896699bbfa640d715d
-DIST nextcloud-21.0.8.tar.bz2 127759792 BLAKE2B 80628713ca3b3805fd81be4ecff6f084789c7fcabb01091b151c202c537aede8edbd4fafe08a0ed8398b41d0d8657b7bbb4e3d373017988c77af807923520fca SHA512 c31df7bb4b48bfdb2d5899938c58f776a214bb444b313d50768f479b1bfc19e5c48bd8b5cd062bc3bd9d85d0e7358a3bc7b684f87ef55ba67e60ffe5d2242d96
 DIST nextcloud-21.0.9.tar.bz2 128237860 BLAKE2B 665d6c43300a595d745af3a2496e9865c5eedb84d99fcd94266fed8f6fd4889adc7dbbfbdccbd043ce5b68eea1af37f0513dc7b497fd585822bbcdab12507bce SHA512 77028d0064b171addaee9569b5d60b617b3d27ce86791393edcf099c5c2674e1f323932810fcba48869bc6b69e76fe9bdbab60ee02d7664b5fd91062e4e6822d
-DIST nextcloud-22.2.4.tar.bz2 131112732 BLAKE2B 7122df7d127c5f4a09f47de14cec8113c4024977512ffbb43970f7d342239361e2018035eb289ac740535238d644aa9e03664d7f4ecef558d9efa0560f802091 SHA512 94c8913cc9971be58dffd3b8f5438e544df7a8255e0a661139e44ccfd0f04fe218375218032e1db19ee6d08a8db1723d023662b65ffb754b464f1f469fabad36
-DIST nextcloud-22.2.5.tar.bz2 131058728 BLAKE2B 6cb2238aed99342ecd61700e7bc2db64eeefd94bb212ee729ec9b3a9fde0e985470cb4bbe70640a0ba51381b41b021d9c85137de32d2538fa0f2f6e63bd72280 SHA512 973151d28108fc428e6c9d1e7d4470c6f9b81f79a3244dca85bbcc74d9c226e2dbe51eb9b2b203d030f589e76bee0cd36ab146b331cc889cae56338218cfa021
 DIST nextcloud-22.2.6.tar.bz2 131746258 BLAKE2B 4a259b13beb1c061a0c789b87f7d3fbc82154f4784ce3c616f1d1e1d8d4bb383a46586a1e5c3e30f2545d8447b633c7c5a114dba8d583c0b8a285d69ee762093 SHA512 e221026b08096c7a99043a37300a33f0396f475b121406e4d2c6fe295b4bd3d8d21ecf0c2b5a352b0ca5a66fdb6f882a945ed8ecb2cc5b3c54ad27681d78b3bf
 DIST nextcloud-23.0.0.tar.bz2 138156149 BLAKE2B 2dc00a1b522b51baa368a19628e354a674af1428e062595ccf75cb8541f497c1b2f8ed4f301cc0b5136382526e0e0c6ea1405f2d08a748b8fa2caf95d70c3d89 SHA512 fba9f03c37a4d3f5e44472218fc50a49157872ae7c1aaaa3bc0c1c0301a97394690f75cf03cd11b3f9b0f282fef29eea189fa52ee5019f40a0d6f671ddda6706
-DIST nextcloud-23.0.1.tar.bz2 139850037 BLAKE2B 7b878035b6c760ae95ea87c73496917c904c944a28e5c49055f65dbe18db6ce2057610426732fdfc3f504aae670cc968c53beb62e1148c84c176719a32b0f90b SHA512 38355386b98b1d8dd15c93acbd59cdbe7ba95620833353e89487da47827fce28ab3442142afa70ffd6a1005f87f16a3099d7b270ba946bb932008e68054a2a9e
-DIST nextcloud-23.0.2.tar.bz2 139878469 BLAKE2B a0d4b8be3f76ea217711e3006346e4db7d9463fa3883a93630457db8675f64fdb33d34ef4cb54abb21bc6157ac01469bdb13986d61241e8da1e43646d9af9b96 SHA512 0c033a39a13daf2be1f6720908ca0052659995458ad6ab3c22147761a10d62da1ad0fb9f0c1090b4e8ba993729b95cad02e9b39b6a682a02c832329c2fbe68f9
 DIST nextcloud-23.0.3.tar.bz2 139983015 BLAKE2B 271d247d66c80e2b342e435ec5b1a627703e09adc373e52a3bfe0a0802b698759c25904e6c489033ba3f6028155b5c0c5bcbcb2378089eddefe2dd967ecabe4b SHA512 406e9c0615447ffa9f77104e067d1d6b73262d78388e531ebcd8de3a759260a26bf08461997a8513ce910b8de81775d6ccad65a26f38e159014aebf6a555aa23
 EBUILD nextcloud-21.0.5.ebuild 1081 BLAKE2B 89d3edc2aa3f41b8bfc2a1a1d59d886d71c77b41c4681e1abff33471e5a336c4b800872d2f3369325ee15c7b9eafeec51d65e6de113017345753ce416f9e732c SHA512 c5fcae9887cdc570c820c94314319b9c597418be7ad378fa78d7c6a16481fadb850a3d6fb6ba8b0973c46c159fee3f56da9c5e6409ab435258aaab0a824893bc
-EBUILD nextcloud-21.0.8.ebuild 1083 BLAKE2B b036df116d245be11fb8ac26716cb0e26e8a910b05150d5377b10ff84275f48b02c04f4c2b477f06f76564992dbaa391b45555d44714afc306941c3e45586f42 SHA512 46430f577e15de602f40a5470c1d5a13de049d08c7879c144e8bffe7eb32135b294f0f403a2b3cadd54d1fd522892d4937b8d3c049b232533dfc1685f894fe37
 EBUILD nextcloud-21.0.9.ebuild 1083 BLAKE2B b036df116d245be11fb8ac26716cb0e26e8a910b05150d5377b10ff84275f48b02c04f4c2b477f06f76564992dbaa391b45555d44714afc306941c3e45586f42 SHA512 46430f577e15de602f40a5470c1d5a13de049d08c7879c144e8bffe7eb32135b294f0f403a2b3cadd54d1fd522892d4937b8d3c049b232533dfc1685f894fe37
-EBUILD nextcloud-22.2.4.ebuild 1083 BLAKE2B b036df116d245be11fb8ac26716cb0e26e8a910b05150d5377b10ff84275f48b02c04f4c2b477f06f76564992dbaa391b45555d44714afc306941c3e45586f42 SHA512 46430f577e15de602f40a5470c1d5a13de049d08c7879c144e8bffe7eb32135b294f0f403a2b3cadd54d1fd522892d4937b8d3c049b232533dfc1685f894fe37
-EBUILD nextcloud-22.2.5.ebuild 1083 BLAKE2B b036df116d245be11fb8ac26716cb0e26e8a910b05150d5377b10ff84275f48b02c04f4c2b477f06f76564992dbaa391b45555d44714afc306941c3e45586f42 SHA512 46430f577e15de602f40a5470c1d5a13de049d08c7879c144e8bffe7eb32135b294f0f403a2b3cadd54d1fd522892d4937b8d3c049b232533dfc1685f894fe37
 EBUILD nextcloud-22.2.6.ebuild 1083 BLAKE2B b036df116d245be11fb8ac26716cb0e26e8a910b05150d5377b10ff84275f48b02c04f4c2b477f06f76564992dbaa391b45555d44714afc306941c3e45586f42 SHA512 46430f577e15de602f40a5470c1d5a13de049d08c7879c144e8bffe7eb32135b294f0f403a2b3cadd54d1fd522892d4937b8d3c049b232533dfc1685f894fe37
 EBUILD nextcloud-23.0.0.ebuild 1081 BLAKE2B 12416bb95d60bbc1a105a62079176135b65fe17e05b4008991e5c8b17fee813bdefb24dba9911315a54de1fb1325236a59f9ab6b3b8b0e38e4a7bbfb0a044567 SHA512 bfbdc2cc665179a1d4ed9bcaa34c8284bce1e78e2f987cc2f490e8d52b010fe3c1e00e8201e729b895cc45614863731a9d6c3b5dcc72e04604eea530fe63ffc4
-EBUILD nextcloud-23.0.1.ebuild 1083 BLAKE2B b036df116d245be11fb8ac26716cb0e26e8a910b05150d5377b10ff84275f48b02c04f4c2b477f06f76564992dbaa391b45555d44714afc306941c3e45586f42 SHA512 46430f577e15de602f40a5470c1d5a13de049d08c7879c144e8bffe7eb32135b294f0f403a2b3cadd54d1fd522892d4937b8d3c049b232533dfc1685f894fe37
-EBUILD nextcloud-23.0.2.ebuild 1083 BLAKE2B b036df116d245be11fb8ac26716cb0e26e8a910b05150d5377b10ff84275f48b02c04f4c2b477f06f76564992dbaa391b45555d44714afc306941c3e45586f42 SHA512 46430f577e15de602f40a5470c1d5a13de049d08c7879c144e8bffe7eb32135b294f0f403a2b3cadd54d1fd522892d4937b8d3c049b232533dfc1685f894fe37
-EBUILD nextcloud-23.0.3.ebuild 1083 BLAKE2B b036df116d245be11fb8ac26716cb0e26e8a910b05150d5377b10ff84275f48b02c04f4c2b477f06f76564992dbaa391b45555d44714afc306941c3e45586f42 SHA512 46430f577e15de602f40a5470c1d5a13de049d08c7879c144e8bffe7eb32135b294f0f403a2b3cadd54d1fd522892d4937b8d3c049b232533dfc1685f894fe37
+EBUILD nextcloud-23.0.3.ebuild 1081 BLAKE2B 12416bb95d60bbc1a105a62079176135b65fe17e05b4008991e5c8b17fee813bdefb24dba9911315a54de1fb1325236a59f9ab6b3b8b0e38e4a7bbfb0a044567 SHA512 bfbdc2cc665179a1d4ed9bcaa34c8284bce1e78e2f987cc2f490e8d52b010fe3c1e00e8201e729b895cc45614863731a9d6c3b5dcc72e04604eea530fe63ffc4
 MISC metadata.xml 645 BLAKE2B 1347bd3fcd02b3e541da305002e905cfc9114307ef1988401e6f8443d54e73b897a37557e4ae1e225ffde3897d6b0d448a0a0859cfab6d81d11b1b9226a734cf SHA512 1aa361e4cf6c13ffa18945645ecf7754721397ef6aa289e56e532435e69d1024e94714907f2c3870b7e0b234f329ec6592e62c69969de69499597f25b64ac0d5
diff --git a/www-apps/nextcloud/nextcloud-21.0.8.ebuild b/www-apps/nextcloud/nextcloud-21.0.8.ebuild
deleted file mode 100644
index b49730459a5f..000000000000
--- a/www-apps/nextcloud/nextcloud-21.0.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-22.2.4.ebuild b/www-apps/nextcloud/nextcloud-22.2.4.ebuild
deleted file mode 100644
index b49730459a5f..000000000000
--- a/www-apps/nextcloud/nextcloud-22.2.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-22.2.5.ebuild b/www-apps/nextcloud/nextcloud-22.2.5.ebuild
deleted file mode 100644
index b49730459a5f..000000000000
--- a/www-apps/nextcloud/nextcloud-22.2.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-23.0.1.ebuild b/www-apps/nextcloud/nextcloud-23.0.1.ebuild
deleted file mode 100644
index b49730459a5f..000000000000
--- a/www-apps/nextcloud/nextcloud-23.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-23.0.2.ebuild b/www-apps/nextcloud/nextcloud-23.0.2.ebuild
deleted file mode 100644
index b49730459a5f..000000000000
--- a/www-apps/nextcloud/nextcloud-23.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-23.0.3.ebuild b/www-apps/nextcloud/nextcloud-23.0.3.ebuild
index b49730459a5f..b398da7a1cb9 100644
--- a/www-apps/nextcloud/nextcloud-23.0.3.ebuild
+++ b/www-apps/nextcloud/nextcloud-23.0.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://nextcloud.com/"
 SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
 LICENSE="AGPL-3"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+curl +imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/www-apps/rocketwiki-lqfb/Manifest b/www-apps/rocketwiki-lqfb/Manifest
deleted file mode 100644
index 5c1ee72dd869..000000000000
--- a/www-apps/rocketwiki-lqfb/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX rocketwiki-lqfb-0.4-parsec1.patch 508 BLAKE2B 50310abebefc331c0d430c17bd54001d31d1b15e45fa4352c870ed90c1f6dfa537ed6c4c1ab53950ade38ea69635f806af604c8b5f2ab52c6c99b27a854fbc46 SHA512 f8a71191b153551b4bcdaddc66ebec4be191b9ce125d79d2b02de2758ed96da96cf486e7f7f37bf7b1a7a51c9a95494ffa6d36fd1ff343525d913e1138a96531
-AUX rocketwiki-lqfb-0.4-utf8.patch 1164 BLAKE2B e333d743d213fc84e20565c8ee3041c3293b4cdde85a13455fdb3f9c796a0499356386235cf2a170e485ceaa91a013ea81be8fc9a8eefb90ab767f1c4fb0eef2 SHA512 91a92b8c024ff593092f4e66d9b474c2e24d52ab0277945bc5a95a415f2e2cb23cfb05881cf665e091e9201beef9ac9d14da71138ca09e0db3c6551bd5b77c1b
-DIST rocketwiki-lqfb-v0.4.tar.gz 5274 BLAKE2B f26390e0c238a0c8453ca15417396d87e9a6c3da2bad9bd0d02061ccf083114e83713eed268541bb6f1d04587083cf8cc24454f4719700b34b1e046f8c42e006 SHA512 fa90b317007c42e2e6d36c79773948ab7ab68ee914bd20825e0d5acbb8bf0add2c0a48119440d8a5b4c991f2d1f59bc83a1835b02d9070ae67fca1d4ffb73caf
-EBUILD rocketwiki-lqfb-0.4.ebuild 653 BLAKE2B d5915441eb418dc09051bef0d371779c71c494c1f0ce11278cd936dfd239e055c822d993e4b6c72b5f64a7ce1327b24d9da1eded063eab3d95bc78406245dd59 SHA512 503966be7cd5a96e7bea61342c371c93b44b34564bc81c93a6f252095b54143518aa94871e043f8ee9dd6f610a51fe1f291d3e703c45c3eaae8bf183389f5b59
-MISC metadata.xml 503 BLAKE2B 441bc80a82552191ed32757d239f6357715d5d2355279541953c25d88a5153306f3eb9f02a4e0ac018396c7f244578ba4a5389bb1bd6187c11763bb8ca551e6f SHA512 a21e18ca7146362963b4a1534fafa175c36ebf688a786b8a2779702758203d1f5ae3c18b48d6b56b40702ca5b3119f569d928790d05dc9f88c3d9d2b79044d5c
diff --git a/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-parsec1.patch b/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-parsec1.patch
deleted file mode 100644
index d615aa86fcfb..000000000000
--- a/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-parsec1.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile	2020-06-10 10:37:53.992504952 +0200
-+++ b/Makefile	2020-06-10 10:38:37.419801522 +0200
-@@ -1,10 +1,10 @@
- all:: rocketwiki-lqfb rocketwiki-lqfb-compat
- 
- rocketwiki-lqfb: rocketwiki-lqfb.hs
--	ghc --make rocketwiki-lqfb
-+	ghc -ignore-package=parsec1 --make rocketwiki-lqfb
- 
- rocketwiki-lqfb-compat: rocketwiki-lqfb-compat.hs
--	ghc --make rocketwiki-lqfb-compat
-+	ghc -ignore-package=parsec1 --make rocketwiki-lqfb-compat
- 
- clean::
- 	rm -f rocketwiki-lqfb rocketwiki-lqfb.hi rocketwiki-lqfb.o
diff --git a/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-utf8.patch b/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-utf8.patch
deleted file mode 100644
index 52c08ee49bf3..000000000000
--- a/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-utf8.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/rocketwiki-lqfb.hs	2013-04-25 21:41:34.044588280 +0200
-+++ b/rocketwiki-lqfb.hs	2013-04-25 21:42:33.108020316 +0200
-@@ -2,6 +2,7 @@
- import Text.ParserCombinators.Parsec
- import Control.Applicative ((<$>), (<*>))
- import Data.List (intercalate)
-+import System.IO (hSetEncoding, stdin, stdout, utf8)
- 
- 
- -----------------------------------------------------
-@@ -405,7 +406,10 @@
-       return htmlEntity
- 
- 
--main = interact wikiParse
-+main = do
-+	hSetEncoding stdin utf8
-+	hSetEncoding stdout utf8
-+	interact wikiParse
- 
- wikiParse str
-   | success parseResult = html
---- a/rocketwiki-lqfb-compat.hs	2013-04-25 21:41:41.340518231 +0200
-+++ b/rocketwiki-lqfb-compat.hs	2013-04-25 21:43:21.299557312 +0200
-@@ -2,6 +2,7 @@
- import Text.ParserCombinators.Parsec
- import Control.Applicative ((<$>), (<*>))
- import Data.List (intercalate)
-+import System.IO (hSetEncoding, stdin, stdout, utf8)
- 
- 
- -----------------------------------------------------
-@@ -412,7 +413,10 @@
-       return htmlEntity
- 
- 
--main = interact wikiParse
-+main = do
-+	hSetEncoding stdin utf8
-+	hSetEncoding stdout utf8
-+	interact wikiParse
- 
- wikiParse str
-   | success parseResult = html
diff --git a/www-apps/rocketwiki-lqfb/metadata.xml b/www-apps/rocketwiki-lqfb/metadata.xml
deleted file mode 100644
index 8bd8463e5cf6..000000000000
--- a/www-apps/rocketwiki-lqfb/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>tupone@gentoo.org</email>
-<name>Alfredo Tupone</name>
-</maintainer>
-<longdescription lang="en">
-RocketWiki is a small parser written in Haskell which translates a wiki dialect to HTML. It uses Parsec, a monadic parser combinator library. The compressed source code of RocketWiki has a size of only 5162 bytes.
-</longdescription>
-</pkgmetadata>
diff --git a/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild b/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild
deleted file mode 100644
index f3db79bdea5b..000000000000
--- a/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${PN}-v${PV}
-
-DESCRIPTION="Small parser which translates a wiki dialect to HTML"
-HOMEPAGE="https://www.public-software-group.org/rocketwiki"
-SRC_URI="https://www.public-software-group.org/pub/projects/rocketwiki/liquid_feedback_edition/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/gmp"
-DEPEND="${RDEPEND}
-	dev-haskell/parsec
-	dev-lang/ghc"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-utf8.patch
-	"${FILESDIR}"/${P}-parsec1.patch
-)
-
-src_install() {
-	dobin ${PN}{,-compat}
-}