subversion-python: update to 1.14.0

3 files changed, 75 insertions, 69 deletions

diff --git a/subversion-python/.footprint b/subversion-python/.footprint
index f6bf62a39..3bbae9bed 100644
--- a/subversion-python/.footprint
+++ b/subversion-python/.footprint
@@ -4,59 +4,60 @@ drwxr-xr-x	root/root	usr/lib/
 lrwxrwxrwx	root/root	usr/lib/libsvn_swig_py-1.so -> libsvn_swig_py-1.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libsvn_swig_py-1.so.0 -> libsvn_swig_py-1.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libsvn_swig_py-1.so.0.0.0
-drwxr-xr-x	root/root	usr/lib/python2.7/
-drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
-drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libsvn/
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/__init__.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/__init__.pyc
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libsvn/_client.la
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libsvn/_client.so
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libsvn/_core.la
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libsvn/_core.so
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libsvn/_delta.la
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libsvn/_delta.so
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libsvn/_diff.la
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libsvn/_diff.so
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libsvn/_fs.la
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libsvn/_fs.so
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libsvn/_ra.la
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libsvn/_ra.so
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libsvn/_repos.la
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libsvn/_repos.so
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libsvn/_wc.la
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libsvn/_wc.so
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/client.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/client.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/core.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/core.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/delta.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/delta.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/diff.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/diff.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/fs.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/fs.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/ra.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/ra.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/repos.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/repos.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/wc.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/libsvn/wc.pyc
-drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/svn/
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/__init__.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/client.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/client.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/core.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/core.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/delta.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/delta.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/diff.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/diff.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/fs.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/fs.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/ra.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/ra.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/repos.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/repos.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/wc.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/svn/wc.pyc
+drwxr-xr-x	root/root	usr/lib/python3.7/
+drwxr-xr-x	root/root	usr/lib/python3.7/libsvn/
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.7/libsvn/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/__pycache__/__init__.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/__pycache__/client.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/__pycache__/core.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/__pycache__/delta.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/__pycache__/diff.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/__pycache__/fs.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/__pycache__/ra.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/__pycache__/repos.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/__pycache__/wc.cpython-37.pyc
+-rwxr-xr-x	root/root	usr/lib/python3.7/libsvn/_client.la
+-rwxr-xr-x	root/root	usr/lib/python3.7/libsvn/_client.so
+-rwxr-xr-x	root/root	usr/lib/python3.7/libsvn/_core.la
+-rwxr-xr-x	root/root	usr/lib/python3.7/libsvn/_core.so
+-rwxr-xr-x	root/root	usr/lib/python3.7/libsvn/_delta.la
+-rwxr-xr-x	root/root	usr/lib/python3.7/libsvn/_delta.so
+-rwxr-xr-x	root/root	usr/lib/python3.7/libsvn/_diff.la
+-rwxr-xr-x	root/root	usr/lib/python3.7/libsvn/_diff.so
+-rwxr-xr-x	root/root	usr/lib/python3.7/libsvn/_fs.la
+-rwxr-xr-x	root/root	usr/lib/python3.7/libsvn/_fs.so
+-rwxr-xr-x	root/root	usr/lib/python3.7/libsvn/_ra.la
+-rwxr-xr-x	root/root	usr/lib/python3.7/libsvn/_ra.so
+-rwxr-xr-x	root/root	usr/lib/python3.7/libsvn/_repos.la
+-rwxr-xr-x	root/root	usr/lib/python3.7/libsvn/_repos.so
+-rwxr-xr-x	root/root	usr/lib/python3.7/libsvn/_wc.la
+-rwxr-xr-x	root/root	usr/lib/python3.7/libsvn/_wc.so
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/client.py
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/core.py
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/delta.py
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/diff.py
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/fs.py
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/ra.py
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/repos.py
+-rw-r--r--	root/root	usr/lib/python3.7/libsvn/wc.py
+drwxr-xr-x	root/root	usr/lib/python3.7/svn/
+-rw-r--r--	root/root	usr/lib/python3.7/svn/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.7/svn/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.7/svn/__pycache__/__init__.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/svn/__pycache__/client.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/svn/__pycache__/core.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/svn/__pycache__/delta.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/svn/__pycache__/diff.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/svn/__pycache__/fs.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/svn/__pycache__/ra.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/svn/__pycache__/repos.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/svn/__pycache__/wc.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/svn/client.py
+-rw-r--r--	root/root	usr/lib/python3.7/svn/core.py
+-rw-r--r--	root/root	usr/lib/python3.7/svn/delta.py
+-rw-r--r--	root/root	usr/lib/python3.7/svn/diff.py
+-rw-r--r--	root/root	usr/lib/python3.7/svn/fs.py
+-rw-r--r--	root/root	usr/lib/python3.7/svn/ra.py
+-rw-r--r--	root/root	usr/lib/python3.7/svn/repos.py
+-rw-r--r--	root/root	usr/lib/python3.7/svn/wc.py
diff --git a/subversion-python/.signature b/subversion-python/.signature
index 7442241b6..3cd693b70 100644
--- a/subversion-python/.signature
+++ b/subversion-python/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF38nZWZ5cBFlCpGBoeSFJYmTB5nbIgMiy2E4egUbzfyFtLfx/sj7Z1jOpAfas19Vb6Iyo5Oya2ehNx+1l8mTZ7wY=
-SHA256 (Pkgfile) = 619d19aba3d262b80e7f6d7ab09730f3b41f026ccd9836694f78fdff2bd8fb70
-SHA256 (.footprint) = 4bbd355340466e909c6ad83e105977661a1c8adaf68f4616f1085e0b3094e277
-SHA256 (subversion-1.12.2.tar.bz2) = 3bd0b5c8e4c5175263dc9a92fd9aef94ce917e80af034f26fe5c45fde7e0f771
+RWSagIOpLGJF39zoT3hOkXn/z8qRkCjJEJMxx6XF3kX1mbWQ7lmhlYhhag3iSG39QEjsK38s6e0TPTAVBeIQLlEVMLqBORz7mwM=
+SHA256 (Pkgfile) = 505880d8e2d48910c985dd37008fbe53146eb944b719a99591f316da6dec33fe
+SHA256 (.footprint) = 974c95213a02123b24d9a2581c3c6db3db2e38b190d2f58990809db13644a989
+SHA256 (subversion-1.14.0.tar.bz2) = 6ba8e218f9f97a83a799e58a3c6da1221d034b18d9d8cbbcb6ec52ab11722102
diff --git a/subversion-python/Pkgfile b/subversion-python/Pkgfile
index b0b011571..be196d096 100644
--- a/subversion-python/Pkgfile
+++ b/subversion-python/Pkgfile
@@ -1,27 +1,32 @@
 # Description: Python bindings for subversion
 # URL:         https://subversion.apache.org
 # Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
