Version bumps, mostly stability fixes

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 00F7AB331B0F097F)

4 files changed, 61 insertions, 14 deletions

diff --git a/www-apps/owncloud/ChangeLog b/www-apps/owncloud/ChangeLog
index 5f6fe271c517..dd780c9d7969 100644
--- a/www-apps/owncloud/ChangeLog
+++ b/www-apps/owncloud/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apps/owncloud
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/ChangeLog,v 1.65 2015/05/04 08:36:09 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/ChangeLog,v 1.66 2015/06/10 13:18:32 voyageur Exp $
+
+*owncloud-8.0.4 (10 Jun 2015)
+*owncloud-7.0.6 (10 Jun 2015)
+*owncloud-6.0.8 (10 Jun 2015)
+
+  10 Jun 2015; Bernard Cafarelli <voyageur@gentoo.org> +owncloud-6.0.8.ebuild,
+  +owncloud-7.0.6.ebuild, -owncloud-8.0.0.ebuild, -owncloud-8.0.2.ebuild,
+  +owncloud-8.0.4.ebuild:
+  Version bumps, mostly stability fixes
 
   04 May 2015; Bernard Cafarelli <voyageur@gentoo.org> +owncloud-8.0.3.ebuild:
   Version bump, drop depend.php eclass use
diff --git a/www-apps/owncloud/owncloud-8.0.2.ebuild b/www-apps/owncloud/owncloud-6.0.8.ebuild
index 13cf6dc7daf0..8c66e7dafa62 100644
--- a/www-apps/owncloud/owncloud-8.0.2.ebuild
+++ b/www-apps/owncloud/owncloud-6.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-8.0.2.ebuild,v 1.1 2015/03/11 16:21:57 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-6.0.8.ebuild,v 1.1 2015/06/10 13:18:32 voyageur Exp $
 
 EAPI=5
 
@@ -44,10 +44,3 @@ src_install() {
 
 	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-7.0.6.ebuild b/www-apps/owncloud/owncloud-7.0.6.ebuild
new file mode 100644
index 000000000000..adfc270c75d9
--- /dev/null
+++ b/www-apps/owncloud/owncloud-7.0.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-7.0.6.ebuild,v 1.1 2015/06/10 13:18:32 voyageur Exp $
+
+EAPI=5
+
+inherit eutils webapp depend.php
+
+DESCRIPTION="Web-based storage application where all your data is under your own control"
+HOMEPAGE="http://owncloud.org"
+SRC_URI="http://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,json,mysql?,pdo,postgres?,simplexml,sqlite?,xmlwriter,zip]"
+need_httpd_cgi
+need_php_httpd
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	epatch_user
+}
+
+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/owncloud/owncloud-8.0.0.ebuild b/www-apps/owncloud/owncloud-8.0.4.ebuild
index d767c2a1532e..de84178d20b1 100644
--- a/www-apps/owncloud/owncloud-8.0.0.ebuild
+++ b/www-apps/owncloud/owncloud-8.0.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-8.0.0.ebuild,v 1.2 2015/03/09 16:58:58 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-8.0.4.ebuild,v 1.1 2015/06/10 13:18:32 voyageur Exp $
 
 EAPI=5
 
-inherit eutils webapp depend.php
+inherit eutils webapp
 
 DESCRIPTION="Web-based storage application where all your data is under your own control"
 HOMEPAGE="http://owncloud.org"
@@ -16,9 +16,8 @@ IUSE="+curl mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,postgres?,simplexml,sqlite?,xmlwriter,zip]"
-need_httpd_cgi
-need_php_httpd
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,postgres?,simplexml,sqlite?,xmlwriter,zip]
+	virtual/httpd-php"
 
 S=${WORKDIR}/${PN}