merge from webapp overlay wrt #208584

(Portage version: 2.1.4.4)

3 files changed, 48 insertions, 32 deletions

diff --git a/www-apps/egroupware/ChangeLog b/www-apps/egroupware/ChangeLog
index f98ca0aa2e00..1be1b9d1fac4 100644
--- a/www-apps/egroupware/ChangeLog
+++ b/www-apps/egroupware/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apps/egroupware
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v 1.85 2007/10/11 08:58:28 wrobel Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v 1.86 2008/02/23 21:06:25 hollow Exp $
+
+  23 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
+  egroupware-1.4.002.ebuild:
+  merge from webapp overlay wrt #208584
+
+  05 Feb 2008; Jakub Moc <jakub@gentoo.org> egroupware-1.4.002.ebuild:
+  Add missing dev-php/PEAR-PEAR and virtual/cron dependencies. Remove bogus gd
+  USE flag and dependency on media-libs/gd, add mssql USE flag. Fix PHP checks.
+  Fix quoting, ebuild clean-up.
 
   11 Oct 2007; <wrobel@gentoo.org> -egroupware-1.4.001.ebuild:
   Removed insecure package from the tree (sec issue #193960).
diff --git a/www-apps/egroupware/egroupware-1.4.002.ebuild b/www-apps/egroupware/egroupware-1.4.002.ebuild
index a61c9a4d02cb..6e9a3a4a2232 100644
--- a/www-apps/egroupware/egroupware-1.4.002.ebuild
+++ b/www-apps/egroupware/egroupware-1.4.002.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/egroupware-1.4.002.ebuild,v 1.6 2007/10/11 07:20:11 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/egroupware-1.4.002.ebuild,v 1.7 2008/02/23 21:06:25 hollow Exp $
 
-inherit webapp depend.php
+inherit eutils webapp depend.php
 
 MY_PN=eGroupWare
-S=${WORKDIR}/${PN}
 
 DESCRIPTION="Web-based GroupWare suite"
 HOMEPAGE="http://www.egroupware.org/"
@@ -14,56 +13,64 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.bz2
 
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 hppa ppc ~sparc x86"
-IUSE="gd jpgraph ldap mysql postgres"
+IUSE="jpgraph ldap mssql mysql postgres"
 
-RDEPEND="
-	ldap? ( net-nds/openldap )
-	gd? ( media-libs/gd )
-	jpgraph? ( || ( dev-php5/jpgraph dev-php4/jpgraph ) )
-"
+RDEPEND="jpgraph? ( || ( dev-php5/jpgraph dev-php4/jpgraph ) )
+	dev-php/PEAR-PEAR
+	virtual/cron"
+
+need_httpd_cgi
+need_php_httpd
+
+S="${WORKDIR}"/${PN}
 
 pkg_setup () {
-	has_php
 	webapp_pkg_setup
+	has_php
+
+	local php_flags="imap session unicode"
 
-	local php_flags="imap session"
+	for f in ldap mssql mysql postgres; do
+		use ${f} && php_flags="${php_flags} ${f}"
+	done
 
-	use ldap && php_flags="${php_flags} ldap"
-	use mysql && php_flags="${php_flags} mysql"
-	use postgres && php_flags="${php_flags} postgres"
-	require_php_with_use ${php_flags}
+	if ! PHPCHECKNODIE="yes" require_php_with_use ${php_flags} || \
+		! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then
+			die "Re-install ${PHP_PKG} with ${php_flags} and either gd or gd-external."
+	fi
 }
 
 src_unpack() {
-	has_php
-
 	unpack ${A}
-	cd ${S}
-	# remove SVN directories
-	find . -type d -name '.svn' -print | xargs rm -rf
+	cd "${S}"
+	esvn_clean
 
 	if use jpgraph; then
 		einfo "Fixing jpgraph location"
-		sed -i "s|EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph.php'|'/usr/share/php${PHP_VERSION}/jpgraph/jpgraph.php'|" projectmanager/inc/class.ganttchart.inc.php || die
-		sed -i "s|EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph_gantt.php'|'/usr/share/php${PHP_VERSION}/jpgraph/jpgraph_gantt.php'|" projectmanager/inc/class.ganttchart.inc.php || die
+		sed -i "s|EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph.php'|'/usr/share/php${PHP_VERSION}/jpgraph/jpgraph.php'|" \
+			projectmanager/inc/class.ganttchart.inc.php || die
+		sed -i "s|EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph_gantt.php'|'/usr/share/php${PHP_VERSION}/jpgraph/jpgraph_gantt.php'|" \
+			projectmanager/inc/class.ganttchart.inc.php || die
 	fi
 }
 
 src_install() {
 	webapp_src_preinst
-	cp -r . ${D}/${MY_HTDOCSDIR}
 
-	webapp_serverowned ${MY_HTDOCSDIR}/phpgwapi/images
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/phpgwapi/images
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en-1.2.txt
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-1.2.txt
 	webapp_src_install
 }
 
 pkg_postinst() {
 	if use ldap; then
-		einfo "If you are using LDAP contacts/addressbook, please read the upgrade instructions at"
-		einfo "http://www.egroupware.org/index.php?page_name=wiki&wikipage=ManualSetupUpdate"
-		einfo "before running the egroupware setup"
+		elog "If you are using LDAP contacts/addressbook, please read the upgrade instructions at"
+		elog "http://www.egroupware.org/index.php?page_name=wiki&wikipage=ManualSetupUpdate"
+		elog "before running the egroupware setup"
 	fi
 	webapp_pkg_postinst
 }
diff --git a/www-apps/egroupware/metadata.xml b/www-apps/egroupware/metadata.xml
index 95c06f0095bb..6632069b5aff 100644
--- a/www-apps/egroupware/metadata.xml
+++ b/www-apps/egroupware/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+	<herd>web-apps</herd>
 </pkgmetadata>