gentoo resync : 14.07.2019

4 files changed, 3 insertions, 101 deletions

diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index 8e576f3f5f2d..12350a9b0e5b 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,7 +1,3 @@
-DIST owncloud-10.0.10.tar.bz2 44943557 BLAKE2B a2cdfbef7affc306b7653f1841b0bb2e781d849bbd62d9b8a0f3a019cca5be8a02ca27b5fa5cbb39ddb9a440aa917b279c937ebdae034504d5c1b9ed3eeee603 SHA512 77f9567395ee5319afc397ed7b9bd93687ddfb90022445be06adfb58ae49557223227a656b638b1cdac19b730509292e7ba260846c9f67540418267ac7b518f7
-DIST owncloud-10.1.1.tar.bz2 20272676 BLAKE2B 36f4a1fb513dc1a49ba571935de309f78c12fad11b4b5297c48fa02541a7c7858ce8c525847c44b89e43a5142f52e37c9c23cfff71aef9380b4192729e5b110c SHA512 4252ac71b87bd7a6372507a501dea4022420b7c2cb6556ec258091238cf3b347a33cd56c2a8afefcf971c0bbd68422fc86db8be2e6bf8fb3b6c76ff3aac228e8
-DIST owncloud-10.2.0.tar.bz2 20370460 BLAKE2B df52e0bfd7090dcddffc2bd87059e17d575ac250bc737a6b38c45ec73cd793e2b2d3deb0bd17e7f91f858e9c4ffe92a551de8204cc0c0246ba833b93721ab3ed SHA512 cbeacfaee4b29d01bbea2a2a0800c34d4ec3d3a430e287b39df1414c359c1aeeaf61fe7d044674f44180bb37962c44f87392a663273e447cd6b0f4d2d62201a6
-EBUILD owncloud-10.0.10.ebuild 1267 BLAKE2B 3a1a4f21b2ca2a46975f2e60516eafdf6c96cde7205867aba7a54e995a1ea424d0d203e49405418c1c3be2ae8cc55bbcd2527c01e631dc66ddc5a1f21b227926 SHA512 1a94a56f9879e9fe2abc25d146539ce38a875d56a51f170d0305897b4e9dd9410bd7f010da89bcd10aa811610438568b6abee3da54a3755ac4dade2ebe8be36d
-EBUILD owncloud-10.1.1.ebuild 1267 BLAKE2B 3a1a4f21b2ca2a46975f2e60516eafdf6c96cde7205867aba7a54e995a1ea424d0d203e49405418c1c3be2ae8cc55bbcd2527c01e631dc66ddc5a1f21b227926 SHA512 1a94a56f9879e9fe2abc25d146539ce38a875d56a51f170d0305897b4e9dd9410bd7f010da89bcd10aa811610438568b6abee3da54a3755ac4dade2ebe8be36d
-EBUILD owncloud-10.2.0.ebuild 1267 BLAKE2B 3a1a4f21b2ca2a46975f2e60516eafdf6c96cde7205867aba7a54e995a1ea424d0d203e49405418c1c3be2ae8cc55bbcd2527c01e631dc66ddc5a1f21b227926 SHA512 1a94a56f9879e9fe2abc25d146539ce38a875d56a51f170d0305897b4e9dd9410bd7f010da89bcd10aa811610438568b6abee3da54a3755ac4dade2ebe8be36d
+DIST owncloud-10.2.1.tar.bz2 20354052 BLAKE2B da7c148e322c202ba599421cdbaf3b20f9ed9d490e7bfe7427a0892bbd1fc12520b21b9769d3afedeb93108632a58efbc13f919f20bc9b8a0faec88010f14540 SHA512 316125cd9540c1830a122fb56ee4bd4df1eedc397ef24996ee7dca582989bdfaee4ab659df3bac2a905c817919f2804bdc419ab18c9db2461909cf5941dda169
+EBUILD owncloud-10.2.1.ebuild 1275 BLAKE2B 0f2990eb49aa741733cca2bfc1860d6f644d0fb489eaf944f3177641c178308fd99ea93d22a2ee032f7587d0cee6e6b9202a08bf58c340d92630664f5bfa6213 SHA512 7ed6fb59c3a699f6dae7169c74820ca55c1c7d06c823c4693fe01339820d248cbb16724414f0e3df6ed78f38524c9563ab4c77a592e0414c1289633e8a54c295
 MISC metadata.xml 362 BLAKE2B 966b48f98107fc73bd40f9c602962f2c876c1be1f074943452cfb5bbf60eb1c2ca08153294ce4166442da85beebd41395ca9bbe9c98d7832665fa16419db374d SHA512 64c690c6fa8bc6861f673b465e0519d5c5e945d76b66a2d9e7422cbfaa967624e7da287626bd12edbf347f0d0b5296fb9719ede93d15f073542367f5fecf5e99
diff --git a/www-apps/owncloud/owncloud-10.1.1.ebuild b/www-apps/owncloud/owncloud-10.1.1.ebuild
deleted file mode 100644
index f493a0c561af..000000000000
--- a/www-apps/owncloud/owncloud-10.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="https://owncloud.org"
-SRC_URI="https://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl 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?,xmlreader,xmlwriter,zip]
-	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_src_install
-}
-
-pkg_postinst() {
-	elog "Additional applications (calendar, ...) are no longer provided by default."
-	elog "You can install them after login via the applications management page"
-	elog "(check the recommended tab). No application data is lost."
-	webapp_pkg_postinst
-}
diff --git a/www-apps/owncloud/owncloud-10.2.0.ebuild b/www-apps/owncloud/owncloud-10.2.0.ebuild
deleted file mode 100644
index f493a0c561af..000000000000
--- a/www-apps/owncloud/owncloud-10.2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="https://owncloud.org"
-SRC_URI="https://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl 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?,xmlreader,xmlwriter,zip]
-	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_src_install
-}
-
-pkg_postinst() {
-	elog "Additional applications (calendar, ...) are no longer provided by default."
-	elog "You can install them after login via the applications management page"
-	elog "(check the recommended tab). No application data is lost."
-	webapp_pkg_postinst
-}
diff --git a/www-apps/owncloud/owncloud-10.0.10.ebuild b/www-apps/owncloud/owncloud-10.2.1.ebuild
index f493a0c561af..a0cf0b0eccd0 100644
--- a/www-apps/owncloud/owncloud-10.0.10.ebuild
+++ b/www-apps/owncloud/owncloud-10.2.1.ebuild
@@ -15,7 +15,7 @@ IUSE="+curl 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?,xmlreader,xmlwriter,zip]
+RDEPEND="<dev-lang/php-7.3[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
 	virtual/httpd-php"
 
 S=${WORKDIR}/${PN}