gentoo resync : 25.09.2021

3 files changed, 2 insertions, 47 deletions

diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index d7926ccf5c46..93ecddcfd89a 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.12.tar.bz2 123184555 BLAKE2B cf1493215a9efc5a6a7e90b3ed92510b629ff3109dc8e7b4a802bc45190604ee42700350c6f76b78823e95c5dee5bcaf3a95d12ed14b64365eee882ac3b8b622 SHA512 423c09256c31bf9530f97eb0961471cd87c23a0d46de9d4eb9a63270a67ea7c861ca77c83fa203426b5f3cae717202dbd44ccdd6b432ae06570c0a0cf6d4dc5e
-DIST nextcloud-21.0.3.tar.bz2 129433656 BLAKE2B 75df0e3363e606fb4406aca7e37ab0a373d390f50966405c59e620b683979855c05f16548bb14e9ac7b4ffa756562679e5d6f1a8e4cd1d46aeda0756f235facd SHA512 e618dc400659a2aca37857c446d31296e64d7671a66bf077969b3194ae35242c6de11eabd1547791067c0edc43e93149fadf102bd4022cffb92802ad9d7e4ef7
 DIST nextcloud-21.0.4.tar.bz2 140200496 BLAKE2B 9dd54a10dda30fdd1107266c8acc7f0161596107c04546336f29ac523275c93be8fd1877558c1b7e469769f5e30f3eb2179896c8bb26db4c20bf6a44f8bc3df7 SHA512 7fef1aa4bc4b9c158a3c50bdff87054b97cfeed8d066076676f00189380c115d318a657492dc2a0f138b85f15fd7dc807c0137775b76f37dbc7b052514614390
 DIST nextcloud-22.1.1.tar.bz2 145195483 BLAKE2B 6572c3b90199b4ca1118f35b412e580c824eb688fca92a38ba578a1d9fe9630f137d5c0a9b3ab3428849b479f09e3d5b90cfc1477c59028755e75070591807e3 SHA512 0b418d7d0e0e825ec9259334e377449a8dcd183dc907b094361c70b51b00732353996fdbf12f17c06cfa6bb918221cac56ee3051df0308ff453bb2d727e9c0ad
 EBUILD nextcloud-20.0.12.ebuild 1083 BLAKE2B 0e18f62655dfa0bdf7a81f5280be99c34c876a8c57e66e206e1c7e43e0cf93745cda3247f05da592fc5882e872e8249dac9391f22648940fe95e8cd2bc158422 SHA512 e0d8a192c51901913a40521b5259c7276356b8c15246c5df193c4a4a5b0652034148dd971c5014a72f378d4449b778e5867030f9ec3d8ad9bf42efa955ce63c5
-EBUILD nextcloud-21.0.3.ebuild 1081 BLAKE2B 89d3edc2aa3f41b8bfc2a1a1d59d886d71c77b41c4681e1abff33471e5a336c4b800872d2f3369325ee15c7b9eafeec51d65e6de113017345753ce416f9e732c SHA512 c5fcae9887cdc570c820c94314319b9c597418be7ad378fa78d7c6a16481fadb850a3d6fb6ba8b0973c46c159fee3f56da9c5e6409ab435258aaab0a824893bc
-EBUILD nextcloud-21.0.4.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
+EBUILD nextcloud-21.0.4.ebuild 1081 BLAKE2B 89d3edc2aa3f41b8bfc2a1a1d59d886d71c77b41c4681e1abff33471e5a336c4b800872d2f3369325ee15c7b9eafeec51d65e6de113017345753ce416f9e732c SHA512 c5fcae9887cdc570c820c94314319b9c597418be7ad378fa78d7c6a16481fadb850a3d6fb6ba8b0973c46c159fee3f56da9c5e6409ab435258aaab0a824893bc
 EBUILD nextcloud-22.1.1.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
 MISC metadata.xml 645 BLAKE2B 1347bd3fcd02b3e541da305002e905cfc9114307ef1988401e6f8443d54e73b897a37557e4ae1e225ffde3897d6b0d448a0a0859cfab6d81d11b1b9226a734cf SHA512 1aa361e4cf6c13ffa18945645ecf7754721397ef6aa289e56e532435e69d1024e94714907f2c3870b7e0b234f329ec6592e62c69969de69499597f25b64ac0d5
diff --git a/www-apps/nextcloud/nextcloud-21.0.3.ebuild b/www-apps/nextcloud/nextcloud-21.0.3.ebuild
deleted file mode 100644
index facb26136365..000000000000
--- a/www-apps/nextcloud/nextcloud-21.0.3.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.4.ebuild b/www-apps/nextcloud/nextcloud-21.0.4.ebuild
index ab3ba8e01bc4..facb26136365 100644
--- a/www-apps/nextcloud/nextcloud-21.0.4.ebuild
+++ b/www-apps/nextcloud/nextcloud-21.0.4.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 )"