Require php with xml/expat support, thanks to Michael Sullivan in bug #151370

(Portage version: 2.1.2_rc2)

5 files changed, 41 insertions, 5 deletions

diff --git a/www-apps/b2evolution/ChangeLog b/www-apps/b2evolution/ChangeLog
index 227c6336e825..af8edc950f2e 100644
--- a/www-apps/b2evolution/ChangeLog
+++ b/www-apps/b2evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/b2evolution
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/ChangeLog,v 1.17 2006/07/24 16:04:01 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/ChangeLog,v 1.18 2006/11/18 21:33:31 dsd Exp $
+
+  18 Nov 2006; Daniel Drake <dsd@gentoo.org> b2evolution-0.9.1.ebuild,
+  b2evolution-0.9.2.ebuild, b2evolution-1.8.0.ebuild:
+  Require php with xml/expat support, thanks to Michael Sullivan in bug #151370
 
   24 Jul 2006; Daniel Drake <dsd@gentoo.org> b2evolution-0.9.1.ebuild,
   b2evolution-0.9.2.ebuild:
diff --git a/www-apps/b2evolution/b2evolution-0.9.1.ebuild b/www-apps/b2evolution/b2evolution-0.9.1.ebuild
index 5995597103d1..c2455c467322 100644
--- a/www-apps/b2evolution/b2evolution-0.9.1.ebuild
+++ b/www-apps/b2evolution/b2evolution-0.9.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-0.9.1.ebuild,v 1.7 2006/07/24 16:04:01 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-0.9.1.ebuild,v 1.8 2006/11/18 21:33:31 dsd Exp $
 
-inherit webapp eutils
+inherit depend.php eutils webapp
 
 MY_EXT="b-2005-09-16"
 
@@ -20,6 +20,16 @@ DEPEND="${DEPEND} ${RDEPEND}
 
 S="${WORKDIR}/${PN}"
 
+pkg_setup() {
+	webapp_pkg_setup
+	has_php
+	if [[ ${PHP_VERSION} == "4" ]]; then
+		require_php_with_use expat
+	else
+		require_php_with_use xml
+	fi
+}
+
 src_install() {
 	webapp_src_preinst
 
diff --git a/www-apps/b2evolution/b2evolution-0.9.2.ebuild b/www-apps/b2evolution/b2evolution-0.9.2.ebuild
index bd2614656fe3..79ff999f3252 100644
--- a/www-apps/b2evolution/b2evolution-0.9.2.ebuild
+++ b/www-apps/b2evolution/b2evolution-0.9.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/b2evolution/b2evolution-0.9.2.ebuild,v 1.2 2006/07/24 16:04:01 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-0.9.2.ebuild,v 1.3 2006/11/18 21:33:31 dsd Exp $
 
 inherit webapp eutils
 
@@ -20,6 +20,16 @@ DEPEND="${DEPEND} ${RDEPEND}
 
 S="${WORKDIR}/${PN}"
 
+pkg_setup() {
+	webapp_pkg_setup
+	has_php
+	if [[ ${PHP_VERSION} == "4" ]]; then
+		require_php_with_use expat
+	else
+		require_php_with_use xml
+	fi
+}
+
 src_install() {
 	webapp_src_preinst
 
diff --git a/www-apps/b2evolution/b2evolution-1.8.0.ebuild b/www-apps/b2evolution/b2evolution-1.8.0.ebuild
index 26d45c773f54..3e29f3c83307 100644
--- a/www-apps/b2evolution/b2evolution-1.8.0.ebuild
+++ b/www-apps/b2evolution/b2evolution-1.8.0.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/b2evolution/b2evolution-1.8.0.ebuild,v 1.1 2006/07/24 15:59:53 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-1.8.0.ebuild,v 1.2 2006/11/18 21:33:31 dsd Exp $
 
 inherit webapp eutils
 
@@ -22,6 +22,16 @@ S="${WORKDIR}/${PN}"
 
 pkg_setup() {
 	webapp_pkg_setup
+	has_php
+	if [[ ${PHP_VERSION} == "4" ]]; then
+		require_php_with_use expat
+	else
+		require_php_with_use xml
+	fi
+}
+
+pkg_setup() {
+	webapp_pkg_setup
 	require_php_with_use tokenizer mysql
 }
 
diff --git a/www-apps/b2evolution/files/digest-b2evolution-0.9.1 b/www-apps/b2evolution/files/digest-b2evolution-0.9.1
index 76238df3afa8..1be5da7b4024 100644
--- a/www-apps/b2evolution/files/digest-b2evolution-0.9.1
+++ b/www-apps/b2evolution/files/digest-b2evolution-0.9.1
@@ -1 +1,3 @@
 MD5 394c15bed69d54091e407b8f527967b7 b2evolution-0.9.1b-2005-09-16.zip 2926356
+RMD160 a28bc2e174a7b20a0834558dca7c9e7b76f55656 b2evolution-0.9.1b-2005-09-16.zip 2926356
+SHA256 31561275fd89a90a9020909309932b775b0c0a197297db10ac908baa089786cb b2evolution-0.9.1b-2005-09-16.zip 2926356