gentoo resync : 25.03.2022

14 files changed, 191 insertions, 237 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index c5457237766e..ec0d8a42bc52 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/dotproject/Manifest b/www-apps/dotproject/Manifest
index 8b19e879e492..bc07341a5858 100644
--- a/www-apps/dotproject/Manifest
+++ b/www-apps/dotproject/Manifest
@@ -1,5 +1,5 @@
 AUX dotproject-2.1.7-pear-date.patch 1755 BLAKE2B 4fbc785091d94655e9dc6cc05bb80029aa0d2377b953183862591e83593582c54ef18ee0c0bda7256e91c95909f5810b5838504939798729528666e855a4a134 SHA512 fca1ffba1bd9df2b49b1e8fd129c807bfaca1f5c847b862fe5b8b159f243e116d7e21f5445c6383d0ac0bfd6e5ed480da10c5c78c5b10f62862f759c8078446b
 AUX install-en.txt 609 BLAKE2B c389d1d3ac975602dd9ff1a31c2fc1b7ab31f33835e62ac9445eae322ffc7a474e93eb03caa3a7c3d01c87743bfd7e1fe4b593c4aa715a9a4d3cd352e1b7b5e5 SHA512 ad00eb64e70702f032f2f0c8f17daf8263659982d24b554e18c70a59e2dbbcdb14f36f3f245faf36e1ec36e3676954975d00c4f9256ddc2b7bf1899e77c961dc
 DIST dotproject-2.1.7.tar.gz 4528969 BLAKE2B 167414d09e6e719e75179872ce8fbf3ebdb51f8328381d991634c683d82e40ec3bc029ccf79dbd6be5fd5345bb2603887bbf9b751511b62c0555248b27d15c3e SHA512 887637d8b66096ca0313dd257de44f2afef587c795cb8009861698f799db4e09677f6cd7e5ee57d3655e81219e25257c379deafac77003bf7e6f82e70eef8f58
-EBUILD dotproject-2.1.7-r1.ebuild 966 BLAKE2B 1a788bd710cc1584e193026cf78d0286fc5235e63d16e25309d4195b11db014d8735402ecbad6528a2509d93b4e22068639125790ca82cf0528657ceafad5009 SHA512 478c0bf67aadbd343ce750ae36bc772665ac814287354375824ade13ff824145d225c8494e10cb6d9f286a9ed6e5e1ee0bcf692a98f63d8cd6f4861d4e3f33e2
+EBUILD dotproject-2.1.7-r2.ebuild 944 BLAKE2B 090eb1feaa5684ce99a5cc51fecc2e1f04a9806cc7ebd260049cd94a1a7e4c477b428c20a1a6b84b726cc81a45739dd2c79487361a94eb046ad55e6eda362a5a SHA512 501efa575fff9b033bdc0c04d3bb8b39f85755ae0ac251a3674c946f438f1eacc6ec5be9e27488bd0d88ca50e89e50441578496370fd42f1093fe5d4cfbe0619
 MISC metadata.xml 355 BLAKE2B 9de875cea2b7e201f77c1d373be07221f6054530ae7bb85fbd8594ce3356f10efb91993ff470d493c3648126fdc5abd40069e3b25355ac97c05de3dcb7695c8b SHA512 13f96f4e3b0778576ca3708e69180a781ad91731e6608de310a0183bfa55750123f4f49ca6201c78a1475ee3d1bd555720d62435bbb86f0ffd18d75a95a5e351
diff --git a/www-apps/dotproject/dotproject-2.1.7-r1.ebuild b/www-apps/dotproject/dotproject-2.1.7-r2.ebuild
index de3f61dc8fa7..2fcf8e7b3201 100644
--- a/www-apps/dotproject/dotproject-2.1.7-r1.ebuild
+++ b/www-apps/dotproject/dotproject-2.1.7-r2.ebuild
@@ -1,37 +1,37 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-inherit epatch webapp
+EAPI=8
+
+inherit webapp
 
 DESCRIPTION="dotProject is a PHP web-based project management framework"
 HOMEPAGE="http://www.dotproject.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 LICENSE="GPL-2"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-DEPEND=""
-RDEPEND="app-text/poppler[utils]
+RDEPEND="
+	app-text/poppler[utils]
 	dev-php/PEAR-Date
