gentoo resync : 05.03.2021

7 files changed, 119 insertions, 8 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index f623a18e0334..cc91f77bcff9 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index 28713a2188b9..029bdce8146e 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -3,6 +3,6 @@ AUX postinstall-en.txt 201 BLAKE2B 4e4ff030cb8031785d62b17e83b7bb2e40124466081b4
 AUX postupgrade-en.txt 218 BLAKE2B 83d752f4a76637ac90d65b7c458c7dadb44a2d5ba496419ce71c9763793abbd95b97b0ead133fe7afd1b2b4b382dc00149d9b6135fa2430300281741ed2a8d34 SHA512 0154d820ed27e43f091d535550dc61fdb91faaf303926cd3a2ba16300b963d0ea5226015fc546cb6419c9df82ab7e99f0f05287b4a5240c2ea381a43ec8e52d3
 AUX vhost-example 366 BLAKE2B 2aef55fee2759d1063936a583cdf6b96fcab77a0d6b056d59390931327ebcfdc338a515a8f7d9cfc5a6f071e0266fa82f0b6b3b4bab97979ff4dd8231fa2d729 SHA512 a2fde5ad64445aee0936a4fe2c608f48ec8163c46949cccd98c1b36b548e769477d387fb82e065b6dade5277580ad43426264ce13dca614182db16a4951247b9
 DIST davical-1.1.9.3.tar.xz 1359608 BLAKE2B d936fa5809413eac92e996262074972a04e1ac2d50d06c921e0f70468dde2b67175c6463d73ead09d5b2bce4ab1c2a02ccb45b64ee43066f6a9609c5ccdd01ee SHA512 cad28a991900d4cd9b1f86aeda7861482eef8707a02a371af53bd9cd17f9b5417ae81ccf1129d01fa5786f7bc9edc7478eb5a7274147039ce3ef603874c093a6
-EBUILD davical-1.1.9.3-r1.ebuild 1788 BLAKE2B b46528deab3559d94a3c84e3f022823d40d8eada03b470e6519020c1ab8b3605774d041278193a2688080ca4294e1f39244ffb51c8888f15966255151793dff5 SHA512 7cf4f9efd719214c38bf28bbc4ac3081d36b9fa7d55eca571ac9e25d5e8373a4afb6b7f446b91d0ee5a1947d082108bd33647962f2c129bf79a6993d40318e49
+EBUILD davical-1.1.9.3-r1.ebuild 1805 BLAKE2B f98a6c364a6115ac40ca3431109dd9da89c0a35e9ee085704f77e98c57fc9d87ec6a1bc17fc9a97fa6e36bed2c472c59779793b1a717f6e06fa736f005cc6fc5 SHA512 1dd143bfb68c539df3ed3ac71bcaec0a760af17ddb4d0efeb923bfe37ac4555ad32b68a63191f8aeaecd5fa7c8f4be22520d6b17a06b82e659d8859151775329
 EBUILD davical-1.1.9.3.ebuild 1736 BLAKE2B d10c9a3af1d34ef20912dfa4929ebc63fdf79f83c18d1d08fc4e7625d3b603416100bcfbd170c208c7bc4e33d621f71e9af4cdc41009b59b690f1eb639f39ef6 SHA512 250d2e292f9e4b074876ef8ae742272e4ffe502f0c711636dc6f756e8d8f8529c80e01c21d43bec3cc7171ac6f9033b8fd324068362cdb3e8ba680196bb10329
 MISC metadata.xml 488 BLAKE2B 415da89c18eca6883cead611be82292f6f3936c01e81db2166e0bdaf5d73dafb550546c0639da311e2f7685a98175212bfe9c9709ec2ff0fab7e00cbf39ed1fe SHA512 6d0e48e689eabd408efa8addab142c14a199ac62b16350f56fcd238f470094c108a56db1719961dc5a80d906102b069ee47e99aef64677cf765be0d79a754485
diff --git a/www-apps/davical/davical-1.1.9.3-r1.ebuild b/www-apps/davical/davical-1.1.9.3-r1.ebuild
index 4b2bc1b3ed47..b8f309f898ba 100644
--- a/www-apps/davical/davical-1.1.9.3-r1.ebuild
+++ b/www-apps/davical/davical-1.1.9.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit webapp
+inherit optfeature webapp
 
 DESCRIPTION="A CalDAV and CardDAV Server"
 HOMEPAGE="https://www.davical.org/"
@@ -11,13 +11,11 @@ SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.x
 
 LICENSE="GPL-2 GPL-2+ GPL-3+ LGPL-2.1+ LGPL-3+"
 KEYWORDS="~amd64 ~x86"
-IUSE="ldap"
 
 BDEPEND="sys-devel/gettext"
 
-# >=dev-lang/php-8:curly braces string offset access was removed (Bug 764908)
 RDEPEND="app-admin/pwgen
-	dev-lang/php[calendar,curl,iconv,imap,ldap?,nls,pdo,postgres,xml]
+	dev-lang/php[calendar,curl,iconv,imap,nls,pdo,postgres,xml]
 	dev-perl/DBD-Pg
 	dev-perl/DBI
 	dev-perl/YAML
