add neon-0.28.1 support wrt #210535; refresh patches

(Portage version: 2.1.4.4)

6 files changed, 44 insertions, 31 deletions

diff --git a/dev-util/subversion/files/subversion-1.1.1-perl-vendor.patch b/dev-util/subversion/files/subversion-1.1.1-perl-vendor.patch
index 5da7451e8164..ed8bdded26ea 100644
--- a/dev-util/subversion/files/subversion-1.1.1-perl-vendor.patch
+++ b/dev-util/subversion/files/subversion-1.1.1-perl-vendor.patch
@@ -3,14 +3,16 @@ instead of site.  The INSTALLDIRS bit is stolen from perl-module.eclass
 
 11 Nov 2004 agriffis
 
---- subversion-1.1.1/Makefile.in.vendor	2004-11-11 23:20:10.000000000 -0500
-+++ subversion-1.1.1/Makefile.in	2004-11-11 23:21:42.815937984 -0500
-@@ -571,7 +571,7 @@
-         done
+Index: subversion-1.4.6/Makefile.in
+===================================================================
+--- subversion-1.4.6.orig/Makefile.in
++++ subversion-1.4.6/Makefile.in
+@@ -606,7 +606,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI
+ 	./config.status subversion/bindings/swig/perl/native/Makefile.PL
  
  $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
 -	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
 +	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL INSTALLDIRS=vendor
  
- swig-pl_DEPS = libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_ra libsvn_repos libsvn_subr libsvn_wc libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile
- swig-pl: $(swig-pl_DEPS)
+ swig-pl_DEPS = autogen-swig-pl libsvn_client libsvn_delta libsvn_diff \
+   libsvn_fs libsvn_ra libsvn_repos libsvn_subr libsvn_wc libsvn_swig_perl \
diff --git a/dev-util/subversion/files/subversion-1.4-db4.patch b/dev-util/subversion/files/subversion-1.4-db4.patch
index 369cabb225f7..cfaaefa8a842 100644
--- a/dev-util/subversion/files/subversion-1.4-db4.patch
+++ b/dev-util/subversion/files/subversion-1.4-db4.patch
@@ -1,12 +1,13 @@
-diff -rNu subversion-0.27.0.orig/configure.in subversion-0.27.0/configure.in
---- subversion-0.27.0.orig/configure.in	2003-08-14 14:22:08.000000000 +0200
-+++ subversion-0.27.0/configure.in	2003-08-26 12:43:23.000000000 +0200
-@@ -261,7 +261,7 @@
+Index: subversion-1.4.6/configure.in
+===================================================================
+--- subversion-1.4.6.orig/configure.in
++++ subversion-1.4.6/configure.in
+@@ -245,7 +245,7 @@ powerpc-apple-darwin*)
  esac
  # Look for libdb4.so first:
  SVN_LIB_BERKELEY_DB($SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MINOR,
 -                    $SVN_FS_WANT_DB_PATCH, [db4 db])
 +                    $SVN_FS_WANT_DB_PATCH, [db-4.3 db-4.2 db-4.0 db-4 db-4.1 db4 db])
  
