Revision bump to finish Gentoo Prefix support, signed off by maintainer in bug 329505

(Portage version: 2.1.10.3/cvs/Linux i686)

3 files changed, 151 insertions, 0 deletions

diff --git a/dev-vcs/subversion/files/subversion-1.5.4-interix.patch b/dev-vcs/subversion/files/subversion-1.5.4-interix.patch
new file mode 100644
index 000000000000..53ef6960c9f3
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.5.4-interix.patch
@@ -0,0 +1,114 @@
+diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion-1.5.4/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
+--- subversion-1.5.4.orig/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h	2008-10-29 08:22:36 +0100
++++ subversion-1.5.4/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h	2008-10-29 08:52:31 +0100
+@@ -49,6 +49,11 @@
+ #  endif
+ #endif
+ 
++// This is bad, but better than nothing ;)
++#if defined(__INTERIX)
++#  define strtoll strtol
++#endif
++
+ 
+ 
+ #if defined(SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK)
+diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/core.c subversion-1.5.4/subversion/bindings/swig/perl/native/core.c
+--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/core.c	2008-10-29 08:22:37 +0100
++++ subversion-1.5.4/subversion/bindings/swig/perl/native/core.c	2008-10-29 08:53:40 +0100
+@@ -1733,7 +1733,10 @@
+ # endif
+ #endif
+ 
+-
++#ifdef __INTERIX
++# define strtoull strtoul
++# define strtoll strtol
++#endif
+ 
+ SWIGINTERN int
+ SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
+diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_client.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_client.c
+--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_client.c	2008-10-29 08:22:37 +0100
++++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_client.c	2008-10-29 08:54:17 +0100
+@@ -1872,6 +1872,10 @@
+ #endif
+ 
+ 
++#ifdef __INTERIX
++# define strtoull strtoul
++# define strtoll strtol
++#endif
+ 
+ SWIGINTERN int
+ SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
+diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_delta.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_delta.c
+--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_delta.c	2008-10-29 08:22:37 +0100
++++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_delta.c	2008-10-29 08:54:28 +0100
+@@ -1745,6 +1745,10 @@
+ #endif
+ 
+ 
++#ifdef __INTERIX
++# define strtoull strtoul
++# define strtoll strtol
++#endif
+ 
+ SWIGINTERN int
+ SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
+diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_fs.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_fs.c
+--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_fs.c	2008-10-29 08:22:37 +0100
++++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_fs.c	2008-10-29 08:54:41 +0100
+@@ -1818,6 +1818,10 @@
+ #endif
+ 
+ 
++#ifdef __INTERIX
++# define strtoull strtoul
++# define strtoll strtol
++#endif
+ 
+ SWIGINTERN int
+ SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
+diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_ra.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_ra.c
+--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_ra.c	2008-10-29 08:22:37 +0100
++++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_ra.c	2008-10-29 08:54:52 +0100
+@@ -1661,6 +1661,10 @@
+ # endif
+ #endif
+ 
++#ifdef __INTERIX
++# define strtoull strtoul
++# define strtoll strtol
++#endif
+ 
+ SWIGINTERN int
+ SWIG_AsVal_double SWIG_PERL_DECL_ARGS_2(SV *obj, double *val)
+diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_repos.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_repos.c
+--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_repos.c	2008-10-29 08:22:37 +0100
++++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_repos.c	2008-10-29 08:55:05 +0100
+@@ -1792,6 +1792,10 @@
+ #endif
+ 
+ 
++#ifdef __INTERIX
++# define strtoull strtoul
++# define strtoll strtol
++#endif
+ 
+ SWIGINTERN int
+ SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
+diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_wc.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_wc.c
+--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_wc.c	2008-10-29 08:22:37 +0100
++++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_wc.c	2008-10-29 08:55:17 +0100
+@@ -1816,6 +1816,10 @@
+ #endif
+ 
+ 
++#ifdef __INTERIX
++# define strtoull strtoul
++# define strtoll strtol
++#endif
+ 
+ SWIGINTERN int
+ SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
diff --git a/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch b/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch
new file mode 100644
index 000000000000..49c6162d1212
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch
@@ -0,0 +1,21 @@
+On AIX, load shared libraries even when created with full aix-soname support:
+http://lists.gnu.org/archive/html/libtool/2011-01/msg00023.html
+http://lists.gnu.org/archive/html/libtool/2011-02/msg00000.html
+Once there is an agreement on that, this patch eventually is for upstream too.
+
+--- subversion/libsvn_ra/ra_loader.c.orig	2009-04-28 14:53:35 +0200
++++ subversion/libsvn_ra/ra_loader.c	2009-04-28 14:55:37 +0200
+@@ -164,6 +164,13 @@
+ 
+     /* find/load the specified library */
+     SVN_ERR(svn_dso_load(&dso, libname));
++#ifdef _AIX
++    if (! dso) {
++        libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.0(shr.o)",
++                           ra_name, SVN_VER_MAJOR);
++        SVN_ERR(svn_dso_load(&dso, libname));
++    }
++#endif
+     if (! dso)
+       return SVN_NO_ERROR;
+ 
diff --git a/dev-vcs/subversion/files/subversion-1.6.3-hpux-dso.patch b/dev-vcs/subversion/files/subversion-1.6.3-hpux-dso.patch
new file mode 100644
index 000000000000..f9739bef3061
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.6.3-hpux-dso.patch
@@ -0,0 +1,16 @@
+--- subversion/libsvn_ra/ra_loader.c.orig	2009-07-20 14:46:02 +0200
++++ subversion/libsvn_ra/ra_loader.c	2009-07-20 14:50:02 +0200
+@@ -154,8 +154,13 @@
+     const char *compat_funcname;
+     apr_status_t status;
+ 
++#if defined(__hpux) && defined(__hppa)
++    libname = apr_psprintf(pool, "libsvn_ra_%s-%d.sl.0",
++                           ra_name, SVN_VER_MAJOR);
++#else
+     libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.0",
+                            ra_name, SVN_VER_MAJOR);
++#endif
+     funcname = apr_psprintf(pool, "svn_ra_%s__init", ra_name);
+     compat_funcname = apr_psprintf(pool, "svn_ra_%s_init", ra_name);
+