3 files changed, 9 insertions, 49 deletions
diff --git a/www-apps/owncloud/ChangeLog b/www-apps/owncloud/ChangeLog
index f3915bac332a..5b0df5008b17 100644
--- a/www-apps/owncloud/ChangeLog
+++ b/www-apps/owncloud/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/owncloud
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/ChangeLog,v 1.9 2012/06/07 22:36:24 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/ChangeLog,v 1.10 2012/06/15 08:42:38 voyageur Exp $
+
+*owncloud-4.0.2 (15 Jun 2012)
+
+  15 Jun 2012; Bernard Cafarelli <voyageur@gentoo.org> -owncloud-4.0.0.ebuild,
+  -owncloud-4.0.1.ebuild, +owncloud-4.0.2.ebuild:
+  Version bump, mostly bugfixes and security updates. Removing previous 4.x
+  versions
 
 *owncloud-4.0.1 (07 Jun 2012)
 
diff --git a/www-apps/owncloud/owncloud-4.0.1.ebuild b/www-apps/owncloud/owncloud-4.0.1.ebuild
deleted file mode 100644
index ccbecb0c0475..000000000000
--- a/www-apps/owncloud/owncloud-4.0.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-4.0.1.ebuild,v 1.1 2012/06/07 22:36:24 voyageur Exp $
-
-EAPI=4
-
-inherit webapp depend.php
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="http://owncloud.org"
-SRC_URI="http://owncloud.org/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl mysql postgres sqlite3"
-REQUIRED_USE="|| ( mysql postgres sqlite3 )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,gd,json,mysql?,pdo,postgres?,sqlite3?,xmlwriter,zip]"
-
-need_httpd_cgi
-need_php_httpd
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="README"
-	dodoc ${docs}
-	rm -f ${docs}
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned "${MY_HTDOCSDIR}"/data
-	webapp_serverowned "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/owncloud/owncloud-4.0.0.ebuild b/www-apps/owncloud/owncloud-4.0.2.ebuild
index fa2241f8afca..0d0378337d2c 100644
--- a/www-apps/owncloud/owncloud-4.0.0.ebuild
+++ b/www-apps/owncloud/owncloud-4.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-4.0.0.ebuild,v 1.2 2012/06/07 22:36:24 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-4.0.2.ebuild,v 1.1 2012/06/15 08:42:38 voyageur Exp $
 
 EAPI=4