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

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

6 files changed, 100 insertions, 109 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/Manifest b/www-apps/egroupware/Manifest
index 093bce91af77..362d78be7dfb 100644
--- a/www-apps/egroupware/Manifest
+++ b/www-apps/egroupware/Manifest
@@ -1,26 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX postinstall-en-1.2.txt 402 RMD160 aefff6af227f9d007afd1b753d97786d66fa7a80 SHA1 72ebcf1a6af140c5b47a9b567f791224d3fbdab8 SHA256 6063f422525dcb597b07a29a54f354452b8962f5487a222c82c75301697a42ba
+AUX postinstall-en-1.2.txt 418 RMD160 dcc485dc2946aaeb13ee1e0f9128ab3fc1d17f78 SHA1 076498946b97075e1a5192cac06913204381c389 SHA256 29abc4e8b6b8b5022a8ec1c6a3ff21b97d59f3eb980b89fa818ce25ada1ca454
 DIST eGroupWare-1.4.004-2.tar.bz2 10035344 RMD160 75801f459daca5a7a783e902d102e84e70bc8426 SHA1 4e80e5bbca9878b6189dd81ac945fed7f33716e9 SHA256 fec225330ba94a7a566d998438357119f70a639bf932abeb6468139db34dc7e1
 DIST eGroupWare-egw-pear-1.4.004-2.tar.bz2 67092 RMD160 8d272252d60f0e79e185bda76b9ad64d91878aff SHA1 e571be165dfdd4db2a01f2e2c005e8231bff2961 SHA256 427b7cceed777a620795f5fb5de27dbdceeda4b7246ac932b0d3c81e2eb939c1
-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
+DIST eGroupware-1.8.004.20120613.tar.bz2 10460480 RMD160 eae0091cdac264df95c9fa1ae5fe0ccbac077a4a SHA1 9141fed018aa53c7582e5b3a135badf6418705cf SHA256 63cab7d7dd02c56164fd4670ade765b18d9cbdf3e0a1834025216a651c170c54
+DIST eGroupware-egw-pear-1.8.004.20120613.tar.bz2 75148 RMD160 96667c5f582cc01580eed21fdc19d40035ad5734 SHA1 e52d4a6c42584b35e625b7c440a3aec9c7295ae2 SHA256 19ec4e94b24535b5d988dcffdecb922c3b2b63524abd6623f90c690cba51e2e4
+DIST eGroupware-gallery-1.8.004.20120613.tar.bz2 10508030 RMD160 1246806c96f14cba96440da49e5cc10db0a7bc9b SHA1 8f2043e4c114ee0ca8b2a0a229844c008ad34899 SHA256 a49e1309a3ad8bc1de319fcb93ee8f3696b64ad14ebb44fc5a3efaf77ac437fa
 EBUILD egroupware-1.4.004.ebuild 2079 RMD160 9488c9394fcb154819424cfd3891520a768c1681 SHA1 2238fd5372ca94e535c5a299b6abb1c94738630a SHA256 4fd4486054f567c03062ac212415bcf5cecd6f5234f23e8711fbe65d01399e5c
-EBUILD egroupware-1.6.001.ebuild 2375 RMD160 f30e6518d21035a76a23c0b11ace7663eff8c4d7 SHA1 b5804db215cec25afb26c64ad1c6529002c11161 SHA256 25b3bebf44163506ff61d43f573fde173ddabdcc55b7767be3c652938c65492e
-MISC ChangeLog 14927 RMD160 5a59c802ec3183bd007698563407f5490292e53c SHA1 05427e8726f2bfd6b6b3bbf1f81bf8f8bbf7aaf3 SHA256 a73774c8bf8b8476147b4673962a629359f095b1ced2eb1c62244a4431b26a0b
-MISC metadata.xml 431 RMD160 c69994a1f2083677888a75a0dddcdbd7fae0cf9d SHA1 685e01872224f955bb021ab3f7a9ca7b3b77e5fb SHA256 99c42adb27ca06b627147d4f361bd82e1001e796cfb838de8a91437bd8f04d45
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBAgAGBQJNoLILAAoJEGurSuXEqSv16TQH/jCiN3qn6eTBzimmxqRLCKLk
-k4p7uBPC6nRfXpZPOBzg4UKGxQf1nGhMFWwvgRAik4Q6wJsce4P8gBNBAjic+GjA
-JQvouWIWkvmapw4ZssYa1xhyMSmVMVtTsL7n9m1ICNcQaXNtgUvxSsGsAOmwOTMg
-MBz7+W6t1wgZ/LRYSfQHB8H5yqWSfBAKOr9AbGe8lBmHpvLoT3KdcRPUarI2riNE
-MevD3dmGBYdSr4rDjqbvY/qX2kWEd3fmwLW6X63KREpnVgCz8iD5zYiCS1wsg5RN
-kvQbKn/dHPvw1a9q2ULtK570wPPIj3IIxfkISdzUewygSKBQ3q6N5DUbvuTK6K4=
-=YGQ9
------END PGP SIGNATURE-----
+EBUILD egroupware-1.8.004.20120613.ebuild 2728 RMD160 ff17fb46fc016163c82d4bddb3f95203c15a89eb SHA1 8aec1f5e97dee483ecc3c324a243edf1a1231dcd SHA256 34a08f9e860d4d2e8c027dd78a07d9abe2084e94b916f9b44e7ecd4eba526cae
+MISC ChangeLog 15248 RMD160 d931632acba24195763d2fb74b921582381ffd81 SHA1 9a0219d2144fae43bdc56927b8613f39ef9834be SHA256 4f96248fd1f5ba7c2a4b4c8c2dcb7a622b9bb287bebe51ab2ad709bcbfe3d97e
+MISC metadata.xml 306 RMD160 6fc39fecea1e23fa54b7a9dfa257605eccd8cebb SHA1 1af2b0e98351e02d540ead836c71db915d91bedc SHA256 1534b1e117628e72a7b953f362c0c57be264e7f22ed62ec71e9f8ad72dfefd57
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>