-	virtual/httpd-php"
+	virtual/httpd-php
+"
 
 need_httpd_cgi
 
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-pear-date.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-pear-date.patch
+)
 
 src_install() {
 	webapp_src_preinst
 
 	dodoc ChangeLog README
-	rm -rf ChangeLog README lib/PEAR/Date.php lib/PEAR/Date
+	rm -r ChangeLog README lib/PEAR/Date.php lib/PEAR/Date || die
 
-	mv includes/config{-dist,}.php
+	mv includes/config{-dist,}.php || die
 
 	insinto "${MY_HTDOCSDIR}"
 	doins -r .
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 27bb23593b82..0fa5f55a7778 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,4 +1,6 @@
+DIST icingaweb2-2.10.0.tar.gz 11491028 BLAKE2B bee48e59ec7d0a564e7056986a84fda9639e61ed82ea65d35da310916e7058837fc146ee06f2c044748f72424198dc42f75b32de4b6ab39f673e2a9bbaf46966 SHA512 e26a4382970ece503c18ac9f93bb9e7ac24fd827dd84fd04352aeeff796ab58dac747840c6153cea5711d548603f219ba32aeffe76d87359ea72f2d3a598468b
 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.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.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.10.0.ebuild
new file mode 100644
index 000000000000..1c12f98d4b39
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.10.0.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/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 2707efcc5480..78e42f026a8a 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -4,15 +4,19 @@ DIST nextcloud-21.0.8.tar.bz2 127759792 BLAKE2B 80628713ca3b3805fd81be4ecff6f084
 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
 MISC metadata.xml 645 BLAKE2B 1347bd3fcd02b3e541da305002e905cfc9114307ef1988401e6f8443d54e73b897a37557e4ae1e225ffde3897d6b0d448a0a0859cfab6d81d11b1b9226a734cf SHA512 1aa361e4cf6c13ffa18945645ecf7754721397ef6aa289e56e532435e69d1024e94714907f2c3870b7e0b234f329ec6592e62c69969de69499597f25b64ac0d5
diff --git a/www-apps/nextcloud/nextcloud-22.2.6.ebuild b/www-apps/nextcloud/nextcloud-22.2.6.ebuild
new file mode 100644
index 000000000000..b49730459a5f
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-22.2.6.ebuild
@@ -0,0 +1,43 @@
+# 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
new file mode 100644
index 000000000000..b49730459a5f
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-23.0.3.ebuild
@@ -0,0 +1,43 @@
+# 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/prewikka/Manifest b/www-apps/prewikka/Manifest
index e20089e2b000..4c0c0d16d3e2 100644
--- a/www-apps/prewikka/Manifest
+++ b/www-apps/prewikka/Manifest
@@ -1,4 +1,4 @@
 AUX prewikka-5.2.0-fix_siteconfig.patch 331 BLAKE2B 0aa3a6ce4d31067b1ce38976bfa6081527d760f0b5461494c36a9fccedba2fbf8bf44691090fea285d70c6743fa948708c32561beaea80758fc528bfd71b360d SHA512 9d7c48ffa8f225f6927961a94da2d69b011209c1c69fe98efb3d37343f7ad78774ac8d5b1a56b5831605800471117e34ec0ec49309385976a41557c3713702df
 DIST prewikka-5.2.0.tar.gz 1808717 BLAKE2B 5713b0ce47a3ef137795035ca074410abf9e934c3e9c90b48d127396f0c92e48969e755b48a8519f52cc63bf56e7200c285fb7ad7069f4489cd552eddaa1be5a SHA512 034040e22c2b122289f6af5a2221024585c671327f158e61845feef720c7f70b06a6aa4caaaeba7b48394aa95cd67c45061d97cdaecc3902e26175df9b86c411
 EBUILD prewikka-5.2.0.ebuild 1365 BLAKE2B 1537eadd7ed99c15679dcae5e8cdde44ea4cc09d9dbdc7030b4c18ec48863dd30e378afbaa3a0ca44ce9e7b81e122572015abdb3bee403c452185c59294c76dc SHA512 907ddbb7cb7759f4fb0a7e5c2a903e145874607b6cbe2fa50787d39d42dc6700192b4cbd1a190eeeb445cd293f754c4794d3abc36a8055c7ed6e30220baa07f1
-MISC metadata.xml 820 BLAKE2B f00528fffcaf1f75e1f9a13e8a15cf27f4edf87b7c1ec7e51c6eeb28eb17f3baf1783f808480f3ef5cedb27d133012c9c1e618893e2a7f1bde608ac8dffdd6d2 SHA512 a579c40f4e00e1e37b8f5b0871c4e9eb79c67a21ce74c55ed15309175411c8bacd43a4e8e250079482898f7b5f66c5bccb5cc6645d15a229ea249cea3b05b449
+MISC metadata.xml 584 BLAKE2B c13f4e7cf2fbecfb8dac6a4e671328bcc68d922d5b7b06dab0fe63d1e2d1c38a93a6a15e062813f6a7e28953e2e40f27332d19824a0e3951142d755dc631c2da SHA512 6615399a41608faaf3c48540da110f6b547fb4401aeb9aa2f7cf544b62c9065d9ff00e0dec7a728a80ebe9747b5654ddf5093c799c0d858041df679233ed4339
diff --git a/www-apps/prewikka/metadata.xml b/www-apps/prewikka/metadata.xml
index 798f737bbe99..32f02839d2d0 100644
--- a/www-apps/prewikka/metadata.xml
+++ b/www-apps/prewikka/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>thomas.andrejak@gmail.com</email>
-		<name>Thomas Andrejak</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Prewikka is the graphical front-end analysis console for the
 		Prelude Universal SIM. Providing numerous features, Prewikka
diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 8b08ebfdafcb..7399144727a1 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,15 +1,11 @@
-AUX permissions 1188 BLAKE2B 9c9813f987c6e2f45f5118f8ba5093e7e68bf02f47e8dfc76eca853b2eb84b535f55379e916e90091961ac3362564d338f741637a2bf80583e594b6881fb91c7 SHA512 c7c383438911d79740f0fd6ff48d934f76fb5074c0c20a6e9da029c546c525f8405cebf987690dedce2e8f53832edbb6a111389bc25183d8c9166866638612d7
 AUX permissions-r1 1189 BLAKE2B 5411939128bac5718d47b91b1f189805e675ecc7142ef47750863dc8c4f2654c48cb7fbbb65457ee0074de1e293faffb71d97672cb04ef5113bfad31c0309558 SHA512 7ffade42d37d6c400c3df10f47165a6f83602182dde82da420ad61244f8db3a22675120d52877e892a959e911307bee759caa843aed25496a244e883fabaa8e3
 AUX postinstall-en-with-daemon-r1.txt 586 BLAKE2B 8a8c24cb93373af40ca662bc5453bbf3f2628ba0e39f0053405010e9c91e032167a7da9feb335782a679af1efee004bd134694fb655a5992cc3b1f8d3712b8db SHA512 e57ae761499454ce26c5bf58b7faa1cdfa05a7409bc4fc2b2ade16097a8131e279ffb09be2d5b39e80a17fd1c9533e795c6908548097f318106f1c7cac00e65d
 AUX postinstall-en.txt 102 BLAKE2B e4edc2c0a482cb8ba822b902e553680626081336abe42421380404c179324c2243eb07c4934ff70ce07b0c9c4777af14c803e1adf08768ea76c1660612e111d3 SHA512 2b1a6e9faf17b36e7011b488cde989d890fa23e87d5f88aa91a1d9597bb55400db74e413742c9d15acbc745a25f23b1533ad6fdb829d04dc21ff5898c7d98ccf
 AUX tt-rss-no-chmod.patch 934 BLAKE2B ef6c7a85ded012b3d9b2369b19ff657dc8b3954b2c94d30b47c42ca83d660b98f753ece525156beb544ed1d0660162e06a07c1e2bef963543bac7eee15cc676c SHA512 659c00f349aecc994d7b95c721e85f5ffca12b56ea81fefed5dc675d33a2a8d6fb3968891065b2f73b52d21e736ea8e95163062103ecf15cd448a0797cf37807
 AUX ttrssd.confd-r2 1581 BLAKE2B ce18840ddb58704abb9311d02e27cfc179bba43668b90cb358082466d55bb54acdb5806f73cb24dbc758981c477eeb6a50c472043323abaf50572f7d2eeee4b1 SHA512 15957854718a4decf7ac9784e955fc090755343008facd3d65d7e72f3e00df170215514a5435378180110c6f4584df9e5580eb45775816eb3f5c58d09e03d249
-AUX ttrssd.initd-r3 2338 BLAKE2B 6ddcb12c548ef6b34196da7539b5ec2f061db46f041912647ea2741208004d25cc7d51d88375aa06b5866a7ef44995088cc9002d625666bdaaf687733b699a8f SHA512 eb6a9824562f49d42e94522c074719720686cd2d3fb3d0ac13ce5d83fdeae6b17a5047e79e761aea084eb8ff6e6aa733d49131324f8a00406935f8e0b962764b
 AUX ttrssd.initd-r4 2866 BLAKE2B e8b8e6369f7c4c290e76f31e69bf24d2ee088c0ff526d41fefadcdf23c21377f483cbccd80101592c5141553bf7b1a8ae20cf730f6df4b9044a5fdd613e8e652 SHA512 392de1fedd03cd54f6cff722a391eb8b2eaa913d216304716a2325b91ed523da29d3cc82e16462aa6ed7eb0ce9ae02fd66c7070d0f6a62219602e4c3ce3a87af
 AUX ttrssd.logrotated-r1 135 BLAKE2B dc653add518cd3ed5296097d51ca2346e102edcbad5ec82397713ded489e8ed8e49af928331e58b80152f13bddc37d673c67440df388651c875cfbd37ff62080 SHA512 c292020a55688c6edb4306d9d8144ad7d30be94fda08467b8bbe560c7bf02b0877d9591123a226dd030e9a9c01b79df4a3696e54fd1ece0dbdef1c285cdae97a
-DIST tt-rss-20200922.tar.gz 3406007 BLAKE2B 7058253fbbba1c121d11eace8a3ef024b7ef83b05fd8b10b0ba0d017fa75d16b970e2c95c13091f760b21bcf092f609d81a5649de03672b0394113412f90beb0 SHA512 90387d07af76bc90bfb2e740dcfa0b2e13ed9af679a6c9258edd053511277bc36fca8edd4b3862c3f1957fa65a827b161abf3ed7fa603d4b84514fd456947a47
 DIST tt-rss-20220218.tar.gz 9916433 BLAKE2B 318969b6e5156842079bf68c4ea614e5e60e21d8caa46b1a78f2cef051904da30e5091838f6e10f6f610d8ee39c7922137aeb60b7cd5004cabc1d2cdf65edfa8 SHA512 38a81dd737462724bc52ca3915350c175abe548cd566a4f9a5e1d5efda9287d0666e9348e5b13dd20549360501de5b0bfb659292fb650f7a60fdab8b63cf8202
-EBUILD tt-rss-20200922.ebuild 2088 BLAKE2B 57da71460733b748deaa542020056f5f447210f1e5756d32af016675480da723aad94daccaca142ee6efaf4bdf22b7f7510fe582bae865b82a3722ec9ae3d46d SHA512 20fa8fd78de92142e5370441378d2e22634d82028c372b63b5d91b45b615b643fa3ab5a82e13df17591fa227d48aa967580b18508a931caf6cde52d92bbc22e4
 EBUILD tt-rss-20220218.ebuild 1927 BLAKE2B f533ff2137699ee6696856cbaadbb0773eea148f45c13e8c7736d2212078171c8629f17c53e0701ddc6b27d69328a7e634854a9e6b8e5c9097be6bd0bf9b2481 SHA512 9edac5cb8ffc212c74f35aa0f16289dafd4c88ba3de7bcb75113c5f8e5e4fae1603de3c087cf3cba3bc8599dd7797ae3838403f76ce851e453b05a47fdb1a803
 EBUILD tt-rss-99999999.ebuild 2092 BLAKE2B e784b3bd22094b2584e2a799b220a80a97680cdb3b3f3f80a2fef49b7ea91ec0a9df3fd172c411abe5f9999b3df410fcd16f72d091c63ab229344fb905d77ebd SHA512 b1bb0ace278597ec63cb05f7a2c649d2d85115bc78a910930d8a88185ddd288a08a50e7f83dea153866409c54ec89ed81523011b75fceda4c7e7f9b4ec9fe4df
 MISC metadata.xml 374 BLAKE2B 659dd027265141ba90d4bf8abe45e12ed5187c866605f939f26fd4b55911870c8cca907c96f4bae2f84cb43c1691a6eb79eabe671e4b3de0c34d9befb6ed4c46 SHA512 ab38e1e98bb90c292576830d65ad6871dc6feab2a93d7cc9a580f1333e6c7859cb215ef44952b3e9018b431ca0c4c7f61fd0ee6d2daa86bde971ab2e113ba0bc
diff --git a/www-apps/tt-rss/files/permissions b/www-apps/tt-rss/files/permissions
deleted file mode 100644
index a26b87f4e715..000000000000
--- a/www-apps/tt-rss/files/permissions
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash -e
-
-cd "${MY_INSTALLDIR}"
-
-if [[ $1 = install ]]; then
-	# We need to lock down cache/ for the operations below to be
-	# safe. The permissions match the webapp-config defaults but these
-	# can be changed and existing installations may also differ.
-	chown root:root cache/
-	chmod 00755 cache/
-
-	chgrp --no-dereference ttrssd feed-icons/ lock/ cache/*/
-	chmod g+ws feed-icons/ lock/ cache/*/
-
-	# Files within lock/ are exclusively written by the update
-	# daemon. Files within feed-icons/ are always unlinked before
-	# modification. Only cache/ holds files that are modified in place
-	# by both processes and therefore ACLs are required to ensure that
-	# the files themselves are created as group writable.
-	if ! setfacl --modify d:g::rwX cache/*/; then
-		echo "WARNING: ACLs are not available on this filesystem. Either enable them or set TTRSSD_USER to your PHP user in /etc/conf.d/ttrssd to avoid permission issues."
-	elif [[ -n $(find cache/ -type f ! -name ".*" ! \( -group ttrssd -perm -020 \) -print -quit) ]]; then
-		echo "WARNING: Files that are not writable by the ttrssd group found within the cache directory. Either delete them or correct their permissions."
-	fi
-fi
diff --git a/www-apps/tt-rss/files/ttrssd.initd-r3 b/www-apps/tt-rss/files/ttrssd.initd-r3
deleted file mode 100644
index a6f3b8a78ef1..000000000000
--- a/www-apps/tt-rss/files/ttrssd.initd-r3
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	after postgresql mysql
-}
-
-PID_DIR="/run/ttrssd"
-LOG_DIR=${LOG_DIR:-"/var/log/ttrssd"}
-TTRSSD_USER=${TTRSSD_USER:-"ttrssd"}
-
-setup() {
-	mkdir -p "${PID_DIR}" "${LOG_DIR}" || return 1
-	chown "${TTRSSD_USER}":ttrssd "${LOG_DIR}" || return 1
-}
-
-list_instance_dirs() {
-	if [ -z "${INSTANCE_DIRS}" ]; then
-		cut -d" " -f4 /var/db/webapps/tt-rss/*/installs 2>/dev/null
-	else
-		printf "%s\n" ${INSTANCE_DIRS}
-	fi
-}
-
-instance_dir_to_name() {
-	local name=${1#/}
-	echo ${name//\//--}
-}
-
-start() {
-	setup || return 1
-	local instance_dir instance_name ret=1
-
-	IFS=$'\n'
-	for instance_dir in $(list_instance_dirs); do
-		if [ -d "${instance_dir}" ]; then
-			if [ ! -f "${instance_dir}"/update_daemon2.php ]; then
-				ewarn "TT-RSS instance in ${instance_dir} has no update_daemon2.php script"
-			elif [ ! -f "${instance_dir}"/config.php ]; then
-				eerror "TT-RSS instance in ${instance_dir} is not configured"
-			else
-				instance_name=$(instance_dir_to_name "${instance_dir}")
-				ebegin "Starting TT-RSS update daemon in ${instance_dir}"
-				start-stop-daemon --start --user "${TTRSSD_USER}":ttrssd \
-								  --background --wait 2000 \
-								  --stdout "${LOG_DIR}/${instance_name}.log" \
-								  --stderr "${LOG_DIR}/${instance_name}.log" \
-								  --make-pidfile --pidfile "${PID_DIR}/${instance_name}.pid" \
-								  --exec /usr/bin/php -- -f "${instance_dir}"/update_daemon2.php \
-								  -- ${TTRSSD_OPTS}
-				eend $? && ret=0
-			fi
-		else
-			eerror "TT-RSS instance in ${instance_dir} is missing"
-		fi
-	done
-	unset IFS
-
-	# Succeed if at least one started.
-	return ${ret}
-}
-
-stop() {
-	local instance_dir instance_name
-
-	IFS=$'\n'
-	for instance_dir in $(list_instance_dirs); do
-		instance_name=$(instance_dir_to_name "${instance_dir}")
-
-		[ -f "${PID_DIR}/${instance_name}.pid" ] ||
-			[ -f "${instance_dir}"/update_daemon2.php ] ||
-			continue
-
-		ebegin "Stopping TT-RSS update daemon in ${instance_dir}"
-		start-stop-daemon --stop --retry 5 --pidfile "${PID_DIR}/${instance_name}.pid" \
-						  --exec /usr/bin/php -- -f "${instance_dir}"/update_daemon2.php \
-						  -- ${TTRSSD_OPTS}
-		eend $?
-
-		rm -f "${instance_dir}"/lock/*.lock
-	done
-	unset IFS
-
-	# Always succeed.
-	return 0
-}
diff --git a/www-apps/tt-rss/tt-rss-20200922.ebuild b/www-apps/tt-rss/tt-rss-20200922.ebuild
deleted file mode 100644
index e2117ac64f57..000000000000
--- a/www-apps/tt-rss/tt-rss-20200922.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit prefix webapp
-
-DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
-HOMEPAGE="https://tt-rss.org/"
-SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.gz" # Upstream git frontend blocks wget?
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE="+acl daemon gd +mysqli postgres"
-REQUIRED_USE="|| ( mysqli postgres )"
-
-PHP_SLOTS="7.4 7.3"
-PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
-
-php_rdepend() {
-	local slot
-	echo "|| ("
-	for slot in ${PHP_SLOTS}; do
-		echo "(
-			virtual/httpd-php:${slot}
-			dev-lang/php:${slot}[$1]
-		)"
-	done
-	echo ")"
-}
-
-DEPEND="
-	daemon? ( acl? ( sys-apps/acl ) )
-"
-
-RDEPEND="
-	${DEPEND}
-	daemon? (
-		acct-user/ttrssd
-		acct-group/ttrssd
-		$(php_rdepend "${PHP_USE},cli,pcntl")
-	)
-	!daemon? (
-		$(php_rdepend "${PHP_USE}")
-	)
-"
-
-DEPEND="
-	!vhosts? ( ${DEPEND} )
-"
-
-need_httpd_cgi # From webapp.eclass
-
-S="${WORKDIR}/${PN}"
-
-src_configure() {
-	hprefixify config.php-dist
-
-	sed -i -r \
-		-e "/'DB_TYPE'/s:,.*:, '$(usex mysqli mysql pgsql)'); // mysql or pgsql:" \
-		-e "/'CHECK_FOR_UPDATES'/s/true/false/" \
-		config.php-dist || die
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r *
-
-	# When updating, grep the plugins directory for additional CACHE_DIR
-	# instances as they cannot be created later due to permissions.
-	dodir "${MY_HTDOCSDIR}"/cache/starred-images
-
-	local dir
-	for dir in "${ED}${MY_HTDOCSDIR}"/{cache/*,feed-icons,lock}/; do
-		webapp_serverowned "${dir#${ED}}"
-	done
-
-	if use daemon; then
-		webapp_hook_script "${FILESDIR}"/permissions
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en-with-daemon-r1.txt
-
-		newinitd "${FILESDIR}"/ttrssd.initd-r3 ttrssd
-		newconfd "${FILESDIR}"/ttrssd.confd-r2 ttrssd
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/ttrssd.logrotated-r1 ttrssd
-
-		elog "After upgrading, please restart ttrssd."
-	else
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	fi
-
-	webapp_src_install
-}