subversion: update to 1.14.5

app-vcs/subversion/autobuild/beyond

@@ -1,26 +1,18 @@
 if ab_match_archgroup mainline; then
-    abinfo "Building site packages ..."
-    if bool "$ABSHADOW"; then
-        cd "$BLDDIR"
-    fi
-
     abinfo "Building site packages ..."
     make LT_LDFLAGS="-L${PKGDIR}/usr/lib"
     make \
-         swig_pydir=/usr/lib/python"${ABPY3VER}"/site-packages/libsvn \
-         swig_pydir_extra=/usr/lib/python${ABPY3VER}/site-packages/svn \
-         OPTIMIZE="${CPPFLAGS} ${CFLAGS}" \
-         OTHERLDFLAGS="${LDFLAGS}" swig-py swig-pl
+        swig_pydir=/usr/lib/python"${ABPY3VER}"/site-packages/libsvn \
+        swig_pydir_extra=/usr/lib/python"${ABPY3VER}"/site-packages/svn \
+        OPTIMIZE="${CPPFLAGS} ${CFLAGS}" \
+        OTHERLDFLAGS="${LDFLAGS}" \
+        swig-py swig-pl
 
     abinfo "Installing site packages ..."
     make DESTDIR="$PKGDIR" \
         swig_pydir=/usr/lib/python"${ABPY3VER}"/site-packages/libsvn \
         swig_pydir_extra=/usr/lib/python"${ABPY3VER}"/site-packages/svn \
         install install-swig-py install-swig-pl
-
-    if bool "$ABSHADOW"; then
-        cd "$SRCDIR"
-    fi
 fi
 
 abinfo "Installing hook scripts ..."

app-vcs/subversion/autobuild/defines

@@ -22,36 +22,35 @@ BUILDDEP__POWERPC="${BUILDDEP__RETRO}"
 BUILDDEP__PPC64="${BUILDDEP__RETRO}"
 PKGDES="A modern concurrent version control system"
 
-AUTOTOOLS_AFTER="--with-apr=/usr \
-                 --with-apr-util=/usr \
-                 --with-zlib=/usr \
-                 --with-serf=/usr \
-                 --with-apxs \
-                 --with-sqlite=/usr \
-                 --without-gnome-keyring \
-                 --without-kwallet \
-                 --disable-javahl \
-                 --with-apache-libexecdir=/usr/lib/httpd/modules \
-                 --disable-static \
-                 --enable-bdb6"
-AUTOTOOLS_AFTER__RETRO=" \
-                 ${AUTOTOOLS_AFTER} \
-                 --without-apxs"
-AUTOTOOLS_AFTER__ARMV4=" \
-                 ${AUTOTOOLS_AFTER__RETRO}"
-AUTOTOOLS_AFTER__ARMV6HF=" \
-                 ${AUTOTOOLS_AFTER__RETRO}"
-AUTOTOOLS_AFTER__ARMV7HF=" \
-                 ${AUTOTOOLS_AFTER__RETRO}"
-AUTOTOOLS_AFTER__I486=" \
-                 ${AUTOTOOLS_AFTER__RETRO}"
-AUTOTOOLS_AFTER__LOONGSON2F=" \
-                 ${AUTOTOOLS_AFTER__RETRO}"
-AUTOTOOLS_AFTER__M68K=" \
-                 ${AUTOTOOLS_AFTER__RETRO}"
-AUTOTOOLS_AFTER__POWERPC=" \
-                 ${AUTOTOOLS_AFTER__RETRO}"
-AUTOTOOLS_AFTER__PPC64=" \
-                 ${AUTOTOOLS_AFTER__RETRO}"
+AUTOTOOLS_AFTER=(
+    --with-apr=/usr
+    --with-apr-util=/usr
+    --with-zlib=/usr
+    --with-serf=/usr
+    --with-apxs
+    --with-sqlite=/usr
+    --without-gnome-keyring
+    --without-kwallet
+    --disable-javahl
+    --with-apache-libexecdir=/usr/lib/httpd/modules
+    --disable-static
+    --enable-bdb6
+)
+AUTOTOOLS_AFTER__RETRO=(
+    "${AUTOTOOLS_AFTER[@]}"
+    --without-apxs
+)
+AUTOTOOLS_AFTER__ARMV4=("${AUTOTOOLS_AFTER__RETRO[@]}")
+AUTOTOOLS_AFTER__ARMV6HF=("${AUTOTOOLS_AFTER__RETRO[@]}")
+AUTOTOOLS_AFTER__ARMV7HF=("${AUTOTOOLS_AFTER__RETRO[@]}")
+AUTOTOOLS_AFTER__I486=("${AUTOTOOLS_AFTER__RETRO[@]}")
+AUTOTOOLS_AFTER__LOONGSON2F=("${AUTOTOOLS_AFTER__RETRO[@]}")
+AUTOTOOLS_AFTER__M68K=("${AUTOTOOLS_AFTER__RETRO[@]}")
+AUTOTOOLS_AFTER__POWERPC=("${AUTOTOOLS_AFTER__RETRO[@]}")
+AUTOTOOLS_AFTER__PPC64=("${AUTOTOOLS_AFTER__RETRO[@]}")
+# FIXME: although loongarch64 is not retro, but apxs building fails on it
+AUTOTOOLS_AFTER__LOONGARCH64=("${AUTOTOOLS_AFTER__RETRO[@]}")
 
