gentoo resync : 30.10.2021

9 files changed, 11 insertions, 52 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index ff2c2068d400..5f865648da04 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/liquid_feedback_frontend/files/liquid_feedback.initd b/www-apps/liquid_feedback_frontend/files/liquid_feedback.initd
index 0fe14172b52f..0fe14172b52f 100755..100644
--- a/www-apps/liquid_feedback_frontend/files/liquid_feedback.initd
+++ b/www-apps/liquid_feedback_frontend/files/liquid_feedback.initd
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 431cf60ac58e..5341480b599a 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,10 +1,8 @@
 AUX php-argon2-en.txt 416 BLAKE2B 9940a3e218d1db382790f4754352594c9098eccce7426729e75471f017e15bb45b50cc885609e54817077e36d9feb4484bcff5b40c4f669ad80d4d5a643da8bc SHA512 076bbbfb9305a2608b60fb7f9802a5a455c5d049d39c8f209eadac1a306ba2015d11a30b4544d8cdf43025077a3c3087f3e9922cd9b530a08c089a7818590115
 DIST nextcloud-20.0.13.tar.bz2 110837657 BLAKE2B b29a0b1db7dba682fee13a38e95502b7235c926a323a34f6c8e38d19876f0c3484d922a9602c0211320d8d82b0da2063612812846809c14c38853bcc6bf450f3 SHA512 a31182e7efcf151bb46f71147025aff6a00f8c7dbd545338e8005c40c2b82b21a75ea73a2119db3029e7dd85b9b018e417525b3ab59a3353dd73eafcf87122d0
-DIST nextcloud-21.0.4.tar.bz2 140200496 BLAKE2B 9dd54a10dda30fdd1107266c8acc7f0161596107c04546336f29ac523275c93be8fd1877558c1b7e469769f5e30f3eb2179896c8bb26db4c20bf6a44f8bc3df7 SHA512 7fef1aa4bc4b9c158a3c50bdff87054b97cfeed8d066076676f00189380c115d318a657492dc2a0f138b85f15fd7dc807c0137775b76f37dbc7b052514614390
 DIST nextcloud-21.0.5.tar.bz2 127542660 BLAKE2B b6c2bc642705ba5572a74a1f473e09a7be0ad6c4937b1a15d3b29bdad652872c373b9b6ab126c1ea90f32dced3fbb34505c82a7fc9d6913e407c6e43b97fe55b SHA512 ef8796cb17e6143dc1c9ccdea56105d0d7e2138eddae228724074b6360f99d0416a3682be047955b9a84dd6a961cdbb15ccff67ee6656a896699bbfa640d715d
 DIST nextcloud-22.2.0.tar.bz2 131241307 BLAKE2B b23526c0a12817b16fa7733b34143bdd4a581b829a7934e6d6865b028ccb46cb3e08b6a077325feea1234d966b36a3017ee6d9443851d30481955654840c29ca SHA512 ecf308fdd46f43e4507d90eae90f4fece4410ac546929cda8ce3f0c48db7fc644a37558c4d1aeef8943cda4c0474d6afa5e151af5c5b9c6f17b4ae05f5e0fc26
 EBUILD nextcloud-20.0.13.ebuild 1083 BLAKE2B 0e18f62655dfa0bdf7a81f5280be99c34c876a8c57e66e206e1c7e43e0cf93745cda3247f05da592fc5882e872e8249dac9391f22648940fe95e8cd2bc158422 SHA512 e0d8a192c51901913a40521b5259c7276356b8c15246c5df193c4a4a5b0652034148dd971c5014a72f378d4449b778e5867030f9ec3d8ad9bf42efa955ce63c5
