version bump. remove old ebuild b/c of security bugs (see bug #284536). jpgraph check adapted from bug #342003

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

5 files changed, 93 insertions, 86 deletions

diff --git a/www-apps/egroupware/ChangeLog b/www-apps/egroupware/ChangeLog
index 90e4ce1935e1..7f60c14f571b 100644
--- a/www-apps/egroupware/ChangeLog
+++ b/www-apps/egroupware/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/egroupware
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v 1.99 2009/01/24 10:02:49 pva Exp $
+# Copyright 2002-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v 1.100 2012/06/23 15:25:36 mabi Exp $
+
+*egroupware-1.8.004.20120613 (23 Jun 2012)
+
+  23 Jun 2012; Matti Bickel <mabi@gentoo.org>
+  +egroupware-1.8.004.20120613.ebuild, -egroupware-1.6.001.ebuild,
+  files/postinstall-en-1.2.txt, metadata.xml:
+  version bump. remove old ebuild b/c of security bugs (see bug #284536).
+  jpgraph check adapted from bug #342003
 
 *egroupware-1.6.001 (24 Jan 2009)
 
diff --git a/www-apps/egroupware/egroupware-1.6.001.ebuild b/www-apps/egroupware/egroupware-1.6.001.ebuild
deleted file mode 100644
index 78b8fa310c2c..000000000000
--- a/www-apps/egroupware/egroupware-1.6.001.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/egroupware-1.6.001.ebuild,v 1.2 2011/04/09 19:22:45 olemarkus Exp $
-
-inherit eutils webapp depend.php
-
-MY_PN=eGroupware
-MY_PV="${PV/_/.}"
-
-DESCRIPTION="Web-based GroupWare suite"
-HOMEPAGE="http://www.egroupware.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${MY_PV}.tar.bz2
-	mirror://sourceforge/${PN}/${MY_PN}-egw-pear-${MY_PV}.tar.bz2
-	mydms? ( mirror://sourceforge/${PN}/${MY_PN}-mydms-${MY_PV}.tar.bz2 )
-	icalsrv? ( mirror://sourceforge/${PN}/${MY_PN}-icalsrv-${MY_PV}.tar.bz2 )
-	gallery? ( mirror://sourceforge/${PN}/${MY_PN}-gallery-${MY_PV}.tar.bz2 )"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="jpgraph ldap mssql mysql postgres mydms icalsrv gallery"
-
-RDEPEND="jpgraph? ( dev-php/jpgraph )
-	dev-php/PEAR-PEAR
-	virtual/cron"
-
-need_httpd_cgi
-need_php_httpd
-
-S=${WORKDIR}/${PN}
-
-pkg_setup () {
-	webapp_pkg_setup
-	has_php
-
-	local php_flags="imap session unicode"
-
-	for f in ldap mssql mysql postgres; do
-		use ${f} && php_flags="${php_flags} ${f}"
-	done
-
-	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() {
-	unpack ${A}
-	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.projectmanager_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.projectmanager_ganttchart.inc.php || die
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_serverowned "${MY_HTDOCSDIR}/phpgwapi/images"
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en-1.2.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	if use ldap; then
-		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/egroupware-1.8.004.20120613.ebuild b/www-apps/egroupware/egroupware-1.8.004.20120613.ebuild
new file mode 100644
index 000000000000..094481a9edf3
--- /dev/null
+++ b/www-apps/egroupware/egroupware-1.8.004.20120613.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/egroupware-1.8.004.20120613.ebuild,v 1.1 2012/06/23 15:25:36 mabi Exp $
+
+EAPI=4
+
+inherit eutils webapp
+
+MY_PN=eGroupware
+
+DESCRIPTION="Web-based GroupWare suite"
+HOMEPAGE="http://www.egroupware.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.bz2
+	mirror://sourceforge/${PN}/${MY_PN}-egw-pear-${PV}.tar.bz2
+	gallery? ( mirror://sourceforge/${PN}/${MY_PN}-gallery-${PV}.tar.bz2 )"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="+jpgraph ldap mysql postgres gallery"
+
+# php deps taken from rpm spec
+# you can use pdo to access almost anything but sqlite is specifically required
+# for the calendar module
+# jpgraph is only needed for the projectmanager module
+RDEPEND="jpgraph? ( dev-php/jpgraph )
+	dev-php/pear
+	dev-php/PEAR-Auth_SASL
+	virtual/httpd-php
+	dev-lang/php[gd,imap,pdo,posix,session,sqlite,ssl,unicode,xml,zip,zlib,ldap?,mysql?,postgres?]
+	virtual/cron"
+
+REQUIRED_USE="|| ( mysql postgres )"
+
+need_httpd_cgi
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	esvn_clean
+
+	if use jpgraph; then
+		einfo "Fixing jpgraph location"
+		MY_JPGRAPH_VERSION="$(best_version dev-php/jpgraph)"
+		MY_JPGRAPH_VERSION="${MY_JPGRAPH_VERSION/'dev-php/jpgraph-'/}"
+		sed -i "s|EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph.php'|'/usr/share/php/jpgraph/jpgraph.php'|" \
+			projectmanager/inc/class.projectmanager_ganttchart.inc.php || die "sed jpgraph failed"
+		sed -i "s|EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph_gantt.php'|'/usr/share/php/jpgraph/jpgraph_gantt.php'|" \
+			projectmanager/inc/class.projectmanager_ganttchart.inc.php || die "sed jpgraph failed"
+		sed -i "s|$jpgraph_path .= SEP.'jpgraph';|$jpgraph_path = dirname('/usr/share/php/jpgraph/jpgraph.php');|" \
+			setup/check_install.php || die "sed jpgraph failed"
+		sed -i "s|'unknown';|'${MY_JPGRAPH_VERSION}';\n         \$available = version_compare(\$version,\$min_version,'>=');|" \
+			setup/check_install.php || die "sed jpgraph failed"
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc doc/rpm-build/egroupware.cron
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}/phpgwapi/images"
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en-1.2.txt"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	if use ldap; then
+		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
+
+	elog "A cronjob to run eGroupware's async services is available at"
+	elog "/usr/share/doc/${P}"
+
+	webapp_pkg_postinst
+}
diff --git a/www-apps/egroupware/files/postinstall-en-1.2.txt b/www-apps/egroupware/files/postinstall-en-1.2.txt
index f6a2ae82b459..eadc25dbc7f7 100644
--- a/www-apps/egroupware/files/postinstall-en-1.2.txt
+++ b/www-apps/egroupware/files/postinstall-en-1.2.txt
@@ -6,7 +6,7 @@ You are almost done!
 and follow the install/upgrade script.
 
 Don't forget to read the installation manual, available from
-http://egroupware.org/specialpages/index.php?page_name=wiki&wikipage=ManualSetup
+http://community.egroupware.org/index.php?page_name=wiki&lang=&wikipage=ManualSetupCheck_install
 It describes the rest of the installation process.
 
 Enjoy eGroupWare!
diff --git a/www-apps/egroupware/metadata.xml b/www-apps/egroupware/metadata.xml
index 21695031c0b6..f9532cd63b27 100644
--- a/www-apps/egroupware/metadata.xml
+++ b/www-apps/egroupware/metadata.xml
@@ -3,9 +3,7 @@
 <pkgmetadata>
 	<herd>web-apps</herd>
 	<use>
-		<flag name='jpgraph'>Add <pkg>dev-php5/jpgraph</pkg> support</flag>
-		<flag name='mydms'>Install eGroupware-MyDMS</flag>
-		<flag name='icalsrv'>Install iCal Server (eGroupware-iCalSrv)</flag>
+		<flag name='jpgraph'>Add <pkg>dev-php/jpgraph</pkg> support</flag>
 		<flag name='gallery'>Install gallery2 port for eGW</flag>
 	</use>
 </pkgmetadata>