* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/, dev-vcs/subversion/files/
@ 2016-10-11 13:25 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2016-10-11 13:25 UTC (permalink / raw
To: gentoo-commits
commit: 4ebaa7e551b2ad695f482b0b1d6d0f66f5d1db9e
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 13:25:21 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 13:25:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ebaa7e5
dev-vcs/subversion: Fixed creation of docs with USE="java" (bug #551094).
Thanks to Alexander Miller for providing a patch.
Package-Manager: portage-2.3.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/subversion-1.8.16-javadoc-nolint.patch | 19 +++++++++++++++++++
dev-vcs/subversion/subversion-1.8.16.ebuild | 1 +
dev-vcs/subversion/subversion-1.9.4.ebuild | 1 +
3 files changed, 21 insertions(+)
diff --git a/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch b/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch
new file mode 100644
index 00000000..8b07d22
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch
@@ -0,0 +1,19 @@
+With newer versions of javadoc (since JDK-1.8), "make doc-javahl"
+reports many errors, causing build failures. Add "-Xdoclint:none"
+option to restore old, sloppy behavior.
+
+Patch created for subversion-1.8.16, should work for other other
+versions, too.
+See <https://bugs.gentoo.org/show_bug.cgi?id=551094>
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -650,7 +650,7 @@
+
+ # Generate API documentation for the JavaHL package.
+ doc-javahl:
+- $(JAVADOC) -d $(abs_builddir)/doc/javadoc \
++ $(JAVADOC) -Xdoclint:none -d $(abs_builddir)/doc/javadoc \
+ -sourcepath $(top_srcdir)/subversion/bindings/javahl/src \
+ -link http://java.sun.com/javase/6/docs/api/ \
+ org.tigris.subversion.javahl \
diff --git a/dev-vcs/subversion/subversion-1.8.16.ebuild b/dev-vcs/subversion/subversion-1.8.16.ebuild
index c4edce6..afae86f 100644
--- a/dev-vcs/subversion/subversion-1.8.16.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.16.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.8.0-hpux-dso.patch
"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch
"${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch
+ "${FILESDIR}"/${PN}-1.8.16-javadoc-nolint.patch
)
want_apache
diff --git a/dev-vcs/subversion/subversion-1.9.4.ebuild b/dev-vcs/subversion/subversion-1.9.4.ebuild
index ced9e81..df0bcd1 100644
--- a/dev-vcs/subversion/subversion-1.9.4.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.4.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.8.0-hpux-dso.patch
"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch
"${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch
+ "${FILESDIR}"/${PN}-1.8.16-javadoc-nolint.patch
)
want_apache
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/, dev-vcs/subversion/files/
@ 2017-12-12 15:31 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2017-12-12 15:31 UTC (permalink / raw
To: gentoo-commits
commit: 2cb86f6e252db891d00c4688a97e19bc957ed911
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 15:23:21 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 15:30:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cb86f6e
dev-vcs/subversion: [QA] Move patches to a distfile
Closes: https://bugs.gentoo.org/620574
dev-vcs/subversion/Manifest | 1 +
.../files/subversion-1.5.4-interix.patch | 114 -----
.../files/subversion-1.5.6-aix-dso.patch | 21 -
.../files/subversion-1.8.0-hpux-dso.patch | 16 -
.../files/subversion-1.8.1-revert_bdb6check.patch | 85 ----
.../files/subversion-1.8.16-javadoc-nolint.patch | 19 -
...ersion-1.8.5-swig-python-no-gnome-keyring.patch | 495 ---------------------
...-parallel-build-support-for-perl-bindings.patch | 11 -
dev-vcs/subversion/subversion-1.8.18.ebuild | 17 +-
dev-vcs/subversion/subversion-1.9.7.ebuild | 15 +-
10 files changed, 18 insertions(+), 776 deletions(-)
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 1aa65091e4a..25926622225 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -1,2 +1,3 @@
+DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2
DIST subversion-1.8.18.tar.bz2 6884906 BLAKE2B 77c0f2e43cd6d69fb360adfea78b42e38ebbfeb6c8d3407a4cdec61e2310e690859247b760f0b67e7a02a0c6d73f0cd6fa77eceed7d4e11eb19e0f0a56e50fdc SHA512 48d596c442da34fa3eb4f0f8b10cc3d5d27841b2fc4e7a493cac8e6f4c722f63fcd67fe99dfac5bbe31ac405055072a304d9a6771974c9990927cb21c5eb31d0
DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b
diff --git a/dev-vcs/subversion/files/subversion-1.5.4-interix.patch b/dev-vcs/subversion/files/subversion-1.5.4-interix.patch
deleted file mode 100644
index 53ef6960c9f..00000000000
--- a/dev-vcs/subversion/files/subversion-1.5.4-interix.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-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
-+
- \f
-
- #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
deleted file mode 100644
index 69a4355f17a..00000000000
--- a/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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.
-
---- a/subversion/libsvn_ra/ra_loader.c
-+++ b/subversion/libsvn_ra/ra_loader.c
-@@ -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.8.0-hpux-dso.patch b/dev-vcs/subversion/files/subversion-1.8.0-hpux-dso.patch
deleted file mode 100644
index 80e5563672c..00000000000
--- a/dev-vcs/subversion/files/subversion-1.8.0-hpux-dso.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- subversion-1.8.0/subversion/libsvn_ra/ra_loader.c
-+++ subversion-1.8.0/subversion/libsvn_ra/ra_loader.c
-@@ -141,8 +141,13 @@
- const char *compat_funcname;
- apr_status_t status;
-
-+#if defined(__hpux) && defined(__hppa)
-+ libname = apr_psprintf(pool, "libsvn_ra_%s-%d.sl.%d",
-+ ra_name, SVN_VER_MAJOR, SVN_SOVERSION);
-+#else
- libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.%d",
- ra_name, SVN_VER_MAJOR, SVN_SOVERSION);
-+#endif
- funcname = apr_psprintf(pool, "svn_ra_%s__init", ra_name);
- compat_funcname = apr_psprintf(pool, "svn_ra_%s_init", ra_name);
-
diff --git a/dev-vcs/subversion/files/subversion-1.8.1-revert_bdb6check.patch b/dev-vcs/subversion/files/subversion-1.8.1-revert_bdb6check.patch
deleted file mode 100644
index 158c0823316..00000000000
--- a/dev-vcs/subversion/files/subversion-1.8.1-revert_bdb6check.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- subversion-1.8.1/build/ac-macros/berkeley-db.m4
-+++ subversion-1.8.1/build/ac-macros/berkeley-db.m4
-@@ -48,7 +48,7 @@
- AC_ARG_WITH(berkeley-db, [AS_HELP_STRING(
- [[--with-berkeley-db[=HEADER:INCLUDES:LIB_SEARCH_DIRS:LIBS]]], [
- The Subversion Berkeley DB based filesystem library
-- requires Berkeley DB $db_version or $db_alt_version. If you
-+ requires Berkeley DB $db_version or newer. If you
- specify `--without-berkeley-db', that library will
- not be built. If you omit the argument of this option
- completely, the configure script will use Berkeley DB
-@@ -126,35 +126,22 @@
- svn_lib_berkeley_db=no
- else
- AC_MSG_CHECKING([for availability of Berkeley DB])
-- AC_ARG_ENABLE(bdb6,
-- AS_HELP_STRING([--enable-bdb6],
-- [Allow building against BDB 6+.
-- See --with-berkeley-db for specifying the location of
-- the Berkeley DB installation. Using BDB 6 will fail if
-- this option is not used.]),
-- [enable_bdb6=$enableval],[enable_bdb6=unspecified])
--
-- SVN_LIB_BERKELEY_DB_TRY($1, $2, $3, $enable_bdb6)
-+ SVN_LIB_BERKELEY_DB_TRY($1, $2, $3)
- if test "$svn_have_berkeley_db" = "yes"; then
- AC_MSG_RESULT([yes])
- svn_lib_berkeley_db=yes
- else
-- if test "$svn_have_berkeley_db" = "no6"; then
-- AC_MSG_RESULT([no (found version 6, but --enable-bdb6 not specified)])
-- # A warning will be printed at the end of configure.ac.
-- else
-- AC_MSG_RESULT([no])
-- fi
-+ AC_MSG_RESULT([no])
- svn_lib_berkeley_db=no
- if test "$bdb_status" = "required"; then
-- AC_MSG_ERROR([Berkeley DB $db_version or $db_alt_version wasn't found.])
-+ AC_MSG_ERROR([Berkeley DB $db_version or newer't found.])
- fi
- fi
- fi
- ])
-
-
--dnl SVN_LIB_BERKELEY_DB_TRY(major, minor, patch, enable_bdb6)
-+dnl SVN_LIB_BERKELEY_DB_TRY(major, minor, patch)
- dnl
- dnl A subroutine of SVN_LIB_BERKELEY_DB.
- dnl
-@@ -187,7 +174,6 @@
- svn_check_berkeley_db_major=$1
- svn_check_berkeley_db_minor=$2
- svn_check_berkeley_db_patch=$3
-- enable_bdb6=$4
-
- if test -z "$SVN_DB_LIBS"; then
- # We pass --dbm-libs here since Debian has modified apu-config not
-@@ -245,12 +231,6 @@
- || patch != DB_VERSION_PATCH)
- exit (1);
-
-- /* Block Berkeley DB 6, because (a) we haven't tested with it, (b) 6.0.20
-- and newer are under the AGPL, and we want use of AGPL dependencies to be
-- opt-in. */
-- if (major >= 6 && strcmp("$enable_bdb6", "yes"))
-- exit(2);
--
- /* Run-time check: ensure the library claims to be the correct version. */
-
- if (major < $svn_check_berkeley_db_major)
-@@ -270,11 +250,7 @@
- }
- ]])],
- [svn_have_berkeley_db=yes],
-- [rc=$?
-- svn_have_berkeley_db=no
-- if test $rc = 2; then
-- svn_have_berkeley_db=no6
-- fi],
-+ [svn_have_berkeley_db=no],
- [svn_have_berkeley_db=yes]
- )
-
diff --git a/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch b/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch
deleted file mode 100644
index 8b07d22ca3f..00000000000
--- a/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-With newer versions of javadoc (since JDK-1.8), "make doc-javahl"
-reports many errors, causing build failures. Add "-Xdoclint:none"
-option to restore old, sloppy behavior.
-
-Patch created for subversion-1.8.16, should work for other other
-versions, too.
-See <https://bugs.gentoo.org/show_bug.cgi?id=551094>
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -650,7 +650,7 @@
-
- # Generate API documentation for the JavaHL package.
- doc-javahl:
-- $(JAVADOC) -d $(abs_builddir)/doc/javadoc \
-+ $(JAVADOC) -Xdoclint:none -d $(abs_builddir)/doc/javadoc \
- -sourcepath $(top_srcdir)/subversion/bindings/javahl/src \
- -link http://java.sun.com/javase/6/docs/api/ \
- org.tigris.subversion.javahl \
diff --git a/dev-vcs/subversion/files/subversion-1.8.5-swig-python-no-gnome-keyring.patch b/dev-vcs/subversion/files/subversion-1.8.5-swig-python-no-gnome-keyring.patch
deleted file mode 100644
index 9feccfbe048..00000000000
--- a/dev-vcs/subversion/files/subversion-1.8.5-swig-python-no-gnome-keyring.patch
+++ /dev/null
@@ -1,495 +0,0 @@
-https://trac.macports.org/browser/trunk/dports/devel/subversion-python27bindings/files/patch-swig-python-core.diff
-
-diff -u -d -b -w -r subversion-1.8.0-orig/subversion/bindings/swig/python/core.c subversion-1.8.0-python/subversion/bindings/swig/python/core.c
---- subversion/bindings/swig/python/core.c 2013-06-13 05:07:20.000000000 -0400
-+++ subversion/bindings/swig/python/core.c 2013-07-12 16:11:05.000000000 -0400
-@@ -2958,140 +2958,139 @@
- #define SWIGTYPE_p_apr_size_t swig_types[15]
- #define SWIGTYPE_p_char swig_types[16]
- #define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[17]
--#define SWIGTYPE_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[18]
--#define SWIGTYPE_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void swig_types[19]
--#define SWIGTYPE_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[20]
--#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[21]
--#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[22]
--#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[23]
--#define SWIGTYPE_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[24]
--#define SWIGTYPE_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[25]
--#define SWIGTYPE_p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[26]
--#define SWIGTYPE_p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[27]
--#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void__int swig_types[28]
--#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int swig_types[29]
--#define SWIGTYPE_p_f_p_q_const__char_p_void__int swig_types[30]
--#define SWIGTYPE_p_f_p_q_const__char_p_void_p_apr_pool_t__int swig_types[31]
--#define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[32]
--#define SWIGTYPE_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[33]
--#define SWIGTYPE_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[34]
--#define SWIGTYPE_p_f_p_svn_boolean_t_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[35]
--#define SWIGTYPE_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[36]
--#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[37]
--#define SWIGTYPE_p_f_p_void_apr_size_t__p_svn_error_t swig_types[38]
--#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[39]
--#define SWIGTYPE_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t swig_types[40]
--#define SWIGTYPE_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t swig_types[41]
--#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t swig_types[42]
--#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t swig_types[43]
--#define SWIGTYPE_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t swig_types[44]
--#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[45]
--#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[46]
--#define SWIGTYPE_p_f_void__p_svn_version_t swig_types[47]
--#define SWIGTYPE_p_int swig_types[48]
--#define SWIGTYPE_p_long swig_types[49]
--#define SWIGTYPE_p_p_apr_array_header_t swig_types[50]
--#define SWIGTYPE_p_p_apr_file_t swig_types[51]
--#define SWIGTYPE_p_p_apr_hash_t swig_types[52]
--#define SWIGTYPE_p_p_char swig_types[53]
--#define SWIGTYPE_p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[54]
--#define SWIGTYPE_p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void swig_types[55]
--#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[56]
--#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[57]
--#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[58]
--#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[59]
--#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[60]
--#define SWIGTYPE_p_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[61]
--#define SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void__int swig_types[62]
--#define SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int swig_types[63]
--#define SWIGTYPE_p_p_f_p_q_const__char_p_void__int swig_types[64]
--#define SWIGTYPE_p_p_f_p_q_const__char_p_void_p_apr_pool_t__int swig_types[65]
--#define SWIGTYPE_p_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[66]
--#define SWIGTYPE_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[67]
--#define SWIGTYPE_p_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[68]
--#define SWIGTYPE_p_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[69]
--#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[70]
--#define SWIGTYPE_p_p_f_p_void_apr_size_t__p_svn_error_t swig_types[71]
--#define SWIGTYPE_p_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[72]
--#define SWIGTYPE_p_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t swig_types[73]
--#define SWIGTYPE_p_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t swig_types[74]
--#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t swig_types[75]
--#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t swig_types[76]
--#define SWIGTYPE_p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t swig_types[77]
--#define SWIGTYPE_p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[78]
--#define SWIGTYPE_p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[79]
--#define SWIGTYPE_p_p_f_void__p_svn_version_t swig_types[80]
--#define SWIGTYPE_p_p_svn_auth_baton_t swig_types[81]
--#define SWIGTYPE_p_p_svn_auth_cred_simple_t swig_types[82]
--#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[83]
--#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_t swig_types[84]
--#define SWIGTYPE_p_p_svn_auth_cred_ssl_server_trust_t swig_types[85]
--#define SWIGTYPE_p_p_svn_auth_cred_username_t swig_types[86]
--#define SWIGTYPE_p_p_svn_auth_iterstate_t swig_types[87]
--#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[88]
--#define SWIGTYPE_p_p_svn_checksum_t swig_types[89]
--#define SWIGTYPE_p_p_svn_config_t swig_types[90]
--#define SWIGTYPE_p_p_svn_io_dirent2_t swig_types[91]
--#define SWIGTYPE_p_p_svn_stream_mark_t swig_types[92]
--#define SWIGTYPE_p_p_svn_stream_t swig_types[93]
--#define SWIGTYPE_p_p_svn_string_t swig_types[94]
--#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[95]
--#define SWIGTYPE_p_p_void swig_types[96]
--#define SWIGTYPE_p_svn_auth_baton_t swig_types[97]
--#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[98]
--#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[99]
--#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[100]
--#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[101]
--#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[102]
--#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[103]
--#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[104]
--#define SWIGTYPE_p_svn_auth_provider_t swig_types[105]
--#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[106]
--#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[107]
--#define SWIGTYPE_p_svn_checksum_kind_t swig_types[108]
--#define SWIGTYPE_p_svn_checksum_t swig_types[109]
--#define SWIGTYPE_p_svn_commit_info_t swig_types[110]
--#define SWIGTYPE_p_svn_config_t swig_types[111]
--#define SWIGTYPE_p_svn_depth_t swig_types[112]
--#define SWIGTYPE_p_svn_dirent_t swig_types[113]
--#define SWIGTYPE_p_svn_errno_t swig_types[114]
--#define SWIGTYPE_p_svn_error_t swig_types[115]
--#define SWIGTYPE_p_svn_io_dirent2_t swig_types[116]
--#define SWIGTYPE_p_svn_io_dirent_t swig_types[117]
--#define SWIGTYPE_p_svn_io_file_del_t swig_types[118]
--#define SWIGTYPE_p_svn_location_segment_t swig_types[119]
--#define SWIGTYPE_p_svn_lock_t swig_types[120]
--#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[121]
--#define SWIGTYPE_p_svn_log_changed_path_t swig_types[122]
--#define SWIGTYPE_p_svn_log_entry_t swig_types[123]
--#define SWIGTYPE_p_svn_merge_range_t swig_types[124]
--#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[125]
--#define SWIGTYPE_p_svn_node_kind_t swig_types[126]
--#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[127]
--#define SWIGTYPE_p_svn_opt_revision_t swig_types[128]
--#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[129]
--#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[130]
--#define SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides swig_types[131]
--#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[132]
--#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[133]
--#define SWIGTYPE_p_svn_prop_kind swig_types[134]
--#define SWIGTYPE_p_svn_prop_t swig_types[135]
--#define SWIGTYPE_p_svn_stream_mark_t swig_types[136]
--#define SWIGTYPE_p_svn_stream_t swig_types[137]
--#define SWIGTYPE_p_svn_string_t swig_types[138]
--#define SWIGTYPE_p_svn_stringbuf_t swig_types[139]
--#define SWIGTYPE_p_svn_tristate_t swig_types[140]
--#define SWIGTYPE_p_svn_version_checklist_t swig_types[141]
--#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[142]
--#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[143]
--#define SWIGTYPE_p_svn_version_extended_t swig_types[144]
--#define SWIGTYPE_p_svn_version_t swig_types[145]
--#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[146]
--#define SWIGTYPE_p_unsigned_char swig_types[147]
--#define SWIGTYPE_p_unsigned_long swig_types[148]
--#define SWIGTYPE_p_void swig_types[149]
--static swig_type_info *swig_types[151];
--static swig_module_info swig_module = {swig_types, 150, 0, 0, 0, 0};
-+#define SWIGTYPE_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void swig_types[18]
-+#define SWIGTYPE_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[19]
-+#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[20]
-+#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[21]
-+#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[22]
-+#define SWIGTYPE_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[23]
-+#define SWIGTYPE_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[24]
-+#define SWIGTYPE_p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[25]
-+#define SWIGTYPE_p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[26]
-+#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void__int swig_types[27]
-+#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int swig_types[28]
-+#define SWIGTYPE_p_f_p_q_const__char_p_void__int swig_types[29]
-+#define SWIGTYPE_p_f_p_q_const__char_p_void_p_apr_pool_t__int swig_types[30]
-+#define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[31]
-+#define SWIGTYPE_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[32]
-+#define SWIGTYPE_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[33]
-+#define SWIGTYPE_p_f_p_svn_boolean_t_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[34]
-+#define SWIGTYPE_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[35]
-+#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[36]
-+#define SWIGTYPE_p_f_p_void_apr_size_t__p_svn_error_t swig_types[37]
-+#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[38]
-+#define SWIGTYPE_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t swig_types[39]
-+#define SWIGTYPE_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t swig_types[40]
-+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t swig_types[41]
-+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t swig_types[42]
-+#define SWIGTYPE_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t swig_types[43]
-+#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[44]
-+#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[45]
-+#define SWIGTYPE_p_f_void__p_svn_version_t swig_types[46]
-+#define SWIGTYPE_p_int swig_types[47]
-+#define SWIGTYPE_p_long swig_types[48]
-+#define SWIGTYPE_p_p_apr_array_header_t swig_types[49]
-+#define SWIGTYPE_p_p_apr_file_t swig_types[50]
-+#define SWIGTYPE_p_p_apr_hash_t swig_types[51]
-+#define SWIGTYPE_p_p_char swig_types[52]
-+#define SWIGTYPE_p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void swig_types[53]
-+#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[54]
-+#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[55]
-+#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[56]
-+#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[57]
-+#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[58]
-+#define SWIGTYPE_p_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[59]
-+#define SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void__int swig_types[60]
-+#define SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int swig_types[61]
-+#define SWIGTYPE_p_p_f_p_q_const__char_p_void__int swig_types[62]
-+#define SWIGTYPE_p_p_f_p_q_const__char_p_void_p_apr_pool_t__int swig_types[63]
-+#define SWIGTYPE_p_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[64]
-+#define SWIGTYPE_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[65]
-+#define SWIGTYPE_p_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[66]
-+#define SWIGTYPE_p_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[67]
-+#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[68]
-+#define SWIGTYPE_p_p_f_p_void_apr_size_t__p_svn_error_t swig_types[69]
-+#define SWIGTYPE_p_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[70]
-+#define SWIGTYPE_p_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t swig_types[71]
-+#define SWIGTYPE_p_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t swig_types[72]
-+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t swig_types[73]
-+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t swig_types[74]
-+#define SWIGTYPE_p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t swig_types[75]
-+#define SWIGTYPE_p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[76]
-+#define SWIGTYPE_p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[77]
-+#define SWIGTYPE_p_p_f_void__p_svn_version_t swig_types[78]
-+#define SWIGTYPE_p_p_svn_auth_baton_t swig_types[79]
-+#define SWIGTYPE_p_p_svn_auth_cred_simple_t swig_types[80]
-+#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[81]
-+#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_t swig_types[82]
-+#define SWIGTYPE_p_p_svn_auth_cred_ssl_server_trust_t swig_types[83]
-+#define SWIGTYPE_p_p_svn_auth_cred_username_t swig_types[84]
-+#define SWIGTYPE_p_p_svn_auth_iterstate_t swig_types[85]
-+#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[86]
-+#define SWIGTYPE_p_p_svn_checksum_t swig_types[87]
-+#define SWIGTYPE_p_p_svn_config_t swig_types[88]
-+#define SWIGTYPE_p_p_svn_io_dirent2_t swig_types[89]
-+#define SWIGTYPE_p_p_svn_stream_mark_t swig_types[90]
-+#define SWIGTYPE_p_p_svn_stream_t swig_types[91]
-+#define SWIGTYPE_p_p_svn_string_t swig_types[92]
-+#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[93]
-+#define SWIGTYPE_p_p_void swig_types[94]
-+#define SWIGTYPE_p_svn_auth_baton_t swig_types[95]
-+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[96]
-+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[97]
-+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[98]
-+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[99]
-+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[100]
-+#define SWIGTYPE_p_svn_auth_gnome_keyring_unlock_prompt_func_t swig_types[101]
-+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[102]
-+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[103]
-+#define SWIGTYPE_p_svn_auth_provider_t swig_types[104]
-+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[105]
-+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[106]
-+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[107]
-+#define SWIGTYPE_p_svn_checksum_t swig_types[108]
-+#define SWIGTYPE_p_svn_commit_info_t swig_types[109]
-+#define SWIGTYPE_p_svn_config_t swig_types[110]
-+#define SWIGTYPE_p_svn_depth_t swig_types[111]
-+#define SWIGTYPE_p_svn_dirent_t swig_types[112]
-+#define SWIGTYPE_p_svn_errno_t swig_types[113]
-+#define SWIGTYPE_p_svn_error_t swig_types[114]
-+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[115]
-+#define SWIGTYPE_p_svn_io_dirent_t swig_types[116]
-+#define SWIGTYPE_p_svn_io_file_del_t swig_types[117]
-+#define SWIGTYPE_p_svn_location_segment_t swig_types[118]
-+#define SWIGTYPE_p_svn_lock_t swig_types[119]
-+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[120]
-+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[121]
-+#define SWIGTYPE_p_svn_log_entry_t swig_types[122]
-+#define SWIGTYPE_p_svn_merge_range_t swig_types[123]
-+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[124]
-+#define SWIGTYPE_p_svn_node_kind_t swig_types[125]
-+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[126]
-+#define SWIGTYPE_p_svn_opt_revision_t swig_types[127]
-+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[128]
-+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[129]
-+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides swig_types[130]
-+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[131]
-+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[132]
-+#define SWIGTYPE_p_svn_prop_kind swig_types[133]
-+#define SWIGTYPE_p_svn_prop_t swig_types[134]
-+#define SWIGTYPE_p_svn_stream_mark_t swig_types[135]
-+#define SWIGTYPE_p_svn_stream_t swig_types[136]
-+#define SWIGTYPE_p_svn_string_t swig_types[137]
-+#define SWIGTYPE_p_svn_stringbuf_t swig_types[138]
-+#define SWIGTYPE_p_svn_tristate_t swig_types[139]
-+#define SWIGTYPE_p_svn_version_checklist_t swig_types[140]
-+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[141]
-+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[142]
-+#define SWIGTYPE_p_svn_version_extended_t swig_types[143]
-+#define SWIGTYPE_p_svn_version_t swig_types[144]
-+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[145]
-+#define SWIGTYPE_p_unsigned_char swig_types[146]
-+#define SWIGTYPE_p_unsigned_long swig_types[147]
-+#define SWIGTYPE_p_void swig_types[148]
-+static swig_type_info *swig_types[150];
-+static swig_module_info swig_module = {swig_types, 149, 0, 0, 0, 0};
- #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
- #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
-
-@@ -3834,29 +3833,6 @@
-
-
-
--/* Helper function to set the gnome-keyring unlock prompt function. This
-- * C function accepts an auth baton, a function and a prompt baton, but
-- * the below callback_typemap uses both the function and the prompt
-- * baton, so the resulting binding has just two arguments: The auth
-- * baton and the prompt function.
-- * The prompt function should again have two arguments: The keyring name
-- * (string) and a pool (except for the ruby version, which doesn't have
-- * the pool argument). It should return the entered password (string).
-- * This binding generated for this function generates a reference to the
-- * prompt function that was passed into this. The caller should store
-- * that reference somewhere, to prevent the function from being garbage
-- * collected...
-- */
--static void svn_auth_set_gnome_keyring_unlock_prompt_func(svn_auth_baton_t *ab,
-- svn_auth_gnome_keyring_unlock_prompt_func_t prompt_func,
-- void *prompt_baton) {
-- svn_auth_set_parameter(ab, SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC,
-- prompt_func);
-- svn_auth_set_parameter(ab, SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON,
-- prompt_baton);
--}
--
--
- static svn_error_t *
- svn_swig_mergeinfo_merge(apr_hash_t **mergeinfo_inout,
- apr_hash_t *changes,
-@@ -17674,7 +17650,7 @@
- SWIGINTERN PyObject *svn_auth_gnome_keyring_unlock_prompt_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-- SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
-+ SWIG_TypeNewClientData(SWIGTYPE_p_svn_auth_gnome_keyring_unlock_prompt_func_t, SWIG_NewClientData(obj));
- return SWIG_Py_Void();
- }
-
-@@ -32562,40 +32538,6 @@
- return SWIG_Py_Void();
- }
-
--SWIGINTERN PyObject *_wrap_svn_auth_set_gnome_keyring_unlock_prompt_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-- PyObject *resultobj = 0;
-- svn_auth_baton_t *arg1 = (svn_auth_baton_t *) 0 ;
-- svn_auth_gnome_keyring_unlock_prompt_func_t arg2 = (svn_auth_gnome_keyring_unlock_prompt_func_t) 0 ;
-- void *arg3 = (void *) 0 ;
-- PyObject * obj0 = 0 ;
-- PyObject * obj1 = 0 ;
--
-- if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_set_gnome_keyring_unlock_prompt_func",&obj0,&obj1)) SWIG_fail;
-- {
-- arg1 = (svn_auth_baton_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj0);
-- if (PyErr_Occurred()) {
-- SWIG_fail;
-- }
-- }
-- {
-- arg2 = svn_swig_py_auth_gnome_keyring_unlock_prompt_func;
-- arg3 = obj1;
-- }
-- {
-- svn_swig_py_release_py_lock();
--
-- svn_auth_set_gnome_keyring_unlock_prompt_func(arg1,arg2,arg3);
--
-- svn_swig_py_acquire_py_lock();
--
-- }
-- resultobj = SWIG_Py_Void();
-- return resultobj;
--fail:
-- return NULL;
--}
--
--
- SWIGINTERN PyObject *_wrap_svn_swig_py_set_application_pool(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- PyObject *arg1 = (PyObject *) 0 ;
-@@ -33902,7 +33844,6 @@
- { (char *)"svn_checksum_is_empty_checksum", _wrap_svn_checksum_is_empty_checksum, METH_VARARGS, (char *)"svn_checksum_is_empty_checksum(svn_checksum_t checksum) -> svn_boolean_t"},
- { (char *)"svn_checksum_mismatch_err", _wrap_svn_checksum_mismatch_err, METH_VARARGS, (char *)"svn_checksum_mismatch_err(svn_checksum_t expected, svn_checksum_t actual, apr_pool_t scratch_pool, char const * fmt) -> svn_error_t"},
- { (char *)"svn_checksum_ctx_t_swigregister", svn_checksum_ctx_t_swigregister, METH_VARARGS, NULL},
-- { (char *)"svn_auth_set_gnome_keyring_unlock_prompt_func", _wrap_svn_auth_set_gnome_keyring_unlock_prompt_func, METH_VARARGS, (char *)"svn_auth_set_gnome_keyring_unlock_prompt_func(svn_auth_baton_t * ab, svn_auth_gnome_keyring_unlock_prompt_func_t prompt_func)"},
- { (char *)"svn_swig_py_set_application_pool", _wrap_svn_swig_py_set_application_pool, METH_VARARGS, (char *)"svn_swig_py_set_application_pool(PyObject * py_pool, apr_pool_t pool)"},
- { (char *)"svn_swig_py_clear_application_pool", _wrap_svn_swig_py_clear_application_pool, METH_VARARGS, (char *)"svn_swig_py_clear_application_pool()"},
- { (char *)"apr_array_header_t_swigregister", apr_array_header_t_swigregister, METH_VARARGS, NULL},
-@@ -33937,7 +33878,6 @@
- static swig_type_info _swigt__p_apr_size_t = {"_p_apr_size_t", "apr_size_t *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
--static swig_type_info _swigt__p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_auth_gnome_keyring_unlock_prompt_func_t|struct svn_error_t *(*)(char **,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void = {"_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void", "svn_auth_simple_provider_func_t|svn_auth_ssl_client_cert_pw_provider_func_t|void (*)(struct svn_auth_provider_object_t **,apr_pool_t *)", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_simple_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_pw_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0};
-@@ -33973,7 +33913,6 @@
- static swig_type_info _swigt__p_p_apr_file_t = {"_p_p_apr_file_t", "apr_file_t **", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **|svn_mergeinfo_t *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
--static swig_type_info _swigt__p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(char **,char const *,void *,apr_pool_t *)|svn_auth_gnome_keyring_unlock_prompt_func_t *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void = {"_p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void", "void (**)(struct svn_auth_provider_object_t **,apr_pool_t *)|svn_auth_simple_provider_func_t *|svn_auth_ssl_client_cert_pw_provider_func_t *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_simple_prompt_func_t *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_client_cert_pw_prompt_func_t *", 0, 0, (void*)0, 0};
-@@ -34022,6 +33961,7 @@
- static swig_type_info _swigt__p_svn_auth_cred_ssl_client_cert_t = {"_p_svn_auth_cred_ssl_client_cert_t", "struct svn_auth_cred_ssl_client_cert_t *|svn_auth_cred_ssl_client_cert_t *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_svn_auth_cred_ssl_server_trust_t = {"_p_svn_auth_cred_ssl_server_trust_t", "struct svn_auth_cred_ssl_server_trust_t *|svn_auth_cred_ssl_server_trust_t *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_svn_auth_cred_username_t = {"_p_svn_auth_cred_username_t", "struct svn_auth_cred_username_t *|svn_auth_cred_username_t *", 0, 0, (void*)0, 0};
-+static swig_type_info _swigt__p_svn_auth_gnome_keyring_unlock_prompt_func_t = {"_p_svn_auth_gnome_keyring_unlock_prompt_func_t", "svn_auth_gnome_keyring_unlock_prompt_func_t *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_svn_auth_iterstate_t = {"_p_svn_auth_iterstate_t", "struct svn_auth_iterstate_t *|svn_auth_iterstate_t *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_svn_auth_provider_object_t = {"_p_svn_auth_provider_object_t", "struct svn_auth_provider_object_t *|svn_auth_provider_object_t *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_svn_auth_provider_t = {"_p_svn_auth_provider_t", "struct svn_auth_provider_t *|svn_auth_provider_t *", 0, 0, (void*)0, 0};
-@@ -34089,7 +34029,6 @@
- &_swigt__p_apr_size_t,
- &_swigt__p_char,
- &_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t,
-- &_swigt__p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
- &_swigt__p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void,
- &_swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
- &_swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
-@@ -34125,7 +34064,6 @@
- &_swigt__p_p_apr_file_t,
- &_swigt__p_p_apr_hash_t,
- &_swigt__p_p_char,
-- &_swigt__p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
- &_swigt__p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void,
- &_swigt__p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
- &_swigt__p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
-@@ -34174,6 +34112,7 @@
- &_swigt__p_svn_auth_cred_ssl_client_cert_t,
- &_swigt__p_svn_auth_cred_ssl_server_trust_t,
- &_swigt__p_svn_auth_cred_username_t,
-+ &_swigt__p_svn_auth_gnome_keyring_unlock_prompt_func_t,
- &_swigt__p_svn_auth_iterstate_t,
- &_swigt__p_svn_auth_provider_object_t,
- &_swigt__p_svn_auth_provider_t,
-@@ -34241,7 +34180,6 @@
- static swig_cast_info _swigc__p_apr_size_t[] = { {&_swigt__p_apr_size_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
--static swig_cast_info _swigc__p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void[] = { {&_swigt__p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
-@@ -34277,7 +34215,6 @@
- static swig_cast_info _swigc__p_p_apr_file_t[] = { {&_swigt__p_p_apr_file_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_p_apr_hash_t[] = { {&_swigt__p_p_apr_hash_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_p_char[] = { {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
--static swig_cast_info _swigc__p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void[] = { {&_swigt__p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
-@@ -34326,6 +34263,7 @@
- static swig_cast_info _swigc__p_svn_auth_cred_ssl_client_cert_t[] = { {&_swigt__p_svn_auth_cred_ssl_client_cert_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_svn_auth_cred_ssl_server_trust_t[] = { {&_swigt__p_svn_auth_cred_ssl_server_trust_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_svn_auth_cred_username_t[] = { {&_swigt__p_svn_auth_cred_username_t, 0, 0, 0},{0, 0, 0, 0}};
-+static swig_cast_info _swigc__p_svn_auth_gnome_keyring_unlock_prompt_func_t[] = { {&_swigt__p_svn_auth_gnome_keyring_unlock_prompt_func_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_svn_auth_iterstate_t[] = { {&_swigt__p_svn_auth_iterstate_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_svn_auth_provider_object_t[] = { {&_swigt__p_svn_auth_provider_object_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_svn_auth_provider_t[] = { {&_swigt__p_svn_auth_provider_t, 0, 0, 0},{0, 0, 0, 0}};
-@@ -34393,7 +34331,6 @@
- _swigc__p_apr_size_t,
- _swigc__p_char,
- _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t,
-- _swigc__p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
- _swigc__p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void,
- _swigc__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
- _swigc__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
-@@ -34429,7 +34366,6 @@
- _swigc__p_p_apr_file_t,
- _swigc__p_p_apr_hash_t,
- _swigc__p_p_char,
-- _swigc__p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
- _swigc__p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void,
- _swigc__p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
- _swigc__p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
-@@ -34478,6 +34414,7 @@
- _swigc__p_svn_auth_cred_ssl_client_cert_t,
- _swigc__p_svn_auth_cred_ssl_server_trust_t,
- _swigc__p_svn_auth_cred_username_t,
-+ _swigc__p_svn_auth_gnome_keyring_unlock_prompt_func_t,
- _swigc__p_svn_auth_iterstate_t,
- _swigc__p_svn_auth_provider_object_t,
- _swigc__p_svn_auth_provider_t,
-@@ -35638,8 +35575,6 @@
- SWIG_Python_SetConstant(d, "SVN_AUTH_PARAM_CONFIG",SWIG_FromCharPtr("svn:auth:config-category-servers"));
- SWIG_Python_SetConstant(d, "SVN_AUTH_PARAM_SERVER_GROUP",SWIG_FromCharPtr("svn:auth:server-group"));
- SWIG_Python_SetConstant(d, "SVN_AUTH_PARAM_CONFIG_DIR",SWIG_FromCharPtr("svn:auth:config-dir"));
-- SWIG_Python_SetConstant(d, "SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC",SWIG_FromCharPtr("gnome-keyring-unlock-prompt-func"));
-- SWIG_Python_SetConstant(d, "SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON",SWIG_FromCharPtr("gnome-keyring-unlock-prompt-baton"));
- SWIG_Python_SetConstant(d, "SVN_CONFIG_CATEGORY_SERVERS",SWIG_FromCharPtr("servers"));
- SWIG_Python_SetConstant(d, "SVN_CONFIG_SECTION_GROUPS",SWIG_FromCharPtr("groups"));
- SWIG_Python_SetConstant(d, "SVN_CONFIG_SECTION_GLOBAL",SWIG_FromCharPtr("global"));
-diff -u -d -b -w -r subversion-1.8.0-orig/subversion/bindings/swig/python/core.py subversion-1.8.0-python/subversion/bindings/swig/python/core.py
---- subversion/bindings/swig/python/core.py 2013-06-13 05:07:20.000000000 -0400
-+++ subversion/bindings/swig/python/core.py 2013-07-12 16:11:04.000000000 -0400
-@@ -3316,8 +3316,6 @@
- def svn_auth_get_platform_specific_client_providers(*args):
- """svn_auth_get_platform_specific_client_providers(svn_config_t * config, apr_pool_t pool) -> svn_error_t"""
- return _core.svn_auth_get_platform_specific_client_providers(*args)
--SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC = _core.SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC
--SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON = _core.SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON
-
- def svn_auth_get_username_provider(*args):
- """svn_auth_get_username_provider(apr_pool_t pool)"""
-@@ -6336,10 +6334,6 @@
- svn_checksum_ctx_t_swigregister(svn_checksum_ctx_t)
-
-
--def svn_auth_set_gnome_keyring_unlock_prompt_func(*args):
-- """svn_auth_set_gnome_keyring_unlock_prompt_func(svn_auth_baton_t * ab, svn_auth_gnome_keyring_unlock_prompt_func_t prompt_func)"""
-- return _core.svn_auth_set_gnome_keyring_unlock_prompt_func(*args)
--
- def svn_swig_py_set_application_pool(*args):
- """svn_swig_py_set_application_pool(PyObject * py_pool, apr_pool_t pool)"""
- return _core.svn_swig_py_set_application_pool(*args)
diff --git a/dev-vcs/subversion/files/subversion-fix-parallel-build-support-for-perl-bindings.patch b/dev-vcs/subversion/files/subversion-fix-parallel-build-support-for-perl-bindings.patch
deleted file mode 100644
index bffb43117b2..00000000000
--- a/dev-vcs/subversion/files/subversion-fix-parallel-build-support-for-perl-bindings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -732,7 +732,7 @@
- extraclean-swig-headers: clean-swig-headers
- $(EXTRACLEAN_SWIG_HEADERS)
-
--$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in
-+$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in libsvn_swig_perl
- ./config.status subversion/bindings/swig/perl/native/Makefile.PL
-
- $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
diff --git a/dev-vcs/subversion/subversion-1.8.18.ebuild b/dev-vcs/subversion/subversion-1.8.18.ebuild
index 11446afe5dc..4ebfd57ae56 100644
--- a/dev-vcs/subversion/subversion-1.8.18.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.18.ebuild
@@ -13,7 +13,8 @@ inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-com
MY_P="${P/_/-}"
DESCRIPTION="Advanced version control system"
HOMEPAGE="http://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2"
+SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
S="${WORKDIR}/${MY_P}"
LICENSE="Subversion GPL-2"
@@ -65,12 +66,12 @@ REQUIRED_USE="
)"
PATCHES=(
- "${FILESDIR}"/${PN}-1.5.4-interix.patch
- "${FILESDIR}"/${PN}-1.5.6-aix-dso.patch
- "${FILESDIR}"/${PN}-1.8.0-hpux-dso.patch
- "${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch
- "${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch
- "${FILESDIR}"/${PN}-1.8.16-javadoc-nolint.patch
+ "${WORKDIR}"/${P}-patchset/${PN}-1.5.4-interix.patch
+ "${WORKDIR}"/${P}-patchset/${PN}-1.5.6-aix-dso.patch
+ "${WORKDIR}"/${P}-patchset/${PN}-1.8.0-hpux-dso.patch
+ "${WORKDIR}"/${P}-patchset/${PN}-fix-parallel-build-support-for-perl-bindings.patch
+ "${WORKDIR}"/${P}-patchset/${PN}-1.8.1-revert_bdb6check.patch
+ "${WORKDIR}"/${P}-patchset/${PN}-1.8.16-javadoc-nolint.patch
)
want_apache
@@ -160,7 +161,7 @@ src_prepare() {
# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C20130614113003.GA19257@tarsus.local2%3E
# in short, we don't have gnome-keyring stuff here, patch
# borrowed from MacPorts
- epatch "${FILESDIR}"/${PN}-1.8.5-swig-python-no-gnome-keyring.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-1.8.5-swig-python-no-gnome-keyring.patch
fi
# XXX: make python_copy_sources accept path
diff --git a/dev-vcs/subversion/subversion-1.9.7.ebuild b/dev-vcs/subversion/subversion-1.9.7.ebuild
index f3c2697e04c..28c8d3cdb68 100644
--- a/dev-vcs/subversion/subversion-1.9.7.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.7.ebuild
@@ -13,7 +13,8 @@ inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-com
MY_P="${P/_/-}"
DESCRIPTION="Advanced version control system"
HOMEPAGE="http://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2"
+SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
+ https://dev.gentoo.org/~mgorny/dist/${PN}-1.8.18-patchset.tar.bz2"
S="${WORKDIR}/${MY_P}"
LICENSE="Subversion GPL-2"
@@ -65,12 +66,12 @@ REQUIRED_USE="
)"
PATCHES=(
- "${FILESDIR}"/${PN}-1.5.4-interix.patch
- "${FILESDIR}"/${PN}-1.5.6-aix-dso.patch
- "${FILESDIR}"/${PN}-1.8.0-hpux-dso.patch
- "${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch
- "${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch
- "${FILESDIR}"/${PN}-1.8.16-javadoc-nolint.patch
+ "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.4-interix.patch
+ "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.6-aix-dso.patch
+ "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.0-hpux-dso.patch
+ "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-fix-parallel-build-support-for-perl-bindings.patch
+ "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.1-revert_bdb6check.patch
+ "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.16-javadoc-nolint.patch
)
want_apache
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/, dev-vcs/subversion/files/
@ 2019-01-24 19:13 Thomas Deutschmann
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2019-01-24 19:13 UTC (permalink / raw
To: gentoo-commits
commit: 460a53098432a7c7a2dfd4d9f703ec631ca9f1a6
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 24 19:13:11 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 24 19:13:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=460a5309
dev-vcs/subversion: fix test wc-queries-test test
Thanks to Branko Čibej (upstream) for the patch!
Closes: https://bugs.gentoo.org/605438
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
...subversion-1.9.7-fix-wc-queries-test-test.patch | 26 ++++++++++++++++++++++
dev-vcs/subversion/subversion-1.10.3.ebuild | 1 +
dev-vcs/subversion/subversion-1.10.4.ebuild | 1 +
dev-vcs/subversion/subversion-1.11.0.ebuild | 3 ++-
dev-vcs/subversion/subversion-1.11.1.ebuild | 1 +
dev-vcs/subversion/subversion-1.9.7-r1.ebuild | 3 ++-
6 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/dev-vcs/subversion/files/subversion-1.9.7-fix-wc-queries-test-test.patch b/dev-vcs/subversion/files/subversion-1.9.7-fix-wc-queries-test-test.patch
new file mode 100644
index 00000000000..6658bd683e7
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.9.7-fix-wc-queries-test-test.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/605438
+
+--- a/subversion/tests/libsvn_wc/wc-queries-test.c 2019/01/24 10:33:42 1852012
++++ b/subversion/tests/libsvn_wc/wc-queries-test.c 2019/01/24 10:58:23 1852013
+@@ -670,7 +670,20 @@
+ || (item->expression_vars < 1))
+ && !is_result_table(item->table))
+ {
+- if (in_list(primary_key_statements, i))
++ if (MATCH_TOKEN(item->table, "sqlite_master"))
++ {
++ /* The sqlite_master table does not have an index.
++ Query explanations that say 'SCAN TABLE sqlite_master'
++ will appear if SQLite was compiled with the option
++ SQLITE_ENABLE_STMT_SCANSTATUS, for queries such
++ as 'DROP TABLE foo', but the performance of such
++ statements is not our concern here. */
++
++ /* "Slow" statements do expect too see a warning, however. */
++ if (is_slow_statement(i))
++ warned = TRUE;
++ }
++ else if (in_list(primary_key_statements, i))
+ {
+ /* Reported as primary key index usage in Sqlite 3.7,
+ as table scan in 3.8+, while the execution plan is
diff --git a/dev-vcs/subversion/subversion-1.10.3.ebuild b/dev-vcs/subversion/subversion-1.10.3.ebuild
index 633b624d554..b13dd328ecf 100644
--- a/dev-vcs/subversion/subversion-1.10.3.ebuild
+++ b/dev-vcs/subversion/subversion-1.10.3.ebuild
@@ -151,6 +151,7 @@ pkg_setup() {
src_prepare() {
eapply "${WORKDIR}/patches"
+ eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch
eapply_user
fperms +x build/transform_libtool_scripts.sh
diff --git a/dev-vcs/subversion/subversion-1.10.4.ebuild b/dev-vcs/subversion/subversion-1.10.4.ebuild
index e21f5be59ff..ef55999b2c5 100644
--- a/dev-vcs/subversion/subversion-1.10.4.ebuild
+++ b/dev-vcs/subversion/subversion-1.10.4.ebuild
@@ -151,6 +151,7 @@ pkg_setup() {
src_prepare() {
eapply "${WORKDIR}/patches"
+ eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch
eapply_user
fperms +x build/transform_libtool_scripts.sh
diff --git a/dev-vcs/subversion/subversion-1.11.0.ebuild b/dev-vcs/subversion/subversion-1.11.0.ebuild
index df2a5c65a4c..a4a22eed915 100644
--- a/dev-vcs/subversion/subversion-1.11.0.ebuild
+++ b/dev-vcs/subversion/subversion-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -151,6 +151,7 @@ pkg_setup() {
src_prepare() {
eapply "${WORKDIR}/patches"
+ eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch
eapply_user
fperms +x build/transform_libtool_scripts.sh
diff --git a/dev-vcs/subversion/subversion-1.11.1.ebuild b/dev-vcs/subversion/subversion-1.11.1.ebuild
index 5b17d2b2a8c..a4a22eed915 100644
--- a/dev-vcs/subversion/subversion-1.11.1.ebuild
+++ b/dev-vcs/subversion/subversion-1.11.1.ebuild
@@ -151,6 +151,7 @@ pkg_setup() {
src_prepare() {
eapply "${WORKDIR}/patches"
+ eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch
eapply_user
fperms +x build/transform_libtool_scripts.sh
diff --git a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
index c135b20995f..b9444c0aaa8 100644
--- a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -88,6 +88,7 @@ PATCHES=(
"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.1-revert_bdb6check.patch
"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.16-javadoc-nolint.patch
"${FILESDIR}"/${P}-kf5.patch
+ "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch
)
want_apache
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/, dev-vcs/subversion/files/
@ 2019-03-21 22:41 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2019-03-21 22:41 UTC (permalink / raw
To: gentoo-commits
commit: 3f6a4f11c79ab1efbbcedb7b5604ed4b72ec61b3
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 22:41:46 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 22:41:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f6a4f11
dev-vcs/subversion: Removed old.
Closes: https://bugs.gentoo.org/674984
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
dev-vcs/subversion/Manifest | 2 -
.../subversion/files/subversion-1.9.7-kf5.patch | 211 ---------
dev-vcs/subversion/subversion-1.9.7-r1.ebuild | 527 ---------------------
3 files changed, 740 deletions(-)
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 27b062f7068..d55f59df88a 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -2,5 +2,3 @@ DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5b
DIST subversion-1.10.4.tar.bz2 8392477 BLAKE2B 93364178d2252332b070ebddd5791cb43e0000802d820848a6ca2e13ae3036a9119901dcde1b73ea09bd34af3fd72b923bdd2765e302359e7f1ecf49a6840685 SHA512 c44a4a4a9533cd4f4cb6ddbc3ce98585a96da6c8e75497d087034b52f899797bb0972dfc0e79db99e81149e59e7fa765398c6ad35eba64f11f4ae9c3b3537434
DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B f14bbe9b28dec32894a8c262d32f36e01c9866352f1c54b5468804e81c1eadb895cbe9e33783a9e7d4a7f54dfa3b25b762015b9ca4886a14628c434254995c77 SHA512 2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d
DIST subversion-1.12.0-rc1.tar.bz2 8503704 BLAKE2B e9f2779155aa45ee0f60359d292c085c1a4bbb2237964d6c045278d7dff71e665662c3af8bfcd81139eb7c501f8f0923377c80348202d1dfb1c9087fafe5a1ed SHA512 b82205d6530ba36d29194382897dbf0b79bd81326eebdaf71f21d061d3759c4f77fecfc2f9f5e761bef9e2534eb4567d62b96618813be644059d5c20219ff546
-DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2
-DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b
diff --git a/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch b/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch
deleted file mode 100644
index 5b692fa3066..00000000000
--- a/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-diff -u b/subversion/libsvn_auth_kwallet/kwallet.cpp b/subversion/libsvn_auth_kwallet/kwallet.cpp
---- b/subversion/libsvn_auth_kwallet/kwallet.cpp (revision 1798731)
-+++ b/subversion/libsvn_auth_kwallet/kwallet.cpp 2018-01-18 16:48:52.026801597 +0100
-@@ -39,8 +39,6 @@
- #include <QtCore/QString>
-
- #include <kaboutdata.h>
--#include <kcmdlineargs.h>
--#include <kcomponentdata.h>
- #include <klocalizedstring.h>
- #include <kwallet.h>
-
-@@ -221,14 +219,15 @@
- app = new QCoreApplication(argc, q_argv);
- }
-
-- KCmdLineArgs::init(q_argc, q_argv,
-- get_application_name(parameters, pool),
-- "subversion",
-- ki18n(get_application_name(parameters, pool)),
-- SVN_VER_NUMBER,
-- ki18n("Version control system"),
-- KCmdLineArgs::CmdLineArgKDE);
-- KComponentData component_data(KCmdLineArgs::aboutData());
-+ KLocalizedString::setApplicationDomain("subversion"); /* translation domain */
-+
-+ /* componentName appears in KDE GUI prompts */
-+ KAboutData aboutData(QStringLiteral("subversion"), /* componentName */
-+ i18n(get_application_name(parameters,
-+ pool)), /* displayName */
-+ QStringLiteral(SVN_VER_NUMBER));
-+ KAboutData::setApplicationData(aboutData);
-+
- QString folder = QString::fromUtf8("Subversion");
- QString key =
- QString::fromUtf8(username) + "@" + QString::fromUtf8(realmstring);
-@@ -291,14 +290,15 @@
- app = new QCoreApplication(argc, q_argv);
- }
-
-- KCmdLineArgs::init(q_argc, q_argv,
-- get_application_name(parameters, pool),
-- "subversion",
-- ki18n(get_application_name(parameters, pool)),
-- SVN_VER_NUMBER,
-- ki18n("Version control system"),
-- KCmdLineArgs::CmdLineArgKDE);
-- KComponentData component_data(KCmdLineArgs::aboutData());
-+ KLocalizedString::setApplicationDomain("subversion"); /* translation domain */
-+
-+ /* componentName appears in KDE GUI prompts */
-+ KAboutData aboutData(QStringLiteral("subversion"), /* componentName */
-+ i18n(get_application_name(parameters,
-+ pool)), /* displayName */
-+ QStringLiteral(SVN_VER_NUMBER));
-+ KAboutData::setApplicationData(aboutData);
-+
- QString q_password = QString::fromUtf8(password);
- QString folder = QString::fromUtf8("Subversion");
- KWallet::Wallet *wallet = get_wallet(wallet_name, parameters);
-unchanged:
---- a/build/ac-macros/compiler.m4 (revision 1798730)
-+++ b/build/ac-macros/compiler.m4 (revision 1798731)
-@@ -126,3 +126,18 @@
- SVN_CXXFLAGS_ADD_IFELSE([-Werror=unknown-warning-option])
- fi
- ])
-+
-+dnl The KWallet provider needs to use C++11 mode when using KDE 5
-+AC_DEFUN([SVN_CXX_MODE_SETUP11],
-+[
-+ CXXFLAGS_KEEP="$CXXFLAGS"
-+ CXXFLAGS=""
-+
-+ if test "$GXX" = "yes"; then
-+ SVN_CXXFLAGS_ADD_IFELSE([-std=c++11])
-+ fi
-+
-+ CXXMODEFLAGS="$CXXFLAGS"
-+ CXXFLAGS="$CXXFLAGS_KEEP"
-+ AC_SUBST(CXXMODEFLAGS)
-+])
-unchanged:
---- a/build/ac-macros/kwallet.m4 (revision 1798730)
-+++ b/build/ac-macros/kwallet.m4 (revision 1802646)
-@@ -25,8 +25,10 @@
- AC_DEFUN(SVN_LIB_KWALLET,
- [
- AC_ARG_WITH(kwallet,
-- [AS_HELP_STRING([[--with-kwallet[=PATH]]],
-- [Enable use of KWallet (KDE 4) for auth credentials])],
-+ [AS_HELP_STRING([[--with-kwallet[=PATH|INCDIR:LIBDIR]]],
-+ [Enable use of KWallet (KDE 5 or 4) for auth credentials.
-+ PATH is the KDE install path, alternatively INCDIR:LIBDIR
-+ are the header and library install paths. ])],
- [svn_lib_kwallet="$withval"],
- [svn_lib_kwallet=no])
-
-@@ -42,40 +44,70 @@
- if test "$APR_HAS_DSO" = "yes"; then
- if test -n "$PKG_CONFIG"; then
- if test "$HAVE_DBUS" = "yes"; then
-- AC_MSG_CHECKING([for QtCore, QtDBus, QtGui])
-- if $PKG_CONFIG --exists QtCore QtDBus QtGui; then
-- AC_MSG_RESULT([yes])
-+ AC_MSG_CHECKING([for Qt])
-+ if $PKG_CONFIG --exists Qt5Core Qt5DBus Qt5Gui; then
-+ AC_MSG_RESULT([yes, Qt5])
-+ qt_pkg_config_names="Qt5Core Qt5DBus Qt5Gui"
-+ kde_config_name="kf5-config"
-+ kde_inc_names="KF5/KWallet KF5/KCoreAddons KF5/KI18n"
-+ kde_lib_names="-lKF5Wallet -lKF5I18n -lKF5CoreAddons -lQt5Gui -lQt5DBus -lQt5Core"
-+ elif $PKG_CONFIG --exists QtCore QtDBus QtGui; then
-+ AC_MSG_RESULT([yes, Qt4])
-+ qt_pkg_config_names="QtCore QtDBus QtGui"
-+ kde_config_name="kde4-config"
-+ kde_inc_names="/"
-+ kde_lib_names="-lkdeui -lkdecore -lQtGui -lQtDBus -lQtCore"
-+ fi
-+ if test -n "$qt_pkg_config_names"; then
- if test "$svn_lib_kwallet" != "yes"; then
-- AC_MSG_CHECKING([for kde4-config])
-- KDE4_CONFIG="$svn_lib_kwallet/bin/kde4-config"
-- if test -f "$KDE4_CONFIG" && test -x "$KDE4_CONFIG"; then
-+ AC_MSG_CHECKING([for $kde_config_name])
-+ KDE_CONFIG="$svn_lib_kwallet/bin/$kde_config_name"
-+ if test -f "$KDE_CONFIG" && test -x "$KDE_CONFIG"; then
- AC_MSG_RESULT([yes])
- else
-- KDE4_CONFIG=""
-- AC_MSG_RESULT([no])
-+ if echo "$svn_lib_kwallet" | $EGREP ":" > /dev/null; then
-+ AC_MSG_RESULT([unneeded])
-+ KDE_CONFIG="unneeded"
-+ kde_incdir=["`echo "$svn_lib_kwallet" | $SED -e "s/:.*//"`"]
-+ kde_libdir=["`echo "$svn_lib_kwallet" | $SED -e "s/.*://"`"]
-+ else
-+ AC_MSG_RESULT([no])
-+ KDE_CONFIG=""
-+ fi
- fi
- else
-- AC_PATH_PROG(KDE4_CONFIG, kde4-config)
-+ AC_PATH_PROG(KDE_CONFIG, $kde_config_name)
-+ if test -n "$KDE_CONFIG"; then
-+ kde_incdir="`$KDE_CONFIG --install include`"
-+ kde_libdir="`$KDE_CONFIG --install lib`"
-+ fi
- fi
-- if test -n "$KDE4_CONFIG"; then
-- AC_MSG_CHECKING([for KWallet])
-+ if test -n "$KDE_CONFIG"; then
-+ if test $kde_config_name = "kf5-config"; then
-+ dnl KF5 does not compile with -std=c++98
-+ SVN_CXX_MODE_SETUP11
-+ fi
- old_CXXFLAGS="$CXXFLAGS"
- old_LDFLAGS="$LDFLAGS"
- old_LIBS="$LIBS"
-- for d in [`$PKG_CONFIG --cflags QtCore QtDBus QtGui`]; do
-+ dnl --std=c++11 may be required
-+ CXXFLAGS="$CXXFLAGS $CXXMODEFLAGS"
-+ AC_MSG_CHECKING([for KWallet])
-+ for d in [`$PKG_CONFIG --cflags $qt_pkg_config_names`]; do
- if test -n ["`echo "$d" | $EGREP -- '^-D[^[:space:]]*'`"]; then
- CPPFLAGS="$CPPFLAGS $d"
- fi
- done
-- qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
-- kde_incdir="`$KDE4_CONFIG --install include`"
-- SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_incdir"
-- qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
-- SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
-- CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
-+ qt_include_dirs="`$PKG_CONFIG --cflags-only-I $qt_pkg_config_names`"
-+ for kde_inc_name in $kde_inc_names; do
-+ kde_kwallet_includes="$kde_kwallet_includes -I$kde_incdir/$kde_inc_name"
-+ done
-+ SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs $kde_kwallet_includes"
-+ qt_libs_other_options="`$PKG_CONFIG --libs-only-other $qt_pkg_config_names`"
-+ SVN_KWALLET_LIBS="$DBUS_LIBS $kde_lib_names $qt_libs_other_options"
-+ CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES -fPIC"
- LIBS="$LIBS $SVN_KWALLET_LIBS"
-- qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
-- kde_libdir="`$KDE4_CONFIG --install lib`"
-+ qt_lib_dirs="`$PKG_CONFIG --libs-only-L $qt_pkg_config_names`"
- LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_libdir)`"
- AC_LANG(C++)
- AC_LINK_IFELSE([AC_LANG_SOURCE([[
-@@ -87,16 +119,19 @@
- AC_MSG_RESULT([yes])
- CXXFLAGS="$old_CXXFLAGS"
- LIBS="$old_LIBS"
-+ if test "$kde_config_name" = "kf5-config"; then
-+ AC_DEFINE([SVN_HAVE_KF5], [1], [Defined if KF5 available])
-+ fi
- else
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([cannot find KWallet])
- fi
- else
-- AC_MSG_ERROR([cannot find kde4-config])
-+ AC_MSG_ERROR([cannot find $kde_config_name])
- fi
- else
- AC_MSG_RESULT([no])
-- AC_MSG_ERROR([cannot find QtCore, QtDBus, QtGui])
-+ AC_MSG_ERROR([cannot find Qt])
- fi
- else
- AC_MSG_ERROR([cannot find D-Bus])
diff --git a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
deleted file mode 100644
index b9444c0aaa8..00000000000
--- a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
+++ /dev/null
@@ -1,527 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby22 ruby21"
-DISTUTILS_OPTIONAL=1
-WANT_AUTOMAKE="none"
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module ruby-single xdg-utils
-
-MY_P="${P/_/-}"
-DESCRIPTION="Advanced version control system"
-HOMEPAGE="https://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
- https://dev.gentoo.org/~mgorny/dist/${PN}-1.8.18-patchset.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Subversion GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
-
-COMMON_DEPEND="
- app-arch/bzip2
- >=dev-db/sqlite-3.7.12
- >=dev-libs/apr-1.3:1
- >=dev-libs/apr-util-1.3:1
- dev-libs/expat
- sys-apps/file
- sys-libs/zlib
- berkdb? ( >=sys-libs/db-4.0.14:= )
- ctypes-python? ( ${PYTHON_DEPS} )
- gnome-keyring? (
- dev-libs/glib:2
- gnome-base/libgnome-keyring
- sys-apps/dbus
- )
- http? ( >=net-libs/serf-1.3.4 )
- kwallet? (
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kwallet:5
- sys-apps/dbus
- )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- ruby? ( ${RUBY_DEPS} )
- sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${COMMON_DEPEND}
- apache2? ( www-servers/apache[apache2_modules_dav] )
- java? ( >=virtual/jre-1.5 )
- nls? ( virtual/libintl )
- perl? ( dev-perl/URI )"
-# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
-DEPEND="${COMMON_DEPEND}
- !!<sys-apps/sandbox-1.6
- ctypes-python? ( dev-python/ctypesgen )
- doc? ( app-doc/doxygen )
- gnome-keyring? ( virtual/pkgconfig )
- http? ( virtual/pkgconfig )
- java? ( >=virtual/jdk-1.5 )
- kwallet? (
- kde-frameworks/kdelibs4support:5
- virtual/pkgconfig
- )
- nls? ( sys-devel/gettext )
- test? ( ${PYTHON_DEPS} )"
-
-REQUIRED_USE="
- ctypes-python? ( ${PYTHON_REQUIRED_USE} )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? (
- ${PYTHON_REQUIRED_USE}
- !dso
- )"
-
-PATCHES=(
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.4-interix.patch
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.6-aix-dso.patch
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.0-hpux-dso.patch
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-fix-parallel-build-support-for-perl-bindings.patch
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.1-revert_bdb6check.patch
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.16-javadoc-nolint.patch
- "${FILESDIR}"/${P}-kf5.patch
- "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch
-)
-
-want_apache
-
-pkg_setup() {
- if use berkdb ; then
- local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
- | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
- | sed 's:.*b::')"
- einfo
- if [[ -z "${SVN_BDB_VERSION}" ]] ; then
- if [[ -n "${apu_bdb_version}" ]] ; then
- SVN_BDB_VERSION="${apu_bdb_version}"
- einfo "Matching db version to apr-util"
- else
- SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
- einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
- fi
- fi
- einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
- einfo
-
- if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
- eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
- eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
- eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
- eerror "Aborting to avoid possible run-time crashes."
- die "Berkeley DB version mismatch"
- fi
- fi
-
- depend.apache_pkg_setup
-
- java-pkg-opt-2_pkg_setup
-
- if ! use http ; then
- ewarn "WebDAV support is disabled. You need WebDAV to"
- ewarn "access repositories through the HTTP protocol."
- ewarn "Consider enabling \"http\" USE flag"
- echo -ne "\a"
- fi
-
- if use debug ; then
- append-cppflags -DSVN_DEBUG -DAP_DEBUG
- fi
-
- # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
- [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
-
- # Allow for custom repository locations.
- SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-
- if use ruby ; then
- local rbslot
- RB_VER=""
- for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
- if has_version dev-lang/ruby:${rbslot} ; then
- RB_VER="${rbslot/.}"
- break
- fi
- done
- [[ -z "${RB_VER}" ]] && die "No useable ruby version found"
- fi
-}
-
-src_prepare() {
- default
-
- fperms +x build/transform_libtool_scripts.sh
-
- sed -i \
- -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
- -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
- # this bites us in particular on Solaris
- sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
- die "/bin/sh is not POSIX shell!"
-
- eautoconf
- elibtoolize
-
- sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
- -i build-outputs.mk || die "sed failed"
-
- if use python ; then
- # XXX: make python_copy_sources accept path
- S=${S}/subversion/bindings/swig/python python_copy_sources
- rm -r "${S}"/subversion/bindings/swig/python || die
- fi
-
- xdg_environment_reset
-}
-
-src_configure() {
- local myconf=(
- --libdir="${EPREFIX%/}/usr/$(get_libdir)"
- $(use_with apache2 apache-libexecdir)
- $(use_with apache2 apxs "${APXS}")
- $(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
- $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
- $(use_enable dso runtime-module-search)
- $(use_with gnome-keyring)
- $(use_enable java javahl)
- $(use_with java jdk "${JAVA_HOME}")
- $(use_with kwallet)
- $(use_enable nls)
- $(use_with sasl)
- $(use_with http serf)
- --with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
- --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
- --disable-experimental-libtool
- --without-jikes
- --disable-mod-activation
- --disable-static
- )
-
- if use python || use perl || use ruby; then
- myconf+=( --with-swig )
- else
- myconf+=( --without-swig )
- fi
-
- if use java ; then
- myconf+=( --without-junit )
- fi
-
- case ${CHOST} in
- *-aix*)
- # avoid recording immediate path to sharedlibs into executables
- append-ldflags -Wl,-bnoipath
- ;;
- *-cygwin*)
- # no LD_PRELOAD support, no undefined symbols
- myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
- ;;
- *-interix*)
- # loader crashes on the LD_PRELOADs...
- myconf+=( --disable-local-library-preloading )
- ;;
- *-solaris*)
- # need -lintl to link
- use nls && append-libs intl
- # this breaks installation, on x64 echo replacement is 32-bits
- myconf+=( --disable-local-library-preloading )
- ;;
- *-mint*)
- myconf+=( --enable-all-static --disable-local-library-preloading )
- ;;
- *)
- # inject LD_PRELOAD entries for easy in-tree development
- myconf+=( --enable-local-library-preloading )
- ;;
- esac
-
- #version 1.7.7 again tries to link against the older installed version and fails, when trying to
- #compile for x86 on amd64, so workaround this issue again
- #check newer versions, if this is still/again needed
- myconf+=( --disable-disallowing-of-undefined-references )
-
- # for build-time scripts
- if use ctypes-python || use python || use test; then
- python_setup
- fi
-
- if use python && [[ ${CHOST} == *-darwin* ]] ; then
- export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
- export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
- export ac_cv_python_compile="$(tc-getCC)"
- fi
-
- # allow overriding Python include directory
- ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \
- ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \
- ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
- econf "${myconf[@]}"
-}
-
-src_compile() {
- emake local-all
-
- if use ctypes-python ; then
- # pre-generate .py files
- use ctypes-python && emake ctypes-python
-
- pushd subversion/bindings/ctypes-python >/dev/null || die
- distutils-r1_src_compile
- popd >/dev/null || die
- fi
-
- if use python ; then
- swig_py_compile() {
- local p=subversion/bindings/swig/python
- rm -f ${p} || die
- ln -s "${BUILD_DIR}" ${p} || die
-
- python_export PYTHON_INCLUDEDIR
- emake swig-py \
- swig_pydir="$(python_get_sitedir)/libsvn" \
- swig_pydir_extra="$(python_get_sitedir)/svn"
- }
-
- # this will give us proper BUILD_DIR for symlinking
- BUILD_DIR=python \
- python_foreach_impl swig_py_compile
- fi
-
- if use perl ; then
- emake swig-pl
- fi
-
- if use ruby ; then
- emake swig-rb
- fi
-
- if use java ; then
- emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
- fi
-
- if use extras ; then
- emake tools
- fi
-
- if use doc ; then
- doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
- if use java; then
- emake doc-javahl
- fi
- fi
-}
-
-src_test() {
- if has_version ~${CATEGORY}/${P} ; then
- default
-
- if use ctypes-python ; then
- python_test() {
- "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
- || die "ctypes-python tests fail with ${EPYTHON}"
- }
-
- distutils-r1_src_test
- fi
-
- if use python ; then
- swig_py_test() {
- pushd "${BUILD_DIR}" >/dev/null || die
- "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
- popd >/dev/null || die
- }
-
- BUILD_DIR=subversion/bindings/swig/python \
- python_foreach_impl swig_py_test
- fi
- else
- ewarn "The test suite shows errors when there is an older version of"
- ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
- ewarn "before running the test suite."
- ewarn "Test suite skipped."
- fi
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" local-install
-
- if use ctypes-python ; then
- pushd subversion/bindings/ctypes-python >/dev/null || die
- distutils-r1_src_install
- popd >/dev/null || die
- fi
-
- if use python ; then
- swig_py_install() {
- local p=subversion/bindings/swig/python
- rm -f ${p} || die
- ln -s "${BUILD_DIR}" ${p} || die
-
- emake \
- DESTDIR="${D}" \
- swig_pydir="$(python_get_sitedir)/libsvn" \
- swig_pydir_extra="$(python_get_sitedir)/svn" \
- install-swig-py
- }
-
- BUILD_DIR=python \
- python_foreach_impl swig_py_install
- fi
-
- if use perl ; then
- emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
- perl_delete_localpod
- find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete
- fi
-
- if use ruby ; then
- emake DESTDIR="${D}" install-swig-rb
- fi
-
- if use java ; then
- emake DESTDIR="${D}" install-javahl
- java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
- java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
- rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
- fi
-
- # Install Apache module configuration.
- if use apache2 ; then
- keepdir "${APACHE_MODULES_CONFDIR}"
- insinto "${APACHE_MODULES_CONFDIR}"
- doins "${FILESDIR}/47_mod_dav_svn.conf"
- fi
-
- # Install Bash Completion, bug 43179.
- newbashcomp tools/client-side/bash_completion svn
- bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
- rm -f tools/client-side/bash_completion
-
- # Install hot backup script, bug 54304.
- newbin tools/backup/hot-backup.py svn-hot-backup
- rm -fr tools/backup
-
- # Install svnserve init-script and xinet.d snippet, bug 43245.
- newinitd "${FILESDIR}"/svnserve.initd3 svnserve
- newconfd "${FILESDIR}"/svnserve.confd svnserve
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/svnserve.xinetd svnserve
-
- #adjust default user and group with disabled apache2 USE flag, bug 381385
- use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \
- -e "s\GROUP:-apache\GROUP:-svnusers\g" \
- -i "${ED%/}"/etc/init.d/svnserve || die
- use apache2 || sed -e "0,/apache/s//svn/" \
- -e "s:apache:svnusers:" \
- -i "${ED%/}"/etc/xinetd.d/svnserve || die
-
- # Install documentation.
- dodoc CHANGES COMMITTERS README
- dodoc tools/xslt/svnindex.{css,xsl}
- rm -fr tools/xslt
-
- # Install extra files.
- if use extras ; then
- cat <<- EOF > 80subversion-extras
- PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
- ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
- EOF
- doenvd 80subversion-extras
-
- emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
-
- find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
- rm -fr tools/client-side/svnmucc
- rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
- rm -fr tools/{buildbot,dev,diff,po}
-
- insinto /usr/share/${PN}
- find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
- doins -r tools
- fi
-
- if use doc ; then
- docinto html
- dodoc -r doc/doxygen/html/*
-
- if use java ; then
- java-pkg_dojavadoc doc/javadoc
- fi
- fi
-
- prune_libtool_files --all
-
- cd "${ED%/}"/usr/share/locale
- for i in * ; do
- [[ ${i} == *$LINGUAS* ]] || { rm -r ${i} || die ; }
- done
-}
-
-pkg_preinst() {
- # Compare versions of Berkeley DB, bug 122877.
- if use berkdb && [[ -f "${EROOT%/}/usr/bin/svn" ]] ; then
- OLD_BDB_VERSION="$(scanelf -nq "${EROOT%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
- NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
- if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
- CHANGED_BDB_VERSION="1"
- fi
- fi
-}
-
-pkg_postinst() {
- if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
- ewarn "You upgraded from an older version of Berkeley DB and may experience"
- ewarn "problems with your repository. Run the following commands as root to fix it:"
- ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos"
- ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
- fi
-
- ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
-}
-
-pkg_postrm() {
- :
-}
-
-pkg_config() {
- # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
- # already has EPREFIX in it
- einfo "Initializing the database in ${SVN_REPOS_LOC}..."
- if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
- echo "A Subversion repository already exists and I will not overwrite it."
- echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
- else
- mkdir -p "${SVN_REPOS_LOC}/conf"
-
- einfo "Populating repository directory..."
- # Create initial repository.
- "${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
-
- einfo "Setting repository permissions..."
- SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
- SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
- if use apache2 ; then
- [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
- [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
- else
- [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
- [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
- fi
- chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
- chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
- echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
- echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
- echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
- echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
- echo "to finish the configuration."
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/, dev-vcs/subversion/files/
@ 2019-04-15 6:48 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2019-04-15 6:48 UTC (permalink / raw
To: gentoo-commits
commit: 64ca050d5c3447f07d0e146a6f52f45c0c532b11
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 06:48:10 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 06:48:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64ca050d
dev-vcs/subversion: Security cleanup
Bug: https://bugs.gentoo.org/676094
Closes: https://bugs.gentoo.org/674984
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
dev-vcs/subversion/Manifest | 2 -
.../subversion/files/subversion-1.9.7-kf5.patch | 211 --------
dev-vcs/subversion/subversion-1.9.7-r1.ebuild | 531 ---------------------
3 files changed, 744 deletions(-)
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 27b062f7068..d55f59df88a 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -2,5 +2,3 @@ DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5b
DIST subversion-1.10.4.tar.bz2 8392477 BLAKE2B 93364178d2252332b070ebddd5791cb43e0000802d820848a6ca2e13ae3036a9119901dcde1b73ea09bd34af3fd72b923bdd2765e302359e7f1ecf49a6840685 SHA512 c44a4a4a9533cd4f4cb6ddbc3ce98585a96da6c8e75497d087034b52f899797bb0972dfc0e79db99e81149e59e7fa765398c6ad35eba64f11f4ae9c3b3537434
DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B f14bbe9b28dec32894a8c262d32f36e01c9866352f1c54b5468804e81c1eadb895cbe9e33783a9e7d4a7f54dfa3b25b762015b9ca4886a14628c434254995c77 SHA512 2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d
DIST subversion-1.12.0-rc1.tar.bz2 8503704 BLAKE2B e9f2779155aa45ee0f60359d292c085c1a4bbb2237964d6c045278d7dff71e665662c3af8bfcd81139eb7c501f8f0923377c80348202d1dfb1c9087fafe5a1ed SHA512 b82205d6530ba36d29194382897dbf0b79bd81326eebdaf71f21d061d3759c4f77fecfc2f9f5e761bef9e2534eb4567d62b96618813be644059d5c20219ff546
-DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2
-DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b
diff --git a/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch b/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch
deleted file mode 100644
index 5b692fa3066..00000000000
--- a/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-diff -u b/subversion/libsvn_auth_kwallet/kwallet.cpp b/subversion/libsvn_auth_kwallet/kwallet.cpp
---- b/subversion/libsvn_auth_kwallet/kwallet.cpp (revision 1798731)
-+++ b/subversion/libsvn_auth_kwallet/kwallet.cpp 2018-01-18 16:48:52.026801597 +0100
-@@ -39,8 +39,6 @@
- #include <QtCore/QString>
-
- #include <kaboutdata.h>
--#include <kcmdlineargs.h>
--#include <kcomponentdata.h>
- #include <klocalizedstring.h>
- #include <kwallet.h>
-
-@@ -221,14 +219,15 @@
- app = new QCoreApplication(argc, q_argv);
- }
-
-- KCmdLineArgs::init(q_argc, q_argv,
-- get_application_name(parameters, pool),
-- "subversion",
-- ki18n(get_application_name(parameters, pool)),
-- SVN_VER_NUMBER,
-- ki18n("Version control system"),
-- KCmdLineArgs::CmdLineArgKDE);
-- KComponentData component_data(KCmdLineArgs::aboutData());
-+ KLocalizedString::setApplicationDomain("subversion"); /* translation domain */
-+
-+ /* componentName appears in KDE GUI prompts */
-+ KAboutData aboutData(QStringLiteral("subversion"), /* componentName */
-+ i18n(get_application_name(parameters,
-+ pool)), /* displayName */
-+ QStringLiteral(SVN_VER_NUMBER));
-+ KAboutData::setApplicationData(aboutData);
-+
- QString folder = QString::fromUtf8("Subversion");
- QString key =
- QString::fromUtf8(username) + "@" + QString::fromUtf8(realmstring);
-@@ -291,14 +290,15 @@
- app = new QCoreApplication(argc, q_argv);
- }
-
-- KCmdLineArgs::init(q_argc, q_argv,
-- get_application_name(parameters, pool),
-- "subversion",
-- ki18n(get_application_name(parameters, pool)),
-- SVN_VER_NUMBER,
-- ki18n("Version control system"),
-- KCmdLineArgs::CmdLineArgKDE);
-- KComponentData component_data(KCmdLineArgs::aboutData());
-+ KLocalizedString::setApplicationDomain("subversion"); /* translation domain */
-+
-+ /* componentName appears in KDE GUI prompts */
-+ KAboutData aboutData(QStringLiteral("subversion"), /* componentName */
-+ i18n(get_application_name(parameters,
-+ pool)), /* displayName */
-+ QStringLiteral(SVN_VER_NUMBER));
-+ KAboutData::setApplicationData(aboutData);
-+
- QString q_password = QString::fromUtf8(password);
- QString folder = QString::fromUtf8("Subversion");
- KWallet::Wallet *wallet = get_wallet(wallet_name, parameters);
-unchanged:
---- a/build/ac-macros/compiler.m4 (revision 1798730)
-+++ b/build/ac-macros/compiler.m4 (revision 1798731)
-@@ -126,3 +126,18 @@
- SVN_CXXFLAGS_ADD_IFELSE([-Werror=unknown-warning-option])
- fi
- ])
-+
-+dnl The KWallet provider needs to use C++11 mode when using KDE 5
-+AC_DEFUN([SVN_CXX_MODE_SETUP11],
-+[
-+ CXXFLAGS_KEEP="$CXXFLAGS"
-+ CXXFLAGS=""
-+
-+ if test "$GXX" = "yes"; then
-+ SVN_CXXFLAGS_ADD_IFELSE([-std=c++11])
-+ fi
-+
-+ CXXMODEFLAGS="$CXXFLAGS"
-+ CXXFLAGS="$CXXFLAGS_KEEP"
-+ AC_SUBST(CXXMODEFLAGS)
-+])
-unchanged:
---- a/build/ac-macros/kwallet.m4 (revision 1798730)
-+++ b/build/ac-macros/kwallet.m4 (revision 1802646)
-@@ -25,8 +25,10 @@
- AC_DEFUN(SVN_LIB_KWALLET,
- [
- AC_ARG_WITH(kwallet,
-- [AS_HELP_STRING([[--with-kwallet[=PATH]]],
-- [Enable use of KWallet (KDE 4) for auth credentials])],
-+ [AS_HELP_STRING([[--with-kwallet[=PATH|INCDIR:LIBDIR]]],
-+ [Enable use of KWallet (KDE 5 or 4) for auth credentials.
-+ PATH is the KDE install path, alternatively INCDIR:LIBDIR
-+ are the header and library install paths. ])],
- [svn_lib_kwallet="$withval"],
- [svn_lib_kwallet=no])
-
-@@ -42,40 +44,70 @@
- if test "$APR_HAS_DSO" = "yes"; then
- if test -n "$PKG_CONFIG"; then
- if test "$HAVE_DBUS" = "yes"; then
-- AC_MSG_CHECKING([for QtCore, QtDBus, QtGui])
-- if $PKG_CONFIG --exists QtCore QtDBus QtGui; then
-- AC_MSG_RESULT([yes])
-+ AC_MSG_CHECKING([for Qt])
-+ if $PKG_CONFIG --exists Qt5Core Qt5DBus Qt5Gui; then
-+ AC_MSG_RESULT([yes, Qt5])
-+ qt_pkg_config_names="Qt5Core Qt5DBus Qt5Gui"
-+ kde_config_name="kf5-config"
-+ kde_inc_names="KF5/KWallet KF5/KCoreAddons KF5/KI18n"
-+ kde_lib_names="-lKF5Wallet -lKF5I18n -lKF5CoreAddons -lQt5Gui -lQt5DBus -lQt5Core"
-+ elif $PKG_CONFIG --exists QtCore QtDBus QtGui; then
-+ AC_MSG_RESULT([yes, Qt4])
-+ qt_pkg_config_names="QtCore QtDBus QtGui"
-+ kde_config_name="kde4-config"
-+ kde_inc_names="/"
-+ kde_lib_names="-lkdeui -lkdecore -lQtGui -lQtDBus -lQtCore"
-+ fi
-+ if test -n "$qt_pkg_config_names"; then
- if test "$svn_lib_kwallet" != "yes"; then
-- AC_MSG_CHECKING([for kde4-config])
-- KDE4_CONFIG="$svn_lib_kwallet/bin/kde4-config"
-- if test -f "$KDE4_CONFIG" && test -x "$KDE4_CONFIG"; then
-+ AC_MSG_CHECKING([for $kde_config_name])
-+ KDE_CONFIG="$svn_lib_kwallet/bin/$kde_config_name"
-+ if test -f "$KDE_CONFIG" && test -x "$KDE_CONFIG"; then
- AC_MSG_RESULT([yes])
- else
-- KDE4_CONFIG=""
-- AC_MSG_RESULT([no])
-+ if echo "$svn_lib_kwallet" | $EGREP ":" > /dev/null; then
-+ AC_MSG_RESULT([unneeded])
-+ KDE_CONFIG="unneeded"
-+ kde_incdir=["`echo "$svn_lib_kwallet" | $SED -e "s/:.*//"`"]
-+ kde_libdir=["`echo "$svn_lib_kwallet" | $SED -e "s/.*://"`"]
-+ else
-+ AC_MSG_RESULT([no])
-+ KDE_CONFIG=""
-+ fi
- fi
- else
-- AC_PATH_PROG(KDE4_CONFIG, kde4-config)
-+ AC_PATH_PROG(KDE_CONFIG, $kde_config_name)
-+ if test -n "$KDE_CONFIG"; then
-+ kde_incdir="`$KDE_CONFIG --install include`"
-+ kde_libdir="`$KDE_CONFIG --install lib`"
-+ fi
- fi
-- if test -n "$KDE4_CONFIG"; then
-- AC_MSG_CHECKING([for KWallet])
-+ if test -n "$KDE_CONFIG"; then
-+ if test $kde_config_name = "kf5-config"; then
-+ dnl KF5 does not compile with -std=c++98
-+ SVN_CXX_MODE_SETUP11
-+ fi
- old_CXXFLAGS="$CXXFLAGS"
- old_LDFLAGS="$LDFLAGS"
- old_LIBS="$LIBS"
-- for d in [`$PKG_CONFIG --cflags QtCore QtDBus QtGui`]; do
-+ dnl --std=c++11 may be required
-+ CXXFLAGS="$CXXFLAGS $CXXMODEFLAGS"
-+ AC_MSG_CHECKING([for KWallet])
-+ for d in [`$PKG_CONFIG --cflags $qt_pkg_config_names`]; do
- if test -n ["`echo "$d" | $EGREP -- '^-D[^[:space:]]*'`"]; then
- CPPFLAGS="$CPPFLAGS $d"
- fi
- done
-- qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
-- kde_incdir="`$KDE4_CONFIG --install include`"
-- SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_incdir"
-- qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
-- SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
-- CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
-+ qt_include_dirs="`$PKG_CONFIG --cflags-only-I $qt_pkg_config_names`"
-+ for kde_inc_name in $kde_inc_names; do
-+ kde_kwallet_includes="$kde_kwallet_includes -I$kde_incdir/$kde_inc_name"
-+ done
-+ SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs $kde_kwallet_includes"
-+ qt_libs_other_options="`$PKG_CONFIG --libs-only-other $qt_pkg_config_names`"
-+ SVN_KWALLET_LIBS="$DBUS_LIBS $kde_lib_names $qt_libs_other_options"
-+ CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES -fPIC"
- LIBS="$LIBS $SVN_KWALLET_LIBS"
-- qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
-- kde_libdir="`$KDE4_CONFIG --install lib`"
-+ qt_lib_dirs="`$PKG_CONFIG --libs-only-L $qt_pkg_config_names`"
- LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_libdir)`"
- AC_LANG(C++)
- AC_LINK_IFELSE([AC_LANG_SOURCE([[
-@@ -87,16 +119,19 @@
- AC_MSG_RESULT([yes])
- CXXFLAGS="$old_CXXFLAGS"
- LIBS="$old_LIBS"
-+ if test "$kde_config_name" = "kf5-config"; then
-+ AC_DEFINE([SVN_HAVE_KF5], [1], [Defined if KF5 available])
-+ fi
- else
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([cannot find KWallet])
- fi
- else
-- AC_MSG_ERROR([cannot find kde4-config])
-+ AC_MSG_ERROR([cannot find $kde_config_name])
- fi
- else
- AC_MSG_RESULT([no])
-- AC_MSG_ERROR([cannot find QtCore, QtDBus, QtGui])
-+ AC_MSG_ERROR([cannot find Qt])
- fi
- else
- AC_MSG_ERROR([cannot find D-Bus])
diff --git a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
deleted file mode 100644
index 6be305333dd..00000000000
--- a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
+++ /dev/null
@@ -1,531 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby22 ruby21"
-DISTUTILS_OPTIONAL=1
-WANT_AUTOMAKE="none"
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module ruby-single xdg-utils
-
-MY_P="${P/_/-}"
-DESCRIPTION="Advanced version control system"
-HOMEPAGE="https://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
- https://dev.gentoo.org/~mgorny/dist/${PN}-1.8.18-patchset.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Subversion GPL-2"
-SLOT="0"
-KEYWORDS="~arm64 ~mips s390 ~sh ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
-
-COMMON_DEPEND="
- app-arch/bzip2
- >=dev-db/sqlite-3.7.12
- >=dev-libs/apr-1.3:1
- >=dev-libs/apr-util-1.3:1
- dev-libs/expat
- sys-apps/file
- sys-libs/zlib
- berkdb? ( >=sys-libs/db-4.0.14:= )
- ctypes-python? ( ${PYTHON_DEPS} )
- gnome-keyring? (
- dev-libs/glib:2
- gnome-base/libgnome-keyring
- sys-apps/dbus
- )
- http? ( >=net-libs/serf-1.3.4 )
- kwallet? (
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kwallet:5
- sys-apps/dbus
- )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- ruby? ( ${RUBY_DEPS} )
- sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${COMMON_DEPEND}
- apache2? ( www-servers/apache[apache2_modules_dav] )
- java? ( >=virtual/jre-1.5 )
- nls? ( virtual/libintl )
- perl? ( dev-perl/URI )"
-# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
-DEPEND="${COMMON_DEPEND}
- !!<sys-apps/sandbox-1.6
- ctypes-python? ( dev-python/ctypesgen )
- doc? ( app-doc/doxygen )
- gnome-keyring? ( virtual/pkgconfig )
- http? ( virtual/pkgconfig )
- java? ( >=virtual/jdk-1.5 )
- kwallet? (
- kde-frameworks/kdelibs4support:5
- virtual/pkgconfig
- )
- nls? ( sys-devel/gettext )
- test? ( ${PYTHON_DEPS} )"
-
-REQUIRED_USE="
- ctypes-python? ( ${PYTHON_REQUIRED_USE} )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? (
- ${PYTHON_REQUIRED_USE}
- !dso
- )"
-
-PATCHES=(
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.4-interix.patch
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.6-aix-dso.patch
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.0-hpux-dso.patch
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-fix-parallel-build-support-for-perl-bindings.patch
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.1-revert_bdb6check.patch
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.16-javadoc-nolint.patch
- "${FILESDIR}"/${P}-kf5.patch
- "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch
- "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.patch
-)
-
-want_apache
-
-pkg_setup() {
- if use berkdb ; then
- local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
- | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
- | sed 's:.*b::')"
- einfo
- if [[ -z "${SVN_BDB_VERSION}" ]] ; then
- if [[ -n "${apu_bdb_version}" ]] ; then
- SVN_BDB_VERSION="${apu_bdb_version}"
- einfo "Matching db version to apr-util"
- else
- SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
- einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
- fi
- fi
- einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
- einfo
-
- if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
- eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
- eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
- eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
- eerror "Aborting to avoid possible run-time crashes."
- die "Berkeley DB version mismatch"
- fi
- fi
-
- depend.apache_pkg_setup
-
- java-pkg-opt-2_pkg_setup
-
- if ! use http ; then
- ewarn "WebDAV support is disabled. You need WebDAV to"
- ewarn "access repositories through the HTTP protocol."
- ewarn "Consider enabling \"http\" USE flag"
- echo -ne "\a"
- fi
-
- # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739
- append-cppflags -P
-
- if use debug ; then
- append-cppflags -DSVN_DEBUG -DAP_DEBUG
- fi
-
- # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
- [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
-
- # Allow for custom repository locations.
- SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-
- if use ruby ; then
- local rbslot
- RB_VER=""
- for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
- if has_version dev-lang/ruby:${rbslot} ; then
- RB_VER="${rbslot/.}"
- break
- fi
- done
- [[ -z "${RB_VER}" ]] && die "No useable ruby version found"
- fi
-}
-
-src_prepare() {
- default
-
- fperms +x build/transform_libtool_scripts.sh
-
- sed -i \
- -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
- -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
- # this bites us in particular on Solaris
- sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
- die "/bin/sh is not POSIX shell!"
-
- eautoconf
- elibtoolize
-
- sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
- -i build-outputs.mk || die "sed failed"
-
- if use python ; then
- # XXX: make python_copy_sources accept path
- S=${S}/subversion/bindings/swig/python python_copy_sources
- rm -r "${S}"/subversion/bindings/swig/python || die
- fi
-
- xdg_environment_reset
-}
-
-src_configure() {
- local myconf=(
- --libdir="${EPREFIX%/}/usr/$(get_libdir)"
- $(use_with apache2 apache-libexecdir)
- $(use_with apache2 apxs "${APXS}")
- $(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
- $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
- $(use_enable dso runtime-module-search)
- $(use_with gnome-keyring)
- $(use_enable java javahl)
- $(use_with java jdk "${JAVA_HOME}")
- $(use_with kwallet)
- $(use_enable nls)
- $(use_with sasl)
- $(use_with http serf)
- --with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
- --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
- --disable-experimental-libtool
- --without-jikes
- --disable-mod-activation
- --disable-static
- )
-
- if use python || use perl || use ruby; then
- myconf+=( --with-swig )
- else
- myconf+=( --without-swig )
- fi
-
- if use java ; then
- myconf+=( --without-junit )
- fi
-
- case ${CHOST} in
- *-aix*)
- # avoid recording immediate path to sharedlibs into executables
- append-ldflags -Wl,-bnoipath
- ;;
- *-cygwin*)
- # no LD_PRELOAD support, no undefined symbols
- myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
- ;;
- *-interix*)
- # loader crashes on the LD_PRELOADs...
- myconf+=( --disable-local-library-preloading )
- ;;
- *-solaris*)
- # need -lintl to link
- use nls && append-libs intl
- # this breaks installation, on x64 echo replacement is 32-bits
- myconf+=( --disable-local-library-preloading )
- ;;
- *-mint*)
- myconf+=( --enable-all-static --disable-local-library-preloading )
- ;;
- *)
- # inject LD_PRELOAD entries for easy in-tree development
- myconf+=( --enable-local-library-preloading )
- ;;
- esac
-
- #version 1.7.7 again tries to link against the older installed version and fails, when trying to
- #compile for x86 on amd64, so workaround this issue again
- #check newer versions, if this is still/again needed
- myconf+=( --disable-disallowing-of-undefined-references )
-
- # for build-time scripts
- if use ctypes-python || use python || use test; then
- python_setup
- fi
-
- if use python && [[ ${CHOST} == *-darwin* ]] ; then
- export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
- export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
- export ac_cv_python_compile="$(tc-getCC)"
- fi
-
- # allow overriding Python include directory
- ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \
- ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \
- ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
- econf "${myconf[@]}"
-}
-
-src_compile() {
- emake local-all
-
- if use ctypes-python ; then
- # pre-generate .py files
- use ctypes-python && emake ctypes-python
-
- pushd subversion/bindings/ctypes-python >/dev/null || die
- distutils-r1_src_compile
- popd >/dev/null || die
- fi
-
- if use python ; then
- swig_py_compile() {
- local p=subversion/bindings/swig/python
- rm -f ${p} || die
- ln -s "${BUILD_DIR}" ${p} || die
-
- python_export PYTHON_INCLUDEDIR
- emake swig-py \
- swig_pydir="$(python_get_sitedir)/libsvn" \
- swig_pydir_extra="$(python_get_sitedir)/svn"
- }
-
- # this will give us proper BUILD_DIR for symlinking
- BUILD_DIR=python \
- python_foreach_impl swig_py_compile
- fi
-
- if use perl ; then
- emake swig-pl
- fi
-
- if use ruby ; then
- emake swig-rb
- fi
-
- if use java ; then
- emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
- fi
-
- if use extras ; then
- emake tools
- fi
-
- if use doc ; then
- doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
- if use java; then
- emake doc-javahl
- fi
- fi
-}
-
-src_test() {
- if has_version ~${CATEGORY}/${P} ; then
- default
-
- if use ctypes-python ; then
- python_test() {
- "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
- || die "ctypes-python tests fail with ${EPYTHON}"
- }
-
- distutils-r1_src_test
- fi
-
- if use python ; then
- swig_py_test() {
- pushd "${BUILD_DIR}" >/dev/null || die
- "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
- popd >/dev/null || die
- }
-
- BUILD_DIR=subversion/bindings/swig/python \
- python_foreach_impl swig_py_test
- fi
- else
- ewarn "The test suite shows errors when there is an older version of"
- ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
- ewarn "before running the test suite."
- ewarn "Test suite skipped."
- fi
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" local-install
-
- if use ctypes-python ; then
- pushd subversion/bindings/ctypes-python >/dev/null || die
- distutils-r1_src_install
- popd >/dev/null || die
- fi
-
- if use python ; then
- swig_py_install() {
- local p=subversion/bindings/swig/python
- rm -f ${p} || die
- ln -s "${BUILD_DIR}" ${p} || die
-
- emake \
- DESTDIR="${D}" \
- swig_pydir="$(python_get_sitedir)/libsvn" \
- swig_pydir_extra="$(python_get_sitedir)/svn" \
- install-swig-py
- }
-
- BUILD_DIR=python \
- python_foreach_impl swig_py_install
- fi
-
- if use perl ; then
- emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
- perl_delete_localpod
- find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete
- fi
-
- if use ruby ; then
- emake DESTDIR="${D}" install-swig-rb
- fi
-
- if use java ; then
- emake DESTDIR="${D}" install-javahl
- java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
- java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
- rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
- fi
-
- # Install Apache module configuration.
- if use apache2 ; then
- keepdir "${APACHE_MODULES_CONFDIR}"
- insinto "${APACHE_MODULES_CONFDIR}"
- doins "${FILESDIR}/47_mod_dav_svn.conf"
- fi
-
- # Install Bash Completion, bug 43179.
- newbashcomp tools/client-side/bash_completion svn
- bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
- rm -f tools/client-side/bash_completion
-
- # Install hot backup script, bug 54304.
- newbin tools/backup/hot-backup.py svn-hot-backup
- rm -fr tools/backup
-
- # Install svnserve init-script and xinet.d snippet, bug 43245.
- newinitd "${FILESDIR}"/svnserve.initd3 svnserve
- newconfd "${FILESDIR}"/svnserve.confd svnserve
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/svnserve.xinetd svnserve
-
- #adjust default user and group with disabled apache2 USE flag, bug 381385
- use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \
- -e "s\GROUP:-apache\GROUP:-svnusers\g" \
- -i "${ED%/}"/etc/init.d/svnserve || die
- use apache2 || sed -e "0,/apache/s//svn/" \
- -e "s:apache:svnusers:" \
- -i "${ED%/}"/etc/xinetd.d/svnserve || die
-
- # Install documentation.
- dodoc CHANGES COMMITTERS README
- dodoc tools/xslt/svnindex.{css,xsl}
- rm -fr tools/xslt
-
- # Install extra files.
- if use extras ; then
- cat <<- EOF > 80subversion-extras
- PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
- ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
- EOF
- doenvd 80subversion-extras
-
- emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
-
- find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
- rm -fr tools/client-side/svnmucc
- rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
- rm -fr tools/{buildbot,dev,diff,po}
-
- insinto /usr/share/${PN}
- find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
- doins -r tools
- fi
-
- if use doc ; then
- docinto html
- dodoc -r doc/doxygen/html/*
-
- if use java ; then
- java-pkg_dojavadoc doc/javadoc
- fi
- fi
-
- prune_libtool_files --all
-
- cd "${ED%/}"/usr/share/locale
- for i in * ; do
- [[ ${i} == *$LINGUAS* ]] || { rm -r ${i} || die ; }
- done
-}
-
-pkg_preinst() {
- # Compare versions of Berkeley DB, bug 122877.
- if use berkdb && [[ -f "${EROOT%/}/usr/bin/svn" ]] ; then
- OLD_BDB_VERSION="$(scanelf -nq "${EROOT%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
- NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
- if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
- CHANGED_BDB_VERSION="1"
- fi
- fi
-}
-
-pkg_postinst() {
- if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
- ewarn "You upgraded from an older version of Berkeley DB and may experience"
- ewarn "problems with your repository. Run the following commands as root to fix it:"
- ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos"
- ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
- fi
-
- ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
-}
-
-pkg_postrm() {
- :
-}
-
-pkg_config() {
- # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
- # already has EPREFIX in it
- einfo "Initializing the database in ${SVN_REPOS_LOC}..."
- if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
- echo "A Subversion repository already exists and I will not overwrite it."
- echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
- else
- mkdir -p "${SVN_REPOS_LOC}/conf"
-
- einfo "Populating repository directory..."
- # Create initial repository.
- "${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
-
- einfo "Setting repository permissions..."
- SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
- SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
- if use apache2 ; then
- [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
- [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
- else
- [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
- [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
- fi
- chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
- chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
- echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
- echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
- echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
- echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
- echo "to finish the configuration."
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/, dev-vcs/subversion/files/
@ 2022-06-08 7:09 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-06-08 7:09 UTC (permalink / raw
To: gentoo-commits
commit: 8dd9ea5055c9f00eb442189a59addad5dad0dda6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 8 07:09:24 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 8 07:09:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dd9ea50
dev-vcs/subversion: add 1.14.2
Closes: https://bugs.gentoo.org/845984
Bug: https://bugs.gentoo.org/838085
Bug: https://bugs.gentoo.org/807343
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-vcs/subversion/Manifest | 1 +
.../files/subversion-1.14.2-python3.11.patch | 16 +
dev-vcs/subversion/subversion-1.14.2.ebuild | 441 +++++++++++++++++++++
3 files changed, 458 insertions(+)
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index af59d7c4f533..b705b5220494 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -1,2 +1,3 @@
DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
DIST subversion-1.14.1.tar.bz2 8504612 BLAKE2B 27c6c5a9e656680b10fbc4b5c6d5fed36759d42d908e2bd5e56e19a7477c779c72314eb4a6766a13f1af047a759f9f9334b963c1d41cd48573b9800d5b671cc1 SHA512 0a70c7152b77cdbcb810a029263e4b3240b6ef41d1c19714e793594088d3cca758d40dfbc05622a806b06463becb73207df249393924ce591026b749b875fcdd
+DIST subversion-1.14.2.tar.bz2 8606570 BLAKE2B cf15c61b932823fb18b52f83d84907386f068d2d40e14dbab94c42ad9d4c0fdf35d82db78036d7c1f2be47c2d51cdd27bfb966eb7607a52a21e072aeff76fb38 SHA512 20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc
diff --git a/dev-vcs/subversion/files/subversion-1.14.2-python3.11.patch b/dev-vcs/subversion/files/subversion-1.14.2-python3.11.patch
new file mode 100644
index 000000000000..37a3a87735f3
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.14.2-python3.11.patch
@@ -0,0 +1,16 @@
+https://src.fedoraproject.org/rpms/subversion/raw/rawhide/f/subversion-1.14.1-python-3.11-build.patch
+
+Use read_file instead of deprecated readfp - removed in Python 3.11
+
+--- a/build/generator/gen_base.py
++++ b/build/generator/gen_base.py
+@@ -76,7 +76,7 @@
+
+ # Now read and parse build.conf
+ parser = configparser.ConfigParser()
+- parser.readfp(open(fname))
++ parser.read_file(open(fname))
+
+ self.conf = build_path(os.path.abspath(fname))
+
+
diff --git a/dev-vcs/subversion/subversion-1.14.2.ebuild b/dev-vcs/subversion/subversion-1.14.2.ebuild
new file mode 100644
index 000000000000..8a18869d19ab
--- /dev/null
+++ b/dev-vcs/subversion/subversion-1.14.2.ebuild
@@ -0,0 +1,441 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WANT_AUTOMAKE="none"
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby26"
+
+inherit autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2 libtool multilib perl-module python-any-r1 ruby-single xdg-utils
+
+MY_P="${P/_/-}"
+DESCRIPTION="Advanced version control system"
+HOMEPAGE="https://subversion.apache.org/"
+SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
+ https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 BSD MIT BSD-2 FSFAP unicode"
+SLOT="0"
+if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+IUSE="apache2 berkdb debug doc extras gnome-keyring java kwallet nls perl plaintext-password-storage ruby sasl test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ app-arch/bzip2
+ app-arch/lz4
+ >=dev-db/sqlite-3.7.12
+ >=dev-libs/apr-1.5:1
+ >=dev-libs/apr-util-1.5:1
+ dev-libs/expat
+ dev-libs/libutf8proc:=
+ >=net-libs/serf-1.3.4
+ sys-apps/file
+ sys-libs/zlib
+ berkdb? ( >=sys-libs/db-4.0.14:= )
+ gnome-keyring? (
+ dev-libs/glib:2
+ app-crypt/libsecret
+ sys-apps/dbus
+ )
+ kwallet? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kwallet:5
+ sys-apps/dbus
+ )
+ perl? ( dev-lang/perl:= )
+ ruby? ( ${RUBY_DEPS} )
+ sasl? ( dev-libs/cyrus-sasl )
+"
+RDEPEND="${COMMON_DEPEND}
+ apache2? (
+ acct-group/apache
+ acct-user/apache
+ www-servers/apache[apache2_modules_dav]
+ )
+ !apache2? (
+ acct-group/svnusers
+ acct-user/svn
+ )
+ java? ( >=virtual/jre-1.8:* )
+ nls? ( virtual/libintl )
+ perl? ( dev-perl/URI )
+"
+# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ !!<sys-apps/sandbox-1.6
+ doc? ( app-doc/doxygen )
+ java? ( >=virtual/jdk-1.8:* )
+ kwallet? ( kde-frameworks/kdelibs4support:5 )
+ nls? ( sys-devel/gettext )
+ perl? ( dev-lang/swig )
+ ruby? ( dev-lang/swig )
+ test? ( ${PYTHON_DEPS} )
+"
+
+want_apache
+
+pkg_setup() {
+ if use berkdb ; then
+ local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
+ | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
+ | sed 's:.*b::')"
+ einfo
+ if [[ -z "${SVN_BDB_VERSION}" ]] ; then
+ if [[ -n "${apu_bdb_version}" ]] ; then
+ SVN_BDB_VERSION="${apu_bdb_version}"
+ einfo "Matching db version to apr-util"
+ else
+ SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
+ einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
+ fi
+ fi
+ einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
+ einfo
+
+ if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
+ eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
+ eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
+ eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
+ eerror "Aborting to avoid possible run-time crashes."
+ die "Berkeley DB version mismatch"
+ fi
+ fi
+
+ depend.apache_pkg_setup
+
+ java-pkg-opt-2_pkg_setup
+
+ # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739
+ append-cppflags -P
+
+ if use debug ; then
+ append-cppflags -DSVN_DEBUG -DAP_DEBUG
+ fi
+
+ # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
+ [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
+
+ # Allow for custom repository locations.
+ SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
+
+ if use ruby ; then
+ local rbslot
+ RB_VER=""
+ for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
+ if has_version dev-lang/ruby:${rbslot} ; then
+ RB_VER="${rbslot/.}"
+ break
+ fi
+ done
+ [[ -z "${RB_VER}" ]] && die "No useable ruby version found"
+ fi
+}
+
+src_prepare() {
+ # https://bugs.gentoo.org/721300
+ rm "${WORKDIR}"/patches/subversion-1.10.0_rc1-utf8proc_include.patch || die
+
+ eapply "${WORKDIR}/patches"
+
+ eapply "${FILESDIR}"/subversion-1.14.2-python3.11.patch
+ eapply_user
+
+ chmod +x build/transform_libtool_scripts.sh || die
+
+ sed -i \
+ -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
+ -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
+
+ # this bites us in particular on Solaris
+ sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
+ die "/bin/sh is not POSIX shell!"
+
+ eautoconf
+ elibtoolize
+
+ sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
+ -i build-outputs.mk || die "sed failed"
+
+ xdg_environment_reset
+}
+
+src_configure() {
+ local myconf=(
+ --libdir="${EPREFIX}/usr/$(get_libdir)"
+ $(use_with apache2 apache-libexecdir)
+ $(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
+ $(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
+ --without-ctypesgen
+ --disable-runtime-module-search
+ $(use_with gnome-keyring)
+ $(use_enable java javahl)
+ $(use_with java jdk "${JAVA_HOME}")
+ $(use_with kwallet)
+ $(use_enable nls)
+ $(use_enable plaintext-password-storage)
+ $(use_with sasl)
+ --with-serf
+ --with-apr="${EPREFIX}/usr/bin/apr-1-config"
+ --with-apr-util="${EPREFIX}/usr/bin/apu-1-config"
+ --disable-experimental-libtool
+ --without-jikes
+ --disable-mod-activation
+ --disable-static
+ --enable-svnxx
+ )
+
+ if use perl || use ruby; then
+ myconf+=( --with-swig )
+ else
+ myconf+=( --without-swig )
+ fi
+
+ if use java ; then
+ myconf+=( --without-junit )
+ fi
+
+ case ${CHOST} in
+ *-aix*)
+ # avoid recording immediate path to sharedlibs into executables
+ append-ldflags -Wl,-bnoipath
+ ;;
+ *-cygwin*)
+ # no LD_PRELOAD support, no undefined symbols
+ myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
+ ;;
+ *-interix*)
+ # loader crashes on the LD_PRELOADs...
+ myconf+=( --disable-local-library-preloading )
+ ;;
+ *-solaris*)
+ # need -lintl to link
+ use nls && append-libs intl
+ # this breaks installation, on x64 echo replacement is 32-bits
+ myconf+=( --disable-local-library-preloading )
+ ;;
+ *-mint*)
+ myconf+=( --enable-all-static --disable-local-library-preloading )
+ ;;
+ *)
+ # inject LD_PRELOAD entries for easy in-tree development
+ myconf+=( --enable-local-library-preloading )
+ ;;
+ esac
+
+ #version 1.7.7 again tries to link against the older installed version and fails, when trying to
+ #compile for x86 on amd64, so workaround this issue again
+ #check newer versions, if this is still/again needed
+ #myconf+=( --disable-disallowing-of-undefined-references )
+
+ # for build-time scripts
+ if use test; then
+ python_setup
+ fi
+
+ # Remove when >=dev-libs/libutf8proc-2.5.0 is stable
+ # https://bugs.gentoo.org/721300
+ append-cppflags -I"${EPREFIX}"/usr/include/libutf8proc
+
+ # allow overriding Python include directory
+ ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
+ ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ emake local-all
+
+ if use perl ; then
+ emake swig-pl
+ fi
+
+ if use ruby ; then
+ emake swig-rb
+ fi
+
+ if use java ; then
+ emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
+ fi
+
+ if use extras ; then
+ emake tools
+ fi
+
+ if use doc ; then
+ doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
+
+ if use java; then
+ emake doc-javahl
+ fi
+ fi
+}
+
+src_test() {
+ #if has_version ~${CATEGORY}/${P} ; then
+ default
+ #else
+ # ewarn "The test suite shows errors when there is an older version of"
+ # ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
+ # ewarn "before running the test suite."
+ # ewarn "Test suite skipped."
+ #fi
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" local-install
+
+ if use perl ; then
+ emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
+ perl_delete_localpod
+ find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die
+ fi
+
+ if use ruby ; then
+ emake DESTDIR="${D}" install-swig-rb
+ fi
+
+ if use java ; then
+ emake DESTDIR="${D}" install-javahl
+ java-pkg_regso "${ED}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
+ java-pkg_dojar "${ED}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
+ rm -fr "${ED}"/usr/$(get_libdir)/svn-javahl/*.jar
+ fi
+
+ # Install Apache module configuration.
+ if use apache2 ; then
+ keepdir "${APACHE_MODULES_CONFDIR}"
+ insinto "${APACHE_MODULES_CONFDIR}"
+ doins "${FILESDIR}/47_mod_dav_svn.conf"
+ fi
+
+ # Install Bash Completion, bug 43179.
+ newbashcomp tools/client-side/bash_completion svn
+ bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
+ rm -f tools/client-side/bash_completion
+
+ # Install hot backup script, bug 54304.
+ newbin tools/backup/hot-backup.py svn-hot-backup
+ rm -fr tools/backup
+
+ # Install svnserve init-script and xinet.d snippet, bug 43245.
+ newinitd "${FILESDIR}"/svnserve.initd3 svnserve
+ newconfd "${FILESDIR}"/svnserve.confd svnserve
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/svnserve.xinetd svnserve
+
+ #adjust default user and group with disabled apache2 USE flag, bug 381385
+ if ! use apache2 ; then
+ sed -e "s\USER:-apache\USER:-svn\g" \
+ -e "s\GROUP:-apache\GROUP:-svnusers\g" \
+ -i "${ED}"/etc/init.d/svnserve || die
+ sed -e "0,/apache/s//svn/" \
+ -e "s:apache:svnusers:" \
+ -i "${ED}"/etc/xinetd.d/svnserve || die
+ fi
+
+ # Install documentation.
+ dodoc CHANGES COMMITTERS README
+ dodoc tools/xslt/svnindex.{css,xsl}
+ rm -fr tools/xslt
+
+ # Install extra files.
+ if use extras ; then
+ cat <<- EOF > 80subversion-extras
+ PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+ ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+ EOF
+ doenvd 80subversion-extras
+
+ emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
+
+ find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr
+ rm -fr tools/client-side/svnmucc
+ rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
+ rm -fr tools/{buildbot,dev,diff,po}
+ fi
+
+ if use doc ; then
+ docinto html
+ dodoc -r doc/doxygen/html/*
+
+ if use java ; then
+ java-pkg_dojavadoc doc/javadoc
+ fi
+ fi
+
+ find "${D}" -name '*.la' -type f -delete || die
+
+ cd "${ED}"/usr/share/locale
+ for i in * ; do
+ if [[ ${i} != *${LINGUAS}* ]] ; then
+ rm -r ${i} || die
+ fi
+ done
+}
+
+pkg_preinst() {
+ # Compare versions of Berkeley DB, bug 122877.
+ if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then
+ OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+ NEW_BDB_VERSION="$(scanelf -nq "${ED}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+ if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
+ CHANGED_BDB_VERSION="1"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
+ ewarn "You upgraded from an older version of Berkeley DB and may experience"
+ ewarn "problems with your repository. Run the following commands as root to fix it:"
+ ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos"
+ ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
+ fi
+
+ ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
+}
+
+pkg_postrm() {
+ :
+}
+
+pkg_config() {
+ # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
+ # already has EPREFIX in it
+ einfo "Initializing the database in ${SVN_REPOS_LOC}..."
+ if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
+ echo "A Subversion repository already exists and I will not overwrite it."
+ echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
+ else
+ mkdir -p "${SVN_REPOS_LOC}/conf"
+
+ einfo "Populating repository directory..."
+ # Create initial repository.
+ "${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
+
+ einfo "Setting repository permissions..."
+ SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
+ SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
+ if use apache2 ; then
+ [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
+ [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
+ else
+ [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
+ [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
+ fi
+ chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
+ chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
+ chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} "${SVN_REPOS_LOC}/repos"
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-06-08 7:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-24 19:13 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/, dev-vcs/subversion/files/ Thomas Deutschmann
-- strict thread matches above, loose matches on Subject: below --
2022-06-08 7:09 Sam James
2019-04-15 6:48 Lars Wendler
2019-03-21 22:41 Lars Wendler
2017-12-12 15:31 Michał Górny
2016-10-11 13:25 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox