From d3e8f7ad633e7544fcb7fdd9be1602d37d66b47a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 9 Jun 2020 00:33:31 +0200
Subject: [PATCH] subversion: update to 1.14.0.

---
 srcpkgs/subversion/template | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 5dbabc056c..d3806661e7 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -3,28 +3,30 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/subversion-kwallet-auth".
 #
 pkgname=subversion
-version=1.13.0
-revision=2
+version=1.14.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-javahl --disable-static --config-cache
  --with-gnome-keyring --with-editor=vi --disable-mod-activation
  --with-utf8proc=internal"
-hostmakedepends="automake libtool pkg-config perl python apache-devel gettext"
+hostmakedepends="automake libtool pkg-config perl python3
+ apache-devel gettext swig"
 makedepends="apache-devel gdbm-devel libgnome-keyring-devel serf-devel
- libsecret-devel liblz4-devel python-devel sqlite-devel swig
+ libsecret-devel liblz4-devel python3-devel sqlite-devel py3c
  file-devel perl"
 depends="ca-certificates"
 short_desc="Enterprise-class centralized version control for the masses"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="http://subversion.apache.org/"
+changelog="https://subversion.apache.org/docs/release-notes/${version%.*}.html"
 distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2"
-checksum=bc50ce2c3faa7b1ae9103c432017df98dfd989c4239f9f8270bb3a314ed9e5bd
+checksum=6ba8e218f9f97a83a799e58a3c6da1221d034b18d9d8cbbcb6ec52ab11722102
 
 pre_configure() {
 	# Based on native build values
 	cat <<-EOF >config.cache
-	ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py2_ver}
+	ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}
 	ac_cv_python_compile="${CC} -fPIC"
 	ac_cv_python_link="${CC} -shared ${LDFLAGS}"
 	ac_cv_python_libs="${LDFLAGS}"
@@ -74,8 +76,8 @@ post_configure() {
 do_build() {
 	make ${makejobs} LT_LDFLAGS="-L$Fdestdir/usr/lib"
 	make ${makejobs} \
-		swig_pydir=${XBPS_CROSS_BASE}/usr/lib/python$py2_ver/site-packages/libsvn \
-		swig_pydir_extra=${XBPS_CROSS_BASE}/usr/lib/python$py2_ver/site-packages/svn \
+		swig_pydir=${XBPS_CROSS_BASE}/usr/lib/python$py3_ver/site-packages/libsvn \
+		swig_pydir_extra=${XBPS_CROSS_BASE}/usr/lib/python$py3_ver/site-packages/svn \
 		swig-py
 	make ${makejobs} INSTALLDIRS=vendor \
 		PERL_MM_USE_DEFAULT=1 CC="$CC" LD="$CC" OPTIMIZE="$CFLAGS" \
@@ -91,8 +93,8 @@ do_install() {
 
 	make DESTDIR=${DESTDIR} INSTALLDIRS=vendor install
 	make DESTDIR=${DESTDIR} INSTALLDIRS=vendor \
-		swig_pydir=${XBPS_CROSS_BASE}/usr/lib/python$py2_ver/site-packages/libsvn \
-		swig_pydir_extra=${XBPS_CROSS_BASE}/usr/lib/python$py2_ver/site-packages/svn \
+		swig_pydir=${XBPS_CROSS_BASE}/usr/lib/python$py3_ver/site-packages/libsvn \
+		swig_pydir_extra=${XBPS_CROSS_BASE}/usr/lib/python$py3_ver/site-packages/svn \
 		install-swig-py
 	make DESTDIR=${DESTDIR} INSTALLDIRS=vendor \
 		PERL_MM_USE_DEFAULT=1 CC="$CC" LD="$CC" OPTIMIZE="$CFLAGS" \
@@ -159,7 +161,7 @@ subversion-gnome-keyring-auth_package() {
 
 subversion-python_package() {
 	lib32disabled=yes
-	depends="python"
+	depends="python3"
 	short_desc+=" - python bindings"
 	pkg_install() {
 		vmove "usr/lib/libsvn_swig_py*"