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

Package-Manager: portage-2.1.2_rc2

6 files changed, 61 insertions, 35 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/Manifest b/www-apps/b2evolution/Manifest
index 774df930baea..079f9a67c9c7 100644
--- a/www-apps/b2evolution/Manifest
+++ b/www-apps/b2evolution/Manifest
@@ -1,46 +1,36 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX postinstall-en.txt 340 RMD160 41bfb67810c28da6f41ba53e1d26478707682bcb SHA1 78cfe35015e23d3ae0a20e48ed445b3a64905c18 SHA256 894883c46bca9d7184b3a750ae58624578c716a5a1023225ce9989a8fe32665d
 MD5 d584b5d4ec8d7378cbfcc77cde85306d files/postinstall-en.txt 340
 RMD160 41bfb67810c28da6f41ba53e1d26478707682bcb files/postinstall-en.txt 340
 SHA256 894883c46bca9d7184b3a750ae58624578c716a5a1023225ce9989a8fe32665d files/postinstall-en.txt 340
-DIST b2evolution-0.9.1b-2005-09-16.zip 2926356
+DIST b2evolution-0.9.1b-2005-09-16.zip 2926356 RMD160 a28bc2e174a7b20a0834558dca7c9e7b76f55656 SHA1 aa5aaf4b5080e780d163983736b0ae0f4e7a8e02 SHA256 31561275fd89a90a9020909309932b775b0c0a197297db10ac908baa089786cb
 DIST b2evolution-0.9.2-2006-05-22.zip 3294584 RMD160 6e04fbe04c8a160b61342391ed553326b69f2b49 SHA1 b218dc992950b56034eb41ad62ef13735ef97cfb SHA256 302b18f9768580750e96a1354a19c401c65d7f11324a208f10b956094b7914fe
 DIST b2evolution-1.8.0-2006-07-09.zip 2188059 RMD160 719a657fe658643f62f87d7dd1a9da7a7b4ebf5a SHA1 8ef8ca7e1b81f0a18c648f8be03c5b55a569e1e3 SHA256 cb195753e7fe8631d22a7653d551b88d0dd7ad46aae5cf3369498d1467ca02d6
