[gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/files/, dev-vcs/subversion/

2024-02-05 Thread Sam James 
commit: dd9f5a0b35a3d402eb2f24d1146029baba0b0604
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 04:47:15 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 04:56:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd9f5a0b

dev-vcs/subversion: add 1.14.3

* Inline patches from tarball in SRC_URI (404'd). We were already deleting
  some patches from it and there was a lot of fuzz in another (obsolete patch
  for interix).
* EAPI 8
* Add support for ruby32 (comes with this release).
* Drop old libutf8proc hack & depend on newer version so we can drop that hack.
* Run tests in parallel which helps a fair bit.
* Run tests with -Onone so it doesn't look like they're hanging.
* Add misc. missing || dies.

Closes: https://bugs.gentoo.org/919090
Signed-off-by: Sam James  gentoo.org>

 dev-vcs/subversion/Manifest|   1 +
 .../files/subversion-1.14.3-ruby-c99.patch |  28 ++
 .../files/subversion-1.5.6-aix-dso.patch   |  21 +
 .../files/subversion-1.8.1-revert_bdb6check.patch  |  85 
 .../files/subversion-1.8.16-javadoc-nolint.patch   |  19 +
 dev-vcs/subversion/subversion-1.14.3.ebuild| 445 +
 6 files changed, 599 insertions(+)

diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 0b4b2863e158..552c86fa6c00 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.2.tar.bz2 8606570 BLAKE2B 
cf15c61b932823fb18b52f83d84907386f068d2d40e14dbab94c42ad9d4c0fdf35d82db78036d7c1f2be47c2d51cdd27bfb966eb7607a52a21e072aeff76fb38
 SHA512 
20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e66bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc
+DIST subversion-1.14.3.tar.bz2 8569985 BLAKE2B 
bc366a611f77d7dc3a5dc6015ea50b8daae0cffc20f8830de04a7f310a26ab9e955db343e7902475079d31d7984cb6b03f7810e71feae9a5374e1cb690933b49
 SHA512 
40b172492005fd3b0cd9e457baf8ea5d8ff8fc161a9a0c6dc3a7314c6ad4ff75a4676f68a1919ae6273ae03e34d04eba8c1c37b8c0b4ec70d6731b527b41

diff --git a/dev-vcs/subversion/files/subversion-1.14.3-ruby-c99.patch 
b/dev-vcs/subversion/files/subversion-1.14.3-ruby-c99.patch
new file mode 100644
index ..161984f978f9
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.14.3-ruby-c99.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/919090
+https://src.fedoraproject.org/rpms/subversion/blob/rawhide/f/subversion-ruby-c99.patch
+
+The Ruby bindings apply the Ruby NIL_P macro to an apr_hash_t * value,
+which some compilers flag as a type error.
+
+Submitted upstream: 
+
+--- a/subversion/bindings/swig/include/svn_containers.swg
 b/subversion/bindings/swig/include/svn_containers.swg
+@@ -299,7 +299,7 @@
+   $1 = svn_swig_rb_hash_to_apr_hash_svn_string($input, _global_pool);
+   _global_pool = NULL;
+   if (!NIL_P(rb_pool)) {
+-if (NIL_P($1)) {
++if ($1 == NULL) {
+   svn_swig_rb_destroy_pool(rb_pool);
+ } else {
+   svn_swig_rb_set_pool_for_no_swig_type($input, rb_pool);
+@@ -373,7 +373,7 @@
+ svn_swig_rb_hash_to_apr_hash_string($input, _global_pool);
+   _global_pool = NULL;
+   if (!NIL_P(rb_pool)) {
+-if (NIL_P($1)) {
++if ($1 == NULL) {
+   svn_swig_rb_destroy_pool(rb_pool);
+ } else {
+   svn_swig_rb_set_pool_for_no_swig_type($input, rb_pool);

diff --git a/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch 
b/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch
new file mode 100644
index ..69a4355f17af
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch
@@ -0,0 +1,21 @@
+On AIX, load shared libraries even when created with full aix-soname support:
+http://lists.gnu.org/archive/html/libtool/2011-01/msg00023.html
+http://lists.gnu.org/archive/html/libtool/2011-02/msg0.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(, 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(, libname));
++}
++#endif
+ if (! dso)
+   return SVN_NO_ERROR;
+ 

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
new file mode 100644
index ..158c08233165
--- /dev/null
+++

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/files/, dev-vcs/subversion/

2019-08-12 Thread Lars Wendler 
commit: 7a7a627164167509632bcd5b2e782b8a09c358d2
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Aug 12 07:16:44 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Aug 12 07:17:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a7a6271

dev-vcs/subversion: Security cleanup

Bug: https://bugs.gentoo.org/690594
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 dev-vcs/subversion/Manifest|   3 -
 .../files/subversion-1.11.1-allow-apr-1.7.0+.patch |  18 -
 ...subversion-1.9.7-fix-wc-queries-test-test.patch |  26 -
 dev-vcs/subversion/subversion-1.10.4.ebuild| 532 -
 dev-vcs/subversion/subversion-1.11.1.ebuild| 532 -
 dev-vcs/subversion/subversion-1.12.0.ebuild| 532 -
 6 files changed, 1643 deletions(-)

diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 46c3cbbf98c..297c8addf67 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -1,5 +1,2 @@
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 
7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17
 SHA512 
aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
-DIST subversion-1.10.4.tar.bz2 8392477 BLAKE2B 
93364178d2252332b070ebddd5791cb43e802d820848a6ca2e13ae3036a9119901dcde1b73ea09bd34af3fd72b923bdd2765e302359e7f1ecf49a6840685
 SHA512 
c44a4a4a9533cd4f4cb6ddbc3ce98585a96da6c8e75497d087034b52f899797bb0972dfc0e79db99e81149e59e7fa765398c6ad35eba64f11f4ae9c3b3537434
-DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B 
f14bbe9b28dec32894a8c262d32f36e01c9866352f1c54b5468804e81c1eadb895cbe9e33783a9e7d4a7f54dfa3b25b762015b9ca4886a14628c434254995c77
 SHA512 
2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d
-DIST subversion-1.12.0.tar.bz2 8504473 BLAKE2B 
21664158bf48ff1231b8ae25fd70971ee90ded5306bbf29a1e4a105fca9f15c4d8bfa4d7ab33fc5d10f86aa191120a1921d049b1fac6346cc643391a28d84997
 SHA512 
87a00b23bdac63124fa00642e2ac7e6f7818b092bc6422cabdeb2ca8fbc8c481fb8c1e4fbd86aac94e8e1fc099fa163aa0609aca23265ceb96ef4ebe78a64c13
 DIST subversion-1.12.2.tar.bz2 8506584 BLAKE2B 
535e4c6c369537baa7f9fc9123d0314de1bb8d4b3c51e0216662047fd1084ceb6a1f349de54bf575f0eb8e1041fcd6525e6cf27dbd908e2148578cb9fb807bb3
 SHA512 
b1f859b460afa54598778d8633f648acb4fa46138f7d6f0c1451e3c6a1de71df859233cd9ac7f19f0f20d7237ed3988f0a38da7552ffa58391e19d957bc7c136

diff --git a/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch 
b/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch
deleted file mode 100644
index a0da4a5931d..000
--- a/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch
+++ /dev/null
@@ -1,18 +0,0 @@
 a/build/ac-macros/swig.m4
-+++ b/build/ac-macros/swig.m4
-@@ -137,13 +137,13 @@
- AC_CACHE_CHECK([for apr_int64_t Python/C API format string],
-[svn_cv_pycfmt_apr_int64_t], [
-   if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
--AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd],
-+AC_EGREP_CPP([MaTcHtHiS +\"ll(\" *\")?d\" +EnDeNd],
-  [#include 
-   MaTcHtHiS APR_INT64_T_FMT EnDeNd],
-  [svn_cv_pycfmt_apr_int64_t="L"])
-   fi
-   if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
--AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r
-+AC_EGREP_CPP([MaTcHtHiS +\"l(\" *\")?d\" +EnDeNd],r
-  [#include 
-   MaTcHtHiS APR_INT64_T_FMT EnDeNd],
-  [svn_cv_pycfmt_apr_int64_t="l"])

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
deleted file mode 100644
index 6658bd683e7..000
--- a/dev-vcs/subversion/files/subversion-1.9.7-fix-wc-queries-test-test.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-+

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/files/, dev-vcs/subversion/

2019-04-09 Thread Thomas Deutschmann 
commit: 94454a54314e0b471877ee2d1b44d8a6b9128cea
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Apr  9 19:30:02 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Apr  9 19:30:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94454a54

dev-vcs/subversion: fix building against >=dev-libs/apr-1.7.0

Closes: https://bugs.gentoo.org/682786
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../files/subversion-1.11.1-allow-apr-1.7.0+.patch | 18 ++
 dev-vcs/subversion/subversion-1.10.4.ebuild|  4 
 dev-vcs/subversion/subversion-1.11.1.ebuild|  4 
 dev-vcs/subversion/subversion-1.12.0_rc1.ebuild|  4 
 dev-vcs/subversion/subversion-1.9.7-r1.ebuild  |  4 
 5 files changed, 34 insertions(+)

diff --git a/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch 
b/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch
new file mode 100644
index 000..a0da4a5931d
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch
@@ -0,0 +1,18 @@
+--- a/build/ac-macros/swig.m4
 b/build/ac-macros/swig.m4
+@@ -137,13 +137,13 @@
+ AC_CACHE_CHECK([for apr_int64_t Python/C API format string],
+[svn_cv_pycfmt_apr_int64_t], [
+   if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
+-AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd],
++AC_EGREP_CPP([MaTcHtHiS +\"ll(\" *\")?d\" +EnDeNd],
+  [#include 
+   MaTcHtHiS APR_INT64_T_FMT EnDeNd],
+  [svn_cv_pycfmt_apr_int64_t="L"])
+   fi
+   if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
+-AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r
++AC_EGREP_CPP([MaTcHtHiS +\"l(\" *\")?d\" +EnDeNd],r
+  [#include 
+   MaTcHtHiS APR_INT64_T_FMT EnDeNd],
+  [svn_cv_pycfmt_apr_int64_t="l"])

diff --git a/dev-vcs/subversion/subversion-1.10.4.ebuild 
b/dev-vcs/subversion/subversion-1.10.4.ebuild
index 27db0ff68b2..ae74dc6cd38 100644
--- a/dev-vcs/subversion/subversion-1.10.4.ebuild
+++ b/dev-vcs/subversion/subversion-1.10.4.ebuild
@@ -130,6 +130,9 @@ pkg_setup() {
append-cppflags -DSVN_DEBUG -DAP_DEBUG
fi
 
+   # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739
+   append-cppflags -P
+
# 
http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3c51c42014.3060...@wandisco.com%3E
[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
 
@@ -152,6 +155,7 @@ pkg_setup() {
 src_prepare() {
eapply "${WORKDIR}/patches"
eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch
+   eapply "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.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 a4a22eed915..7510d3694e6 100644
--- a/dev-vcs/subversion/subversion-1.11.1.ebuild
+++ b/dev-vcs/subversion/subversion-1.11.1.ebuild
@@ -126,6 +126,9 @@ pkg_setup() {
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
@@ -152,6 +155,7 @@ pkg_setup() {
 src_prepare() {
eapply "${WORKDIR}/patches"
eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch
+   eapply "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.patch
eapply_user
 
fperms +x build/transform_libtool_scripts.sh

diff --git a/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild 
b/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild
index 088d6446ba4..2f0f32c6f26 100644
--- a/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild
+++ b/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild
@@ -126,6 +126,9 @@ pkg_setup() {
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
@@ -151,6 +154,7 @@ pkg_setup() {
 
 src_prepare() {
eapply "${WORKDIR}/patches"
+   eapply "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.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 ebe11966889..6be305333dd 100644
--- a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
@@ -89,6 +89,7 @@ PATCHES=(
"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.16-javadoc-nolint.patch
"${FILESDIR}"/${P}-kf5.patch

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/files/, dev-vcs/subversion/

2019-03-21 Thread Lars Wendler 
commit: 17f4f6d2b6bf291e0c7b7f422ed246de7a400a3f
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Mar 21 23:18:36 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Mar 21 23:18:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f4f6d2

Revert "dev-vcs/subversion: Removed old."

This reverts commit 3f6a4f11c79ab1efbbcedb7b5604ed4b72ec61b3.

Signed-off-by: Lars Wendler  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 insertions(+)

diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index d55f59df88a..27b062f7068 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -2,3 +2,5 @@ DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 
7c9619b95ca6b433a58dc5b
 DIST subversion-1.10.4.tar.bz2 8392477 BLAKE2B 
93364178d2252332b070ebddd5791cb43e802d820848a6ca2e13ae3036a9119901dcde1b73ea09bd34af3fd72b923bdd2765e302359e7f1ecf49a6840685
 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
new file mode 100644
index 000..5b692fa3066
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch
@@ -0,0 +1,211 @@
+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 
+ 
+ #include 
+-#include 
+-#include 
+ #include 
+ #include 
+ 
+@@ -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"), /*

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/files/, dev-vcs/subversion/

2018-01-18 Thread Andreas Sturmlechner 
commit: 66ddac47253433ade32f3bbed4a2d153f7bc12bf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan 18 15:58:13 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jan 18 16:13:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66ddac47

dev-vcs/subversion: Switch to KF5/Qt5

Took the upstream revision and fixed it.

Bug: https://bugs.gentoo.org/635074
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../subversion/files/subversion-1.9.7-kf5.patch| 211 +
 dev-vcs/subversion/subversion-1.9.7-r1.ebuild  | 522 +
 2 files changed, 733 insertions(+)

diff --git a/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch 
b/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch
new file mode 100644
index 000..5b692fa3066
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch
@@ -0,0 +1,211 @@
+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 
+ 
+ #include 
+-#include 
+-#include 
+ #include 
+ #include 
+ 
+@@ -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
+-

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/files/

2017-12-03 Thread Lars Wendler 
commit: 2477626ccaf172eb1aca4d1bbc17724db8f83146
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Dec  3 08:42:26 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Dec  3 12:40:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2477626c

dev-vcs/subversion: remove unused file

Closes: https://github.com/gentoo/gentoo/pull/6413

 dev-vcs/subversion/files/70svn-gentoo.el | 13 -
 1 file changed, 13 deletions(-)

diff --git a/dev-vcs/subversion/files/70svn-gentoo.el 
b/dev-vcs/subversion/files/70svn-gentoo.el
deleted file mode 100644
index e5721e2480c..000
--- a/dev-vcs/subversion/files/70svn-gentoo.el
+++ /dev/null
@@ -1,13 +0,0 @@
-
-;;; subversion site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(and (< emacs-major-version 22)
- (add-to-list 'load-path "@SITELISP@/compat"))
-(add-to-list 'vc-handled-backends 'SVN)
-
-(defalias 'svn-examine 'svn-status)
-(autoload 'svn-status "dsvn" "Run `svn status'." t)
-(autoload 'svn-update "dsvn" "Run `svn update'." t)
-(autoload 'svn-status "psvn"
-  "Examine the status of Subversion working copy in directory DIR." t)

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/files/

2016-11-21 Thread Lars Wendler 
commit: 77bd4f97c9ee410eb7bacb25e6b9d748b88b14bb
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Tue Nov 15 18:44:00 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Nov 21 13:45:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77bd4f97

dev-vcs/subversion: remove unused patch/file

Closes: https://github.com/gentoo/gentoo/pull/2840

 .../files/subversion-1.6.3-hpux-dso.patch  | 16 -
 dev-vcs/subversion/files/svnserve.initd2   | 26 --
 2 files changed, 42 deletions(-)

diff --git a/dev-vcs/subversion/files/subversion-1.6.3-hpux-dso.patch 
b/dev-vcs/subversion/files/subversion-1.6.3-hpux-dso.patch
deleted file mode 100644
index f9739be..
--- a/dev-vcs/subversion/files/subversion-1.6.3-hpux-dso.patch
+++ /dev/null
@@ -1,16 +0,0 @@
 subversion/libsvn_ra/ra_loader.c.orig  2009-07-20 14:46:02 +0200
-+++ subversion/libsvn_ra/ra_loader.c   2009-07-20 14:50:02 +0200
-@@ -154,8 +154,13 @@
- const char *compat_funcname;
- apr_status_t status;
- 
-+#if defined(__hpux) && defined(__hppa)
-+libname = apr_psprintf(pool, "libsvn_ra_%s-%d.sl.0",
-+   ra_name, SVN_VER_MAJOR);
-+#else
- libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.0",
-ra_name, SVN_VER_MAJOR);
-+#endif
- funcname = apr_psprintf(pool, "svn_ra_%s__init", ra_name);
- compat_funcname = apr_psprintf(pool, "svn_ra_%s_init", ra_name);
- 

diff --git a/dev-vcs/subversion/files/svnserve.initd2 
b/dev-vcs/subversion/files/svnserve.initd2
deleted file mode 100644
index 0e7956c..
--- a/dev-vcs/subversion/files/svnserve.initd2
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Id$
-
-depend() {
-   need net
-}
-
-start() {
-   ebegin "Starting svnserve"
-   # Ensure that we run from a readable working dir, and that we do not
-   # lock filesystems when being run from such a location.
-   cd /
-   start-stop-daemon --start --quiet --background --make-pidfile \
-   --pidfile /var/run/svnserve.pid --exec /usr/bin/svnserve \
-   --user ${SVNSERVE_USER:-apache} --group 
${SVNSERVE_GROUP:-apache} -- \
-   --foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn}
-   eend $?
-}
-
-stop() {
-   ebegin "Stopping svnserve"
-   start-stop-daemon --stop --quiet --pidfile /var/run/svnserve.pid
-   eend $?
-}

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/files/

2016-08-17 Thread Lars Wendler 
commit: 792252a30c2ac412fd1179feecacfdd17ab00c0c
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Aug 17 14:29:46 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Aug 17 14:30:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=792252a3

dev-vcs/subversion: Make some patches EAPI-6 compliant.

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler  gentoo.org>

 dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch   | 4 ++--
 .../subversion-fix-parallel-build-support-for-perl-bindings.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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
index 49c6162..69a4355 100644
--- a/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch
+++ b/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch
@@ -3,8 +3,8 @@ http://lists.gnu.org/archive/html/libtool/2011-01/msg00023.html
 http://lists.gnu.org/archive/html/libtool/2011-02/msg0.html
 Once there is an agreement on that, this patch eventually is for upstream too.
 
 subversion/libsvn_ra/ra_loader.c.orig  2009-04-28 14:53:35 +0200
-+++ subversion/libsvn_ra/ra_loader.c   2009-04-28 14:55:37 +0200
+--- a/subversion/libsvn_ra/ra_loader.c
 b/subversion/libsvn_ra/ra_loader.c
 @@ -164,6 +164,13 @@
  
  /* find/load the specified library */

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
index 4fab19a..bffb431 100644
--- 
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
@@ -1,5 +1,5 @@
 Makefile.in2011-07-16 13:50:53.0 +0200
-+++ Makefile.in.new2012-03-11 12:13:57.0 +0100
+--- a/Makefile.in
 b/Makefile.in
 @@ -732,7 +732,7 @@
  extraclean-swig-headers: clean-swig-headers
$(EXTRACLEAN_SWIG_HEADERS)