Sync changes to 1.4.4 ebuild, fixes bug #182870.

Package-Manager: portage-2.1.2.7

3 files changed, 0 insertions, 140 deletions

diff --git a/dev-util/subversion/files/digest-subversion-1.4.4-r1 b/dev-util/subversion/files/digest-subversion-1.4.4-r2
index e3c9fe8133a5..e3c9fe8133a5 100644
--- a/dev-util/subversion/files/digest-subversion-1.4.4-r1
+++ b/dev-util/subversion/files/digest-subversion-1.4.4-r2
diff --git a/dev-util/subversion/files/subversion-apr-version.patch b/dev-util/subversion/files/subversion-apr-version.patch
deleted file mode 100644
index 201a127d9853..000000000000
--- a/dev-util/subversion/files/subversion-apr-version.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in	(revision 19124)
-+++ configure.in	(revision 19125)
-@@ -84,14 +84,13 @@
- 
- dnl verify apr version and set apr flags
- dnl These regular expressions should not contain "\(" and "\)".
--APR_VER_REGEX=["0\.9\.[5-9]"]
--APR_VER_REGEX_TOO="1\."
--APU_VER_REGEX=["0\.9\.[5-9]"]
--APU_VER_REGEX_TOO="1\."
- 
--SVN_LIB_APR($APR_VER_REGEX, $APR_VER_REGEX_TOO)
--SVN_LIB_APRUTIL($APU_VER_REGEX, $APU_VER_REGEX_TOO)
-+APR_VER_REGEXES=["0\.9\.[5-9] 0\.9\.1[0-9] 1\."]
-+APU_VER_REGEXES=["0\.9\.[5-9] 0\.9\.1[0-9] 1\."]
- 
-+SVN_LIB_APR($APR_VER_REGEXES)
-+SVN_LIB_APRUTIL($APU_VER_REGEXES)
-+
- dnl What version of Expat are we using? -----------------
- 
- APU_HAVE_OLD_EXPAT="`$apu_config --old-expat`"
-Index: build/ac-macros/aprutil.m4
-===================================================================
---- build/ac-macros/aprutil.m4	(revision 19124)
-+++ build/ac-macros/aprutil.m4	(revision 19125)
-@@ -15,8 +15,7 @@
- 
- AC_DEFUN(SVN_LIB_APRUTIL,
- [
--  APRUTIL_WANTED_REGEX="$1"
--  APRUTIL_WANTED_REGEX_TOO="$2"
-+  APRUTIL_WANTED_REGEXES="$1"
- 
-   AC_MSG_NOTICE([Apache Portable Runtime Utility (APRUTIL) library configuration])
- 
-@@ -49,9 +48,16 @@
-   fi
-   AC_MSG_RESULT([$apu_version])
- 
--  if test `expr $apu_version : $APRUTIL_WANTED_REGEX` -eq 0 \
--       -a `expr $apu_version : $APRUTIL_WANTED_REGEX_TOO` -eq 0; then
--    echo "wanted regex is $APRUTIL_WANTED_REGEX or $APRUTIL_WANTED_REGEX_TOO"
-+  APU_WANTED_REGEX_MATCH=0
-+  for apu_wanted_regex in $APRUTIL_WANTED_REGEXES; do
-+    if test `expr $apu_version : $apu_wanted_regex` -ne 0; then
-+      APU_WANTED_REGEX_MATCH=1
-+      break
-+    fi
-+  done
-+
-+  if test $APU_WANTED_REGEX_MATCH -eq 0; then
-+    echo "wanted regexes are $APRUTIL_WANTED_REGEXES"
-     AC_MSG_ERROR([invalid apr-util version found])
-   fi
- 
-Index: build/ac-macros/apr.m4
-===================================================================
---- build/ac-macros/apr.m4	(revision 19124)
-+++ build/ac-macros/apr.m4	(revision 19125)
-@@ -10,8 +10,7 @@
- 
- AC_DEFUN(SVN_LIB_APR,
- [
--  APR_WANTED_REGEX="$1"
--  APR_WANTED_REGEX_TOO="$2"
-+  APR_WANTED_REGEXES="$1"
- 
-   AC_MSG_NOTICE([Apache Portable Runtime (APR) library configuration])
- 
-@@ -36,9 +35,16 @@
-   fi
-   AC_MSG_RESULT([$apr_version])
- 
--  if test `expr $apr_version : $APR_WANTED_REGEX` -eq 0 \
--       -a `expr $apr_version : $APR_WANTED_REGEX_TOO` -eq 0; then
--    echo "wanted regex is $APR_WANTED_REGEX or $APR_WANTED_REGEX_TOO"
-+  APR_WANTED_REGEX_MATCH=0
-+  for apr_wanted_regex in $APR_WANTED_REGEXES; do
-+    if test `expr $apr_version : $apr_wanted_regex` -ne 0; then
-+      APR_WANTED_REGEX_MATCH=1
-+      break
-+    fi
-+  done
-+      
-+  if test $APR_WANTED_REGEX_MATCH -eq 0; then
-+    echo "wanted regexes are $APR_WANTED_REGEXES"
-     AC_MSG_ERROR([invalid apr version found])
-   fi
- 
diff --git a/dev-util/subversion/files/subversion-neon-config.patch b/dev-util/subversion/files/subversion-neon-config.patch
deleted file mode 100644
index bb25adc8528e..000000000000
--- a/dev-util/subversion/files/subversion-neon-config.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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 @@
- 
- # Either a space-separated list of allowable Neon versions, or "any" to
- # mean allow anything.
--NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4"
--NEON_LATEST_WORKING_VER=0.25.4
-+NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5"
-+NEON_LATEST_WORKING_VER=0.25.5
- 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"
-+])