Version bump, bug #251743, thank Kai Sommer and Thomas Raschbacher for this work. Remove old.

(Portage version: 2.1.6.7/cvs/Linux x86_64)

4 files changed, 29 insertions, 90 deletions

diff --git a/www-apps/egroupware/ChangeLog b/www-apps/egroupware/ChangeLog
index 00fbc6b4f7ea..90e4ce1935e1 100644
--- a/www-apps/egroupware/ChangeLog
+++ b/www-apps/egroupware/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/egroupware
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v 1.98 2008/08/23 04:45:05 cardoe Exp $
+# 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 $
+
+*egroupware-1.6.001 (24 Jan 2009)
+
+  24 Jan 2009; Peter Volkov <pva@gentoo.org> metadata.xml,
+  -egroupware-1.4.002.ebuild, -egroupware-1.4.003.ebuild,
+  +egroupware-1.6.001.ebuild:
+  Version bump, bug #251743, thank Kai Sommer and Thomas Raschbacher for this
+  work. Remove old.
 
   23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/www-apps/egroupware/egroupware-1.4.003.ebuild b/www-apps/egroupware/egroupware-1.4.003.ebuild
deleted file mode 100644
index 02dd33505e83..000000000000
--- a/www-apps/egroupware/egroupware-1.4.003.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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.003.ebuild,v 1.6 2008/08/09 21:40:07 hoffie Exp $
-
-inherit eutils webapp depend.php
-
-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"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ppc ~sparc x86"
-IUSE="jpgraph ldap mssql mysql postgres"
-
-RDEPEND="jpgraph? ( dev-php5/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.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
-
-	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.4.002.ebuild b/www-apps/egroupware/egroupware-1.6.001.ebuild
index 141dde4408d7..7c537d14fd82 100644
--- a/www-apps/egroupware/egroupware-1.4.002.ebuild
+++ b/www-apps/egroupware/egroupware-1.6.001.ebuild
@@ -1,19 +1,23 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.4.002.ebuild,v 1.8 2008/08/09 21:40:07 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/egroupware-1.6.001.ebuild,v 1.1 2009/01/24 10:02:49 pva Exp $
 
 inherit eutils webapp depend.php
 
-MY_PN=eGroupWare
+MY_PN=eGroupware
+MY_PV="${PV/_/.}"
 
 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"
+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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="jpgraph ldap mssql mysql postgres mydms icalsrv gallery"
 
 RDEPEND="jpgraph? ( dev-php5/jpgraph )
 	dev-php/PEAR-PEAR
@@ -22,7 +26,7 @@ RDEPEND="jpgraph? ( dev-php5/jpgraph )
 need_httpd_cgi
 need_php_httpd
 
-S="${WORKDIR}"/${PN}
+S=${WORKDIR}/${PN}
 
 pkg_setup () {
 	webapp_pkg_setup
@@ -48,9 +52,9 @@ src_unpack() {
 	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
+			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.ganttchart.inc.php || die
+			projectmanager/inc/class.projectmanager_ganttchart.inc.php || die
 	fi
 }
 
@@ -60,9 +64,9 @@ src_install() {
 	insinto "${MY_HTDOCSDIR}"
 	doins -r .
 
-	webapp_serverowned "${MY_HTDOCSDIR}"/phpgwapi/images
+	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
 }
 
diff --git a/www-apps/egroupware/metadata.xml b/www-apps/egroupware/metadata.xml
index 69e192b1252d..21695031c0b6 100644
--- a/www-apps/egroupware/metadata.xml
+++ b/www-apps/egroupware/metadata.xml
@@ -4,5 +4,8 @@
 	<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='gallery'>Install gallery2 port for eGW</flag>
 	</use>
 </pkgmetadata>