summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2006-07-09 13:43:54 +0000
committerRoy Marples <uberlord@gentoo.org>2006-07-09 13:43:54 +0000
commit97d46e3909e7689fc68a6f32c213a3a9ab176963 (patch)
tree8d387db07a789a89b5d6af14c610cf7f3c722068 /www-apps/websvn
parent- removing modular xorg out of p.masking now that binutils-2.16.1-r3 (with -z... (diff)
downloadhistorical-97d46e3909e7689fc68a6f32c213a3a9ab176963.tar.gz
historical-97d46e3909e7689fc68a6f32c213a3a9ab176963.tar.bz2
historical-97d46e3909e7689fc68a6f32c213a3a9ab176963.zip
Use depend.php to work out if we have xml support, #139627
thanks to Jakub Moc. Package-Manager: portage-2.1.1_pre2-r6
Diffstat (limited to 'www-apps/websvn')
-rw-r--r--www-apps/websvn/ChangeLog6
-rw-r--r--www-apps/websvn/Manifest16
-rw-r--r--www-apps/websvn/websvn-2.0_rc1.ebuild13
3 files changed, 21 insertions, 14 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/Manifest b/www-apps/websvn/Manifest
index 96d100216b9e..5c61b01bc224 100644
--- a/www-apps/websvn/Manifest
+++ b/www-apps/websvn/Manifest
@@ -41,14 +41,14 @@ EBUILD websvn-1.70_beta1.ebuild 1223 RMD160 60a8d35fec6518355ceab950ffe349569f78
MD5 f13b3ba8bd66f163f991ea63a55a9307 websvn-1.70_beta1.ebuild 1223
RMD160 60a8d35fec6518355ceab950ffe349569f78b5d8 websvn-1.70_beta1.ebuild 1223
SHA256 57919c3e6863e2b45306d64ef5414bddc9da4616a0d8bd7b555966dfb9f33f08 websvn-1.70_beta1.ebuild 1223
-EBUILD websvn-2.0_rc1.ebuild 1435 RMD160 c08b2e300439796c3d602d0c98ba0c44797316cf SHA1 0dcd9287d8dc82dab5df8d40a0b2f6e3d80027de SHA256 e790dae9ddb882b11f7af28a4d4186aacb72c44c7fc8b4e398954e54fed95e90
-MD5 4f70dc0681daf2acc492f3981cbc961f websvn-2.0_rc1.ebuild 1435
-RMD160 c08b2e300439796c3d602d0c98ba0c44797316cf websvn-2.0_rc1.ebuild 1435
-SHA256 e790dae9ddb882b11f7af28a4d4186aacb72c44c7fc8b4e398954e54fed95e90 websvn-2.0_rc1.ebuild 1435
-MISC ChangeLog 2586 RMD160 3ef7307fffea3bf25531610f79cedea0c2e0d79f SHA1 c6b25b8b4a4680d46343ffca1ee265f5edec4671 SHA256 7e838096b118fe6dcafb69444803667d51e831ef3cf87e8751f5218127bd8edf
-MD5 4845e76b14bd0275c9b9df201d29762e ChangeLog 2586
-RMD160 3ef7307fffea3bf25531610f79cedea0c2e0d79f ChangeLog 2586
-SHA256 7e838096b118fe6dcafb69444803667d51e831ef3cf87e8751f5218127bd8edf ChangeLog 2586
+EBUILD websvn-2.0_rc1.ebuild 1421 RMD160 4773f567141e5a18827ed1b65d8328534833fc5b SHA1 15027435da0c459303b72a2d08780237ca34f5a0 SHA256 de9b903c5c53f24b0eee8d44e290c95eed927654e9d5241dafa236fe01d5dd06
+MD5 3cc1827c3d79141a9d7a81d1a39e137c websvn-2.0_rc1.ebuild 1421
+RMD160 4773f567141e5a18827ed1b65d8328534833fc5b websvn-2.0_rc1.ebuild 1421
+SHA256 de9b903c5c53f24b0eee8d44e290c95eed927654e9d5241dafa236fe01d5dd06 websvn-2.0_rc1.ebuild 1421
+MISC ChangeLog 2743 RMD160 2dd733273fc47746f74e830c6bb645ea81d06a84 SHA1 ac2c6e6c7103cf878dc703c1254b43576724b1ee SHA256 c5a214e5830068599ebbe21ab6a22430ecbbc8a6c678c135d061231cf9752d09
+MD5 82eac09e96d991194349bd90a8389205 ChangeLog 2743
+RMD160 2dd733273fc47746f74e830c6bb645ea81d06a84 ChangeLog 2743
+SHA256 c5a214e5830068599ebbe21ab6a22430ecbbc8a6c678c135d061231cf9752d09 ChangeLog 2743
MISC metadata.xml 323 RMD160 17622b17fd3c66bf69763a1d3bbb90d7fe692c73 SHA1 283d5c6b988636d8021649a7b3715cbd3d04483c SHA256 6d442fd3b4a583c963c30df7f8036f11b1c95788c8c539fc7ef4d01ff3ac173e
MD5 7999d6b6542ca3e8b7f9fb693fbbd016 metadata.xml 323
RMD160 17622b17fd3c66bf69763a1d3bbb90d7fe692c73 metadata.xml 323
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
}