-NOPARALLEL=1
+# FIXME: without this the build system will write some broken C files
+# for the python binding to $SRCDIR/abbuild/~ and the correct C files to $SRCDIR/~
+ABSHADOW=0

app-vcs/subversion/autobuild/defines.stage2

@@ -4,18 +4,20 @@ PKGDEP="file serf sqlite systemd bash-completion python-3 libutf8proc"
 BUILDDEP="httpd perl swig py3c"
 PKGDES="A modern concurrent version control system"
 
-AUTOTOOLS_AFTER="--with-apr=/usr \
-                 --with-apr-util=/usr \
-                 --with-zlib=/usr \
-                 --with-serf=/usr \
-                 --with-apxs \
-                 --with-sqlite=/usr \
-                 --without-gnome-keyring \
-                 --without-kwallet \
-                 --disable-javahl \
-                 --with-apache-libexecdir=/usr/lib/httpd/modules \
-                 --disable-static \
-                 --enable-bdb6"
+AUTOTOOLS_AFTER=(
+    --with-apr=/usr
+    --with-apr-util=/usr
+    --with-zlib=/usr
+    --with-serf=/usr
+    --with-apxs
+    --with-sqlite=/usr
+    --without-gnome-keyring
+    --without-kwallet
+    --disable-javahl
+    --with-apache-libexecdir=/usr/lib/httpd/modules
+    --disable-static
+    --enable-bdb6
+)
 
 PKGDEP__RETRO="file serf sqlite systemd bash-completion libutf8proc"
 PKGDEP__ARMV4="${PKGDEP__RETRO}"
@@ -35,3 +37,6 @@ BUILDDEP__POWERPC="${BUILDDEP__RETRO}"
 BUILDDEP__PPC64="${BUILDDEP__RETRO}"
 
 NOPARALLEL=1
+# FIXME: without this the build system will write some broken C files
+# for the python binding to $SRCDIR/abbuild/~ and the correct C files to $SRCDIR/~
+ABSHADOW=0

app-vcs/subversion/autobuild/prepare

@@ -1,2 +1,11 @@
 abinfo "Exporting necessary environment variables ..."
 export PYTHON=/usr/bin/python3
+
+abinfo "Generating SWIG files ..."
+# FIXME: OSError: [Errno 2] No such file or directory: 'subversion/bindings/swig/proxy/tmprPyU9d'
+# we have to make it manually
+mkdir -vp subversion/bindings/swig/proxy/
+# run autogen with --release first to generate some .c files that are only included in release tarballs
+# but not git repository
+# those included in release tarballs are not compatible with our SWIG
+./autogen.sh --release

app-vcs/subversion/autobuild/prepare.stage2

@@ -1,6 +1,15 @@
 abinfo "Exporting necessary environment variables ..."
 export PYTHON=/usr/bin/python3
 
+abinfo "Generating SWIG files ..."
+# FIXME: OSError: [Errno 2] No such file or directory: 'subversion/bindings/swig/proxy/tmprPyU9d'
+# we have to make it manually
+mkdir -vp subversion/bindings/swig/proxy/
+# run autogen with --release first to generate some .c files that are only included in release tarballs
+# but not git repository
+# those included in release tarballs are not compatible with our SWIG
+./autogen.sh --release
+
 BUILD_FINAL() {
     abinfo "Installing binaries (to system) ..."
     make install

app-vcs/subversion/spec

@@ -1,5 +1,4 @@
-VER=1.14.3
-REL=2
-SRCS="tbl::https://archive.apache.org/dist/subversion/subversion-$VER.tar.gz"
-CHKSUMS="sha256::cf70775e5ed075ebc6a63fe8619dc6b530da254a3f61ba53a502dd83c8f14afc"
+VER=1.14.5
+SRCS="git::commit=aosc/${VER}::https://github.com/AOSC-Tracking/subversion.git"
+CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=4905"