@@ -70,4 +68,8 @@ pkg_postinst() {
 	elog "       ./update-davical-database -dbuser xxxxxxx -appuser xxxxxx"
 
 	webapp_pkg_postinst
+
+	elog ""
+	elog "Optional runtime dependencies:"
+	optfeature "LDAP authentication" dev-lang/php[ldap]
 }
diff --git a/www-apps/novnc/Manifest b/www-apps/novnc/Manifest
index 9ec32c742be4..d9a8780114f6 100644
--- a/www-apps/novnc/Manifest
+++ b/www-apps/novnc/Manifest
@@ -1,6 +1,6 @@
 DIST novnc-1.1.0.tar.gz 1034997 BLAKE2B 0cb920cac99c3567cbf1c6a58e12649d4bca211d552a472a73ac1089d7c8a18d9478dcfeb558b6302c0c74d321b62575c35a492b02717dc4721b6a9b42f54415 SHA512 9c736912f5a3051027efe779fc64b182f523b9378ff412d78202e52665772678846d97fe3cc5ac18f5c29dd83d5ff2a2dd915e5eadf9af3573fe871db2e7821e
 DIST novnc-1.2.0.tar.gz 1356408 BLAKE2B a84b767afcdaa641a21943d19ac93c9200074c24c83c899fe2452a82eef526ecd74de92da47b3caa85abe9d51f2fb8d5078f3bf66c0868a241218d22a9088239 SHA512 461490da7bb983e9c94b8ce39f8455ee6609b5a9df8d88254bcc37ebaa5153f5ee9db6afbd88b51762d6d55661bc5cde6fbe70616597583bfce1203e337adf75
 EBUILD novnc-1.1.0.ebuild 1067 BLAKE2B d0631012fc7545269046d6f2d60480c0b7e054317c510ce78f0f8759f2c84da0fbff7a416c14abfada07a7941fbbdc4ab57febbf0abe78bd0487fb065fb79a2e SHA512 7c45f0426318595a48c8202d96adf8af26f94d0e479f4f03433de420d44fd9661658f61fd5f12bb9db5a4ddbe64cd558c721b11d7ce6727f75c281181f9346bf
-EBUILD novnc-1.2.0.ebuild 1047 BLAKE2B 93e31645198b2d82815a7ea22c5672e2ca2faa591fb7bf275ea0ba8d221cec267277b2c6ab12fd702f99e3d003182f04be1d850755ff72e616e88f7ba5b92300 SHA512 3a5def70433820dc2fcfe76e7c08dfb306f0047ae92200068d85e0dfb420f2b2b42760cb59b2a86cc1625cf3df54bc50830c5e81c88799d7c8eec659025318b1
+EBUILD novnc-1.2.0.ebuild 1045 BLAKE2B c908617e3b3144fba6e7744e33f9c088cb25b44e1a9b77b159f0274f15871b191f6e922ef40c344e873842f7522c5090136df7fc9236725883ad8c7a4c74f31e SHA512 0e2b87770aebd96b58c01481a162d56935e86609b31b3aff464d06c9a16cd5be87f9a41e4c84516bcaefd95228de2683a2e4569adf083375c2a0fe7a4f5c556e
 EBUILD novnc-9999.ebuild 1047 BLAKE2B 93e31645198b2d82815a7ea22c5672e2ca2faa591fb7bf275ea0ba8d221cec267277b2c6ab12fd702f99e3d003182f04be1d850755ff72e616e88f7ba5b92300 SHA512 3a5def70433820dc2fcfe76e7c08dfb306f0047ae92200068d85e0dfb420f2b2b42760cb59b2a86cc1625cf3df54bc50830c5e81c88799d7c8eec659025318b1
 MISC metadata.xml 366 BLAKE2B 906b92c7ce5ff24c210578573f975a37d59277c2166f0a974586a4291283989bff4d434f08357b5ea2c8d59daec1e7a7f0f181c4f49317c04338f3d39a2c7090 SHA512 b40cc0d12181b3b3a723f929894445c913bc3410cf5651e72bf9cbe3538e9effde67edd4de1c5547a723e995998d7d11ca44e69bf9cd7683bfc30269f3e5148e
