6 files changed, 26 insertions, 26 deletions
diff --git a/www-apps/owncloud/ChangeLog b/www-apps/owncloud/ChangeLog
index dd780c9d7969..836bfc984acb 100644
--- a/www-apps/owncloud/ChangeLog
+++ b/www-apps/owncloud/ChangeLog
@@ -1,6 +1,11 @@
 # 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.66 2015/06/10 13:18:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/ChangeLog,v 1.67 2015/06/18 12:17:08 voyageur Exp $
+
+  18 Jun 2015; Bernard Cafarelli <voyageur@gentoo.org> owncloud-5.0.19.ebuild,
+  owncloud-6.0.7.ebuild, owncloud-6.0.8.ebuild, owncloud-7.0.5.ebuild,
+  owncloud-7.0.6.ebuild:
+  Drop depend.php eclass use in older versions too
 
 *owncloud-8.0.4 (10 Jun 2015)
 *owncloud-7.0.6 (10 Jun 2015)
diff --git a/www-apps/owncloud/owncloud-5.0.19.ebuild b/www-apps/owncloud/owncloud-5.0.19.ebuild
index bd23c1bd8022..6b1007b7d89e 100644
--- a/www-apps/owncloud/owncloud-5.0.19.ebuild
+++ b/www-apps/owncloud/owncloud-5.0.19.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-5.0.19.ebuild,v 1.1 2015/03/11 16:21:57 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-5.0.19.ebuild,v 1.2 2015/06/18 12:17:08 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}
 
diff --git a/www-apps/owncloud/owncloud-6.0.7.ebuild b/www-apps/owncloud/owncloud-6.0.7.ebuild
index bf436564d39a..4e2c6f067b45 100644
--- a/www-apps/owncloud/owncloud-6.0.7.ebuild
+++ b/www-apps/owncloud/owncloud-6.0.7.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-6.0.7.ebuild,v 1.1 2015/03/11 16:21:57 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-6.0.7.ebuild,v 1.2 2015/06/18 12:17:08 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}
 
diff --git a/www-apps/owncloud/owncloud-6.0.8.ebuild b/www-apps/owncloud/owncloud-6.0.8.ebuild
index 8c66e7dafa62..5f8e02b8641a 100644
--- a/www-apps/owncloud/owncloud-6.0.8.ebuild
+++ b/www-apps/owncloud/owncloud-6.0.8.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-6.0.8.ebuild,v 1.1 2015/06/10 13:18:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-6.0.8.ebuild,v 1.2 2015/06/18 12:17:08 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}
 
diff --git a/www-apps/owncloud/owncloud-7.0.5.ebuild b/www-apps/owncloud/owncloud-7.0.5.ebuild
index ebab3c71ee69..7604ac8456e2 100644
--- a/www-apps/owncloud/owncloud-7.0.5.ebuild
+++ b/www-apps/owncloud/owncloud-7.0.5.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-7.0.5.ebuild,v 1.1 2015/03/11 16:21:57 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-7.0.5.ebuild,v 1.2 2015/06/18 12:17:08 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}
 
diff --git a/www-apps/owncloud/owncloud-7.0.6.ebuild b/www-apps/owncloud/owncloud-7.0.6.ebuild
index adfc270c75d9..5bc43f8d5b10 100644
--- a/www-apps/owncloud/owncloud-7.0.6.ebuild
+++ b/www-apps/owncloud/owncloud-7.0.6.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-7.0.6.ebuild,v 1.1 2015/06/10 13:18:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-7.0.6.ebuild,v 1.2 2015/06/18 12:17:08 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}