-EBUILD b2evolution-0.9.1.ebuild 1260 RMD160 e68fc607141128b8ed156e0c2cc7fcd1a856394a SHA1 a72c863b4be1c79226fb3edcd914b7d28d231f55 SHA256 e49b3f42bebdeeaf777562781b2e6d3dcae670d7a0334afa26e600e87b8cbbcb
-MD5 0d4d66fff401ab79f9f337fa46899d62 b2evolution-0.9.1.ebuild 1260
-RMD160 e68fc607141128b8ed156e0c2cc7fcd1a856394a b2evolution-0.9.1.ebuild 1260
-SHA256 e49b3f42bebdeeaf777562781b2e6d3dcae670d7a0334afa26e600e87b8cbbcb b2evolution-0.9.1.ebuild 1260
-EBUILD b2evolution-0.9.2.ebuild 1263 RMD160 a8c1b52061133f586425ceaa108d175080d6a8af SHA1 d4160303166ff94fa730258818f7d0dedb4e511c SHA256 42fcf152684ddcdd1553595b08173151d74762972064ac2d8353caa74a639cba
-MD5 63a38034e9018ad904f9cf4781b40b08 b2evolution-0.9.2.ebuild 1263
-RMD160 a8c1b52061133f586425ceaa108d175080d6a8af b2evolution-0.9.2.ebuild 1263
-SHA256 42fcf152684ddcdd1553595b08173151d74762972064ac2d8353caa74a639cba b2evolution-0.9.2.ebuild 1263
-EBUILD b2evolution-1.8.0.ebuild 1402 RMD160 31f740ff577f8735c7a2576f579733186696beff SHA1 1db1eaf9ff94bb14b4bf5f65fdde40fc54ad26b9 SHA256 c532097fd679a882792937281991f87f18a027dbef187d9ffb022fa7acf88b9f
-MD5 10f6ea133017fb56315c24a3b70411f5 b2evolution-1.8.0.ebuild 1402
-RMD160 31f740ff577f8735c7a2576f579733186696beff b2evolution-1.8.0.ebuild 1402
-SHA256 c532097fd679a882792937281991f87f18a027dbef187d9ffb022fa7acf88b9f b2evolution-1.8.0.ebuild 1402
-MISC ChangeLog 2941 RMD160 f4f0f886e31015a659ffe210d39a91ca9574d5ae SHA1 afecc59f0bb392411cc5b306e86077428dc29c63 SHA256 2deba6bfdfd1c0951de0793f74270ee1371dc3147be0287b2c3f7464ef2e2aaa
-MD5 39c4093486e15625b7f8af4f60f47736 ChangeLog 2941
-RMD160 f4f0f886e31015a659ffe210d39a91ca9574d5ae ChangeLog 2941
-SHA256 2deba6bfdfd1c0951de0793f74270ee1371dc3147be0287b2c3f7464ef2e2aaa ChangeLog 2941
+EBUILD b2evolution-0.9.1.ebuild 1419 RMD160 496abd49b5d1c82a57b1992be4c0d047de386894 SHA1 eeaec65da9f056bd7e3142a1e9b0a3b824f8635c SHA256 7d7561e13e6028c523607cf03a462ee49343a035f97b66ebfa6ccc07473a8357
+MD5 78f7012387dcb80029412d33727ba5ad b2evolution-0.9.1.ebuild 1419
+RMD160 496abd49b5d1c82a57b1992be4c0d047de386894 b2evolution-0.9.1.ebuild 1419
+SHA256 7d7561e13e6028c523607cf03a462ee49343a035f97b66ebfa6ccc07473a8357 b2evolution-0.9.1.ebuild 1419
+EBUILD b2evolution-0.9.2.ebuild 1411 RMD160 f668b1f443e701a91c65f223714be3758e29c5d7 SHA1 a4108a2a59f92ae89cd12c74dcb3bb7693aacd25 SHA256 15c8488f8c537c3bf125472a567f64c1fff3766078d18220005c3e366c5e7c5a
+MD5 c1522577137510c8736b3e8346fc4858 b2evolution-0.9.2.ebuild 1411
+RMD160 f668b1f443e701a91c65f223714be3758e29c5d7 b2evolution-0.9.2.ebuild 1411
+SHA256 15c8488f8c537c3bf125472a567f64c1fff3766078d18220005c3e366c5e7c5a b2evolution-0.9.2.ebuild 1411
+EBUILD b2evolution-1.8.0.ebuild 1550 RMD160 d33bf21334568ad6cf379ff478398498ea11566f SHA1 75d7f6c521dcd9bc992afe4aa53a8e0e4b29afa4 SHA256 e84c238416e4b89c83f8d4b9ac9230c3d9e9331eba189746e73b749296d9cf34
+MD5 34008cf468d79299d7cdc26569bfdee4 b2evolution-1.8.0.ebuild 1550
+RMD160 d33bf21334568ad6cf379ff478398498ea11566f b2evolution-1.8.0.ebuild 1550
+SHA256 e84c238416e4b89c83f8d4b9ac9230c3d9e9331eba189746e73b749296d9cf34 b2evolution-1.8.0.ebuild 1550
+MISC ChangeLog 3147 RMD160 a6974b7ea5bff08c48ce35c29b790b7ae63ec62a SHA1 5bfa2674b6b714e2afea2edfacda9b826c278742 SHA256 bf1aff9a7703b7a6c040a39bc7245b7b14dd366ff8bca8739815f25a5a1c287d
+MD5 591bf7761f2adcd933407c38c4a04860 ChangeLog 3147
+RMD160 a6974b7ea5bff08c48ce35c29b790b7ae63ec62a ChangeLog 3147
+SHA256 bf1aff9a7703b7a6c040a39bc7245b7b14dd366ff8bca8739815f25a5a1c287d ChangeLog 3147
 MISC metadata.xml 247 RMD160 d614869009a6c5c10b1675ae724b30b9a40ee9e6 SHA1 8f019e8217ba1c85346608c369b94f190af1eac6 SHA256 51d7089e9b7fc2bab9592df63ddbcb8e28ec1cfe575a5b77c6bd63381079776e
 MD5 a87207b3b148a8e1057c02dad9d02af8 metadata.xml 247
 RMD160 d614869009a6c5c10b1675ae724b30b9a40ee9e6 metadata.xml 247
 SHA256 51d7089e9b7fc2bab9592df63ddbcb8e28ec1cfe575a5b77c6bd63381079776e metadata.xml 247
-MD5 aa3594668732d94839440295a8b4fb79 files/digest-b2evolution-0.9.1 79
-RMD160 0d126f3a20fb0ca86cce12f3fcb4b0ce6e7bb459 files/digest-b2evolution-0.9.1 79
-SHA256 b0082dee9ff5b5a9ee504888884efef4e3055d0adc3c5b367b1d4f581f900b7d files/digest-b2evolution-0.9.1 79
+MD5 6ed90665e73cdb04d5ec32b072f84827 files/digest-b2evolution-0.9.1 283
+RMD160 7d3ba46ed546d9a56eaa7cb6babdeb27b4caa68b files/digest-b2evolution-0.9.1 283
+SHA256 030643f6c501883ea567ffdc9e93fc1cb987b79e1a95fb2ed6080d77289c9c49 files/digest-b2evolution-0.9.1 283
 MD5 6c9d7cfc433bf3c61ce48d28fcdc29e7 files/digest-b2evolution-0.9.2 280
 RMD160 d7cf2588aecb39c4a1be2682e1c77523848d5a63 files/digest-b2evolution-0.9.2 280
 SHA256 799efc79f5cfb5d768c16769eebd6cac5262e44a7f98ce21eea6f7db83d2f8f7 files/digest-b2evolution-0.9.2 280
 MD5 b49284b18d0b49a6a2ca66a928c9054b files/digest-b2evolution-1.8.0 280
 RMD160 e1c9c2fec83eef3047f92ba862a34b7ea8bcc6d2 files/digest-b2evolution-1.8.0 280
 SHA256 9738f09a6e6d95756c8eb6498868c366b66ac1de70194fc6d3d0bfec8b58afa3 files/digest-b2evolution-1.8.0 280
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFExPN1TOXg++0VvJQRAouuAKC77ys3fTgQ/R4M2/M2lTULsNcILQCfVgo4
-3ewTNxai3HO3ojGuDCiCFlM=
-=rn1A
------END PGP SIGNATURE-----
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