summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Albertson <ramereth@gentoo.org>2011-05-27 15:28:11 +0000
committerLance Albertson <ramereth@gentoo.org>2011-05-27 15:28:11 +0000
commit81749fbf2894dbabebda4339924db3c7fa4aa101 (patch)
tree9ae3b6ae35ba84684f6c7ec051c6ee4452cbbb3d /www-apps/dokuwiki
parentversion bump (diff)
downloadgentoo-2-81749fbf2894dbabebda4339924db3c7fa4aa101.tar.gz
gentoo-2-81749fbf2894dbabebda4339924db3c7fa4aa101.tar.bz2
gentoo-2-81749fbf2894dbabebda4339924db3c7fa4aa101.zip
spl is only for <=php-5.2, fixing use dep #362359
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'www-apps/dokuwiki')
-rw-r--r--www-apps/dokuwiki/ChangeLog5
-rw-r--r--www-apps/dokuwiki/dokuwiki-20101107a.ebuild7
2 files changed, 8 insertions, 4 deletions
diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index b0a9eda5b565..a9c8dcd70892 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-apps/dokuwiki
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.51 2011/05/26 23:00:59 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.52 2011/05/27 15:28:11 ramereth Exp $
+
+ 27 May 2011; Lance Albertson <ramereth@gentoo.org> dokuwiki-20101107a.ebuild:
+ spl is only for <=php-5.2, fixing use dep #362359
26 May 2011; Lance Albertson <ramereth@gentoo.org> dokuwiki-20101107a.ebuild:
Require spl use-flag with dev-lang/php (resolves #362359)
diff --git a/www-apps/dokuwiki/dokuwiki-20101107a.ebuild b/www-apps/dokuwiki/dokuwiki-20101107a.ebuild
index fb11346c388b..f6085a288e60 100644
--- a/www-apps/dokuwiki/dokuwiki-20101107a.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20101107a.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20101107a.ebuild,v 1.3 2011/05/26 23:00:59 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20101107a.ebuild,v 1.4 2011/05/27 15:28:11 ramereth Exp $
-EAPI="2"
+EAPI="4"
inherit webapp depend.php
@@ -19,7 +19,8 @@ KEYWORDS="amd64 ~ppc ~sparc x86"
IUSE="gd"
DEPEND=""
-RDEPEND="dev-lang/php[xml,spl]
+RDEPEND="
+ || ( <dev-lang/php-5.3[xml,spl] >=dev-lang/php-5.3[xml] )
gd? ( || ( dev-lang/php[gd]
media-gfx/imagemagick )
)"