Check if PHP has been built with XML support. Fixes bug #171610, reported by Philippe...

Package-Manager: portage-2.1.2.2

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index e103bc426123d2e99b76796139d533b4bb59b3fb..fa8a2217cd47bdca10514b744647aa449bef8757 100644 (file)
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/dokuwiki
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.20 2007/03/16 06:54:42 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.21 2007/03/23 20:44:22 ticho Exp $
+
+  23 Mar 2007; Andrej Kacian <ticho@gentoo.org> dokuwiki-20061106.ebuild:
+  Check if PHP has been built with XML support. Fixes bug #171610, reported by
+  Philippe Chaintreuil <pchaintreuil at syrres.com>.
 
   16 Mar 2007; Andrej Kacian <ticho@gentoo.org> -dokuwiki-20060309e.ebuild:
   Removed vulnerable version from the tree.

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index d23bf625e2434893d4e1eeca7940270d8bba5afb..02c8de8234123cc4ec06eeff0c510c706ecc6a7d 100644 (file)
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -6,14 +6,14 @@ MD5 1b5b86b6942f3451fc286451dbaf7c4a files/postinstall-en.txt 1590
 RMD160 febd5daba4df2026d77f03f45894f022a0d1eaa9 files/postinstall-en.txt 1590
 SHA256 16f56b18233207dde91c632b4a69a07b627154abd3809aee94ccbf165bb60f41 files/postinstall-en.txt 1590
 DIST dokuwiki-2006-11-06.tgz 1058194 RMD160 6b1eee41b7eb464e3a7aaa314a2332256906790e SHA1 2b3022285a4d2ccfd31c19f0ec9aa6ea4bfd5f9c SHA256 97c63ef56234a5031223b9a69582910ff692a3d0929e18481ff39203b13aeb7d
-EBUILD dokuwiki-20061106.ebuild 1833 RMD160 59748e0dc828350ca9622b6a3e52846aab8e159f SHA1 b47b7b967d49dd9a542115c28133d3ab31ed2b67 SHA256 e55bd763f3ebf832e1ef7ec8a949b6223747fea376ba9ab8ae27f40183754308
-MD5 a5c5829d365f12957e76a01bb6a43e4c dokuwiki-20061106.ebuild 1833
-RMD160 59748e0dc828350ca9622b6a3e52846aab8e159f dokuwiki-20061106.ebuild 1833
-SHA256 e55bd763f3ebf832e1ef7ec8a949b6223747fea376ba9ab8ae27f40183754308 dokuwiki-20061106.ebuild 1833
-MISC ChangeLog 3389 RMD160 b80190f011bdf1f457bf1c57594a91ec837f2937 SHA1 5772735330f5b93dee08a9baccdf5c9883ec752f SHA256 57f11ee07e928fd962e0ff21234ba923ed306d4a39678ff0e5e6df3536bc2dc3
-MD5 fc281c29d2976962205d9d6e85bfd50d ChangeLog 3389
-RMD160 b80190f011bdf1f457bf1c57594a91ec837f2937 ChangeLog 3389
-SHA256 57f11ee07e928fd962e0ff21234ba923ed306d4a39678ff0e5e6df3536bc2dc3 ChangeLog 3389
+EBUILD dokuwiki-20061106.ebuild 2094 RMD160 a809dd4c6f07ab18e9702e5404fad3610b1fa224 SHA1 6036f16a968840c47ac65a1800d0925d54c9e6c5 SHA256 258c6e6c076a441619fe15899bba6c5f904762731554da9fa171cecbbaccce7f
+MD5 9312ea5e152071ffadb994e23936b573 dokuwiki-20061106.ebuild 2094
+RMD160 a809dd4c6f07ab18e9702e5404fad3610b1fa224 dokuwiki-20061106.ebuild 2094
+SHA256 258c6e6c076a441619fe15899bba6c5f904762731554da9fa171cecbbaccce7f dokuwiki-20061106.ebuild 2094
+MISC ChangeLog 3596 RMD160 c0c922ece8f18e850bb3d98c02ba1c9c3df6bf5d SHA1 a37d6dad6fe8e5dd64517866660c89abe6281b70 SHA256 a553a94670cd97e7a49791dfe762e11f6148394f9453fa9572f4b95d51e23180
+MD5 84b6cd87e5566a6e547ae7c77c56a7aa ChangeLog 3596
+RMD160 c0c922ece8f18e850bb3d98c02ba1c9c3df6bf5d ChangeLog 3596
+SHA256 a553a94670cd97e7a49791dfe762e11f6148394f9453fa9572f4b95d51e23180 ChangeLog 3596
 MISC metadata.xml 843 RMD160 61c80553f74e108ce84fec44467c6c4e6dc2cb9f SHA1 022976ebf107c25d6db434e4765adbaa9645ae5b SHA256 2d1d093fc0a1eb15ba44bebe61142c3c3e17bb87ec7adee4aadb1d8f6a90c693
 MD5 faff62ef368ab735f9a3cd36ccfbeac6 metadata.xml 843
 RMD160 61c80553f74e108ce84fec44467c6c4e6dc2cb9f metadata.xml 843
@@ -22,9 +22,9 @@ MD5 5edaed586a08d7e987d67969c7eb45a6 files/digest-dokuwiki-20061106 253
 RMD160 a65af752fc6a4892ffa870ecc9386a52e3f6a113 files/digest-dokuwiki-20061106 253
 SHA256 479d8e94ec88253088b7c35e02cd788b45a480bf8fe6e08c1abd35bbd0f48262 files/digest-dokuwiki-20061106 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFF+j87QlM6RnzZP+IRAhcvAJwMXJDqoRLJxopgyZ4tOYD/XrE4rwCfQV3M
-0HGjaIZdQWilsb6Ffz5JiVw=
-=4Ecv
+iD8DBQFGBDwtQlM6RnzZP+IRAr+mAJ0ciWIlf+Vt7LuIxKXs7vKALTrOSQCfVyzg
+QvSMD1OTEEhVQdDvRhjBhig=
+=/PtF
 -----END PGP SIGNATURE-----

diff --git a/www-apps/dokuwiki/dokuwiki-20061106.ebuild b/www-apps/dokuwiki/dokuwiki-20061106.ebuild
index 68de778c91720e02ce6d9e4e1e1dcfded34850e9..6090613a0428884b7c89757b8f45ff43b881f4bc 100644 (file)
--- a/www-apps/dokuwiki/dokuwiki-20061106.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20061106.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20061106.ebuild,v 1.2 2007/03/16 06:50:19 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20061106.ebuild,v 1.3 2007/03/23 20:44:22 ticho Exp $
 
-inherit webapp
+inherit depend.php webapp
 
 # Upstream uses dashes in the datestamp
 MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
@@ -19,6 +19,18 @@ IUSE=""
 DEPEND="virtual/php"
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+       # let the eclass pick right php version...
+       require_php_cli
+
+       # ...and we check if correct USE flag for XML support is enabled
+       if [[ ${PHP_VERSION} == "4" ]] ; then
+               require_php_with_use expat
+       else
+               require_php_with_use xml
+       fi
+}
+
 src_unpack() {
        cd ${WORKDIR}
        unpack ${PN}-${MY_PV}.tgz