From 7e662c038477a4f888de32c6caf89b4f27340a9d Mon Sep 17 00:00:00 2001 From: Robert Piasek Date: Tue, 13 Jan 2009 17:01:21 +0000 Subject: Fixed subversion eclass. We don't need to check for subversion build_with_use flag during cross-compilation --- eclass/subversion.eclass | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'eclass') diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass index 437019e..2c3f0c8 100644 --- a/eclass/subversion.eclass +++ b/eclass/subversion.eclass @@ -169,21 +169,18 @@ subversion_fetch() { case "${protocol}" in http|https) - # We have to fake the ROOT variable for built_with_use to work in - # e.g. cross-compile environments. - OLDROOT=${ROOT} - ROOT="/" - if ! built_with_use --missing true -o dev-util/subversion webdav-neon webdav-serf || \ - built_with_use --missing false dev-util/subversion nowebdav ; then - echo - eerror "In order to emerge this package, you need to" - eerror "reinstall Subversion with support for WebDAV." - eerror "Subversion requires either Neon or Serf to support WebDAV." - echo - die "${ESVN}: reinstall Subversion with support for WebDAV." + # We don't need this check for cross-compilation + if [ CHOST = CBUILD ]; then + if ! built_with_use --missing true -o dev-util/subversion webdav-neon webdav-serf || \ + built_with_use --missing false dev-util/subversion nowebdav ; then + echo + eerror "In order to emerge this package, you need to" + eerror "reinstall Subversion with support for WebDAV." + eerror "Subversion requires either Neon or Serf to support WebDAV." + echo + die "${ESVN}: reinstall Subversion with support for WebDAV." + fi fi - # Reset the ROOT variable to the original one - ROOT=${OLDROOT} ;; svn|svn+ssh) ;; -- cgit v1.2.3-65-gdbad