gentoo resync : 24.07.2021

4 files changed, 2 insertions, 92 deletions

diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index e7734767cd91..fee0754515a2 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,12 +1,8 @@
 AUX php-argon2-en.txt 416 BLAKE2B 9940a3e218d1db382790f4754352594c9098eccce7426729e75471f017e15bb45b50cc885609e54817077e36d9feb4484bcff5b40c4f669ad80d4d5a643da8bc SHA512 076bbbfb9305a2608b60fb7f9802a5a455c5d049d39c8f209eadac1a306ba2015d11a30b4544d8cdf43025077a3c3087f3e9922cd9b530a08c089a7818590115
-DIST nextcloud-20.0.10.tar.bz2 123375030 BLAKE2B 881777f0ee0489e14ae67eef5d7eaa37b8b7b6e047eb3953467470e7e39268c7680b0ccd43f10426de1668cde3f4ad82ec57148e93a84142d1cfbee7c1ee354f SHA512 a65a4c19894d61ac7d168f03a7aae489e39eb53f42cd02301800fe511483df056afab15a9d8708effa0109af6c451c9cb13ab3502ccea7447ec3cdb10367fcf1
 DIST nextcloud-20.0.11.tar.bz2 123339332 BLAKE2B f89dd1c81a9fcac46bb270a646df89d43064bac73e96209e379a5a60b204bdc44ade6b265c870138bc35a0a3aa2a52f4797166c03c1d156ac49336e48c1372d7 SHA512 4863a7819a564655db0a7b49a7ca9be642ab5383cdeada5c3ce6fc4529fda522a4427eb4b3ba5e00e4719232fed6c1f9e606e11f38c35f8838f82247359f335b
-DIST nextcloud-21.0.2.tar.bz2 129247099 BLAKE2B 282f79e9f764f1444dfe339e73fb955a7c77ad9335304ce0d9f8f7353769f3d11ee455ab01aea03ea04f5f8a029b3e97e49845fe6490d5db4d07324460626917 SHA512 a222c55c7ff515b96b7c826da13ff1770f82bebda2e73df6bb31df635338155dff611a560b665b0e9b17f2d8f33132abf75ffa80e84f5a115ee5d8a4737b6795
 DIST nextcloud-21.0.3.tar.bz2 129433656 BLAKE2B 75df0e3363e606fb4406aca7e37ab0a373d390f50966405c59e620b683979855c05f16548bb14e9ac7b4ffa756562679e5d6f1a8e4cd1d46aeda0756f235facd SHA512 e618dc400659a2aca37857c446d31296e64d7671a66bf077969b3194ae35242c6de11eabd1547791067c0edc43e93149fadf102bd4022cffb92802ad9d7e4ef7
 DIST nextcloud-22.0.0.tar.bz2 144386509 BLAKE2B 5d41337a7577d33f4be2ce5900b97df5582542bf4b51a4de4eff2f62726bcf014d99456ebc775feb16fd625582760e31ee434a23874451a1072822dcd21d5cd6 SHA512 ced81296d1080cb224ac96df501721c1a16a8a83f9784ab281d97202ec6611173d60a6a87279e7f36b735a92dd010ed81b0c7561fc7dadde00df10f9b7711cec
-EBUILD nextcloud-20.0.10.ebuild 1081 BLAKE2B 51166655fca8673a06762990e4cd9770655e2fe027e51a2a51b4ae3a1a05f020f5a863d415d132ef7d0974654170205879c4d4eded787195490d8abb7cf2249a SHA512 a198ebbb7005113bb1f2eec73ef7ca56e7c1831da6dc1eacc5a942ae59344d8d10f1c6f8467db6e430359e9dcdc807de21e90ea7269f795d088ec9618708ea5a
 EBUILD nextcloud-20.0.11.ebuild 1083 BLAKE2B 0e18f62655dfa0bdf7a81f5280be99c34c876a8c57e66e206e1c7e43e0cf93745cda3247f05da592fc5882e872e8249dac9391f22648940fe95e8cd2bc158422 SHA512 e0d8a192c51901913a40521b5259c7276356b8c15246c5df193c4a4a5b0652034148dd971c5014a72f378d4449b778e5867030f9ec3d8ad9bf42efa955ce63c5
-EBUILD nextcloud-21.0.2.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
-EBUILD nextcloud-21.0.3.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
+EBUILD nextcloud-21.0.3.ebuild 1081 BLAKE2B 89d3edc2aa3f41b8bfc2a1a1d59d886d71c77b41c4681e1abff33471e5a336c4b800872d2f3369325ee15c7b9eafeec51d65e6de113017345753ce416f9e732c SHA512 c5fcae9887cdc570c820c94314319b9c597418be7ad378fa78d7c6a16481fadb850a3d6fb6ba8b0973c46c159fee3f56da9c5e6409ab435258aaab0a824893bc
 EBUILD nextcloud-22.0.0.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
 MISC metadata.xml 644 BLAKE2B 893952d31b289d07befd82be0d9998df95149363a0bfcfbb64626d8679b67048017a520fe65e5eb14224432a98efbb726e866c95562de23f2dc650df90df5371 SHA512 ec4bcd3ea472df2201830ac14e6dbc01a8317fc8ad8eadd5231014c49a07151ed7647b6d87c22a62df9a2f67d8c2911d44b504a612c9f446228f9a227e6bed7b
diff --git a/www-apps/nextcloud/nextcloud-20.0.10.ebuild b/www-apps/nextcloud/nextcloud-20.0.10.ebuild
deleted file mode 100644
index db622aa5e6ab..000000000000
--- a/www-apps/nextcloud/nextcloud-20.0.10.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-8[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.2.ebuild b/www-apps/nextcloud/nextcloud-21.0.2.ebuild
deleted file mode 100644
index ab3ba8e01bc4..000000000000
--- a/www-apps/nextcloud/nextcloud-21.0.2.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.3.ebuild b/www-apps/nextcloud/nextcloud-21.0.3.ebuild
index ab3ba8e01bc4..facb26136365 100644
--- a/www-apps/nextcloud/nextcloud-21.0.3.ebuild
+++ b/www-apps/nextcloud/nextcloud-21.0.3.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 )"