Version bumped. Security bump. See 74487

12 files changed, 26 insertions, 187 deletions

diff --git a/www-apps/phpgroupware/ChangeLog b/www-apps/phpgroupware/ChangeLog
index 20402266a4ea..6eb7feb5d0e5 100644
--- a/www-apps/phpgroupware/ChangeLog
+++ b/www-apps/phpgroupware/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/phpgroupware
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/ChangeLog,v 1.7 2004/09/15 12:49:23 kugelfang Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/ChangeLog,v 1.8 2005/01/02 01:49:08 mholzer Exp $
+
+*phpgroupware-0.9.16.004 (02 Jan 2005)
+
+  02 Jan 2005; Martin Holzer <mholzer@gentoo.org>
+  +phpgroupware-0.9.16.004.ebuild:
+  Version bumped. Security bump. See 74487
 
   15 Sep 2004; Danny van Dyk <kugelfang@gentoo.org>
   phpgroupware-0.9.16.003.ebuild:
diff --git a/www-apps/phpgroupware/Manifest b/www-apps/phpgroupware/Manifest
index 7dfadb4a317b..bfcc03f072d1 100644
--- a/www-apps/phpgroupware/Manifest
+++ b/www-apps/phpgroupware/Manifest
@@ -1,13 +1,7 @@
-MD5 7b198d9d960dd13e75eccb9d69500501 ChangeLog 5169
+MD5 5178f7d13d5158da138272cd981811f5 ChangeLog 5336
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 083699baf5457d94248c0d85f00e1d1f phpgroupware-0.9.16.000.ebuild 1570
-MD5 30d4a110026dbf4629c86ed89dcbce7d phpgroupware-0.9.16.001.ebuild 1570
-MD5 902233467f9f4ff30ffda6e80db35a71 phpgroupware-0.9.16.002-r1.ebuild 898
-MD5 25d8cec6b08e8ed863216b1a7298d163 phpgroupware-0.9.16.002.ebuild 1570
-MD5 da811338de8ef376c5da0adaff985968 phpgroupware-0.9.16.003.ebuild 934
-MD5 922ab954a67c17f0e1a566626098243a files/digest-phpgroupware-0.9.16.000 80
-MD5 476589363905ff689b142486cc9e534c files/digest-phpgroupware-0.9.16.001 78
-MD5 2d079648289561daf7733bb66d312958 files/digest-phpgroupware-0.9.16.002 78
-MD5 2d079648289561daf7733bb66d312958 files/digest-phpgroupware-0.9.16.002-r1 78
-MD5 e5ce1749ac7ebe273ebca1904d055281 files/digest-phpgroupware-0.9.16.003 78
+MD5 44da205cc847f03f79af7a0f2e835ad9 phpgroupware-0.9.16.003.ebuild 932
+MD5 3059b9e00ac75e483ea2e7e57d7fea12 phpgroupware-0.9.16.004.ebuild 934
 MD5 d93f91af3aec42a3a699571b816060b2 files/postinstall-en.txt 251
