www-apps/nextcloud: 11.0.6/12.0.4 bumps

Also backport bugfix on authentication required

Closes: https://bugs.gentoo.org/639994
Package-Manager: Portage-2.3.16, Repoman-2.3.6

4 files changed, 113 insertions, 3 deletions

diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 7f33eb7ada4f..2c0100c88a5b 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,4 +1,6 @@
-DIST nextcloud-11.0.4.tar.bz2 42164294 SHA256 68b89f1d0068728f76d89519c7d0a57396f2d216d048cc970346d436ec61999e SHA512 3e521921dfd218100cd114da02f5b9316883d72c000e44ecee606ecfc300c9847de9af3c291d8cbe936a43d29ac37b2d76c03d32a633b7a8f73dc6ff51e9c520 WHIRLPOOL 2453f49e0e7e8f0ed6bc69dbfbd5e7c9b88d9a2f4279fca046f47f7cf393c5d89a96c73956b685a40a9ddd7fb4ec155af5bc0d85828302cf6bda1654c0403246
-DIST nextcloud-11.0.5.tar.bz2 42515140 SHA256 47261211384e63b1d4816be60817b0315029d018b5568ac3aeb3181be5fb98a4 SHA512 4e25fefb34c68d2244fe9bbfba33a140b6d0833a485f4bffdd24b5f774f1053b80a9a8eb161a673b1fcbe278a929f8ae80b5f9da0163b668f6f41bacaaac478a WHIRLPOOL f9cd8473c839f2edf9e06b120e9efbd1b480310415d9973561f00a312c4d39fddceaf3682c373c857a1a436adbe6c2321b0a786c7604c0a355554251c29eebc8
+DIST nextcloud-11.0.4.tar.bz2 42164294 BLAKE2B 9cb46b3b189ab68da885d4db176ff12767ab5fd6dedb68fe4dddaba6dd8dea77ca6d0cc7a6454cf94c9707302f790b09abc9cefb2bc0ed0eb19a98d8c4dc652c SHA512 3e521921dfd218100cd114da02f5b9316883d72c000e44ecee606ecfc300c9847de9af3c291d8cbe936a43d29ac37b2d76c03d32a633b7a8f73dc6ff51e9c520
+DIST nextcloud-11.0.5.tar.bz2 42515140 BLAKE2B 865546232ec0dae8bb8385f3bfe90fef65c48167c38e1d441860466d06370000e773f5bbdfe1668901f43126935ec0c7fd5ae7154700d9ff740cdf169a82cfba SHA512 4e25fefb34c68d2244fe9bbfba33a140b6d0833a485f4bffdd24b5f774f1053b80a9a8eb161a673b1fcbe278a929f8ae80b5f9da0163b668f6f41bacaaac478a
+DIST nextcloud-11.0.6.tar.bz2 43226496 BLAKE2B 08b1f088cb05d1b2916d84d29c4a9b99ff88c8e1852f7337701030a8e56bb4fc484aa4b945dc634b095ff3046479a3e004c6483b039036b4ab9597e5a6c5b20f SHA512 66ff8e69cbf895c751665f590ff3dfab1629d79424c008455ef0145fd7a637f1f545d2ea106109624c0bdd33e505732a04ab98bcde1da2b4df1c0ac84d301e0f
 DIST nextcloud-12.0.2.tar.bz2 42756355 SHA256 eb34d6cb9f55ee84bf2ad847b4b08cdb925321848ffa2264a9b1566e7b21a17c SHA512 5451c2dd2fa0a9f64e66723e075642d3e37b43f9611dc1a954183babea137c241c4e6c6428dbac99b3a99bff1ce6c6e4db6f3b42babb37caf445bfbd1674faa2 WHIRLPOOL d1d1baa6c0852d5abf9863bcc0ba67fea29b8c14eb5015191f5f547fd9c6d1247e863eecf2f8966314cccecdb19ec16e5d66454ed21995b6c99076eac8f3205a