-# Depends on:  python subversion swig
+# Depends on:  python3-py3c subversion swig
 
 name=subversion-python
-version=1.12.2
-release=2
+version=1.14.0
+release=1
 source=(https://archive.apache.org/dist/subversion/subversion-$version.tar.bz2)
 
 build() {
-	PYTHONVERSION=$(python -c "import sys; print \"%s.%s\" % (sys.version_info[0], sys.version_info[1]);")
+	pylibdir=$(/usr/bin/python3 -c "import sysconfig; print(sysconfig.get_path('stdlib'))")
 
 	cd subversion-$version
 
+	export PYTHON="/usr/bin/python3"
+
 	./configure \
 		--prefix=/usr \
-		--disable-mod-activation \
 		--disable-nls \
 		--disable-static \
-		--with-lz4=internal \
-		--with-utf8proc=internal
+		--disable-mod-activation \
+		--without-apxs
+
+	make swig-py-lib swig-py \
+		swig_pydir="$pylibdir/libsvn" \
+		swig_pydir_extra="$pylibdir/svn"
 
 	make DESTDIR=$PKG install-swig-py-lib install-swig-py \
-		swig_pydir=/usr/lib/python$PYTHONVERSION/site-packages/libsvn \
-		swig_pydir_extra=/usr/lib/python$PYTHONVERSION/site-packages/svn
+		swig_pydir=$pylibdir/libsvn \
+		swig_pydir_extra=$pylibdir/svn
 }