gentoo resync : 11.08.2021

8 files changed, 113 insertions, 13 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 9414b803c83f..669571588cb9 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/airdcpp-webui/Manifest b/www-apps/airdcpp-webui/Manifest
index e7cd134ee799..44ec0bb3d7cb 100644
--- a/www-apps/airdcpp-webui/Manifest
+++ b/www-apps/airdcpp-webui/Manifest
@@ -1,5 +1,5 @@
 DIST airdcpp-webui-2.11.0.tgz 8148062 BLAKE2B 2a47bae691667aae14afadbfd5a5b1f938c72de7ba3ff75f0feca6a5d13f890fdb663057237ff29ed85eea6fe55f72e421201fe2c44efd9181dc751e59748bb8 SHA512 00147c4f1d19a0866735a6bb0b4789e915ae028bf92e4a46aea586c1c4eea57fd85558cdffd9504abb36ffb78764bf6c310a5937f06d99de03883bdfaf6a2b33
 DIST airdcpp-webui-2.11.1.tgz 8147412 BLAKE2B 4d4eb713b1c0c570d5c1cf02053c87bf983c97c6ae33ac58b04f4cee0aab41828981fc299c74383da4bdd015695daba4dfed62b0a6bf5d925e1dd1065fe2e60e SHA512 c54673ba2755e3b7e5889c34d2ca3a19c9682b81b2c527d579007931a7983e8faa905ef8f26b5a7c8479d98c7c9fd98de5c9aac2de0161aeb849460e28d22465
-EBUILD airdcpp-webui-2.11.0.ebuild 466 BLAKE2B 33d5bf2a65ef48aa5178d11145433d33091bc16766b10335aeca6d43ace6d0f725d911c0b8f4bcf50dd06f497f08da8504f489367429a5b1adb59f4aa6e58d61 SHA512 1b8d9d28d58616b93e7ffc9dd12a0309a9443fd0f2d6f936810ca6c116e16e1081c32061af5e2d9550f7ed63893787f73d18c53f904925c2afd1ac2f9f4d8f8f
+EBUILD airdcpp-webui-2.11.0.ebuild 464 BLAKE2B d3f1eb40a2e590691b0f5bcf7f0be057c79f16ec9aa8129000b1bc58842d64055bcfbf52a4c2d3c3d92eb4eb5bb27793bfc88dd218e875b00cacfe6a6aa09c3b SHA512 2d83ea9710167a129e5cb1d51cc2abb56c24defeabd812058145e684ef4c481e9e8acb8df23405ece32898cb611ffbd38bb469d205df41e22e2932cd62d7b78d
 EBUILD airdcpp-webui-2.11.1.ebuild 466 BLAKE2B f7fac3d59fdd1a83f4c6481d0284b3992f3b4dee4f12a47122512d867fb0cfaf478cd9c3be977d70bcd982045dab927c93228d940226296759a6f7d08462b10d SHA512 a7a2ff15c5af50e3c7bd0309b30046f05a8e66b4044918076b162d654ceca08b99f1ea0378fe9f451ca16dbad898085179a80f61700f90164e329045390acf08
 MISC metadata.xml 436 BLAKE2B 92cd8485d25c29615695fb9962b3257e23313798a95eb8d8d9b08713139516c7d27e4ec23a297b67fa8755fdb38d81ce8107f7e0c2126c028d0e2c97f8503726 SHA512 40b9ea3a77b14203c322d5afd798aea2aac78acc4fe5a4998acbbd3b3a41b701ac31e554ce75389db2e4d960c79bf52c941588749859d31e402c80b840aac72d
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.11.0.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.11.0.ebuild
index 57182bf92d32..3b5a9f021358 100644
--- a/www-apps/airdcpp-webui/airdcpp-webui-2.11.0.ebuild
+++ b/www-apps/airdcpp-webui/airdcpp-webui-2.11.0.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Web interface for airdcpp-webclient"
 HOMEPAGE="https://airdcpp-web.github.io/"
 SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 687c275f03da..6a43e4fc3be0 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,7 +1,7 @@
 AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r3 732 BLAKE2B 8227349f9ffe5dbf7c59efc3b1e250bf8184a72d37958c0ce0a2d8affabaadcb6aaf271b1402c7ac127b80d534f4f72b888ccdce7aa5f7a7cf86a0efe0e719e0 SHA512 7c8aa33dcea56b6fccac23095f7b84225f1c85541cd5eb3536d2901e638c391e025bd9db28bd10c26ef91e5a8fe2d12a878040cf21d4b983858a19f2cac7d1b0
