Version bumped.

5 files changed, 77 insertions, 9 deletions

diff --git a/dev-php/groupoffice/ChangeLog b/dev-php/groupoffice/ChangeLog
index ca8b79653cd2..51b6b1e8748d 100644
--- a/dev-php/groupoffice/ChangeLog
+++ b/dev-php/groupoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/groupoffice
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/groupoffice/ChangeLog,v 1.11 2004/02/18 23:33:30 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/groupoffice/ChangeLog,v 1.12 2004/03/09 21:32:13 mholzer Exp $
+
+*groupoffice-2.01 (09 Mar 2004)
+
+  09 Mar 2004; Martin Holzer <mholzer@gentoo.org> groupoffice-1.98.ebuild,
+  groupoffice-2.01.ebuild:
+  Version bumped.
 
 *groupoffice-1.98 (19 Feb 2004)
 
diff --git a/dev-php/groupoffice/Manifest b/dev-php/groupoffice/Manifest
index 29db31417b65..707f24d4dacc 100644
--- a/dev-php/groupoffice/Manifest
+++ b/dev-php/groupoffice/Manifest
@@ -1,4 +1,6 @@
+MD5 184367934599905d0be33b6872067063 groupoffice-2.01.ebuild 1868
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 2238c4249e2606cfff602e53671c3e66 groupoffice-1.98.ebuild 1865
-MD5 404f062797549395e889f19e0e44b9b6 ChangeLog 1642
+MD5 ab4c3be4a403edfca5ad3ef7e82e0746 groupoffice-1.98.ebuild 1868
+MD5 94e85a6783e7735c8ca65c76d6274d94 ChangeLog 1796
+MD5 eed4525c73e09f377adb7f135b9d8400 files/digest-groupoffice-2.01 146
 MD5 b15c84531171edcc9266b5ec3e323151 files/digest-groupoffice-1.98 146
diff --git a/dev-php/groupoffice/files/digest-groupoffice-2.01 b/dev-php/groupoffice/files/digest-groupoffice-2.01
new file mode 100644
index 000000000000..a3674cb9adb8
--- /dev/null
+++ b/dev-php/groupoffice/files/digest-groupoffice-2.01
@@ -0,0 +1,2 @@
+MD5 a362c22fbf834ff4b9c7c44d1674d1bb groupoffice-com-2.01.tar.gz 2732718
+MD5 4ee2188438e2a98cf17d6b47796ec30a GO-theme-crystal-1.93.tar.gz 286777
diff --git a/dev-php/groupoffice/groupoffice-1.98.ebuild b/dev-php/groupoffice/groupoffice-1.98.ebuild
index f611b7e853df..7377c9fec29a 100644
--- a/dev-php/groupoffice/groupoffice-1.98.ebuild
+++ b/dev-php/groupoffice/groupoffice-1.98.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/groupoffice/groupoffice-1.98.ebuild,v 1.1 2004/02/18 23:33:30 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/groupoffice/groupoffice-1.98.ebuild,v 1.2 2004/03/09 21:32:13 mholzer Exp $
 
 inherit webapp-apache
 
@@ -18,9 +18,9 @@ KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~sparc ~hppa"
 DEPEND="virtual/php
 	dev-db/mysql"
 
-webapp-detect || NO_WEBSERVER=1
 
 pkg_setup() {
+	webapp-detect || NO_WEBSERVER=1
 	webapp-pkg_setup "${NO_WEBSERVER}"
 	if [ -d ${HTTPD_ROOT}/${PN} ] ; then
 		ewarn "You need to unmerge your old ${PN} version first."
@@ -32,11 +32,8 @@ pkg_setup() {
 	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
 }
 
-src_unpack() {
-	unpack ${A}
-}
-
 src_install() {
+	webapp-detect || NO_WEBSERVER=1
 	webapp-mkdirs
 
 	local DocumentRoot=${HTTPD_ROOT}
diff --git a/dev-php/groupoffice/groupoffice-2.01.ebuild b/dev-php/groupoffice/groupoffice-2.01.ebuild
new file mode 100644
index 000000000000..afed1bf23667
--- /dev/null
+++ b/dev-php/groupoffice/groupoffice-2.01.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/groupoffice/groupoffice-2.01.ebuild,v 1.1 2004/03/09 21:32:13 mholzer Exp $
+
+inherit webapp-apache
+
+S=${WORKDIR}/${PN}-com-${PV}
+DESCRIPTION="Group-Office is a powerfull modular Intranet application framework. It runs *nix using PHP and has several database support."
+HOMEPAGE="http://group-office.sourceforge.net/"
+SRC_URI="mirror://sourceforge/group-office/${PN}-com-${PV}.tar.gz
+	mirror://sourceforge/group-office/GO-theme-crystal-1.93.tar.gz"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~sparc ~hppa"
+
+DEPEND="virtual/php
+	dev-db/mysql"
+
+
+pkg_setup() {
+	webapp-detect || NO_WEBSERVER=1
+	webapp-pkg_setup "${NO_WEBSERVER}"
+	if [ -d ${HTTPD_ROOT}/${PN} ] ; then
+		ewarn "You need to unmerge your old ${PN} version first."
+		ewarn "${PN} will be installed into ${HTTPD_ROOT}/${PN}"
+		ewarn "directly instead of a version-dependant directory."
+		die "need to unmerge old version first"
+	fi
+
+	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
+}
+
+src_install() {
+	webapp-detect || NO_WEBSERVER=1
+	webapp-mkdirs
+
+	local DocumentRoot=${HTTPD_ROOT}
+	local destdir=${DocumentRoot}/${PN}
+
+	mkdir -p ${D}${destdir}
+	mv ${WORKDIR}/crystal ${S}/themes
+	cd ${S}
+	dodoc CHANGELOG DEVELOPERS FAQ INSTALL RELEASE README.ldap TODO TRANSLATORS
+	rm -rf CHANGELOG FAQ INSTALL README.ldap TODO TRANSLATORS
+
+	cp -r . ${D}${destdir}
+
+	cd "${D}/${HTTPD_ROOT}"
+	chown -R "${HTTPD_USER}:${HTTPD_GROUP}" ${PN}
+	# Fix permissions
+	find ${D}${destdir} -type d | xargs chmod 755
+	find ${D}${destdir} -type f | xargs chmod 644
+}
+
+pkg_postinst() {
+	einfo "Follow the instructions at /usr/share/doc/${PF}/INSTALL"
+	einfo "to complete the install.  You need to add MySQL users"
+	einfo "and configure ${PN}"
+}