Fixed multiple dies

Package-Manager: portage-2.1_pre10-r5

3 files changed, 23 insertions, 19 deletions

diff --git a/www-apps/egroupware/ChangeLog b/www-apps/egroupware/ChangeLog
index da980743369e..717a0e9d1f2a 100644
--- a/www-apps/egroupware/ChangeLog
+++ b/www-apps/egroupware/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/egroupware
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v 1.52 2006/04/22 15:29:41 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v 1.53 2006/05/13 17:01:31 rl03 Exp $
+
+  13 May 2006; Renat Lumpau <rl03@gentoo.org> egroupware-1.2.ebuild:
+  Fixed multiple dies
 
 *egroupware-1.2 (22 Apr 2006)
 
diff --git a/www-apps/egroupware/Manifest b/www-apps/egroupware/Manifest
index 8c53440409c7..25c4da0ec170 100644
--- a/www-apps/egroupware/Manifest
+++ b/www-apps/egroupware/Manifest
@@ -15,14 +15,14 @@ EBUILD egroupware-1.0.0.009_p3.ebuild 1421 RMD160 f764b0cb6d1bd8a67ad0713c2a86b0
 MD5 31794927c816e482e64aa85ebc7e41a0 egroupware-1.0.0.009_p3.ebuild 1421
 RMD160 f764b0cb6d1bd8a67ad0713c2a86b066d7512cd0 egroupware-1.0.0.009_p3.ebuild 1421
 SHA256 3700169e77118329686cce0e84978a67adc7dd7df9b490a71c1d0342d4d8a23d egroupware-1.0.0.009_p3.ebuild 1421
-EBUILD egroupware-1.2.ebuild 1762 RMD160 6d787464e9ff4d1b43e2a9cbc97530fe4932122c SHA1 dfe2ce1f0f21300fbe159cae558c897af22c88a9 SHA256 9183348917b282f6919e681def8628ed9a54bba2c7ff78f946f0da66f05be9d4 size 1762
-MD5 be10fac3aa9d037c0dfc9b88cb1d5f54 egroupware-1.2.ebuild 1762
-RMD160 6d787464e9ff4d1b43e2a9cbc97530fe4932122c egroupware-1.2.ebuild 1762
-SHA256 9183348917b282f6919e681def8628ed9a54bba2c7ff78f946f0da66f05be9d4 egroupware-1.2.ebuild 1762
-MISC ChangeLog 8368 RMD160 0c220421b751f31e8c4b77ef4784baf847e6f159 SHA1 0b6da75d0369684a928f0451e5898548a21f0a12 SHA256 999b2aa9ade03f95ca3faa282322ead2b66962d32f3caef771f151be2e52e2d7 size 8368
-MD5 a776404e9566367619d748042a0c7e34 ChangeLog 8368
-RMD160 0c220421b751f31e8c4b77ef4784baf847e6f159 ChangeLog 8368
-SHA256 999b2aa9ade03f95ca3faa282322ead2b66962d32f3caef771f151be2e52e2d7 ChangeLog 8368
+EBUILD egroupware-1.2.ebuild 1808 RMD160 48d167c0e42460f27787aa60af2b02405d341bdf SHA1 8d2dbebd3384f63eccb8a8e10148f8b9d3ad5322 SHA256 b7cccc05c94adb2bf14624abce1d0535571e5d8d64fb37ed2480cf867e653c2b size 1808
+MD5 3f3f8965143a433e035298a0083ba80f egroupware-1.2.ebuild 1808
+RMD160 48d167c0e42460f27787aa60af2b02405d341bdf egroupware-1.2.ebuild 1808
+SHA256 b7cccc05c94adb2bf14624abce1d0535571e5d8d64fb37ed2480cf867e653c2b egroupware-1.2.ebuild 1808
+MISC ChangeLog 8460 RMD160 ca377364f975d061f877523510f534a80f3320fc SHA1 cbedf5fe854b5bd2859dd45c359cb793029261c6 SHA256 bbc14230b4169e5985f0e340fd5e43ef534eb2109882d08d4960e65620b725b1 size 8460
+MD5 e9ee204fe0aba6b052d519c41e02b002 ChangeLog 8460
+RMD160 ca377364f975d061f877523510f534a80f3320fc ChangeLog 8460
+SHA256 bbc14230b4169e5985f0e340fd5e43ef534eb2109882d08d4960e65620b725b1 ChangeLog 8460
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 size 161
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b metadata.xml 161
@@ -30,15 +30,13 @@ SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 metadata
 MD5 28debcc4cd0f93017d184c3e3582223c files/digest-egroupware-1.0.0.009_p3 277
 RMD160 138f0cbcbe815be82295610e4b1addce37186791 files/digest-egroupware-1.0.0.009_p3 277
 SHA256 d71601a709ef3fda7509b521fd25e088e40e05f6616d5fbe5ef05a7fa256ccad files/digest-egroupware-1.0.0.009_p3 277
-size 277 files/digest-egroupware-1.0.0.009_p3 277
 MD5 4e4ba6b7ccf6d85a4ab5982b98911c59 files/digest-egroupware-1.2 259
 RMD160 df9f8fab27621f23abb3d6ae7d6879d2f182da72 files/digest-egroupware-1.2 259
 SHA256 554f353887d732a0ad6dbda5403faab4f7148939597cc7ee0536c595518611fe files/digest-egroupware-1.2 259
-size 259 files/digest-egroupware-1.2 259
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFESkvyEzitwsaoONoRAk4IAJ4y4KTt1GySHvzswwEPVMmSawozvACeMut9
-BU8aWgxV/naMtjydy4meP+8=
-=Gluy
+iD8DBQFEZhD1EzitwsaoONoRAqWaAJ9CG3XQR+JB0Z+SiJdRgsUbjFToCgCfUOIN
+ZEDWBiP/ZQTY1maAiuyf2gI=
+=pTIU
 -----END PGP SIGNATURE-----
diff --git a/www-apps/egroupware/egroupware-1.2.ebuild b/www-apps/egroupware/egroupware-1.2.ebuild
index 778076972ef0..937efe97df1d 100644
--- a/www-apps/egroupware/egroupware-1.2.ebuild
+++ b/www-apps/egroupware/egroupware-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/egroupware-1.2.ebuild,v 1.1 2006/04/22 15:29:41 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/egroupware-1.2.ebuild,v 1.2 2006/05/13 17:01:31 rl03 Exp $
 
 inherit webapp depend.php
 
@@ -28,10 +28,13 @@ pkg_setup () {
 	has_php
 	webapp_pkg_setup
 
-	require_php_with_use imap session
-	use ldap && require_php_with_use ldap
-	use mysql && require_php_with_use mysql
-	use postgres && require_php_with_use postgres
+	local php_flags="imap session"
+
+	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}
+
 	einfo "Consider installing an MTA if you want to use eGW's mail capabilities."
 }