- 
- # Only add *_APACHE_RULE if we also have db, since mod_dav_svn depends on it.
+ AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MAJOR,
+                    [The desired major version for the Berkeley DB])
diff --git a/dev-util/subversion/files/subversion-1.4.3-debug-config.patch b/dev-util/subversion/files/subversion-1.4.3-debug-config.patch
index fe6abafec101..94fb19438906 100644
--- a/dev-util/subversion/files/subversion-1.4.3-debug-config.patch
+++ b/dev-util/subversion/files/subversion-1.4.3-debug-config.patch
@@ -1,6 +1,8 @@
---- configure.in.orig	2007-02-27 21:58:01.000000000 +0100
-+++ configure.in	2007-02-27 22:00:07.000000000 +0100
-@@ -433,7 +433,7 @@
+Index: subversion-1.4.6/configure.in
+===================================================================
+--- subversion-1.4.6.orig/configure.in
++++ subversion-1.4.6/configure.in
+@@ -433,7 +433,7 @@ AC_HELP_STRING([--with-ssl],
  
  AC_ARG_ENABLE(debug,
  AC_HELP_STRING([--enable-debug],
@@ -9,7 +11,7 @@
  [
      if test "$enableval" = "yes" ; then
        enable_debugging="yes"
-@@ -441,17 +441,6 @@
+@@ -441,17 +441,6 @@ AC_HELP_STRING([--enable-debug],
        enable_debugging="no"
      fi
  ])
diff --git a/dev-util/subversion/files/subversion-1.4.6-neon-0.28.patch b/dev-util/subversion/files/subversion-1.4.6-neon-0.28.patch
index 0b5f7e5399b4..7dc23c576de0 100644
--- a/dev-util/subversion/files/subversion-1.4.6-neon-0.28.patch
+++ b/dev-util/subversion/files/subversion-1.4.6-neon-0.28.patch
@@ -1,6 +1,8 @@
---- build/ac-macros/neon.m4
-+++ build/ac-macros/neon.m4
-@@ -50,14 +50,18 @@
+Index: subversion-1.4.6/build/ac-macros/neon.m4
+===================================================================
+--- subversion-1.4.6.orig/build/ac-macros/neon.m4
++++ subversion-1.4.6/build/ac-macros/neon.m4
+@@ -50,14 +50,18 @@ AC_DEFUN(SVN_LIB_NEON,
        NEON_VERSION=`cat $abs_srcdir/neon/.version`
        AC_MSG_RESULT([$NEON_VERSION])
  
@@ -21,7 +23,7 @@
  
        for svn_allowed_neon in $NEON_ALLOWED_LIST; do
          if test "$NEON_VERSION" = "$svn_allowed_neon" ||
-@@ -127,14 +131,18 @@
+@@ -127,14 +131,18 @@ AC_DEFUN(SVN_NEON_CONFIG,
        NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
        AC_MSG_RESULT([$NEON_VERSION])
  
@@ -42,9 +44,11 @@
  
        for svn_allowed_neon in $NEON_ALLOWED_LIST; do
          if test "$NEON_VERSION" = "$svn_allowed_neon" ||
---- subversion/libsvn_ra_dav/session.c
-+++ subversion/libsvn_ra_dav/session.c
-@@ -575,7 +575,11 @@
+Index: subversion-1.4.6/subversion/libsvn_ra_dav/session.c
+===================================================================
+--- subversion-1.4.6.orig/subversion/libsvn_ra_dav/session.c
++++ subversion-1.4.6/subversion/libsvn_ra_dav/session.c
+@@ -575,7 +575,11 @@ typedef struct neonprogress_baton_t
  } neonprogress_baton_t;
  
  static void
diff --git a/dev-util/subversion/files/subversion-apr_cppflags.patch b/dev-util/subversion/files/subversion-apr_cppflags.patch
index 1c24d8ea9664..c46a2511e59d 100644
--- a/dev-util/subversion/files/subversion-apr_cppflags.patch
+++ b/dev-util/subversion/files/subversion-apr_cppflags.patch
@@ -1,6 +1,8 @@
---- subversion-1.3.1/build/ac-macros/apr.m4	2004-11-24 00:18:18.000000000 +0100
-+++ subversion-1.3.1/build/ac-macros/apr.m4.new	2006-04-16 17:57:36.214707250 +0200
-@@ -59,7 +59,7 @@
+Index: subversion-1.4.6/build/ac-macros/apr.m4
+===================================================================
+--- subversion-1.4.6.orig/build/ac-macros/apr.m4
++++ subversion-1.4.6/build/ac-macros/apr.m4
+@@ -64,7 +64,7 @@ AC_DEFUN(SVN_LIB_APR,
      AC_MSG_ERROR([apr-config --ldflags failed])
    fi
  
diff --git a/dev-util/subversion/files/subversion-hotbackup-config.patch b/dev-util/subversion/files/subversion-hotbackup-config.patch
index ca9380f1aba5..b10b7d9fb194 100644
--- a/dev-util/subversion/files/subversion-hotbackup-config.patch
+++ b/dev-util/subversion/files/subversion-hotbackup-config.patch
@@ -1,6 +1,8 @@
---- tools/backup/hot-backup.py.in.orig	2003-12-16 17:41:14.000000000 +0100
-+++ tools/backup/hot-backup.py.in	2005-07-06 10:44:55.000000000 +0200
-@@ -34,7 +34,14 @@
+Index: subversion-1.4.6/tools/backup/hot-backup.py.in
+===================================================================
+--- subversion-1.4.6.orig/tools/backup/hot-backup.py.in
++++ subversion-1.4.6/tools/backup/hot-backup.py.in
+@@ -34,7 +34,14 @@ svnlook = "@SVN_BINDIR@/svnlook"
  svnadmin = "@SVN_BINDIR@/svnadmin"
  
  # Number of backups to keep around (0 for "keep them all")
@@ -14,5 +16,5 @@
 +print 'Keeping up to', num_backups, 'around.'			
 +
  
- ######################################################################
- # Command line arguments
+ # Archive types/extensions
+ archive_map = {