Version bumped.

7 files changed, 47 insertions, 134 deletions

diff --git a/dev-php/groupoffice/ChangeLog b/dev-php/groupoffice/ChangeLog
index f1aedf0c2117..44849ef45432 100644
--- a/dev-php/groupoffice/ChangeLog
+++ b/dev-php/groupoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/groupoffice
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/groupoffice/ChangeLog,v 1.19 2004/08/07 22:07:10 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/groupoffice/ChangeLog,v 1.20 2004/10/30 22:45:13 mholzer Exp $
+
+*groupoffice-2.06 (31 Oct 2004)
+
+  31 Oct 2004; Martin Holzer <mholzer@gentoo.org> -groupoffice-1.98.ebuild,
+  -groupoffice-2.01.ebuild, +groupoffice-2.06.ebuild:
+  Version bumped.
 
   07 Aug 2004; Tom Martin <slarti@gentoo.org> groupoffice-1.98.ebuild,
   groupoffice-2.01.ebuild, groupoffice-2.02.ebuild, groupoffice-2.04.ebuild,
diff --git a/dev-php/groupoffice/Manifest b/dev-php/groupoffice/Manifest
index fb5a77ba1818..8ac69fa069b8 100644
--- a/dev-php/groupoffice/Manifest
+++ b/dev-php/groupoffice/Manifest
@@ -1,13 +1,11 @@
+MD5 3006ca18a54c02f245bf78e867fbcf39 groupoffice-2.04.ebuild 1862
 MD5 eb2e88d4f3c2fcd52562a2389e3a98a6 groupoffice-2.05.ebuild 1052
-MD5 e40dda8dc9b71cd0650c6379411337e9 groupoffice-1.98.ebuild 1864
+MD5 eb2e88d4f3c2fcd52562a2389e3a98a6 groupoffice-2.06.ebuild 1052
 MD5 197e114eec0fbfaa2867990b885de5e7 groupoffice-2.02.ebuild 1863
-MD5 3006ca18a54c02f245bf78e867fbcf39 groupoffice-2.04.ebuild 1862
-MD5 d1b2f138e037ce81665b788793ccea46 groupoffice-2.01.ebuild 1864
-MD5 0e06a9a642d1f22e11a600f247856893 ChangeLog 2590
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 252288f5d0f5b81c836d57317005d1b7 files/postinstall-en.txt 403
-MD5 b15c84531171edcc9266b5ec3e323151 files/digest-groupoffice-1.98 146
-MD5 eed4525c73e09f377adb7f135b9d8400 files/digest-groupoffice-2.01 146
+MD5 0e06a9a642d1f22e11a600f247856893 ChangeLog 2590
+MD5 f97b1d800d135c8cf64b6ce982b21e56 files/digest-groupoffice-2.05 146
+MD5 25de94b493244adff1a2a706f44ff5d3 files/digest-groupoffice-2.06 146
 MD5 56c18997ce16cb2efd35f0cdfb679b67 files/digest-groupoffice-2.02 146
 MD5 0699a14fa9aca95a209915564dc81cd1 files/digest-groupoffice-2.04 146
-MD5 f97b1d800d135c8cf64b6ce982b21e56 files/digest-groupoffice-2.05 146
+MD5 252288f5d0f5b81c836d57317005d1b7 files/postinstall-en.txt 403
diff --git a/dev-php/groupoffice/files/digest-groupoffice-2.01 b/dev-php/groupoffice/files/digest-groupoffice-2.01
deleted file mode 100644
index a3674cb9adb8..000000000000
--- a/dev-php/groupoffice/files/digest-groupoffice-2.01
+++ /dev/null
@@ -1,2 +0,0 @@
-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/files/digest-groupoffice-1.98 b/dev-php/groupoffice/files/digest-groupoffice-2.06
index f62d57af1a7a..f4b343017ba0 100644
--- a/dev-php/groupoffice/files/digest-groupoffice-1.98
+++ b/dev-php/groupoffice/files/digest-groupoffice-2.06
@@ -1,2 +1,2 @@
-MD5 17db6aa6f2dece99a6225f76f8759419 groupoffice-com-1.98.tar.gz 3454777
+MD5 dfceb81923287444fe0a297c40b2f265 groupoffice-com-2.06.tar.gz 4246139
 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
deleted file mode 100644
index dbe4ef729329..000000000000
--- a/dev-php/groupoffice/groupoffice-1.98.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.5 2004/08/07 22:07:10 slarti Exp $
-
-inherit webapp-apache
-
-S=${WORKDIR}/${PN}-com-${PV}
-DESCRIPTION="Group-Office is a powerful 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"
-IUSE=""
-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}"
-}
diff --git a/dev-php/groupoffice/groupoffice-2.01.ebuild b/dev-php/groupoffice/groupoffice-2.01.ebuild
deleted file mode 100644
index 536f715fa555..000000000000
--- a/dev-php/groupoffice/groupoffice-2.01.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.4 2004/08/07 22:07:10 slarti Exp $
-
-inherit webapp-apache
-
-S=${WORKDIR}/${PN}-com-${PV}
-DESCRIPTION="Group-Office is a powerful 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"
-IUSE=""
-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}"
-}
diff --git a/dev-php/groupoffice/groupoffice-2.06.ebuild b/dev-php/groupoffice/groupoffice-2.06.ebuild
new file mode 100644
index 000000000000..6d97bb5e2b76
--- /dev/null
+++ b/dev-php/groupoffice/groupoffice-2.06.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/groupoffice/groupoffice-2.06.ebuild,v 1.1 2004/10/30 22:45:13 mholzer Exp $
+
+inherit webapp
+
+S=${WORKDIR}/${PN}-com-${PV}
+DESCRIPTION="Group-Office is a powerful 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"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~sparc"
+IUSE=""
+DEPEND="virtual/php
+	dev-db/mysql"
+
+src_install() {
+	webapp_src_preinst
+
+	mv ${WORKDIR}/crystal ${S}/themes
+	cd ${S}
+	dodoc CHANGELOG DEVELOPERS FAQ INSTALL RELEASE README.ldap TODO TRANSLATORS
+	rm -f CHANGELOG FAQ INSTALL README.ldap TODO TRANSLATORS
+
+	cp -r . ${D}${MY_HTDOCSDIR}
+	webapp_serverowned ${MY_HTDOCSDIR}
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}