diff options
| author |   Andrej Kacian <ticho@gentoo.org> | 2007-03-23 20:44:22 +0000 |
|---|---|---|
| committer | Andrej Kacian <ticho@gentoo.org> | 2007-03-23 20:44:22 +0000 |
| commit | 6335e9ff4e7e4b05f073ff25132243f86c242cf3 (patch) | |
| tree | 52a4071d484352b406c0e09ec762609496668f75 /www-apps/dokuwiki | |
| parent | Stable on hppa. See bug #167643. (diff) | |
| download | gentoo-2-6335e9ff4e7e4b05f073ff25132243f86c242cf3.tar.gz gentoo-2-6335e9ff4e7e4b05f073ff25132243f86c242cf3.tar.bz2 gentoo-2-6335e9ff4e7e4b05f073ff25132243f86c242cf3.zip | |
Check if PHP has been built with XML support. Fixes bug #171610, reported by Philippe Chaintreuil <pchaintreuil at syrres.com>.
(Portage version: 2.1.2.2)
Diffstat (limited to 'www-apps/dokuwiki')
| -rw-r--r-- | www-apps/dokuwiki/ChangeLog | 6 | ||||
| -rw-r--r-- | www-apps/dokuwiki/dokuwiki-20061106.ebuild | 16 |
2 files changed, 19 insertions, 3 deletions
diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog index e103bc426123..fa8a2217cd47 100644 --- 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/dokuwiki-20061106.ebuild b/www-apps/dokuwiki/dokuwiki-20061106.ebuild index 68de778c9172..6090613a0428 100644 --- 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 |