From 8ccae1f4e479ac1e12627167a491c6bd97c79af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Nizio?= <slawomir.nizio@sabayon.org>
Date: Thu, 26 Jul 2018 23:04:01 +0200
Subject: [PATCH] 
 [dev-vcs/subversion,dev-vcs/subversion-java,www-apache/mod_dav_svn] version
 bump to 1.10.2

---
 dev-vcs/subversion-java/Manifest              |   3 +-
 ...1.ebuild => subversion-java-1.10.2.ebuild} |  37 +--
 dev-vcs/subversion/Manifest                   |   3 +-
 .../files/subversion-1.9.7-kf5.patch          | 211 ------------------
 ...9.7-r1.ebuild => subversion-1.10.2.ebuild} |  46 ++--
 www-apache/mod_dav_svn/Manifest               |   3 +-
 ....7-r1.ebuild => mod_dav_svn-1.10.2.ebuild} |  47 +---
 7 files changed, 42 insertions(+), 308 deletions(-)
 rename dev-vcs/subversion-java/{subversion-java-1.9.7-r1.ebuild => subversion-java-1.10.2.ebuild} (74%)
 delete mode 100644 dev-vcs/subversion/files/subversion-1.9.7-kf5.patch
 rename dev-vcs/subversion/{subversion-1.9.7-r1.ebuild => subversion-1.10.2.ebuild} (90%)
 rename www-apache/mod_dav_svn/{mod_dav_svn-1.9.7-r1.ebuild => mod_dav_svn-1.10.2.ebuild} (84%)

diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest
index 98e52d893..35d920fff 100644
--- a/dev-vcs/subversion-java/Manifest
+++ b/dev-vcs/subversion-java/Manifest
@@ -1,4 +1,3 @@
 DIST subversion-1.10.0.tar.bz2 8369823 BLAKE2B a8496959d838f6a0a9046913768e2090d7c46e2ac91f0360c2287a7b91c19e4cf5eae1a4421f79ceb2be4b998ee47735b22f5c22947992ff736a8d743f819556 SHA512 26e49c961d54c4e78067caa202f384c36544e0ce7506abbffe73e59186ac34559a70cbd6c0934ed47dcc5c3580fce0f0cc2ef14b77695c26e8dbbc6358d1ec6a
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
-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
+DIST subversion-1.10.2.tar.bz2 8369762 BLAKE2B 1cd9ecf91818172ce60b8a38b1cb0eec0180725af58c09b9b5e62aa70fc2a7266d20b9fcfdafe993cbbb57f118dc9eb77126c199c3f4f2797fd50ef5f59b1f7e SHA512 ccbe860ec93a198745e40620cb7e005a85797e344a99ddbc0e24c32ad846976eae35cf5b3d62ba5751b998f0d40bbebbba72f484d92c92693bbb2112c989b129
diff --git a/dev-vcs/subversion-java/subversion-java-1.9.7-r1.ebuild b/dev-vcs/subversion-java/subversion-java-1.10.2.ebuild
similarity index 74%
rename from dev-vcs/subversion-java/subversion-java-1.9.7-r1.ebuild
rename to dev-vcs/subversion-java/subversion-java-1.10.2.ebuild
index 7fbec3a86..79ab9519e 100644
--- a/dev-vcs/subversion-java/subversion-java-1.9.7-r1.ebuild
+++ b/dev-vcs/subversion-java/subversion-java-1.10.2.ebuild
@@ -12,12 +12,12 @@ MY_SVN_PF="${MY_SVN_PN}-${PVR}"
 MY_SVN_CATEGORY="${CATEGORY}"
 
 # note: java-pkg-2, not java-pkt-opt-2
