commit:     7a7a627164167509632bcd5b2e782b8a09c358d2
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 07:16:44 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 07:17:00 2019 +0000
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 <polynomial-c <AT> 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 
93364178d2252332b070ebddd5791cb43e0000802d820848a6ca2e13ae3036a9119901dcde1b73ea09bd34af3fd72b923bdd2765e302359e7f1ecf49a6840685
 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..00000000000
--- 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 <apr.h>
-                       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 <apr.h>
-                       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..00000000000
--- 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
-+                     as 'DROP TABLE foo', but the performance of such
-+                     statements is not our concern here. */
-+
-+                  /* "Slow" statements do expect too see a warning, however. 
*/
-+                  if (is_slow_statement(i))
-+                    warned = TRUE;
-+                }
-+              else if (in_list(primary_key_statements, i))
-                 {
-                   /* Reported as primary key index usage in Sqlite 3.7,
-                      as table scan in 3.8+, while the execution plan is

diff --git a/dev-vcs/subversion/subversion-1.10.4.ebuild 
b/dev-vcs/subversion/subversion-1.10.4.ebuild
deleted file mode 100644
index 29e2204d1a6..00000000000
--- a/dev-vcs/subversion/subversion-1.10.4.ebuild
+++ /dev/null
@@ -1,532 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-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 flag-o-matic java-pkg-opt-2 libtool 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/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz";
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Subversion GPL-2"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc 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:= )
-       ctypes-python? ( ${PYTHON_DEPS} )
-       gnome-keyring? (
-               dev-libs/glib:2
-               gnome-base/libgnome-keyring
-               sys-apps/dbus
-       )
-       http? ( >=net-libs/serf-1.3.4 )
-       kwallet? (
-               dev-qt/qtcore:5
-               dev-qt/qtdbus:5
-               dev-qt/qtgui:5
-               kde-frameworks/kcoreaddons:5
-               kde-frameworks/ki18n:5
-               kde-frameworks/kwallet:5
-               sys-apps/dbus
-       )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       ruby? ( ${RUBY_DEPS} )
-       sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${COMMON_DEPEND}
-       apache2? ( www-servers/apache[apache2_modules_dav] )
-       java? ( >=virtual/jre-1.8 )
-       nls? ( virtual/libintl )
-       perl? ( dev-perl/URI )"
-# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
-DEPEND="${COMMON_DEPEND}
-       !!<sys-apps/sandbox-1.6
-       ctypes-python? ( dev-python/ctypesgen )
-       doc? ( app-doc/doxygen )
-       gnome-keyring? ( virtual/pkgconfig )
-       http? ( virtual/pkgconfig )
-       java? ( >=virtual/jdk-1.8 )
-       kwallet? (
-               kde-frameworks/kdelibs4support:5
-               virtual/pkgconfig
-       )
-       nls? ( sys-devel/gettext )
-       perl? ( dev-lang/swig )
-       python? ( dev-lang/swig )
-       ruby? ( dev-lang/swig )
-       test? ( ${PYTHON_DEPS} )"
-
-REQUIRED_USE="
-       ctypes-python? ( ${PYTHON_REQUIRED_USE} )
-       python? ( ${PYTHON_REQUIRED_USE} )
-       test? (
-               ${PYTHON_REQUIRED_USE}
-               !dso
-       )"
-
-want_apache
-
-pkg_setup() {
-       if use berkdb ; then
-               local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config 
--includes \
-                       | grep -Eoe 
'-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
-                       | sed 's:.*b::')"
-               einfo
-               if [[ -z "${SVN_BDB_VERSION}" ]] ; then
-                       if [[ -n "${apu_bdb_version}" ]] ; then
-                               SVN_BDB_VERSION="${apu_bdb_version}"
-                               einfo "Matching db version to apr-util"
-                       else
-                               SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver 
sys-libs/db 2>/dev/null)")"
-                               einfo "SVN_BDB_VERSION variable isn't set. You 
can set it to enforce using of specific version of Berkeley DB."
-                       fi
-               fi
-               einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
-               einfo
-
-               if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != 
"${apu_bdb_version}" ]]; then
-                       eerror "APR-Util is linked against Berkeley DB 
${apu_bdb_version}, but you are trying"
-                       eerror "to build Subversion with support for Berkeley 
DB ${SVN_BDB_VERSION}."
-                       eerror "Rebuild dev-libs/apr-util or set 
SVN_BDB_VERSION=\"${apu_bdb_version}\"."
-                       eerror "Aborting to avoid possible run-time crashes."
-                       die "Berkeley DB version mismatch"
-               fi
-       fi
-
-       depend.apache_pkg_setup
-
-       java-pkg-opt-2_pkg_setup
-
-       if ! use http ; then
-               ewarn "WebDAV support is disabled. You need WebDAV to"
-               ewarn "access repositories through the HTTP protocol."
-               ewarn "Consider enabling \"http\" USE flag"
-               echo -ne "\a"
-       fi
-
-       if use debug ; then
-               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__
-
-       # Allow for custom repository locations.
-       SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-
-       if use ruby ; then
-               local rbslot
-               RB_VER=""
-               for rbslot in $(sed 
's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
-                       if has_version dev-lang/ruby:${rbslot} ;  then
-                               RB_VER="${rbslot/.}"
-                               break
-                       fi
-               done
-               [[ -z "${RB_VER}" ]] && die "No useable ruby version found"
-       fi
-}
-
-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
-
-       chmod +x build/transform_libtool_scripts.sh || die
-
-       sed -i \
-               -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-               -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
-       # this bites us in particular on Solaris
-       sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
-               die "/bin/sh is not POSIX shell!"
-
-       eautoconf
-       elibtoolize
-
-       sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
-               -i build-outputs.mk || die "sed failed"
-
-       if use python ; then
-               # XXX: make python_copy_sources accept path
-               S=${S}/subversion/bindings/swig/python python_copy_sources
-               rm -r "${S}"/subversion/bindings/swig/python || die
-       fi
-
-       xdg_environment_reset
-}
-
-src_configure() {
-       local myconf=(
-               --libdir="${EPREFIX%/}/usr/$(get_libdir)"
-               $(use_with apache2 apache-libexecdir)
-               $(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
-               $(use_with berkdb berkeley-db 
"db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
-               $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
-               $(use_enable dso runtime-module-search)
-               $(use_with gnome-keyring)
-               $(use_enable java javahl)
-               $(use_with java jdk "${JAVA_HOME}")
-               $(use_with kwallet)
-               $(use_enable nls)
-               $(use_with sasl)
-               $(use_with http serf)
-               --with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
-               --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
-               --disable-experimental-libtool
-               --without-jikes
-               --disable-mod-activation
-               --disable-static
-       )
-
-       if use python || use perl || use ruby; then
-               myconf+=( --with-swig )
-       else
-               myconf+=( --without-swig )
-       fi
-
-       if use java ; then
-               myconf+=( --without-junit )
-       fi
-
-       case ${CHOST} in
-               *-aix*)
-                       # avoid recording immediate path to sharedlibs into 
executables
-                       append-ldflags -Wl,-bnoipath
-               ;;
-               *-cygwin*)
-                       # no LD_PRELOAD support, no undefined symbols
-                       myconf+=( --disable-local-library-preloading 
LT_LDFLAGS=-no-undefined )
-                       ;;
-               *-interix*)
-                       # loader crashes on the LD_PRELOADs...
-                       myconf+=( --disable-local-library-preloading )
-               ;;
-               *-solaris*)
-                       # need -lintl to link
-                       use nls && append-libs intl
-                       # this breaks installation, on x64 echo replacement is 
32-bits
-                       myconf+=( --disable-local-library-preloading )
-               ;;
-               *-mint*)
-                       myconf+=( --enable-all-static 
--disable-local-library-preloading )
-               ;;
-               *)
-                       # inject LD_PRELOAD entries for easy in-tree development
-                       myconf+=( --enable-local-library-preloading )
-               ;;
-       esac
-
-       #version 1.7.7 again tries to link against the older installed version 
and fails, when trying to
-       #compile for x86 on amd64, so workaround this issue again
-       #check newer versions, if this is still/again needed
-       myconf+=( --disable-disallowing-of-undefined-references )
-
-       # for build-time scripts
-       if use ctypes-python || use python || use test; then
-               python_setup
-       fi
-
-       if use python && [[ ${CHOST} == *-darwin* ]] ; then
-               export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) 
-bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
-               export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined 
dynamic_lookup $(PYTHON_LIBS)'
-               export ac_cv_python_compile="$(tc-getCC)"
-       fi
-
-       # allow overriding Python include directory
-       ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" 
"none") \
-       ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" 
"none") \
-       ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
-       econf "${myconf[@]}"
-}
-
-src_compile() {
-       emake local-all
-
-       if use ctypes-python ; then
-               # pre-generate .py files
-               use ctypes-python && emake ctypes-python
-
-               pushd subversion/bindings/ctypes-python >/dev/null || die
-               distutils-r1_src_compile
-               popd >/dev/null || die
-       fi
-
-       if use python ; then
-               swig_py_compile() {
-                       local p=subversion/bindings/swig/python
-                       rm -f ${p} || die
-                       ln -s "${BUILD_DIR}" ${p} || die
-
-                       python_export PYTHON_INCLUDEDIR
-                       emake swig-py \
-                               swig_pydir="$(python_get_sitedir)/libsvn" \
-                               swig_pydir_extra="$(python_get_sitedir)/svn"
-               }
-
-               # this will give us proper BUILD_DIR for symlinking
-               BUILD_DIR=python \
-               python_foreach_impl swig_py_compile
-       fi
-
-       if use perl ; then
-               emake swig-pl
-       fi
-
-       if use ruby ; then
-               emake swig-rb
-       fi
-
-       if use java ; then
-               emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding 
iso8859-1" javahl
-       fi
-
-       if use extras ; then
-               emake tools
-       fi
-
-       if use doc ; then
-               doxygen doc/doxygen.conf || die "Building of Subversion HTML 
documentation failed"
-
-               if use java; then
-                       emake doc-javahl
-               fi
-       fi
-}
-
-src_test() {
-       if has_version ~${CATEGORY}/${P} ; then
-               default
-
-               if use ctypes-python ; then
-                       python_test() {
-                               "${PYTHON}" 
subversion/bindings/ctypes-python/test/run_all.py \
-                                       || die "ctypes-python tests fail with 
${EPYTHON}"
-                       }
-
-                       distutils-r1_src_test
-               fi
-
-               if use python ; then
-                       swig_py_test() {
-                               pushd "${BUILD_DIR}" >/dev/null || die
-                               "${PYTHON}" tests/run_all.py || die "swig-py 
tests fail with ${EPYTHON}"
-                               popd >/dev/null || die
-                       }
-
-                       BUILD_DIR=subversion/bindings/swig/python \
-                       python_foreach_impl swig_py_test
-               fi
-       else
-               ewarn "The test suite shows errors when there is an older 
version of"
-               ewarn "${CATEGORY}/${PN} installed. Please install 
=${CATEGORY}/${P}*"
-               ewarn "before running the test suite."
-               ewarn "Test suite skipped."
-       fi
-}
-
-src_install() {
-       emake -j1 DESTDIR="${D}" local-install
-
-       if use ctypes-python ; then
-               pushd subversion/bindings/ctypes-python >/dev/null || die
-               distutils-r1_src_install
-               popd >/dev/null || die
-       fi
-
-       if use python ; then
-               swig_py_install() {
-                       local p=subversion/bindings/swig/python
-                       rm -f ${p} || die
-                       ln -s "${BUILD_DIR}" ${p} || die
-
-                       emake \
-                               DESTDIR="${D}" \
-                               swig_pydir="$(python_get_sitedir)/libsvn" \
-                               swig_pydir_extra="$(python_get_sitedir)/svn" \
-                               install-swig-py
-               }
-
-               BUILD_DIR=python \
-               python_foreach_impl swig_py_install
-       fi
-
-       if use perl ; then
-               emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
-               perl_delete_localpod
-               find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || 
die
-       fi
-
-       if use ruby ; then
-               emake DESTDIR="${D}" install-swig-rb
-       fi
-
-       if use java ; then
-               emake DESTDIR="${D}" install-javahl
-               java-pkg_regso 
"${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
-               java-pkg_dojar 
"${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-               rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
-       fi
-
-       # Install Apache module configuration.
-       if use apache2 ; then
-               keepdir "${APACHE_MODULES_CONFDIR}"
-               insinto "${APACHE_MODULES_CONFDIR}"
-               doins "${FILESDIR}/47_mod_dav_svn.conf"
-       fi
-
-       # Install Bash Completion, bug 43179.
-       newbashcomp tools/client-side/bash_completion svn
-       bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
-       rm -f tools/client-side/bash_completion
-
-       # Install hot backup script, bug 54304.
-       newbin tools/backup/hot-backup.py svn-hot-backup
-       rm -fr tools/backup
-
-       # Install svnserve init-script and xinet.d snippet, bug 43245.
-       newinitd "${FILESDIR}"/svnserve.initd3 svnserve
-       newconfd "${FILESDIR}"/svnserve.confd svnserve
-       insinto /etc/xinetd.d
-       newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-       #adjust default user and group with disabled apache2 USE flag, bug 
381385
-       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
-               sed -e "0,/apache/s//svn/" \
-                       -e "s:apache:svnusers:" \
-                       -i "${ED%/}"/etc/xinetd.d/svnserve || die
-       fi
-
-       # Install documentation.
-       dodoc CHANGES COMMITTERS README
-       dodoc tools/xslt/svnindex.{css,xsl}
-       rm -fr tools/xslt
-
-       # Install extra files.
-       if use extras ; then
-               cat <<- EOF > 80subversion-extras
-                       PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-                       ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-               EOF
-               doenvd 80subversion-extras
-
-               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
-               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}
-
-               insinto /usr/share/${PN}
-               find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || 
die
-               doins -r tools
-       fi
-
-       if use doc ; then
-               docinto html
-               dodoc -r doc/doxygen/html/*
-
-               if use java ; then
-                       java-pkg_dojavadoc doc/javadoc
-               fi
-       fi
-
-       prune_libtool_files --all
-
-       cd "${ED%/}"/usr/share/locale
-       for i in * ; do
-               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/")"
-               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"
-               fi
-       fi
-}
-
-pkg_postinst() {
-       if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
-               ewarn "You upgraded from an older version of Berkeley DB and 
may experience"
-               ewarn "problems with your repository. Run the following 
commands as root to fix it:"
-               ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-               ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-       fi
-
-       ewarn "If you run subversion as a daemon, you will need to restart it 
to avoid module mismatches."
-}
-
-pkg_postrm() {
-       :
-}
-
-pkg_config() {
-       # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
-       # already has EPREFIX in it
-       einfo "Initializing the database in ${SVN_REPOS_LOC}..."
-       if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
-               echo "A Subversion repository already exists and I will not 
overwrite it."
-               echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure 
you want to have a clean version."
-       else
-               mkdir -p "${SVN_REPOS_LOC}/conf"
-
-               einfo "Populating repository directory..."
-               # Create initial repository.
-               "${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}")"
-               if use apache2 ; then
-                       [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
-                       [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
-               else
-                       [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
-                       [[ -z "${SVNSERVE_GROUP}" ]] && 
SVNSERVE_GROUP="svnusers"
-               fi
-               chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
-               chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
-               echo "Please create \"${SVNSERVE_GROUP}\" group if it does not 
exist yet."
-               echo "Afterwards please create \"${SVNSERVE_USER}\" user with 
homedir \"${SVN_REPOS_LOC}\""
-               echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does 
not exist yet."
-               echo "Finally, execute \"chown -Rf 
${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
-               echo "to finish the configuration."
-       fi
-}

diff --git a/dev-vcs/subversion/subversion-1.11.1.ebuild 
b/dev-vcs/subversion/subversion-1.11.1.ebuild
deleted file mode 100644
index 29ff1706b70..00000000000
--- a/dev-vcs/subversion/subversion-1.11.1.ebuild
+++ /dev/null
@@ -1,532 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-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 flag-o-matic java-pkg-opt-2 libtool 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/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz";
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Subversion GPL-2"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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:= )
-       ctypes-python? ( ${PYTHON_DEPS} )
-       gnome-keyring? (
-               dev-libs/glib:2
-               gnome-base/libgnome-keyring
-               sys-apps/dbus
-       )
-       http? ( >=net-libs/serf-1.3.4 )
-       kwallet? (
-               dev-qt/qtcore:5
-               dev-qt/qtdbus:5
-               dev-qt/qtgui:5
-               kde-frameworks/kcoreaddons:5
-               kde-frameworks/ki18n:5
-               kde-frameworks/kwallet:5
-               sys-apps/dbus
-       )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       ruby? ( ${RUBY_DEPS} )
-       sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${COMMON_DEPEND}
-       apache2? ( www-servers/apache[apache2_modules_dav] )
-       java? ( >=virtual/jre-1.8 )
-       nls? ( virtual/libintl )
-       perl? ( dev-perl/URI )"
-# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
-DEPEND="${COMMON_DEPEND}
-       !!<sys-apps/sandbox-1.6
-       ctypes-python? ( dev-python/ctypesgen )
-       doc? ( app-doc/doxygen )
-       gnome-keyring? ( virtual/pkgconfig )
-       http? ( virtual/pkgconfig )
-       java? ( >=virtual/jdk-1.8 )
-       kwallet? (
-               kde-frameworks/kdelibs4support:5
-               virtual/pkgconfig
-       )
-       nls? ( sys-devel/gettext )
-       perl? ( dev-lang/swig )
-       python? ( dev-lang/swig )
-       ruby? ( dev-lang/swig )
-       test? ( ${PYTHON_DEPS} )"
-
-REQUIRED_USE="
-       ctypes-python? ( ${PYTHON_REQUIRED_USE} )
-       python? ( ${PYTHON_REQUIRED_USE} )
-       test? (
-               ${PYTHON_REQUIRED_USE}
-               !dso
-       )"
-
-want_apache
-
-pkg_setup() {
-       if use berkdb ; then
-               local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config 
--includes \
-                       | grep -Eoe 
'-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
-                       | sed 's:.*b::')"
-               einfo
-               if [[ -z "${SVN_BDB_VERSION}" ]] ; then
-                       if [[ -n "${apu_bdb_version}" ]] ; then
-                               SVN_BDB_VERSION="${apu_bdb_version}"
-                               einfo "Matching db version to apr-util"
-                       else
-                               SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver 
sys-libs/db 2>/dev/null)")"
-                               einfo "SVN_BDB_VERSION variable isn't set. You 
can set it to enforce using of specific version of Berkeley DB."
-                       fi
-               fi
-               einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
-               einfo
-
-               if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != 
"${apu_bdb_version}" ]]; then
-                       eerror "APR-Util is linked against Berkeley DB 
${apu_bdb_version}, but you are trying"
-                       eerror "to build Subversion with support for Berkeley 
DB ${SVN_BDB_VERSION}."
-                       eerror "Rebuild dev-libs/apr-util or set 
SVN_BDB_VERSION=\"${apu_bdb_version}\"."
-                       eerror "Aborting to avoid possible run-time crashes."
-                       die "Berkeley DB version mismatch"
-               fi
-       fi
-
-       depend.apache_pkg_setup
-
-       java-pkg-opt-2_pkg_setup
-
-       if ! use http ; then
-               ewarn "WebDAV support is disabled. You need WebDAV to"
-               ewarn "access repositories through the HTTP protocol."
-               ewarn "Consider enabling \"http\" USE flag"
-               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
-
-       # 
http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3c51c42014.3060...@wandisco.com%3E
-       [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
-
-       # Allow for custom repository locations.
-       SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-
-       if use ruby ; then
-               local rbslot
-               RB_VER=""
-               for rbslot in $(sed 
's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
-                       if has_version dev-lang/ruby:${rbslot} ;  then
-                               RB_VER="${rbslot/.}"
-                               break
-                       fi
-               done
-               [[ -z "${RB_VER}" ]] && die "No useable ruby version found"
-       fi
-}
-
-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
-
-       chmod +x build/transform_libtool_scripts.sh || die
-
-       sed -i \
-               -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-               -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
-       # this bites us in particular on Solaris
-       sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
-               die "/bin/sh is not POSIX shell!"
-
-       eautoconf
-       elibtoolize
-
-       sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
-               -i build-outputs.mk || die "sed failed"
-
-       if use python ; then
-               # XXX: make python_copy_sources accept path
-               S=${S}/subversion/bindings/swig/python python_copy_sources
-               rm -r "${S}"/subversion/bindings/swig/python || die
-       fi
-
-       xdg_environment_reset
-}
-
-src_configure() {
-       local myconf=(
-               --libdir="${EPREFIX%/}/usr/$(get_libdir)"
-               $(use_with apache2 apache-libexecdir)
-               $(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
-               $(use_with berkdb berkeley-db 
"db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
-               $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
-               $(use_enable dso runtime-module-search)
-               $(use_with gnome-keyring)
-               $(use_enable java javahl)
-               $(use_with java jdk "${JAVA_HOME}")
-               $(use_with kwallet)
-               $(use_enable nls)
-               $(use_with sasl)
-               $(use_with http serf)
-               --with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
-               --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
-               --disable-experimental-libtool
-               --without-jikes
-               --disable-mod-activation
-               --disable-static
-       )
-
-       if use python || use perl || use ruby; then
-               myconf+=( --with-swig )
-       else
-               myconf+=( --without-swig )
-       fi
-
-       if use java ; then
-               myconf+=( --without-junit )
-       fi
-
-       case ${CHOST} in
-               *-aix*)
-                       # avoid recording immediate path to sharedlibs into 
executables
-                       append-ldflags -Wl,-bnoipath
-               ;;
-               *-cygwin*)
-                       # no LD_PRELOAD support, no undefined symbols
-                       myconf+=( --disable-local-library-preloading 
LT_LDFLAGS=-no-undefined )
-                       ;;
-               *-interix*)
-                       # loader crashes on the LD_PRELOADs...
-                       myconf+=( --disable-local-library-preloading )
-               ;;
-               *-solaris*)
-                       # need -lintl to link
-                       use nls && append-libs intl
-                       # this breaks installation, on x64 echo replacement is 
32-bits
-                       myconf+=( --disable-local-library-preloading )
-               ;;
-               *-mint*)
-                       myconf+=( --enable-all-static 
--disable-local-library-preloading )
-               ;;
-               *)
-                       # inject LD_PRELOAD entries for easy in-tree development
-                       myconf+=( --enable-local-library-preloading )
-               ;;
-       esac
-
-       #version 1.7.7 again tries to link against the older installed version 
and fails, when trying to
-       #compile for x86 on amd64, so workaround this issue again
-       #check newer versions, if this is still/again needed
-       myconf+=( --disable-disallowing-of-undefined-references )
-
-       # for build-time scripts
-       if use ctypes-python || use python || use test; then
-               python_setup
-       fi
-
-       if use python && [[ ${CHOST} == *-darwin* ]] ; then
-               export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) 
-bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
-               export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined 
dynamic_lookup $(PYTHON_LIBS)'
-               export ac_cv_python_compile="$(tc-getCC)"
-       fi
-
-       # allow overriding Python include directory
-       ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" 
"none") \
-       ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" 
"none") \
-       ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
-       econf "${myconf[@]}"
-}
-
-src_compile() {
-       emake local-all
-
-       if use ctypes-python ; then
-               # pre-generate .py files
-               use ctypes-python && emake ctypes-python
-
-               pushd subversion/bindings/ctypes-python >/dev/null || die
-               distutils-r1_src_compile
-               popd >/dev/null || die
-       fi
-
-       if use python ; then
-               swig_py_compile() {
-                       local p=subversion/bindings/swig/python
-                       rm -f ${p} || die
-                       ln -s "${BUILD_DIR}" ${p} || die
-
-                       python_export PYTHON_INCLUDEDIR
-                       emake swig-py \
-                               swig_pydir="$(python_get_sitedir)/libsvn" \
-                               swig_pydir_extra="$(python_get_sitedir)/svn"
-               }
-
-               # this will give us proper BUILD_DIR for symlinking
-               BUILD_DIR=python \
-               python_foreach_impl swig_py_compile
-       fi
-
-       if use perl ; then
-               emake swig-pl
-       fi
-
-       if use ruby ; then
-               emake swig-rb
-       fi
-
-       if use java ; then
-               emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding 
iso8859-1" javahl
-       fi
-
-       if use extras ; then
-               emake tools
-       fi
-
-       if use doc ; then
-               doxygen doc/doxygen.conf || die "Building of Subversion HTML 
documentation failed"
-
-               if use java; then
-                       emake doc-javahl
-               fi
-       fi
-}
-
-src_test() {
-       if has_version ~${CATEGORY}/${P} ; then
-               default
-
-               if use ctypes-python ; then
-                       python_test() {
-                               "${PYTHON}" 
subversion/bindings/ctypes-python/test/run_all.py \
-                                       || die "ctypes-python tests fail with 
${EPYTHON}"
-                       }
-
-                       distutils-r1_src_test
-               fi
-
-               if use python ; then
-                       swig_py_test() {
-                               pushd "${BUILD_DIR}" >/dev/null || die
-                               "${PYTHON}" tests/run_all.py || die "swig-py 
tests fail with ${EPYTHON}"
-                               popd >/dev/null || die
-                       }
-
-                       BUILD_DIR=subversion/bindings/swig/python \
-                       python_foreach_impl swig_py_test
-               fi
-       else
-               ewarn "The test suite shows errors when there is an older 
version of"
-               ewarn "${CATEGORY}/${PN} installed. Please install 
=${CATEGORY}/${P}*"
-               ewarn "before running the test suite."
-               ewarn "Test suite skipped."
-       fi
-}
-
-src_install() {
-       emake -j1 DESTDIR="${D}" local-install
-
-       if use ctypes-python ; then
-               pushd subversion/bindings/ctypes-python >/dev/null || die
-               distutils-r1_src_install
-               popd >/dev/null || die
-       fi
-
-       if use python ; then
-               swig_py_install() {
-                       local p=subversion/bindings/swig/python
-                       rm -f ${p} || die
-                       ln -s "${BUILD_DIR}" ${p} || die
-
-                       emake \
-                               DESTDIR="${D}" \
-                               swig_pydir="$(python_get_sitedir)/libsvn" \
-                               swig_pydir_extra="$(python_get_sitedir)/svn" \
-                               install-swig-py
-               }
-
-               BUILD_DIR=python \
-               python_foreach_impl swig_py_install
-       fi
-
-       if use perl ; then
-               emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
-               perl_delete_localpod
-               find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || 
die
-       fi
-
-       if use ruby ; then
-               emake DESTDIR="${D}" install-swig-rb
-       fi
-
-       if use java ; then
-               emake DESTDIR="${D}" install-javahl
-               java-pkg_regso 
"${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
-               java-pkg_dojar 
"${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-               rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
-       fi
-
-       # Install Apache module configuration.
-       if use apache2 ; then
-               keepdir "${APACHE_MODULES_CONFDIR}"
-               insinto "${APACHE_MODULES_CONFDIR}"
-               doins "${FILESDIR}/47_mod_dav_svn.conf"
-       fi
-
-       # Install Bash Completion, bug 43179.
-       newbashcomp tools/client-side/bash_completion svn
-       bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
-       rm -f tools/client-side/bash_completion
-
-       # Install hot backup script, bug 54304.
-       newbin tools/backup/hot-backup.py svn-hot-backup
-       rm -fr tools/backup
-
-       # Install svnserve init-script and xinet.d snippet, bug 43245.
-       newinitd "${FILESDIR}"/svnserve.initd3 svnserve
-       newconfd "${FILESDIR}"/svnserve.confd svnserve
-       insinto /etc/xinetd.d
-       newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-       #adjust default user and group with disabled apache2 USE flag, bug 
381385
-       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
-               sed -e "0,/apache/s//svn/" \
-                       -e "s:apache:svnusers:" \
-                       -i "${ED%/}"/etc/xinetd.d/svnserve || die
-       fi
-
-       # Install documentation.
-       dodoc CHANGES COMMITTERS README
-       dodoc tools/xslt/svnindex.{css,xsl}
-       rm -fr tools/xslt
-
-       # Install extra files.
-       if use extras ; then
-               cat <<- EOF > 80subversion-extras
-                       PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-                       ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-               EOF
-               doenvd 80subversion-extras
-
-               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
-               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}
-
-               insinto /usr/share/${PN}
-               find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || 
die
-               doins -r tools
-       fi
-
-       if use doc ; then
-               docinto html
-               dodoc -r doc/doxygen/html/*
-
-               if use java ; then
-                       java-pkg_dojavadoc doc/javadoc
-               fi
-       fi
-
-       prune_libtool_files --all
-
-       cd "${ED%/}"/usr/share/locale
-       for i in * ; do
-               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/")"
-               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"
-               fi
-       fi
-}
-
-pkg_postinst() {
-       if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
-               ewarn "You upgraded from an older version of Berkeley DB and 
may experience"
-               ewarn "problems with your repository. Run the following 
commands as root to fix it:"
-               ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-               ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-       fi
-
-       ewarn "If you run subversion as a daemon, you will need to restart it 
to avoid module mismatches."
-}
-
-pkg_postrm() {
-       :
-}
-
-pkg_config() {
-       # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
-       # already has EPREFIX in it
-       einfo "Initializing the database in ${SVN_REPOS_LOC}..."
-       if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
-               echo "A Subversion repository already exists and I will not 
overwrite it."
-               echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure 
you want to have a clean version."
-       else
-               mkdir -p "${SVN_REPOS_LOC}/conf"
-
-               einfo "Populating repository directory..."
-               # Create initial repository.
-               "${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}")"
-               if use apache2 ; then
-                       [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
-                       [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
-               else
-                       [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
-                       [[ -z "${SVNSERVE_GROUP}" ]] && 
SVNSERVE_GROUP="svnusers"
-               fi
-               chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
-               chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
-               echo "Please create \"${SVNSERVE_GROUP}\" group if it does not 
exist yet."
-               echo "Afterwards please create \"${SVNSERVE_USER}\" user with 
homedir \"${SVN_REPOS_LOC}\""
-               echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does 
not exist yet."
-               echo "Finally, execute \"chown -Rf 
${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
-               echo "to finish the configuration."
-       fi
-}

diff --git a/dev-vcs/subversion/subversion-1.12.0.ebuild 
b/dev-vcs/subversion/subversion-1.12.0.ebuild
deleted file mode 100644
index a281b9a9523..00000000000
--- a/dev-vcs/subversion/subversion-1.12.0.ebuild
+++ /dev/null
@@ -1,532 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby26 ruby25 ruby24"
-DISTUTILS_OPTIONAL=1
-WANT_AUTOMAKE="none"
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 
elisp-common flag-o-matic java-pkg-opt-2 libtool 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/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz";
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Subversion GPL-2"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
-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:= )
-       ctypes-python? ( ${PYTHON_DEPS} )
-       gnome-keyring? (
-               dev-libs/glib:2
-               gnome-base/libgnome-keyring
-               sys-apps/dbus
-       )
-       http? ( >=net-libs/serf-1.3.4 )
-       kwallet? (
-               dev-qt/qtcore:5
-               dev-qt/qtdbus:5
-               dev-qt/qtgui:5
-               kde-frameworks/kcoreaddons:5
-               kde-frameworks/ki18n:5
-               kde-frameworks/kwallet:5
-               sys-apps/dbus
-       )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       ruby? ( ${RUBY_DEPS} )
-       sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${COMMON_DEPEND}
-       apache2? ( www-servers/apache[apache2_modules_dav] )
-       java? ( >=virtual/jre-1.8 )
-       nls? ( virtual/libintl )
-       perl? ( dev-perl/URI )"
-# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
-DEPEND="${COMMON_DEPEND}
-       !!<sys-apps/sandbox-1.6
-       ctypes-python? ( dev-python/ctypesgen )
-       doc? ( app-doc/doxygen )
-       gnome-keyring? ( virtual/pkgconfig )
-       http? ( virtual/pkgconfig )
-       java? ( >=virtual/jdk-1.8 )
-       kwallet? (
-               kde-frameworks/kdelibs4support:5
-               virtual/pkgconfig
-       )
-       nls? ( sys-devel/gettext )
-       perl? ( dev-lang/swig )
-       python? ( dev-lang/swig )
-       ruby? ( dev-lang/swig )
-       test? ( ${PYTHON_DEPS} )"
-
-REQUIRED_USE="
-       ctypes-python? ( ${PYTHON_REQUIRED_USE} )
-       python? ( ${PYTHON_REQUIRED_USE} )
-       test? (
-               ${PYTHON_REQUIRED_USE}
-               !dso
-       )"
-
-want_apache
-
-pkg_setup() {
-       if use berkdb ; then
-               local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config 
--includes \
-                       | grep -Eoe 
'-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
-                       | sed 's:.*b::')"
-               einfo
-               if [[ -z "${SVN_BDB_VERSION}" ]] ; then
-                       if [[ -n "${apu_bdb_version}" ]] ; then
-                               SVN_BDB_VERSION="${apu_bdb_version}"
-                               einfo "Matching db version to apr-util"
-                       else
-                               SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver 
sys-libs/db 2>/dev/null)")"
-                               einfo "SVN_BDB_VERSION variable isn't set. You 
can set it to enforce using of specific version of Berkeley DB."
-                       fi
-               fi
-               einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
-               einfo
-
-               if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != 
"${apu_bdb_version}" ]]; then
-                       eerror "APR-Util is linked against Berkeley DB 
${apu_bdb_version}, but you are trying"
-                       eerror "to build Subversion with support for Berkeley 
DB ${SVN_BDB_VERSION}."
-                       eerror "Rebuild dev-libs/apr-util or set 
SVN_BDB_VERSION=\"${apu_bdb_version}\"."
-                       eerror "Aborting to avoid possible run-time crashes."
-                       die "Berkeley DB version mismatch"
-               fi
-       fi
-
-       depend.apache_pkg_setup
-
-       java-pkg-opt-2_pkg_setup
-
-       if ! use http ; then
-               ewarn "WebDAV support is disabled. You need WebDAV to"
-               ewarn "access repositories through the HTTP protocol."
-               ewarn "Consider enabling \"http\" USE flag"
-               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
-
-       # 
http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3c51c42014.3060...@wandisco.com%3E
-       [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
-
-       # Allow for custom repository locations.
-       SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-
-       if use ruby ; then
-               local rbslot
-               RB_VER=""
-               for rbslot in $(sed 
's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
-                       if has_version dev-lang/ruby:${rbslot} ;  then
-                               RB_VER="${rbslot/.}"
-                               break
-                       fi
-               done
-               [[ -z "${RB_VER}" ]] && die "No useable ruby version found"
-       fi
-}
-
-src_prepare() {
-       eapply "${WORKDIR}/patches"
-       eapply "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.patch
-       eapply_user
-
-       chmod +x build/transform_libtool_scripts.sh || die
-
-       sed -i \
-               -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-               -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
-       # this bites us in particular on Solaris
-       sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
-               die "/bin/sh is not POSIX shell!"
-
-       eautoconf
-       elibtoolize
-
-       sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
-               -i build-outputs.mk || die "sed failed"
-
-       if use python ; then
-               # XXX: make python_copy_sources accept path
-               S=${S}/subversion/bindings/swig/python python_copy_sources
-               rm -r "${S}"/subversion/bindings/swig/python || die
-       fi
-
-       xdg_environment_reset
-}
-
-src_configure() {
-       local myconf=(
-               --libdir="${EPREFIX%/}/usr/$(get_libdir)"
-               $(use_with apache2 apache-libexecdir)
-               $(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
-               $(use_with berkdb berkeley-db 
"db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
-               $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
-               $(use_enable dso runtime-module-search)
-               $(use_with gnome-keyring)
-               $(use_enable java javahl)
-               $(use_with java jdk "${JAVA_HOME}")
-               $(use_with kwallet)
-               $(use_enable nls)
-               $(use_with sasl)
-               $(use_with http serf)
-               --with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
-               --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
-               --disable-experimental-libtool
-               --without-jikes
-               --disable-mod-activation
-               --disable-static
-               --enable-svnxx
-       )
-
-       if use python || use perl || use ruby; then
-               myconf+=( --with-swig )
-       else
-               myconf+=( --without-swig )
-       fi
-
-       if use java ; then
-               myconf+=( --without-junit )
-       fi
-
-       case ${CHOST} in
-               *-aix*)
-                       # avoid recording immediate path to sharedlibs into 
executables
-                       append-ldflags -Wl,-bnoipath
-               ;;
-               *-cygwin*)
-                       # no LD_PRELOAD support, no undefined symbols
-                       myconf+=( --disable-local-library-preloading 
LT_LDFLAGS=-no-undefined )
-                       ;;
-               *-interix*)
-                       # loader crashes on the LD_PRELOADs...
-                       myconf+=( --disable-local-library-preloading )
-               ;;
-               *-solaris*)
-                       # need -lintl to link
-                       use nls && append-libs intl
-                       # this breaks installation, on x64 echo replacement is 
32-bits
-                       myconf+=( --disable-local-library-preloading )
-               ;;
-               *-mint*)
-                       myconf+=( --enable-all-static 
--disable-local-library-preloading )
-               ;;
-               *)
-                       # inject LD_PRELOAD entries for easy in-tree development
-                       myconf+=( --enable-local-library-preloading )
-               ;;
-       esac
-
-       #version 1.7.7 again tries to link against the older installed version 
and fails, when trying to
-       #compile for x86 on amd64, so workaround this issue again
-       #check newer versions, if this is still/again needed
-       #myconf+=( --disable-disallowing-of-undefined-references )
-
-       # for build-time scripts
-       if use ctypes-python || use python || use test; then
-               python_setup
-       fi
-
-       if use python && [[ ${CHOST} == *-darwin* ]] ; then
-               export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) 
-bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
-               export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined 
dynamic_lookup $(PYTHON_LIBS)'
-               export ac_cv_python_compile="$(tc-getCC)"
-       fi
-
-       # allow overriding Python include directory
-       ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" 
"none") \
-       ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" 
"none") \
-       ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
-       econf "${myconf[@]}"
-}
-
-src_compile() {
-       emake local-all
-
-       if use ctypes-python ; then
-               # pre-generate .py files
-               use ctypes-python && emake ctypes-python
-
-               pushd subversion/bindings/ctypes-python >/dev/null || die
-               distutils-r1_src_compile
-               popd >/dev/null || die
-       fi
-
-       if use python ; then
-               swig_py_compile() {
-                       local p=subversion/bindings/swig/python
-                       rm -f ${p} || die
-                       ln -s "${BUILD_DIR}" ${p} || die
-
-                       python_export PYTHON_INCLUDEDIR
-                       emake swig-py \
-                               swig_pydir="$(python_get_sitedir)/libsvn" \
-                               swig_pydir_extra="$(python_get_sitedir)/svn"
-               }
-
-               # this will give us proper BUILD_DIR for symlinking
-               BUILD_DIR=python \
-               python_foreach_impl swig_py_compile
-       fi
-
-       if use perl ; then
-               emake swig-pl
-       fi
-
-       if use ruby ; then
-               emake swig-rb
-       fi
-
-       if use java ; then
-               emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding 
iso8859-1" javahl
-       fi
-
-       if use extras ; then
-               emake tools
-       fi
-
-       if use doc ; then
-               doxygen doc/doxygen.conf || die "Building of Subversion HTML 
documentation failed"
-
-               if use java; then
-                       emake doc-javahl
-               fi
-       fi
-}
-
-src_test() {
-       if has_version ~${CATEGORY}/${P} ; then
-               default
-
-               if use ctypes-python ; then
-                       python_test() {
-                               "${PYTHON}" 
subversion/bindings/ctypes-python/test/run_all.py \
-                                       || die "ctypes-python tests fail with 
${EPYTHON}"
-                       }
-
-                       distutils-r1_src_test
-               fi
-
-               if use python ; then
-                       swig_py_test() {
-                               pushd "${BUILD_DIR}" >/dev/null || die
-                               "${PYTHON}" tests/run_all.py || die "swig-py 
tests fail with ${EPYTHON}"
-                               popd >/dev/null || die
-                       }
-
-                       BUILD_DIR=subversion/bindings/swig/python \
-                       python_foreach_impl swig_py_test
-               fi
-       else
-               ewarn "The test suite shows errors when there is an older 
version of"
-               ewarn "${CATEGORY}/${PN} installed. Please install 
=${CATEGORY}/${P}*"
-               ewarn "before running the test suite."
-               ewarn "Test suite skipped."
-       fi
-}
-
-src_install() {
-       emake -j1 DESTDIR="${D}" local-install
-
-       if use ctypes-python ; then
-               pushd subversion/bindings/ctypes-python >/dev/null || die
-               distutils-r1_src_install
-               popd >/dev/null || die
-       fi
-
-       if use python ; then
-               swig_py_install() {
-                       local p=subversion/bindings/swig/python
-                       rm -f ${p} || die
-                       ln -s "${BUILD_DIR}" ${p} || die
-
-                       emake \
-                               DESTDIR="${D}" \
-                               swig_pydir="$(python_get_sitedir)/libsvn" \
-                               swig_pydir_extra="$(python_get_sitedir)/svn" \
-                               install-swig-py
-               }
-
-               BUILD_DIR=python \
-               python_foreach_impl swig_py_install
-       fi
-
-       if use perl ; then
-               emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
-               perl_delete_localpod
-               find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || 
die
-       fi
-
-       if use ruby ; then
-               emake DESTDIR="${D}" install-swig-rb
-       fi
-
-       if use java ; then
-               emake DESTDIR="${D}" install-javahl
-               java-pkg_regso 
"${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
-               java-pkg_dojar 
"${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-               rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
-       fi
-
-       # Install Apache module configuration.
-       if use apache2 ; then
-               keepdir "${APACHE_MODULES_CONFDIR}"
-               insinto "${APACHE_MODULES_CONFDIR}"
-               doins "${FILESDIR}/47_mod_dav_svn.conf"
-       fi
-
-       # Install Bash Completion, bug 43179.
-       newbashcomp tools/client-side/bash_completion svn
-       bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
-       rm -f tools/client-side/bash_completion
-
-       # Install hot backup script, bug 54304.
-       newbin tools/backup/hot-backup.py svn-hot-backup
-       rm -fr tools/backup
-
-       # Install svnserve init-script and xinet.d snippet, bug 43245.
-       newinitd "${FILESDIR}"/svnserve.initd3 svnserve
-       newconfd "${FILESDIR}"/svnserve.confd svnserve
-       insinto /etc/xinetd.d
-       newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-       #adjust default user and group with disabled apache2 USE flag, bug 
381385
-       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
-               sed -e "0,/apache/s//svn/" \
-                       -e "s:apache:svnusers:" \
-                       -i "${ED%/}"/etc/xinetd.d/svnserve || die
-       fi
-
-       # Install documentation.
-       dodoc CHANGES COMMITTERS README
-       dodoc tools/xslt/svnindex.{css,xsl}
-       rm -fr tools/xslt
-
-       # Install extra files.
-       if use extras ; then
-               cat <<- EOF > 80subversion-extras
-                       PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-                       ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-               EOF
-               doenvd 80subversion-extras
-
-               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
-               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}
-
-               insinto /usr/share/${PN}
-               find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || 
die
-               doins -r tools
-       fi
-
-       if use doc ; then
-               docinto html
-               dodoc -r doc/doxygen/html/*
-
-               if use java ; then
-                       java-pkg_dojavadoc doc/javadoc
-               fi
-       fi
-
-       prune_libtool_files --all
-
-       cd "${ED%/}"/usr/share/locale
-       for i in * ; do
-               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/")"
-               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"
-               fi
-       fi
-}
-
-pkg_postinst() {
-       if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
-               ewarn "You upgraded from an older version of Berkeley DB and 
may experience"
-               ewarn "problems with your repository. Run the following 
commands as root to fix it:"
-               ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-               ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-       fi
-
-       ewarn "If you run subversion as a daemon, you will need to restart it 
to avoid module mismatches."
-}
-
-pkg_postrm() {
-       :
-}
-
-pkg_config() {
-       # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
-       # already has EPREFIX in it
-       einfo "Initializing the database in ${SVN_REPOS_LOC}..."
-       if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
-               echo "A Subversion repository already exists and I will not 
overwrite it."
-               echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure 
you want to have a clean version."
-       else
-               mkdir -p "${SVN_REPOS_LOC}/conf"
-
-               einfo "Populating repository directory..."
-               # Create initial repository.
-               "${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}")"
-               if use apache2 ; then
-                       [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
-                       [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
-               else
-                       [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
-                       [[ -z "${SVNSERVE_GROUP}" ]] && 
SVNSERVE_GROUP="svnusers"
-               fi
-               chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
-               chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
-               echo "Please create \"${SVNSERVE_GROUP}\" group if it does not 
exist yet."
-               echo "Afterwards please create \"${SVNSERVE_USER}\" user with 
homedir \"${SVN_REPOS_LOC}\""
-               echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does 
not exist yet."
-               echo "Finally, execute \"chown -Rf 
${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
-               echo "to finish the configuration."
-       fi
-}

Reply via email to