-DIST gitea-1.14.2.tar.gz 117884130 BLAKE2B 75ae36ade602bcbdcc59cd3f75f60ab5fbde713399b1d8b83f29b2bee044c9a5dc83fbae8f372f62c991edeef7237a5a96a9f6b4cda0ae1db93d6596377e1a98 SHA512 073ff6d718522c1b8d2746379d6d0051dd18db89331604c1cc252bcedbad04e75a1f402bdd37fea05d21e6b5d24f43ebf9e70748f8522996fdf8eb133d2a3e38
-EBUILD gitea-1.14.2.ebuild 3459 BLAKE2B 237f50a9cfbe2acf6edd8e2e2db428c22cfd505f2d11107ade63cb81ca0e8a75266c634199b2aba0331377e8be2df065a5bd156feb5557e3b55ddc14bc7a2c0c SHA512 8added364e5e315b08b5138b8cf986738c1ca3c31789625205159d6778436d3c01b5a0480c980e19cba18587e32add945f3b6fce79e62a3b953b4fcd89ad56cd
+DIST gitea-1.14.6.tar.gz 117871468 BLAKE2B f71ea5e6761e36bbb5d4304e606b99513196703773c4595fef85e1641cff179e2b58b3150de199636a504ec806fc17d8deb73cac903824502749cbcdd6f72aaa SHA512 2e17994dbadc29d62f244d70550da59c1ab6818a1e5af20265405024b26fe6641bbeabb6b227f432170abd133fb3f11a2b5d9ac814ebd234729e4fcc0c4ed6d0
+EBUILD gitea-1.14.6.ebuild 3459 BLAKE2B 237f50a9cfbe2acf6edd8e2e2db428c22cfd505f2d11107ade63cb81ca0e8a75266c634199b2aba0331377e8be2df065a5bd156feb5557e3b55ddc14bc7a2c0c SHA512 8added364e5e315b08b5138b8cf986738c1ca3c31789625205159d6778436d3c01b5a0480c980e19cba18587e32add945f3b6fce79e62a3b953b4fcd89ad56cd
 EBUILD gitea-9999.ebuild 3262 BLAKE2B 98ceac63dcaf4c5e7ff8df2b891f89a8bb108b77386378799bb81b4e555b05a63b4553527dcad84a030757504ed7c64a7acd87059d089357895fd14ed185adf8 SHA512 218c59a6c8bc9399b31bb2659180ae9ff3a544f863b433274cd251dcc39aa6d595dce3873c62dd31406b4cd01cd203337d791e6490e11ca66d0c80b120162fb0
-MISC metadata.xml 669 BLAKE2B 081a892f3f74992c0bfba4da4ad2fcaa42e2331b787607f63f4b6df2b88f8955cd39e85fb380ac42260197c553fce553845659a2cb7ec868c19ab651406be2ac SHA512 4f13893712a51a03c829403f6a093763b7ef92094cb6e700a30a15006ab8aa7bcae090a4a478e544692adf09d34bf477fe7bc38943447bfec8e4dc122d8ab912
+MISC metadata.xml 431 BLAKE2B 8f29805f96990189bf6f2ce5e4a851cd93e588a7b9227a906fc92edd328bad559eb694abf12085697ca78c57f78679690e042fb3c6d517a221e8594b14ac85c3 SHA512 f3e9f62480e697aa36630bed231461546a4df3f5a5cc7378ccd9b6074d88ef3b56dab6402ef32f3314fd2e321564dce26fa8d885c99625311f20e131a17f32ff
diff --git a/www-apps/gitea/gitea-1.14.2.ebuild b/www-apps/gitea/gitea-1.14.6.ebuild
index c1bc0be80fab..c1bc0be80fab 100644
--- a/www-apps/gitea/gitea-1.14.2.ebuild
+++ b/www-apps/gitea/gitea-1.14.6.ebuild
diff --git a/www-apps/gitea/metadata.xml b/www-apps/gitea/metadata.xml
index 5066856c1a43..06999cac2334 100644
--- a/www-apps/gitea/metadata.xml
+++ b/www-apps/gitea/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>nemunaire@nemunai.re</email>
-		<name>Pierre-Olivier Mercier</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">go-gitea/gitea</remote-id>
 	</upstream>
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index cbb83d1ece6e..7d4dcf3d00be 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -1,4 +1,6 @@
 AUX postinstall-en-2.3.txt 1827 BLAKE2B 49402566ddf6981cf0226f6a963fdd2c482957903583807f5c42731dfd5b4aea56de7d1ebd47ab6909f12492bd5e7a788322e0b2d80e15d883483a080f8fe11c SHA512 59e304d63830227b1619ed1299e9b61f5b6e534cb03da4d3a0e35a0fe727ccf2d994a034bd12d515bba4f8a6a8ca513cf2131c031fa63f85906639aca159993a
