diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-07-09 13:43:54 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-07-09 13:43:54 +0000 |
| commit | e43f7117a6e8ba7505c52c1a3a0d3fb4fadcb48e (patch) | |
| tree | e950fc35386af8bcff8c999beb134a93a6392f91 /www-apps/websvn | |
| parent | - removing modular xorg out of p.masking now that binutils-2.16.1-r3 (with -z... (diff) | |
| download | gentoo-2-e43f7117a6e8ba7505c52c1a3a0d3fb4fadcb48e.tar.gz gentoo-2-e43f7117a6e8ba7505c52c1a3a0d3fb4fadcb48e.tar.bz2 gentoo-2-e43f7117a6e8ba7505c52c1a3a0d3fb4fadcb48e.zip | |
Use depend.php to work out if we have xml support, #139627
thanks to Jakub Moc.
(Portage version: 2.1.1_pre2-r6)
Diffstat (limited to 'www-apps/websvn')
| -rw-r--r-- | www-apps/websvn/ChangeLog | 6 | ||||
| -rw-r--r-- | www-apps/websvn/websvn-2.0_rc1.ebuild | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/www-apps/websvn/ChangeLog b/www-apps/websvn/ChangeLog index 8fa3f634071e..9ab8447e355f 100644 --- a/www-apps/websvn/ChangeLog +++ b/www-apps/websvn/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-apps/websvn # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/ChangeLog,v 1.13 2006/06/23 12:35:36 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/ChangeLog,v 1.14 2006/07/09 13:43:54 uberlord Exp $ + + 09 Jul 2006; Roy Marples <uberlord@gentoo.org> websvn-2.0_rc1.ebuild: + Use depend.php to work out if we have xml support, #139627 + thanks to Jakub Moc. 23 Jun 2006; Roy Marples <uberlord@gentoo.org> websvn-2.0_rc1.ebuild: Drop invalid DEPEND on PEAR-XML_Parser, replace with check to see if php diff --git a/www-apps/websvn/websvn-2.0_rc1.ebuild b/www-apps/websvn/websvn-2.0_rc1.ebuild index cd19cc9db4d8..19643ed2119e 100644 --- a/www-apps/websvn/websvn-2.0_rc1.ebuild +++ b/www-apps/websvn/websvn-2.0_rc1.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/websvn/websvn-2.0_rc1.ebuild,v 1.3 2006/06/23 12:35:36 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/websvn-2.0_rc1.ebuild,v 1.4 2006/07/09 13:43:54 uberlord Exp $ -inherit eutils webapp +inherit depend.php eutils webapp MY_PV="${PV//_/}" DESCRIPTION="Web-based browsing tool for Subversion (SVN) repositories in PHP" @@ -20,9 +20,12 @@ RDEPEND="virtual/php S="${WORKDIR}/WebSVN-${MY_PV}" pkg_setup() { - if ! built_with_use dev-lang/php xml ; then - eerror "You MUST re-emerge php with the xml USE flag" - die "current php install cannot support ${PN}" + webapp_pkg_setup + + if ! has_version "=dev-lang/php-5*" ; then + require_php_with_use expat + else + require_php_with_use xml fi } |