merge from webapp overlay wrt #208584

Package-Manager: portage-2.1.4.4

4 files changed, 61 insertions, 35 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/Manifest b/www-apps/egroupware/Manifest
index e002de5df4e7..addb439fb296 100644
--- a/www-apps/egroupware/Manifest
+++ b/www-apps/egroupware/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinstall-en-1.2.txt 402 RMD160 aefff6af227f9d007afd1b753d97786d66fa7a80 SHA1 72ebcf1a6af140c5b47a9b567f791224d3fbdab8 SHA256 6063f422525dcb597b07a29a54f354452b8962f5487a222c82c75301697a42ba
 DIST eGroupWare-1.4.002.tar.bz2 9822488 RMD160 b0dfc876331d4d83a4aad125e1c061a1ada77ed9 SHA1 09b026efc596bb3d87a2b753243afa03ddc1181c SHA256 ac601969572060131b1460d207bf659840cf48d1ed356321c095965015fba9e9
 DIST eGroupWare-egw-pear-1.4.002.tar.bz2 66295 RMD160 1c8a737964760f4be0c2b3fa19a0c7a5c75d308a SHA1 559410234a1272440236b886057ea89f8b73b3bb SHA256 bb997f9d5120792823a8c79dc3461fa9f635337405123a9a6969199e28778830
-EBUILD egroupware-1.4.002.ebuild 1984 RMD160 713348dcb2185f0fab046befc5c735f5e99ab0b1 SHA1 465f63df118692282f44f6f263c94e4ba7771db1 SHA256 9dd9748fc089b3e8af3c3cc2d3b4f01d8376d18384246eb6b7a29be740a4ccda
-MISC ChangeLog 12755 RMD160 feb976e712c9db83f40c15bba1f6b2691770f1fe SHA1 fb8e8ac1eeb9cf367fdf2f3acbcaa85cdcd2349e SHA256 815adc612c46b4d746cf5f9ee099ee65c27d70ddaa4132bbddd69de21536997b
-MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
+EBUILD egroupware-1.4.002.ebuild 2097 RMD160 2bc55f74f71fb43071a85617bdad46aa8e93588a SHA1 01431ef4c4e0f18c939d2ae592815dd23b25fed7 SHA256 dec95b5fe03e70bc4dc5c0046bff43651fdebc98faae5a541f20d866bb63c523
+MISC ChangeLog 13152 RMD160 75f43cf22b201de11621d9fa8a68e589778fb6bd SHA1 917d947791a5a367fe2290306f3734da0cdc2e63 SHA256 5875bd445b6680b371a0cd7c83944969d43513907e4c80b30c4d104b3fbe9e43
+MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkfAitsACgkQmPFBzbX68WH6igCgmYbJRKfJLs5AYUWXV2eMDr2m
+8KoAn20zaY1i28zpuOIVA/x4hGGSewP0
+=2ERx
+-----END PGP SIGNATURE-----
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>