-DIST nextcloud-12.0.3.tar.bz2 42935218 SHA256 88bcaccba886d0e5a145b15fe216d652ab68a0a4c089a102f1fa1e78e6ddfb71 SHA512 4aae61cb201f3c8b7ba7fa6c2789fb72930b1190ff40ef96494bc2763f268f321b2c2d1ec70c9add8cd45307818ddee39749a5d0a7d0667997980e4b5087c308 WHIRLPOOL 3445559e0efe59c78098b6ea53660403664a70999c18b24759c945757450b3de0a7241c85caffdfc165a275caa7a87931af854853ff3330aeb382f0855d936e0
+DIST nextcloud-12.0.3.tar.bz2 42935218 BLAKE2B 98927af76c326c1869094fb61ddffd0c32a7bbc51becb193b65c46d5593d588f92e79fcac31869416985fd55629afbec406063dc45af93d8604c7c7a5932e6f3 SHA512 4aae61cb201f3c8b7ba7fa6c2789fb72930b1190ff40ef96494bc2763f268f321b2c2d1ec70c9add8cd45307818ddee39749a5d0a7d0667997980e4b5087c308
+DIST nextcloud-12.0.4.tar.bz2 43583313 BLAKE2B a1f495d9afca67c55f4c9b5721baa9b6be79d4d21f23daea786382b7f21f9e9cae6c8166a18bc8d40dc84a153faf759bb57739cbb8716550f68888483bcf3902 SHA512 30426e6998ccc38026ab584fbec2e8e64419dc500a62066fefa8efd29eae94c7d11104e1ecfa6307ac754dbb82d4eaa499c2b38459af6353845ea741b304a4bf
diff --git a/www-apps/nextcloud/files/nextcloud-12.0.4-destroy_modal_when_closed.patch b/www-apps/nextcloud/files/nextcloud-12.0.4-destroy_modal_when_closed.patch
new file mode 100644
index 000000000000..ca63cb6db402
--- /dev/null
+++ b/www-apps/nextcloud/files/nextcloud-12.0.4-destroy_modal_when_closed.patch
@@ -0,0 +1,26 @@
+From 75bc40f7a08e11fc115e4986bb45fc314d49632a Mon Sep 17 00:00:00 2001
+From: Thomas Bille <thomas.bille625@gmail.com>
+Date: Mon, 10 Jul 2017 14:33:41 +0200
+Subject: [PATCH] Destroy modal when closed
+
+Signed-off-by: Thomas Bille <contact@tbille.fr>
+---
+ core/js/jquery.ocdialog.js | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
+index 555b35e59ff..f3a54119e78 100644
+--- a/core/js/jquery.ocdialog.js
++++ b/core/js/jquery.ocdialog.js
+@@ -212,8 +212,10 @@
+ 			// Ugly hack to catch remaining keyup events.
+ 			setTimeout(function() {
+ 				self._trigger('close', self);
+-				self.$dialog.hide();
+ 			}, 200);
++
++			self.$dialog.remove();
++			this.destroy();
+ 		},
+ 		destroy: function() {
+ 			if(this.$title) {
diff --git a/www-apps/nextcloud/nextcloud-11.0.6.ebuild b/www-apps/nextcloud/nextcloud-11.0.6.ebuild
new file mode 100644
index 000000000000..d70e7708a17f
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-11.0.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="http://nextcloud.com"
+SRC_URI="http://download.nextcloud.com/server/releases/${P}.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,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
+}
diff --git a/www-apps/nextcloud/nextcloud-12.0.4.ebuild b/www-apps/nextcloud/nextcloud-12.0.4.ebuild
new file mode 100644
index 000000000000..94a35930f422
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-12.0.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="http://nextcloud.com"
+SRC_URI="http://download.nextcloud.com/server/releases/${P}.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,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
+	virtual/httpd-php"
+
+PATCHES=( "${FILESDIR}"/${P}-destroy_modal_when_closed.patch )
+
+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
+}