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

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

5 files changed, 37 insertions, 108 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/Manifest b/www-apps/egroupware/Manifest
index 3e78432bbb9c..23d9ff42c978 100644
--- a/www-apps/egroupware/Manifest
+++ b/www-apps/egroupware/Manifest
@@ -1,22 +1,12 @@
------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-1.4.003.tar.bz2 9875895 RMD160 32d101074ffe311bcddebe4d0b062d44fa4d6bd9 SHA1 7cdce1eaf9f70f9f80881e8f4c403e00eef87596 SHA256 ca3be2994d81d4b93de5951a46f43adb67c61a8f8b4fd82eae8734df9ab28f3a
 DIST eGroupWare-1.4.004-2.tar.bz2 10035344 RMD160 75801f459daca5a7a783e902d102e84e70bc8426 SHA1 4e80e5bbca9878b6189dd81ac945fed7f33716e9 SHA256 fec225330ba94a7a566d998438357119f70a639bf932abeb6468139db34dc7e1
-DIST eGroupWare-egw-pear-1.4.002.tar.bz2 66295 RMD160 1c8a737964760f4be0c2b3fa19a0c7a5c75d308a SHA1 559410234a1272440236b886057ea89f8b73b3bb SHA256 bb997f9d5120792823a8c79dc3461fa9f635337405123a9a6969199e28778830
-DIST eGroupWare-egw-pear-1.4.003.tar.bz2 67136 RMD160 d8528ec92a9f3cfeeb48a3040012fdc2be3cb55c SHA1 f23b674f12fbc90353c9e1eedf3c078699322f5b SHA256 6a54d4b1f7c4bf368c9bb3336bde56a88391a35f5cd1cde7eb28ef2cacc13193
 DIST eGroupWare-egw-pear-1.4.004-2.tar.bz2 67092 RMD160 8d272252d60f0e79e185bda76b9ad64d91878aff SHA1 e571be165dfdd4db2a01f2e2c005e8231bff2961 SHA256 427b7cceed777a620795f5fb5de27dbdceeda4b7246ac932b0d3c81e2eb939c1
-EBUILD egroupware-1.4.002.ebuild 2073 RMD160 5e831766ed2009b00c1dc029b3d3cabfda3b3c01 SHA1 e8de3fc837efc8d1b83f22dc97dbcb18f2621c29 SHA256 a95eac73a9d049b0b783367f7970f08527a1dd176990642de05cd49b433e33d4
-EBUILD egroupware-1.4.003.ebuild 2073 RMD160 5a346f82f355c3544b312a94d4f2518c93ec21c3 SHA1 f336bed4da18abd7eb8a81cb664cf87719bd1549 SHA256 1db38f16513537f6fcf4654187c5390fa1e58098c9f22a2140a1a193d38a1ee6
+DIST eGroupware-1.6.001.tar.bz2 9021592 RMD160 e6bc7400794de37566509346657fd3003d07f414 SHA1 413ab3e04f898f4941a32cfaba38be7bbee2edea SHA256 1c7442b34e629065419e4414ae96b7990a6c0f5fdc411ee556259744e7594ba7
+DIST eGroupware-egw-pear-1.6.001.tar.bz2 68887 RMD160 367e49985819621a9ffc7055ff459051ed6432dd SHA1 ba1b8540bf4b11a55fcb23fafc0b6fa4e824e486 SHA256 e3ddd771b43be3e0643c47d5df6d04290b95caebbd714360c033cf238da97b46
+DIST eGroupware-gallery-1.6.001.tar.bz2 10540837 RMD160 91eacdb893ad095fd39d6dc1c6c4bee7aa6a7742 SHA1 31f0c81c40beaf09dce3c0988a4ccebc4d9abf2f SHA256 84066aad36b98174142f510634448d5cf5d7d8905ab7d4eeb6e1429e903a7e4a
+DIST eGroupware-icalsrv-1.6.001.tar.bz2 640871 RMD160 fc3210287979af13319d654e44db32f68579a73b SHA1 6bb18835b1b1fcb874e9fd59202a608299bb624c SHA256 cc08bc5ec185c5b9d6224648ca185f6e34071cce468d279caba2d52a7fd6512f
+DIST eGroupware-mydms-1.6.001.tar.bz2 581677 RMD160 2c96c47da3d124bdbf6d510cdc0551bcaa0e165a SHA1 86e746aa89aa888dd0aa39618fa3ea729c0d1248 SHA256 16206378223ebc3ec50422aee0360fe8f5f1c82b55d0d296ce5104a127b81016
 EBUILD egroupware-1.4.004.ebuild 2077 RMD160 066310342cf7472ccc3aa17f56520057ca8a721b SHA1 e3c02ca53e8cf876da90a0b86d2001b3e3f9313b SHA256 f736e5dc8bc7b6a92ea5eebc377d6a4c33434d553dca7444088cf94d02c75ab0
-MISC ChangeLog 14649 RMD160 52def0315839010a99ecefe60eaa6ccb8fe9ff96 SHA1 1d4fa6de3a8797d1d5318b437dc1ab263583dee7 SHA256 d7313127919fb62ce5029665a7deecd58bf479c8b8793bde6ca63f65579371a3
-MISC metadata.xml 247 RMD160 04af8f1ada9b0cc5f6157cc170a8e86f419d1c12 SHA1 2352104f18fa00acef62d75a0f01501f40652b0f SHA256 168a5012682a0462436fadcc76612d5768334b884380790a81facdc17c223851
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkivldcACgkQoeSe8B0zEfyv0ACfQimD2Wmq7+akDubJnMDkRMY5
-Nw4AnRu7SUxAQGa7beNII2DXVJ+pKqp0
-=Crn1
------END PGP SIGNATURE-----
+EBUILD egroupware-1.6.001.ebuild 2370 RMD160 3e09d79b09b11e1b8bc3d61f5a0ae6d3f4e369a0 SHA1 dbb67ffdd852e8c715d126915d31569e2daac8ae SHA256 a42f02ddebce7a29ebd4cfb5101099bee77c0ad50bdf2f5802273ed23aba3c3a
+MISC ChangeLog 14927 RMD160 5a59c802ec3183bd007698563407f5490292e53c SHA1 05427e8726f2bfd6b6b3bbf1f81bf8f8bbf7aaf3 SHA256 a73774c8bf8b8476147b4673962a629359f095b1ced2eb1c62244a4431b26a0b
+MISC metadata.xml 431 RMD160 c69994a1f2083677888a75a0dddcdbd7fae0cf9d SHA1 685e01872224f955bb021ab3f7a9ca7b3b77e5fb SHA256 99c42adb27ca06b627147d4f361bd82e1001e796cfb838de8a91437bd8f04d45
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>