+MD5 e5ce1749ac7ebe273ebca1904d055281 files/digest-phpgroupware-0.9.16.003 78
+MD5 fed33549c26825072f62f6c0afecef2e files/digest-phpgroupware-0.9.16.004 78
diff --git a/www-apps/phpgroupware/files/digest-phpgroupware-0.9.16.000 b/www-apps/phpgroupware/files/digest-phpgroupware-0.9.16.000
deleted file mode 100644
index 71e692c3c770..000000000000
--- a/www-apps/phpgroupware/files/digest-phpgroupware-0.9.16.000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d40a2e046d8356511b4ec8fd1d834c7f phpgroupware-0.9.16.000-1.tar.bz2 17078710
diff --git a/www-apps/phpgroupware/files/digest-phpgroupware-0.9.16.001 b/www-apps/phpgroupware/files/digest-phpgroupware-0.9.16.001
deleted file mode 100644
index 1525a5ded94e..000000000000
--- a/www-apps/phpgroupware/files/digest-phpgroupware-0.9.16.001
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e53885fd3e1fd60b2ee587af281a7c02 phpgroupware-0.9.16.001.tar.bz2 17482130
diff --git a/www-apps/phpgroupware/files/digest-phpgroupware-0.9.16.002 b/www-apps/phpgroupware/files/digest-phpgroupware-0.9.16.002
deleted file mode 100644
index b6ede76ed16e..000000000000
--- a/www-apps/phpgroupware/files/digest-phpgroupware-0.9.16.002
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e53885fd3e1fd60b2ee587af281a7c02 phpgroupware-0.9.16.002.tar.bz2 17482130
diff --git a/www-apps/phpgroupware/files/digest-phpgroupware-0.9.16.002-r1 b/www-apps/phpgroupware/files/digest-phpgroupware-0.9.16.002-r1
deleted file mode 100644
index b6ede76ed16e..000000000000
--- a/www-apps/phpgroupware/files/digest-phpgroupware-0.9.16.002-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e53885fd3e1fd60b2ee587af281a7c02 phpgroupware-0.9.16.002.tar.bz2 17482130
diff --git a/www-apps/phpgroupware/files/digest-phpgroupware-0.9.16.004 b/www-apps/phpgroupware/files/digest-phpgroupware-0.9.16.004
new file mode 100644
index 000000000000..08697b132b4d
--- /dev/null
+++ b/www-apps/phpgroupware/files/digest-phpgroupware-0.9.16.004
@@ -0,0 +1 @@
+MD5 bf7d6cb0db9bbd922ca7eb8ebe9dde6a phpgroupware-0.9.16.004.tar.bz2 17501721
diff --git a/www-apps/phpgroupware/phpgroupware-0.9.16.000.ebuild b/www-apps/phpgroupware/phpgroupware-0.9.16.000.ebuild
deleted file mode 100644
index dcae8ce58b3d..000000000000
--- a/www-apps/phpgroupware/phpgroupware-0.9.16.000.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/phpgroupware-0.9.16.000.ebuild,v 1.2 2004/09/03 17:17:21 pvdabeel Exp $
-
-inherit webapp-apache
-
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="intranet/groupware tool and application framework"
-HOMEPAGE="http://www.phpgroupware.org/"
-SRC_URI="mirror://sourceforge/phpgroupware/${P}-1.tar.bz2"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~alpha amd64 ~sparc ~hppa"
-
-RDEPEND=">=dev-php/mod_php-4.1"
-
-pkg_setup() {
-	webapp-detect || NO_WEBSERVER=1
-	if [ -L ${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
-	webapp-pkg_setup "${NO_WEBSERVER}"
-	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
-}
-
-src_install() {
-	webapp-detect || NO_WEBSERVER=1
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/${PN}
-
-	dodir ${destdir}
-	#cd ${WORKDIR}
-	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
-	dohtml ${PN}/doc/en_US/html/admin/*.html
-}
-
-pkg_postinst() {
-	einfo "Follow the instructions at"
-	einfo "/usr/share/doc/${PF}/html/x62.html#AEN134"
-	einfo "to complete the install."
-	einfo "You need to add MySQL users and configure ${PN}"
-}
diff --git a/www-apps/phpgroupware/phpgroupware-0.9.16.001.ebuild b/www-apps/phpgroupware/phpgroupware-0.9.16.001.ebuild
deleted file mode 100644
index 421d816aefc8..000000000000
--- a/www-apps/phpgroupware/phpgroupware-0.9.16.001.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/phpgroupware-0.9.16.001.ebuild,v 1.2 2004/09/03 17:17:21 pvdabeel Exp $
-
-inherit webapp-apache
-
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="intranet/groupware tool and application framework"
-HOMEPAGE="http://www.phpgroupware.org/"
-SRC_URI="mirror://sourceforge/phpgroupware/${P}.tar.bz2"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ppc ~alpha ~amd64 ~sparc ~hppa"
-
-RDEPEND=">=dev-php/mod_php-4.1"
-
-pkg_setup() {
-	webapp-detect || NO_WEBSERVER=1
-	if [ -L ${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
-	webapp-pkg_setup "${NO_WEBSERVER}"
-	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
-}
-
-src_install() {
-	webapp-detect || NO_WEBSERVER=1
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/${PN}
-
-	dodir ${destdir}
-	#cd ${WORKDIR}
-	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
-	dohtml ${PN}/doc/en_US/html/admin/*.html
-}
-
-pkg_postinst() {
-	einfo "Follow the instructions at"
-	einfo "/usr/share/doc/${PF}/html/x62.html#AEN134"
-	einfo "to complete the install."
-	einfo "You need to add MySQL users and configure ${PN}"
-}
diff --git a/www-apps/phpgroupware/phpgroupware-0.9.16.002.ebuild b/www-apps/phpgroupware/phpgroupware-0.9.16.002.ebuild
deleted file mode 100644
index 536f18175807..000000000000
--- a/www-apps/phpgroupware/phpgroupware-0.9.16.002.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/phpgroupware-0.9.16.002.ebuild,v 1.2 2004/09/03 17:17:21 pvdabeel Exp $
-
-inherit webapp-apache
-
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="intranet/groupware tool and application framework"
-HOMEPAGE="http://www.phpgroupware.org/"
-SRC_URI="mirror://sourceforge/phpgroupware/${P}.tar.bz2"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ppc ~alpha ~amd64 ~sparc ~hppa"
-
-RDEPEND=">=dev-php/mod_php-4.1"
-
-pkg_setup() {
-	webapp-detect || NO_WEBSERVER=1
-	if [ -L ${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
-	webapp-pkg_setup "${NO_WEBSERVER}"
-	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
-}
-
-src_install() {
-	webapp-detect || NO_WEBSERVER=1
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/${PN}
-
-	dodir ${destdir}
-	#cd ${WORKDIR}
-	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
-	dohtml ${PN}/doc/en_US/html/admin/*.html
-}
-
-pkg_postinst() {
-	einfo "Follow the instructions at"
-	einfo "/usr/share/doc/${PF}/html/x62.html#AEN134"
-	einfo "to complete the install."
-	einfo "You need to add MySQL users and configure ${PN}"
-}
diff --git a/www-apps/phpgroupware/phpgroupware-0.9.16.003.ebuild b/www-apps/phpgroupware/phpgroupware-0.9.16.003.ebuild
index 7fa4fe8872a9..5f0caffe9258 100644
--- a/www-apps/phpgroupware/phpgroupware-0.9.16.003.ebuild
+++ b/www-apps/phpgroupware/phpgroupware-0.9.16.003.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/phpgroupware-0.9.16.003.ebuild,v 1.3 2004/09/15 12:49:23 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/phpgroupware-0.9.16.003.ebuild,v 1.4 2005/01/02 01:49:08 mholzer Exp $
 
 inherit webapp
 
diff --git a/www-apps/phpgroupware/phpgroupware-0.9.16.002-r1.ebuild b/www-apps/phpgroupware/phpgroupware-0.9.16.004.ebuild
index 553f94b2bdf2..4c0232ba974f 100644
--- a/www-apps/phpgroupware/phpgroupware-0.9.16.002-r1.ebuild
+++ b/www-apps/phpgroupware/phpgroupware-0.9.16.004.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/phpgroupware-0.9.16.002-r1.ebuild,v 1.3 2004/09/03 17:17:21 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/phpgroupware-0.9.16.004.ebuild,v 1.1 2005/01/02 01:49:08 mholzer Exp $
 
 inherit webapp
 
@@ -11,15 +11,19 @@ HOMEPAGE="http://www.phpgroupware.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 IUSE=""
 LICENSE="GPL-2"
-KEYWORDS="~x86 ppc ~alpha ~amd64 ~sparc ~hppa"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~sparc ~hppa"
 
 RDEPEND=">=dev-php/mod_php-4.1"
 
-src_install() {
-	webapp_src_preinst
-
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 	# remove CVS directories
 	find . -type d -name 'CVS' -print | xargs rm -rf
+}
+
+src_install() {
+	webapp_src_preinst
 
 	cp -R . ${D}/${MY_HTDOCSDIR}
 	dohtml ${PN}/doc/en_US/html/admin/*.html