-EBUILD nextcloud-21.0.4.ebuild 1081 BLAKE2B 89d3edc2aa3f41b8bfc2a1a1d59d886d71c77b41c4681e1abff33471e5a336c4b800872d2f3369325ee15c7b9eafeec51d65e6de113017345753ce416f9e732c SHA512 c5fcae9887cdc570c820c94314319b9c597418be7ad378fa78d7c6a16481fadb850a3d6fb6ba8b0973c46c159fee3f56da9c5e6409ab435258aaab0a824893bc
-EBUILD nextcloud-21.0.5.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
+EBUILD nextcloud-21.0.5.ebuild 1081 BLAKE2B 89d3edc2aa3f41b8bfc2a1a1d59d886d71c77b41c4681e1abff33471e5a336c4b800872d2f3369325ee15c7b9eafeec51d65e6de113017345753ce416f9e732c SHA512 c5fcae9887cdc570c820c94314319b9c597418be7ad378fa78d7c6a16481fadb850a3d6fb6ba8b0973c46c159fee3f56da9c5e6409ab435258aaab0a824893bc
 EBUILD nextcloud-22.2.0.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
 MISC metadata.xml 645 BLAKE2B 1347bd3fcd02b3e541da305002e905cfc9114307ef1988401e6f8443d54e73b897a37557e4ae1e225ffde3897d6b0d448a0a0859cfab6d81d11b1b9226a734cf SHA512 1aa361e4cf6c13ffa18945645ecf7754721397ef6aa289e56e532435e69d1024e94714907f2c3870b7e0b234f329ec6592e62c69969de69499597f25b64ac0d5
diff --git a/www-apps/nextcloud/nextcloud-21.0.4.ebuild b/www-apps/nextcloud/nextcloud-21.0.4.ebuild
deleted file mode 100644
index facb26136365..000000000000
--- a/www-apps/nextcloud/nextcloud-21.0.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 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-21.0.5.ebuild b/www-apps/nextcloud/nextcloud-21.0.5.ebuild
index ab3ba8e01bc4..facb26136365 100644
--- a/www-apps/nextcloud/nextcloud-21.0.5.ebuild
+++ b/www-apps/nextcloud/nextcloud-21.0.5.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/phpBB/files/permissions b/www-apps/phpBB/files/permissions
index b5c21c879eb1..b5c21c879eb1 100755..100644
--- a/www-apps/phpBB/files/permissions
+++ b/www-apps/phpBB/files/permissions
diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index c28c14270107..198af318c12a 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -3,6 +3,6 @@ AUX radicale-r3.init.d 531 BLAKE2B 2462a6a9cc3377d82f53f4add662f17dbb06c49787634
 AUX radicale.service 546 BLAKE2B 6d43e9b9aec713a944259e6323442f6796068ede3da5399f9081692b55fa0edc7ec72b35d190ec68f14972374c4da23178e84c7f4ff6df611c1f82e1e0b3029d SHA512 94705c36ddd4de14b608fa71cb8ee4fff3f4f12cf90cfeb3863c334e98ac5d19b34134d26c319d5d05b61efba8370addb87b8b6a6ad7005a17f8bfb35ff9013b
 DIST radicale-2.1.12.tar.gz 123828 BLAKE2B 38ffb264b1f8e185642e0236821bd1a7714c34306f4d67d181a9130c7955b9f3a616547fa04a15781c2587bbdc5e7ea1eeab9da65790b72fb78cd83d78b0fd43 SHA512 98b5c1e6c71928859de9f497b7e968e56c659e9e5d8c559d4359718511d67a23d4daa9adca679f5f732ad531cb04d184b022cf2684fa5fdbfe24a35c92813968
 DIST radicale-3.0.6.tar.gz 123817 BLAKE2B fa4b70c9920d518df6c939395eca857c237a75218b90ada45564f2d84266d65df12898e4efbb52905829948061e10e72b5442943fd5061a28447330ae8d491e8 SHA512 e9741547395fae8886ad84b6807422ebb196f5293d484f5f6136498058576cff697e28c117216f151d56494af83593347ceee40a6efa21272b803d0f301a396d
