Don't fail when neon wasn't requested

(Portage version: 2.1_pre5-r4)

3 files changed, 44 insertions, 14 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 0140f3eff318..f845f665e87a 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.205 2006/02/21 20:54:18 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.206 2006/03/10 08:55:10 pauldv Exp $
+
+  10 Mar 2006; Paul de Vrieze <pauldv@gentoo.org>
+  files/subversion-neon-config.patch:
+  Fix the patch such that configure doesn't fail when neon wasn't requested (bug 
+  #125570)
 
   21 Feb 2006; Paul de Vrieze <pauldv@gentoo.org>
   +files/subversion-neon-config.patch, subversion-1.3.0.ebuild:
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 57d642ed657b..a28759fd6af8 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -28,9 +28,9 @@ SHA256 7d84d8ec5beb7b30e6ee6e27afdbaa2bed9e4b9e5df45c572c543547b4317f5b files/su
 MD5 82c218472a786250947746b8bc8294dd files/subversion-hotbackup-config.patch 629
 RMD160 6a53b1b676bc3ce3ef2644666c2ebd21574c18fe files/subversion-hotbackup-config.patch 629
 SHA256 7a80e05ed26508abee1bd2aa358747a681ce55e18711ff28c745012f60d989f3 files/subversion-hotbackup-config.patch 629
-MD5 3bb551a8b71abf0dd05abf205a1b083d files/subversion-neon-config.patch 1104
-RMD160 cc99954e11f7ba469e97f3f6597956b333c52094 files/subversion-neon-config.patch 1104
-SHA256 82d0024fbcfe335d2937cf0a15f6e1ddb616e5aa6868cf9d5aa102437248fe38 files/subversion-neon-config.patch 1104
+MD5 00e0d3bc148d96ef33ccb96520bb23b9 files/subversion-neon-config.patch 1889
+RMD160 756655f419c0c5d1062508955850cba1cf29050b files/subversion-neon-config.patch 1889
+SHA256 bec16e3a37de3d09e7ae1958d33a439939450741a7bfe88f02e1a34c447632e4 files/subversion-neon-config.patch 1889
 MD5 10d20fe76ce2f39d1eb45089ce3471a5 files/subversion-swig.m4-ruby.patch 698
 RMD160 ca706a96ee1278c9a42074b7bc0d9af55933bc5c files/subversion-swig.m4-ruby.patch 698
 SHA256 c08a87c86dd90a9a7d4ad2a26aab17058585f16fecc53334d6a597aeb8e02b89 files/subversion-swig.m4-ruby.patch 698
diff --git a/dev-util/subversion/files/subversion-neon-config.patch b/dev-util/subversion/files/subversion-neon-config.patch
index 56b7054488b3..bb25adc8528e 100644
--- a/dev-util/subversion/files/subversion-neon-config.patch
+++ b/dev-util/subversion/files/subversion-neon-config.patch
@@ -1,13 +1,3 @@
---- subversion-1.3.0/build/ac-macros/neon.m4.orig	2006-02-21 21:25:07.000000000 +0100
-+++ subversion-1.3.0/build/ac-macros/neon.m4	2006-02-21 21:26:07.000000000 +0100
-@@ -174,6 +174,6 @@
-   echo "unpack the archive using tar/gunzip and rename the resulting"
-   echo "directory from ./neon-${NEON_LATEST_WORKING_VER}/ to ./neon/"
-   echo ""
--  AC_MSG_RESULT([no suitable neon found])
-+  AC_MSG_FAILURE([no suitable neon found])
-   svn_lib_neon="no"
- ])
 --- subversion-1.3.0/configure.in.orig	2006-02-21 21:51:41.000000000 +0100
 +++ subversion-1.3.0/configure.in	2006-02-21 21:52:08.000000000 +0100
 @@ -227,8 +227,8 @@
@@ -21,3 +11,38 @@
  NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
  dnl You can skip the neon version check only if you know what you are doing 
  AC_ARG_ENABLE(neon-version-check,
+--- subversion-1.3.0/build/ac-macros/neon.m4.orig	2006-02-27 16:13:32.000000000 +0100
++++ subversion-1.3.0/build/ac-macros/neon.m4	2006-02-27 16:19:34.000000000 +0100
+@@ -142,7 +142,7 @@
+       if test -z $svn_allowed_neon_on_system; then
+         echo "You have neon version $NEON_VERSION,"
+         echo "but Subversion needs neon $NEON_LATEST_WORKING_VER."
+-        SVN_DOWNLOAD_NEON()
++        SVN_DOWNLOAD_NEONFAIL()
+       fi
+ 
+     else
+@@ -177,3 +177,23 @@
+   AC_MSG_RESULT([no suitable neon found])
+   svn_lib_neon="no"
+ ])
++
++dnl SVN_DOWNLOAD_NEONFAIL()
++dnl no neon found, print out a message telling the user what to do
++AC_DEFUN(SVN_DOWNLOAD_NEONFAIL,
++[
++  echo ""
++  echo "An appropriate version of neon could not be found, so libsvn_ra_dav"
++  echo "will not be built.  If you want to build libsvn_ra_dav, please either"
++  echo "install neon ${NEON_LATEST_WORKING_VER} on this system"
++  echo ""
++  echo "or"
++  echo ""
++  echo "get neon ${NEON_LATEST_WORKING_VER} from:"
++  echo "    ${NEON_URL}"
++  echo "unpack the archive using tar/gunzip and rename the resulting"
++  echo "directory from ./neon-${NEON_LATEST_WORKING_VER}/ to ./neon/"
++  echo ""
++  AC_MSG_FAILURE([no suitable neon found])
++  svn_lib_neon="no"
++])