Version bump for 2.x releases, closes bug #319233

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

3 files changed, 55 insertions, 42 deletions

diff --git a/www-apps/eyeos/ChangeLog b/www-apps/eyeos/ChangeLog
index d697ba3fc556..e28c3e281982 100644
--- a/www-apps/eyeos/ChangeLog
+++ b/www-apps/eyeos/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/eyeos
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/eyeos/ChangeLog,v 1.7 2011/01/03 13:14:12 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/eyeos/ChangeLog,v 1.8 2011/04/12 15:15:40 voyageur Exp $
+
+*eyeos-2.4 (12 Apr 2011)
+
+  12 Apr 2011; Bernard Cafarelli <voyageur@gentoo.org> -eyeos-1.9.0.1.ebuild,
+  +eyeos-2.4.ebuild:
+  Version bump for 2.x releases, closes bug #319233
 
 *eyeos-1.9.0.2 (03 Jan 2011)
 
diff --git a/www-apps/eyeos/eyeos-1.9.0.1.ebuild b/www-apps/eyeos/eyeos-1.9.0.1.ebuild
deleted file mode 100644
index 535da547cd32..000000000000
--- a/www-apps/eyeos/eyeos-1.9.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/eyeos/eyeos-1.9.0.1.ebuild,v 1.1 2010/02/19 15:13:05 voyageur Exp $
-
-inherit depend.php versionator webapp eutils
-
-DESCRIPTION="AJAX web-based desktop environment"
-HOMEPAGE="http://www.eyeos.org"
-if [[ $(get_version_component_count) < 5 ]]; then
-	SRC_URI="mirror://sourceforge/eyeos/eyeOS_$(get_version_component_range 1-4).zip"
-else
-	SRC_URI="mirror://sourceforge/eyeos/eyeOS_$(get_version_component_range 1-4)-$(get_version_component_range 5).zip"
-fi
-
-LICENSE="AGPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-need_httpd_cgi
-need_php_httpd
-
-S=${WORKDIR}/eyeOS
-
-src_install () {
-	webapp_src_preinst
-
-	dodoc README.txt
-	rm -f README.txt
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	#TODO: needs "." too
-	for file in index.html package.eyepackage installer installer/index.php installer/files/index.txt installer/files/settings.txt; do
-			webapp_serverowned "${MY_HTDOCSDIR}/${file}"
-	done
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_postupgrade_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/eyeos/eyeos-2.4.ebuild b/www-apps/eyeos/eyeos-2.4.ebuild
new file mode 100644
index 000000000000..d2dc153d32a5
--- /dev/null
+++ b/www-apps/eyeos/eyeos-2.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/eyeos/eyeos-2.4.ebuild,v 1.1 2011/04/12 15:15:40 voyageur Exp $
+
+EAPI="4"
+inherit depend.php webapp eutils
+
+DESCRIPTION="AJAX web-based desktop environment"
+HOMEPAGE="http://www.eyeos.org"
+SRC_URI="mirror://sourceforge/eyeos/eyeos2/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+need_httpd_cgi
+need_php_httpd
+
+# http://wiki.eyeos.org/EyeOS_Requirements
+RDEPEND="dev-lang/php[curl,crypt,gd,json,mysql,mysqli,pdo,sharedmem,sqlite]"
+
+S=${WORKDIR}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# Placeholder for first install
+	touch "${ED}/${MY_HTDOCSDIR}"/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/settings.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/settings.php
+
+	# Ugly, but eyeos needs write access in too many places
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/eyeos/system
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/eyeos/tmp
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/eyeos/users
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "To finish your install/upgrade, point your browser to the eyeOS installer at:"
+	elog "	http://${VHOST_HOSTNAME}/${VHOST_APPDIR}:/install/"
+	webapp_pkg_postinst
+}