-EBUILD radicale-2.1.12.ebuild 1722 BLAKE2B 3aa793d57898fd60726422114c247265f2566134587f1bf04a0cd94d0525baa4935ffb53bdf77996b3f12f5faa6c3f9845a78a8d9ae0bfb9de725a7033e0e866 SHA512 32b0893d0778ac3f6b8ae40387a8e7817e77a165d572b311f21565fb37c5e97ddf527e2adafde4784de10e3fa3a6466ac5922b5d778562d6894d1e2f1408d8cb
-EBUILD radicale-3.0.6-r3.ebuild 1917 BLAKE2B 48306d0aa313277ab4e19bb76d102a767ab913313901686202340a77588a4f2a35f68f3e4a6b849e81b155cf7257df4ab509d0ad704c70c780da3dc4603e32e0 SHA512 a6a6fa838dca885f21e2694d43cb645abe1b87168d34e15d940af9ab4be90f06cde55baf25f81ce8d170befd1b0f76c03d8f9354dabfc76c24d72a1940155300
+EBUILD radicale-2.1.12-r1.ebuild 1756 BLAKE2B 91a5a0410c19eada8ae327d96e01420714d6ba5d2af62aecd324e25af24489f847a5cf788b2542a3ff7aa6edfdf8848a43430b1a682dc78b43faed95456fa017 SHA512 d59e1836243cb2541b0752835cc85b06778807c676a6e1e6f0b054cfd63ca3c5bf5704f23dffb19416502d53ee5f429484c67f065a4bfc899d1b68152228a41b
+EBUILD radicale-3.0.6-r4.ebuild 1965 BLAKE2B 87780a1e744e830146be9e54e19bf75130897a7d4ad2329d4d680d7b8fa5af037586722ee0633ba3f03947ed342f3a577f438bd131939395c6b1280dbde0cff2 SHA512 94020e9735157be1aa216b1fcd790ef7414dfe71e23821d200f1dd3d9b2916e159eb8217162b0da5f920b0b6c228b36b74384d728369974a3c23203ce637e454
 MISC metadata.xml 329 BLAKE2B 3321ffedd6ebe3b039cf8dd24979e5b882086adfc9b6ba639abb3506997c8e372d22b22ab95545e3850b9c3e33565e9b2642b9685209830322dd4025b91e1f1e SHA512 24c5261de2945f2ad31b6fa9267375c8ea25eee3f937fa0c1551e4d68638952ff7766e87f3a95a174ac4ecaaad3420a18a109d920a7ce3a3c278e6321eec2e47
diff --git a/www-apps/radicale/radicale-2.1.12.ebuild b/www-apps/radicale/radicale-2.1.12-r1.ebuild
index 29c9db7bf875..2c588c49f493 100644
--- a/www-apps/radicale/radicale-2.1.12.ebuild
+++ b/www-apps/radicale/radicale-2.1.12-r1.ebuild
@@ -26,7 +26,10 @@ RDEPEND="
 	>=dev-python/vobject-0.9.6[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]
 	sys-apps/util-linux
-	bcrypt? ( dev-python/passlib[bcrypt,${PYTHON_USEDEP}] )"
+	bcrypt? (
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+	)"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/www-apps/radicale/radicale-3.0.6-r3.ebuild b/www-apps/radicale/radicale-3.0.6-r4.ebuild
index 634dd1140c4b..a04556547c2d 100644
--- a/www-apps/radicale/radicale-3.0.6-r3.ebuild
+++ b/www-apps/radicale/radicale-3.0.6-r4.ebuild
@@ -21,8 +21,9 @@ MY_P="Radicale-${PV}"
 RDEPEND="
 	acct-user/radicale
 	acct-group/radicale
-	dev-python/defusedxml
-	dev-python/passlib[bcrypt,${PYTHON_USEDEP}]
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/passlib[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/vobject[${PYTHON_USEDEP}]
 	sys-apps/util-linux