diff --git a/www-apps/novnc/novnc-1.2.0.ebuild b/www-apps/novnc/novnc-1.2.0.ebuild
index 02803bff38ac..3a2de2eba158 100644
--- a/www-apps/novnc/novnc-1.2.0.ebuild
+++ b/www-apps/novnc/novnc-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/kanaka/noVNC.git"
 else
 	SRC_URI="https://github.com/kanaka/noVNC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/noVNC-${PV}"
 fi
 
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index 46a844b57f83..d95cc052752b 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -2,7 +2,9 @@ AUX postinstall-en-2.3.txt 1827 BLAKE2B 49402566ddf6981cf0226f6a963fdd2c48295790
 DIST postfixadmin-3.2.4.tar.gz 1331185 BLAKE2B a16df15f6376f9024114c5870174168e5f3d4b0f52d8759db0d83cb4c05fbbe2949056de0ca5ce097652588b777d59f08bcc2555577c95fbd7f2ebc5dd7f357f SHA512 2bd7ae05addbaf3c6c7eebea16ec1e21b2c67c8e6161446ed82a9553c26c04e19c1ec9ce248a9b9df504df56d309590259e6f04907b04b593548028b40e40d47
 DIST postfixadmin-3.3.5.tar.gz 1857139 BLAKE2B f6e051e8439a5bc4a2145fa58219d3e92f9599923a8b9380db2e1a241cbcca03c6cec893a63de78329f78633cd97e09ab08cc4179667629e7ef77687d2a6d752 SHA512 1db7dd42335d1704501f2491ceed3f0ecb3063a1df4b6487a1f1aac397f658e3479e4ccbc374b3e2f854f90406c1465a68579b1bd9a98386dbd6dda6b22d94c5
 DIST postfixadmin-3.3.7.tar.gz 1858520 BLAKE2B 5da2663fe6c445828118cb4531cbb7ca8a0a81b2d4997b71fe1a39dc25031ec3b1ead393dd3dbbef80d139c1518d172b1937a052a15a0a43dfb6bd6f693bee5b SHA512 c635b885235f2683532ff4fcd6d3e123fa5af8314cfcdbcdf412d7242444bb9c040a6eeb2f6b0669b9f5dd9fc56c53127779727768c68699885cc642717453ca
+DIST postfixadmin-3.3.8.tar.gz 1865581 BLAKE2B f8b29248e839d973fd72647747e0bba7452676543f44310f12203d5e64e83222a3992e282a3898fa077dc54100b3446e4d1cded56cd464d72b2997ce34f064db SHA512 bfe5d874083568f1e8b1830394338d2aa29e39e30834d4c8c728836495f12f6d49c65b83b1fae1fce20e7456afaef0058320033866b720a5858911ceec22a022
 EBUILD postfixadmin-3.2.4.ebuild 2768 BLAKE2B 54b3084b81fa92ca8826e9b8a11b41557f1c7566af775bbf1e0a95282723187eaa1cfa534099f937dda51a9965793175afa9998b3f41e3ce2c0a199a30db50fe SHA512 00cdb45baf4c12463c6b19763bf0de878e4cc26ecc3074f2be110b9c3d01109f344337a5caf55c5390b67e594f4b9b2eb48969e98b287808c8160073be183045
 EBUILD postfixadmin-3.3.5.ebuild 2980 BLAKE2B 13d801092bb1b4206d00eebb0d6cb184c271560a8d827f5b30adbf91727323180faedf42d47d1219f08a35cb54de030e825595f843dcdbd8e7abdfc53e669bbe SHA512 2264b4f9af839aacc07e90797d2ca59022014546443cc079e78aca48124e1d5b56c68f32099cd53029de61dc3447c01506683a9d2dced77266b4bae054dc6e89
 EBUILD postfixadmin-3.3.7.ebuild 2980 BLAKE2B 13d801092bb1b4206d00eebb0d6cb184c271560a8d827f5b30adbf91727323180faedf42d47d1219f08a35cb54de030e825595f843dcdbd8e7abdfc53e669bbe SHA512 2264b4f9af839aacc07e90797d2ca59022014546443cc079e78aca48124e1d5b56c68f32099cd53029de61dc3447c01506683a9d2dced77266b4bae054dc6e89
+EBUILD postfixadmin-3.3.8.ebuild 2980 BLAKE2B 13d801092bb1b4206d00eebb0d6cb184c271560a8d827f5b30adbf91727323180faedf42d47d1219f08a35cb54de030e825595f843dcdbd8e7abdfc53e669bbe SHA512 2264b4f9af839aacc07e90797d2ca59022014546443cc079e78aca48124e1d5b56c68f32099cd53029de61dc3447c01506683a9d2dced77266b4bae054dc6e89
 MISC metadata.xml 560 BLAKE2B 2dccae38d76ef72520678dcc26582c6d99d2221c8cad753063e4948b75cd84b39f47b854a010217a6a52186a7308a3355c41ab6a7229af2417deb39ccb3eae84 SHA512 4ab5d3db2584f100b9f1d9729eb50487e40b27d16c436cbe09dd03d24c533d5d7c61b4b19eda03aa423fb34d9cf2b9f3ec55679196bb8e8da5ea3157c0bc567b
diff --git a/www-apps/postfixadmin/postfixadmin-3.3.8.ebuild b/www-apps/postfixadmin/postfixadmin-3.3.8.ebuild
new file mode 100644
index 000000000000..0df1b6d26679
--- /dev/null
+++ b/www-apps/postfixadmin/postfixadmin-3.3.8.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user 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"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+mysql postgres +vacation"
+REQUIRED_USE="|| ( mysql postgres )"
+
+DEPEND="
+	dev-lang/php:*[unicode,imap,postgres?]
+	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] ) )"
+
+S="${WORKDIR}/${PN}-${P}"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if use vacation; then
+		enewgroup vacation
+		enewuser vacation -1 -1 -1 vacation
+	fi
+}
+
+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
+
+	docinto /usr/share/doc/${PF}/
+	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
+}