-inherit autotools eutils flag-o-matic java-pkg-2 libtool multilib xdg-utils
+inherit autotools flag-o-matic java-pkg-2 libtool ltprune multilib xdg-utils
 
 DESCRIPTION="Java bindings for Subversion"
 HOMEPAGE="https://subversion.apache.org/"
 SRC_URI="mirror://apache/${MY_SVN_PN}/${MY_SVN_P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/${MY_SVN_PN}-1.8.18-patchset.tar.bz2"
+	https://dev.gentoo.org/~polynomial-c/${MY_SVN_PN}-1.10.0_rc1-patches-1.tar.xz"
 S="${WORKDIR}/${MY_SVN_P/_/-}"
 
 LICENSE="Subversion"
@@ -29,42 +29,16 @@ IUSE="debug doc nls"
 COMMON_DEPEND="~dev-vcs/subversion-${PV}
 	>=dev-libs/apr-1.3:1
 	>=dev-libs/apr-util-1.3:1
+	dev-libs/libutf8proc
 	sys-apps/file"
 RDEPEND="
 	${COMMON_DEPEND}
 	app-arch/bzip2
+	app-arch/lz4
 	>=virtual/jre-1.5"
 DEPEND="${COMMON_DEPEND}
 	>=virtual/jdk-1.5"
 
