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

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 68 insertions, 45 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/Manifest b/www-apps/eyeos/Manifest
index ed2eebb84e8c..f0cae0f6df16 100644
--- a/www-apps/eyeos/Manifest
+++ b/www-apps/eyeos/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX postinstall-en.txt 330 RMD160 c1b0f006e8fc6a4521aba75fadff1138263610f4 SHA1 0af58428d8602130e7e2aea37240e054e1c3be13 SHA256 d11bf24fbcb2ba7578c43b1fbcf90ec33b2c5bdd48c1d6af75e610b732dee3fa
-DIST eyeOS_1.9.0.1.zip 3336525 RMD160 732598f623982cd5ea1063f4a1a34d6a5bae9d36 SHA1 1862ad88a5c1b2375540f4bab4526d94ab91f773 SHA256 c81d935ab3e11a1f2af156bfe17e010a4714f8833cf0b64b1528396230c41c2b
 DIST eyeOS_1.9.0.2.zip 3369332 RMD160 c4260ef1f8b9c550394ebbb7893017ed76642a64 SHA1 6d4ec6f8c2471a9cd0a24cbcaf4ae3906b3dfeca SHA256 f8db8a531d8368c38a83e1047792a737f99be9be08721f3592218113246e8bb2
-EBUILD eyeos-1.9.0.1.ebuild 1168 RMD160 f3cb88ac9788086b25cbfd972cd430129d14efce SHA1 723f2024edbd6b8458df35699814b5c7b6ae1fcb SHA256 e47456aee9044b6cee08d4581818f0bd0d671595faeda9382f2801318fbbb89b
+DIST eyeos-2.4.tar.gz 28804593 RMD160 cf131e79e8482116495906566134357d182f94e6 SHA1 378bfb8e942fde259d12d73151f680197daecded SHA256 213de5431d08f2642aef07e77a1f1073a2308701873222b70c63ad8e66d4e39b
 EBUILD eyeos-1.9.0.2.ebuild 1168 RMD160 932c2b0f49b682f2931aca54d39dba1c1f37193d SHA1 06c29c1c91af48abe8ddeac384240853e35e7ad4 SHA256 48b2cbeb6e72b4984e67166ea0da1ae0ccdf59cc60280e995f1761552ee7d803
-MISC ChangeLog 1309 RMD160 d790f7726fe5eeb2f4513a469e164af577862bd1 SHA1 20605d5a52c2643995e195d4f5812b45350698bc SHA256 01a83b1e928a4447f9dd8ce69c485141f099d139970c3bb2cdf7a4e1bb3a4553
+EBUILD eyeos-2.4.ebuild 1303 RMD160 2357bcb7e7c0c9c5904da8dda9f2900a9847156c SHA1 f06b2c1b4b6ee2b31382ba1e39ef506fb9943e41 SHA256 b70824f1f6a9846c00ca3c3c781887f105632379fc5e879168676cea0eb6dba3
+MISC ChangeLog 1487 RMD160 db51295a7c0ecda29c1f1deccee4c1cf449aeeb0 SHA1 75c1195bdb2fb7aaecb186aaf87839dfa6f1e8e2 SHA256 ac935f847b42fb4ba0f277318275d245d5c0dbd6efef0960678e463ce8f13619
 MISC metadata.xml 557 RMD160 7491e847e290cd4078dd4400df4378b592b74d51 SHA1 9eec25034e535f0dafd76d729e51f260faae470d SHA256 7087aa166f482c208732e4e90013c4b9207c5ba8f8cc2009a4bdfe5523c7db0f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk2kbKsACgkQFYEBGcdFJfI24wD/aUdRabAlW6IUy+a27pH9ofim
+Hdh9LnSj+WJC1Ui97ooA/jwXd966p3lgP7dBCD3BpjAa9QWOVp55bc/2bAkb21Gu
+=L+lQ
+-----END PGP SIGNATURE-----
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
+}