+DIST postfixadmin-3.3.10.tar.gz 1868307 BLAKE2B 489cac00205dbac9d1995f83a38a1817dfa207b2fd858ef87c0f4f3c45018759f6b2510e44da51f550df4182b0677cba346fd10a7fc3d4183672ebf70e64dd81 SHA512 b922ef08cbb3338e7581a78abb3077e92401019bea584710816615ab019a8cf678b22dbb068d0321550e2298f6a235b8a245c44c9f7eef02bb6b49b696225a2f
 DIST postfixadmin-3.3.9.tar.gz 1866167 BLAKE2B 28546631dce340d3c1128b525de1c33e9e3aa23cd557e6c8f7e9b26f97aedba67f2e5f3ea351e0db2d79e068e16cfa1672cbe3e6abbffd19e5009e2a9df84523 SHA512 791b05df34a4f2eec01fe6f6b9038a6630cd60c42e1f2e725fe3d033a692b77d2d688858b947c53d1ce48258c7c87a2e3fb31356e553632b88149d5a29bfa70e
+EBUILD postfixadmin-3.3.10.ebuild 2903 BLAKE2B a69925b860f312a4ff94c7a8c2509ae4d8c149f37f99a6eebc7320ee14201e4409b11a64ecb32775a4ea57524365b5369b039d5bdb0572f7c926b9265d616afa SHA512 dcb90d76ee15cdbfb9ffa363c9dd840b5348378add396b21910ba9770704457c5b9670bec06902e0f9e79853e6a7149afa07fcfd800f80660d898c0301af561f
 EBUILD postfixadmin-3.3.9-r2.ebuild 2901 BLAKE2B 19b5cb0f3397715224a29106f105bc5bf8c168e62880be57ed85693ff33b170c1ae6f32f1827b4392171f615509a00100067863b359499f951d461793032858a SHA512 4f7435f7b52b2f10ffd36e7abc3225921c39e4718ba4a8f4b163191a61ce8703e2a5d031168b2c19d80fa19d343aa11e24f592e39306e3a34f1688454dea1497
 MISC metadata.xml 560 BLAKE2B 2dccae38d76ef72520678dcc26582c6d99d2221c8cad753063e4948b75cd84b39f47b854a010217a6a52186a7308a3355c41ab6a7229af2417deb39ccb3eae84 SHA512 4ab5d3db2584f100b9f1d9729eb50487e40b27d16c436cbe09dd03d24c533d5d7c61b4b19eda03aa423fb34d9cf2b9f3ec55679196bb8e8da5ea3157c0bc567b
diff --git a/www-apps/postfixadmin/postfixadmin-3.3.10.ebuild b/www-apps/postfixadmin/postfixadmin-3.3.10.ebuild
new file mode 100644
index 000000000000..7a74f56da1f4
--- /dev/null
+++ b/www-apps/postfixadmin/postfixadmin-3.3.10.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
+HOMEPAGE="http://postfixadmin.sourceforge.net"
+SRC_URI="https://github.com/postfixadmin/postfixadmin/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+mysql postgres +vacation"
+REQUIRED_USE="|| ( mysql postgres )"
+
+DEPEND="
+	dev-lang/php:*[unicode,imap,postgres?]
+	vacation? (
+		acct-group/vacation
+		acct-user/vacation
+		dev-perl/DBI
+		dev-perl/Email-Sender
+		dev-perl/Email-Valid
+		dev-perl/Log-Dispatch
+		dev-perl/Log-Log4perl
+		dev-perl/MIME-Charset
+		dev-perl/MIME-EncWords
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	virtual/httpd-php
+	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )
+"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	if use vacation; then
+		insinto /var/spool/vacation
+		newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
+		fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
+		fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
+		dodoc VIRTUAL_VACATION/FILTER_README
+		newdoc VIRTUAL_VACATION/INSTALL.md VIRTUAL_VACATION_INSTALL.md
+		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.md,tests,FILTER_README} || die
+	fi
+
+	dodoc -r ADDITIONS
+
+	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
+	dodoc ${docs}
+
+	rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	einfo "Please note that if upgrading from version prior to 3.3.0,"
+	einfo "existing setup_password will no longer work and you will"
+	einfo "need to generate new one. See instructions in setup.php."
+
+	if use vacation; then
+		# portage does not update owners of directories (feature :)
+		chown vacation:vacation "${ROOT}"/var/spool/vacation/
+		einfo
+		einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
+		einfo "/var/spool/vacation/vacation.pl-${SLOT}"
+		ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},} || die
+	fi
+}
+
+pkg_postrm() {
+	# Make sure we don't leave broken vacation.pl symlink
+	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
+	local shopt_save=$(shopt -p nullglob)
+	shopt -s nullglob
+	local vacation=( "${ROOT}"/var/spool/vacation/vacation.pl-* )
+	${shopt_save}
+	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl && -n ${vacation[@]} ]]; then
+		ln -s "${vacation[-1]}" "${ROOT}"/var/spool/vacation/vacation.pl || die
+		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
+		ewarn "recent verion, but please, do your own checks"
+	fi
+}