-# Making PATCHES more friendly for merging with Gentoo.
-# Simple variable expansion is being done (so keep it updated).
-_sab_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
-'
-PATCHES=()
-while read -r _sab_p; do
-	_sab_kvs=(
-		'${P}' "${MY_SVN_P}" '${PN}' "${MY_SVN_PN}" '"${WORKDIR}"' "${WORKDIR}" '"${FILESDIR}"' "${FILESDIR}"
-	)
-	while (( ${#_sab_kvs[@]} )); do
-		_sab_k=${_sab_kvs[0]}
-		_sab_v=${_sab_kvs[1]}
-		_sab_p=${_sab_p//${_sab_k}/${_sab_v}}
-		_sab_kvs=( "${_sab_kvs[@]:2}" )
-	done
-	[[ ${_sab_p} = *\$* ]] && die "${_sab_p} not fully \$-evaluated"
-	[[ -n ${_sab_p} ]] && PATCHES+=( "${_sab_p}" )
-done <<< "${_sab_PATCHES}"
-unset _sab_k _sab_v _sab_PATCHES _sab_kvs _sab_p
-[[ -z ${PATCHES[0]} ]] && die "PATCHES sanity check failed."
-
 pkg_setup() {
 	java-pkg-2_pkg_setup
 
@@ -76,7 +50,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
+	eapply "${WORKDIR}/patches"
+	eapply_user
 
 	fperms +x build/transform_libtool_scripts.sh
 
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 98e52d893..35d920fff 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -1,4 +1,3 @@
 DIST subversion-1.10.0.tar.bz2 8369823 BLAKE2B a8496959d838f6a0a9046913768e2090d7c46e2ac91f0360c2287a7b91c19e4cf5eae1a4421f79ceb2be4b998ee47735b22f5c22947992ff736a8d743f819556 SHA512 26e49c961d54c4e78067caa202f384c36544e0ce7506abbffe73e59186ac34559a70cbd6c0934ed47dcc5c3580fce0f0cc2ef14b77695c26e8dbbc6358d1ec6a
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
-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
+DIST subversion-1.10.2.tar.bz2 8369762 BLAKE2B 1cd9ecf91818172ce60b8a38b1cb0eec0180725af58c09b9b5e62aa70fc2a7266d20b9fcfdafe993cbbb57f118dc9eb77126c199c3f4f2797fd50ef5f59b1f7e SHA512 ccbe860ec93a198745e40620cb7e005a85797e344a99ddbc0e24c32ad846976eae35cf5b3d62ba5751b998f0d40bbebbba72f484d92c92693bbb2112c989b129
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 5b692fa30..000000000
--- 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.10.2.ebuild
similarity index 90%
rename from dev-vcs/subversion/subversion-1.9.7-r1.ebuild
rename to dev-vcs/subversion/subversion-1.10.2.ebuild
index f4f3f9751..521cedd6e 100644
--- a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.10.2.ebuild
@@ -4,31 +4,34 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby22 ruby21"
+USE_RUBY="ruby25 ruby24 ruby23"
 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 libtool multilib perl-module ruby-single xdg-utils
+inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic libtool ltprune 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"
+	https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="Subversion GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
+
 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
+	app-arch/lz4
 	>=dev-db/sqlite-3.7.12
 	>=dev-libs/apr-1.3:1
 	>=dev-libs/apr-util-1.3:1
 	dev-libs/expat
+	dev-libs/libutf8proc
 	sys-apps/file
 	sys-libs/zlib
 	berkdb? ( >=sys-libs/db-4.0.14:= )
@@ -79,16 +82,6 @@ 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
-)
-
 want_apache
 
 pkg_setup() {
@@ -151,7 +144,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
+	eapply "${WORKDIR}/patches"
+	eapply_user
 
 	fperms +x build/transform_libtool_scripts.sh
 
@@ -364,7 +358,7 @@ src_install() {
 	if use perl ; then
 		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
 		perl_delete_localpod
-		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete
+		find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die
 	fi
 
 	if use ruby ; then
@@ -394,12 +388,14 @@ src_install() {
 	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" \
+	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
-	use apache2 || sed -e "0,/apache/s//svn/" \
+		sed -e "0,/apache/s//svn/" \
 			-e "s:apache:svnusers:" \
 			-i "${ED%/}"/etc/xinetd.d/svnserve || die
+	fi
 
 	# Install documentation.
 	dodoc CHANGES COMMITTERS README
@@ -416,7 +412,7 @@ src_install() {
 
 		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
+		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}
@@ -435,14 +431,16 @@ src_install() {
 
 	cd "${ED%/}"/usr/share/locale
 	for i in * ; do
-		[[ ${i} == *$LINGUAS* ]] || { rm -r ${i} || die ; }
+		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/")"
+	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"
@@ -477,11 +475,11 @@ pkg_config() {
 
 		einfo "Populating repository directory..."
 		# Create initial repository.
-		"${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
+		"${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}")"
+		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"
diff --git a/www-apache/mod_dav_svn/Manifest b/www-apache/mod_dav_svn/Manifest
index 98e52d893..35d920fff 100644
--- a/www-apache/mod_dav_svn/Manifest
+++ b/www-apache/mod_dav_svn/Manifest
@@ -1,4 +1,3 @@
 DIST subversion-1.10.0.tar.bz2 8369823 BLAKE2B a8496959d838f6a0a9046913768e2090d7c46e2ac91f0360c2287a7b91c19e4cf5eae1a4421f79ceb2be4b998ee47735b22f5c22947992ff736a8d743f819556 SHA512 26e49c961d54c4e78067caa202f384c36544e0ce7506abbffe73e59186ac34559a70cbd6c0934ed47dcc5c3580fce0f0cc2ef14b77695c26e8dbbc6358d1ec6a
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
-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
+DIST subversion-1.10.2.tar.bz2 8369762 BLAKE2B 1cd9ecf91818172ce60b8a38b1cb0eec0180725af58c09b9b5e62aa70fc2a7266d20b9fcfdafe993cbbb57f118dc9eb77126c199c3f4f2797fd50ef5f59b1f7e SHA512 ccbe860ec93a198745e40620cb7e005a85797e344a99ddbc0e24c32ad846976eae35cf5b3d62ba5751b998f0d40bbebbba72f484d92c92693bbb2112c989b129
diff --git a/www-apache/mod_dav_svn/mod_dav_svn-1.9.7-r1.ebuild b/www-apache/mod_dav_svn/mod_dav_svn-1.10.2.ebuild
similarity index 84%
rename from www-apache/mod_dav_svn/mod_dav_svn-1.9.7-r1.ebuild
rename to www-apache/mod_dav_svn/mod_dav_svn-1.10.2.ebuild
index 8c02ad094..547ce013d 100644
--- a/www-apache/mod_dav_svn/mod_dav_svn-1.9.7-r1.ebuild
+++ b/www-apache/mod_dav_svn/mod_dav_svn-1.10.2.ebuild
@@ -10,12 +10,12 @@ MY_SVN_PN="subversion"
 MY_SVN_P="${MY_SVN_PN}-${PV}"
 MY_SVN_PF="${MY_SVN_PN}-${PVR}"
 
-inherit autotools db-use depend.apache eutils flag-o-matic libtool multilib eutils xdg-utils
+inherit autotools db-use depend.apache flag-o-matic libtool multilib xdg-utils
 
 DESCRIPTION="Subversion WebDAV support"
 HOMEPAGE="https://subversion.apache.org/"
 SRC_URI="mirror://apache/${MY_SVN_PN}/${MY_SVN_P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/${MY_SVN_PN}-1.8.18-patchset.tar.bz2"
+	https://dev.gentoo.org/~polynomial-c/${MY_SVN_PN}-1.10.0_rc1-patches-1.tar.xz"
 S="${WORKDIR}/${MY_SVN_P}"
 
 LICENSE="Subversion"
@@ -43,10 +43,12 @@ IUSE="berkdb debug +dso nls sasl"
 MY_CDEPS="
 	~dev-vcs/subversion-${PV}[berkdb=,debug=,dso=,nls=,sasl=,http]
 	app-arch/bzip2
+	app-arch/lz4
 	>=dev-db/sqlite-3.7.12
 	>=dev-libs/apr-1.3:1
 	>=dev-libs/apr-util-1.3:1
 	dev-libs/expat
+	dev-libs/libutf8proc
 	sys-apps/file
 	sys-libs/zlib
 	berkdb? ( >=sys-libs/db-4.0.14:= )
@@ -65,34 +67,6 @@ RDEPEND="${MY_CDEPS}
 	www-servers/apache[apache2_modules_dav]
 	nls? ( virtual/libintl )"
 
-# Making PATCHES more friendly for merging with Gentoo.
-# Simple variable expansion is being done (so keep it updated).
-_sab_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
-'
-PATCHES=()
-while read -r _sab_p; do
-	_sab_kvs=(
-		'${P}' "${MY_SVN_P}" '${PN}' "${MY_SVN_PN}" '"${WORKDIR}"' "${WORKDIR}" '"${FILESDIR}"' "${FILESDIR}"
-	)
-	while (( ${#_sab_kvs[@]} )); do
-		_sab_k=${_sab_kvs[0]}
-		_sab_v=${_sab_kvs[1]}
-		_sab_p=${_sab_p//${_sab_k}/${_sab_v}}
-		_sab_kvs=( "${_sab_kvs[@]:2}" )
-	done
-	[[ ${_sab_p} = *\$* ]] && die "${_sab_p} not fully \$-evaluated"
-	[[ -n ${_sab_p} ]] && PATCHES+=( "${_sab_p}" )
-done <<< "${_sab_PATCHES}"
-unset _sab_k _sab_v _sab_PATCHES _sab_kvs _sab_p
-[[ -z ${PATCHES[0]} ]] && die "PATCHES sanity check failed."
-
 need_apache # was: want_apache
 
 pkg_setup() {
@@ -136,7 +110,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
+	eapply "${WORKDIR}/patches"
+	eapply_user
 
 	fperms +x build/transform_libtool_scripts.sh
 
@@ -245,8 +220,8 @@ src_install() {
 
 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/")"
+	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"
@@ -296,11 +271,11 @@ pkg_config() {
 
 		einfo "Populating repository directory..."
 		# Create initial repository.
-		"${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
+		"${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}")"
+		SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
+		SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
 		#use apache2
 		[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
 		[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"