Remove old ebuilds. 1.6.17-r6 is the new stabilisation target in one month.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

6 files changed, 17 insertions, 2803 deletions

diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index e2fd1ac77315..ad02bfbb9eb7 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/subversion
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.56 2011/08/31 18:31:04 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.57 2011/09/01 07:42:03 chainsaw Exp $
+
+  01 Sep 2011; Tony Vroon <chainsaw@gentoo.org> -subversion-1.6.15.ebuild,
+  -subversion-1.6.16.ebuild, -subversion-1.6.17-r4.ebuild,
+  -subversion-1.6.17-r5.ebuild:
+  Remove old ebuilds. 1.6.17-r6 is the new stabilisation target in one month.
 
 *subversion-1.6.17-r6 (31 Aug 2011)
 
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 62095095ada4..968f59b4116f 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 47_mod_dav_svn.conf 422 RMD160 658703e00882a0bce007709372cf40a407fee915 SHA1 3a1ffd40391a1cca3cb9cfb1b9d153c1a4f169a0 SHA256 bdb10203ae3154da723655b07118f630ef1e83ec38a79e31a53e436e0c071d27
 AUX 70svn-gentoo.el 443 RMD160 300189eea80dfefa0f2a8479f67d255b39fd2adb SHA1 245b5ed611755276016bc76de2eabdc117e2c511 SHA256 23aa9effa5aea7ae73d14ae4df1a9269135137a5e483b4ff2a501dc130d7d1be
 AUX subversion-1.5.4-interix.patch 4375 RMD160 4e10804e8a5ed2a61e66674588a6ccf0f61bba75 SHA1 fd614971d98c21dd4c9794b8f8b3d8c34d8e25d1 SHA256 1cb7dec795921a89e90f792d0176c52239aa3d87064bafbd5af9ded4df981dbe
@@ -10,14 +13,15 @@ AUX svnserve.confd 322 RMD160 e291d91f05da848a3517aa76611c1f05527c11e4 SHA1 c070
 AUX svnserve.initd 818 RMD160 6a24ac0599ef46b2d1ef0ae9cde70bdc8124db68 SHA1 f3ef120b584d81124171ccaf5bafec709222d04e SHA256 4f9d38d5b32d4436dcb302f7e3c7284e67d6339b25b0f057a306b978f4a06142
 AUX svnserve.initd2 823 RMD160 33ba9c352013dcea2b4a51f392c06ddc615f2b04 SHA1 c27967ae76a034372090d4ab676e85174c4add89 SHA256 5a13b4e037d38483a7086cec4d29fab2eef7c340cb405f24de6c4674829b3b6b
 AUX svnserve.xinetd 332 RMD160 c2fc4eb02da7e7405756fce650b8897f0a9da7f7 SHA1 d7d478fc257a40626888f9b12ee218df55dac570 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2
-DIST subversion-1.6.15.tar.bz2 5515056 RMD160 d1a1bb87700af624b21d84d2f1fa2bbcdf3917eb SHA1 b6fadf944a94b86f989f07bc2d781be41df017bf SHA256 b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45
-DIST subversion-1.6.16.tar.bz2 5509729 RMD160 f12d7eb31372486290e08143ec1afda029767d34 SHA1 c1a050bd8ad2444eb6729b8a7f451960711af2df SHA256 dce4897d62d0dc29ab03834ed1d66ede95c07702e32a0042f96c24c6f1213386
 DIST subversion-1.6.17.tar.bz2 5504298 RMD160 b0937be80622774fee5d4557e740ad44f7f47172 SHA1 6e3ed7c87d98fdf5f0a999050ab601dcec6155a1 SHA256 d629c657e171616d30cc0cbddf1011a065770813bfc32f78c6940d09ca868124
-EBUILD subversion-1.6.15.ebuild 31841 RMD160 0b018adda55fc51e2a7fb05e7bfdeb1b11f318c4 SHA1 9f73ff35e92d60692d551382a68dac87b56655df SHA256 a1eba80dd50f7ec4092884c410228c7aa0778ca0a812c097deb36139c5907712
-EBUILD subversion-1.6.16.ebuild 31846 RMD160 c2714b45a69939db231e5f03ad26b6def895f397 SHA1 994949ce558dc39e8d8e9b0cf4d248937c628ef7 SHA256 8e4ae636dcb868a4a9ed17dc01c42451c62b8c73f890e99c3b16125c7267af11
-EBUILD subversion-1.6.17-r4.ebuild 15936 RMD160 644dbaa1eb80eab3001675a27ba94734642913bd SHA1 eebe7e972a16a090cd09fac9aa087e736cf58389 SHA256 c2f70bc6fc5600a0ac8ff069ed5210f869a8a08aa31230f373e59eea847b94f4
-EBUILD subversion-1.6.17-r5.ebuild 15942 RMD160 c25bbe88934a03c487247a6a9ad15f447a844856 SHA1 17f7b9d7e0d7238a867933bb33b293a5fd59c426 SHA256 1a2d97681442ad6620c53ad8dd4dbb186cbca97cefb845b3314bbdc35dc12252
 EBUILD subversion-1.6.17-r6.ebuild 16778 RMD160 64d5e3ecd40b8c5f64033031b52cadef81ecda28 SHA1 0675ad79bcef4b23a1c36523401befba6d13c806 SHA256 52e07ef9ecf3890fb19cae22040b03ffd010bfc746d17bbdea8ab698d8b3af47
 EBUILD subversion-1.6.17.ebuild 31726 RMD160 1fadbce9c87e6e752939358da88ca5759915d9d3 SHA1 e5965787a4b125db056b7889a6315601829d6702 SHA256 8d518450171a35ee4b4526ec0fe8e73ff29aa087ae8db978914cf5a9da673b36
-MISC ChangeLog 80228 RMD160 a11823dbfaf7a2991ef2ebacc40d078be5709bd7 SHA1 0ff15a6b13ac0ed03feed7fd37a8c013acb169a3 SHA256 721a51f606c17b2d68f0d181f9eedb0708f64a952b2b78bbd6f9b977297e7451
+MISC ChangeLog 80473 RMD160 56fdfca21bd3aa8166a26bab23e57042512fb2ea SHA1 ef7f4348ef9775a8e5ce749235a2c01b5265d815 SHA256 acb6551ceab2cde48b181f15ccf78d4a8e29c9f6baa43bc452728781c5649c93
 MISC metadata.xml 650 RMD160 17a1bcef59b035ceeb456ff3bcff9f121db2cc5e SHA1 677d1e573840f9f634abfa39dbce0dc4f11e4ee8 SHA256 ca7082ab0d3917e015b6532500bd31ef236513c3ad30782462823c947df1afdb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk5fN1QACgkQp5vW4rUFj5q+3ACggDMbJfDY6kEOW+fU9Ke5Rkvx
+4rAAoIuLm7kDbKcvgrUWgVSYRycqlTMt
+=eDqQ
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/subversion/subversion-1.6.15.ebuild b/dev-vcs/subversion/subversion-1.6.15.ebuild
deleted file mode 100644
index ee92ab8d154f..000000000000
--- a/dev-vcs/subversion/subversion-1.6.15.ebuild
+++ /dev/null
@@ -1,937 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.15.ebuild,v 1.7 2011/01/11 19:16:40 jer Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-WANT_AUTOMAKE="none"
-
-inherit autotools bash-completion db-use depend.apache elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module python
-
-DESCRIPTION="Advanced version control system"
-HOMEPAGE="http://subversion.apache.org/"
-SRC_URI="http://subversion.tigris.org/downloads/${P/_/-}.tar.bz2"
-
-LICENSE="Subversion"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="apache2 berkdb ctypes-python debug doc +dso emacs extras gnome-keyring java kde nls perl python ruby sasl test vim-syntax +webdav-neon webdav-serf"
-
-CDEPEND=">=dev-db/sqlite-3.4[threadsafe]
-	>=dev-libs/apr-1.3:1
-	>=dev-libs/apr-util-1.3:1
-	dev-libs/expat
-	sys-libs/zlib
-	berkdb? ( =sys-libs/db-4* )
-	ctypes-python? ( =dev-lang/python-2* )
-	emacs? ( virtual/emacs )
-	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring )
-	kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >=kde-base/kdelibs-4 )
-	perl? ( dev-lang/perl )
-	python? ( =dev-lang/python-2* )
-	ruby? ( >=dev-lang/ruby-1.8.2 )
-	sasl? ( dev-libs/cyrus-sasl )
-	webdav-neon? ( >=net-libs/neon-0.28 )
-	webdav-serf? ( >=net-libs/serf-0.3.0 )"
-RDEPEND="${CDEPEND}
-	apache2? ( www-servers/apache[apache2_modules_dav] )
-	java? ( >=virtual/jre-1.5 )
-	kde? ( kde-base/kwalletd )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )"
-APACHE_TEST_DEPEND="|| (
-	=www-servers/apache-2.4*[apache2_modules_auth_basic,apache2_modules_authn_core,apache2_modules_authn_file,apache2_modules_authz_core,apache2_modules_authz_user,apache2_modules_dav,apache2_modules_log_config,apache2_modules_unixd]
-	=www-servers/apache-2.2*[apache2_modules_auth_basic,apache2_modules_authn_file,apache2_modules_dav,apache2_modules_log_config]
-	)"
-DEPEND="${CDEPEND}
-	!!<sys-apps/sandbox-1.6
-	ctypes-python? ( dev-python/ctypesgen )
-	doc? ( app-doc/doxygen )
-	gnome-keyring? ( dev-util/pkgconfig )
-	java? ( >=virtual/jdk-1.5 )
-	kde? ( dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )
-	test? (
-		=dev-lang/python-2*
-		webdav-neon? ( ${APACHE_TEST_DEPEND} )
-		webdav-serf? ( ${APACHE_TEST_DEPEND} )
-	)
-	webdav-neon? ( dev-util/pkgconfig )"
-
-want_apache
-
-S="${WORKDIR}/${P/_/-}"
-
-print() {
-	local blue color green normal red
-
-	if [[ "${NOCOLOR:-false}" =~ ^(false|no)$ ]]; then
-		red=$'\e[1;31m'
-		green=$'\e[1;32m'
-		blue=$'\e[1;34m'
-		normal=$'\e[0m'
-	fi
-
-	while (($#)); do
-		case "$1" in
-			--red)
-				color="${red}"
-				;;
-			--green)
-				color="${green}"
-				;;
-			--blue)
-				color="${blue}"
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				break
-				;;
-		esac
-		shift
-	done
-
-	echo " ${green}*${normal} ${color}$@${normal}"
-}
-
-pkg_setup() {
-	if use kde && ! use nls; then
-		eerror "Support for KWallet (KDE) requires Native Language Support (NLS)."
-		die "Enable \"nls\" USE flag"
-	fi
-
-	if use berkdb; then
-		einfo
-		if [[ -z "${SVN_BDB_VERSION}" ]]; then
-			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
-		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
-		einfo
-
-		local apu_bdb_version="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libaprutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		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 ctypes-python || use python || use test; then
-		python_pkg_setup
-	fi
-
-	if ! use webdav-neon && ! use webdav-serf; then
-		ewarn
-		ewarn "WebDAV support is disabled. You need WebDAV to"
-		ewarn "access repositories through the HTTP protocol."
-		ewarn
-		ewarn "WebDAV support needs one of the following USE flags enabled:"
-		ewarn "  webdav-neon webdav-serf"
-		ewarn
-		ewarn "You can do this by enabling one of these flags in /etc/portage/package.use:"
-		ewarn "    ${CATEGORY}/${PN} webdav-neon webdav-serf"
-		ewarn
-		echo -ne "\a"
-	fi
-
-	if use test; then
-		print
-		print --red "************************************************************************************************"
-		print
-		print "NOTES ABOUT TESTS"
-		print
-		print "You can set the following variables to enable testing of some features and configure testing:"
-		if use webdav-neon || use webdav-serf; then
-			print "  SVN_TEST_APACHE_PORT=integer          - Set Apache port number (Default value: 62208)"
-		fi
-		print "  SVN_TEST_SVNSERVE_PORT=integer        - Set svnserve port number (Default value: 62209)"
-		print "  SVN_TEST_FSFS_MEMCACHED=1             - Enable using of Memcached for FSFS repositories"
-		print "  SVN_TEST_FSFS_MEMCACHED_PORT=integer  - Set Memcached port number (Default value: 62210)"
-		print "  SVN_TEST_FSFS_SHARDING=integer        - Enable sharding of FSFS repositories and set default shard size for FSFS repositories"
-		print "  SVN_TEST_FSFS_PACKING=1               - Enable packing of FSFS repositories"
-		print "                                          (SVN_TEST_FSFS_PACKING requires SVN_TEST_FSFS_SHARDING)"
-#		if use sasl; then
-#	 		print "  SVN_TEST_SASL=1                       - Enable SASL authentication"
-#		fi
-		if use ctypes-python || use java || use perl || use python || use ruby; then
-			print "  SVN_TEST_BINDINGS=1                   - Enable testing of bindings"
-		fi
-		if use java || use perl || use python || use ruby; then
-			print "                                          (Testing of bindings requires ${CATEGORY}/${PF})"
-		fi
-		if use java; then
-			print "                                          (Testing of JavaHL library requires dev-java/junit:4)"
-		fi
-		print
-		print --red "************************************************************************************************"
-		print
-
-		if ! use apache2 && { use webdav-neon || use webdav-serf; }; then
-			eerror "Testing of libsvn_ra_neon / libsvn_ra_serf requires support for Apache."
-			die "Enable \"apache2\" USE flag."
-		fi
-
-		if [[ -n "${SVN_TEST_APACHE_PORT}" ]] && ! ([[ "$((${SVN_TEST_APACHE_PORT}))" == "${SVN_TEST_APACHE_PORT}" ]]) &>/dev/null; then
-			die "Value of SVN_TEST_APACHE_PORT must be an integer"
-		fi
-
-		if [[ -n "${SVN_TEST_SVNSERVE_PORT}" ]] && ! ([[ "$((${SVN_TEST_SVNSERVE_PORT}))" == "${SVN_TEST_SVNSERVE_PORT}" ]]) &>/dev/null; then
-			die "Value of SVN_TEST_SVNSERVE_PORT must be an integer"
-		fi
-
-		if [[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]] && ! has_version net-misc/memcached; then
-			die "net-misc/memcached must be installed"
-		fi
-		if [[ -n "${SVN_TEST_FSFS_MEMCACHED_PORT}" ]] && ! ([[ "$((${SVN_TEST_FSFS_MEMCACHED_PORT}))" == "${SVN_TEST_FSFS_MEMCACHED_PORT}" ]]) &>/dev/null; then
-			die "Value of SVN_TEST_FSFS_MEMCACHED_PORT must be an integer"
-		fi
-		if [[ -n "${SVN_TEST_FSFS_SHARDING}" ]] && ! ([[ "$((${SVN_TEST_FSFS_SHARDING}))" == "${SVN_TEST_FSFS_SHARDING}" ]]) &>/dev/null; then
-			die "Value of SVN_TEST_FSFS_SHARDING must be an integer"
-		fi
-		if [[ -n "${SVN_TEST_FSFS_PACKING}" && -z "${SVN_TEST_FSFS_SHARDING}" ]]; then
-			die "SVN_TEST_FSFS_PACKING requires SVN_TEST_FSFS_SHARDING"
-		fi
-
-		if [[ -n "${SVN_TEST_BINDINGS}" ]]; then
-			if { use java || use perl || use python || use ruby; } && ! has_version "=${CATEGORY}/${PF}"; then
-				die "${CATEGORY}/${PF} must be installed"
-			fi
-			if use java && ! has_version dev-java/junit:4; then
-				die "dev-java/junit:4 must be installed"
-			fi
-		fi
-	fi
-
-	if use debug; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-
-	# Allow for custom repository locations.
-	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.6.0-disable_linking_against_unneeded_libraries.patch"
-	epatch "${FILESDIR}/${PN}-1.6.2-local_library_preloading.patch"
-	epatch "${FILESDIR}/${PN}-1.6.3-kwallet_window.patch"
-	chmod +x build/transform_libtool_scripts.sh || die "chmod failed"
-
-	if ! use test; then
-		sed -i \
-			-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-			-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-	fi
-
-	sed -e "/SWIG_PY_INCLUDES=/s/\$ac_cv_python_includes/\\\\\$(PYTHON_INCLUDES)/" -i build/ac-macros/swig.m4 || die "sed failed"
-
-	eautoconf
-	elibtoolize
-
-	sed -e "s/libsvn_swig_py-1\.la/libsvn_swig_py-\$(PYTHON_VERSION)-1.la/" -i build-outputs.mk || die "sed failed"
-}
-
-src_configure() {
-	local myconf
-
-	if use python || use perl || use ruby; then
-		myconf+=" --with-swig"
-	else
-		myconf+=" --without-swig"
-	fi
-
-	if use java; then
-		if use test && [[ -n "${SVN_TEST_BINDINGS}" ]]; then
-			myconf+=" --with-junit=${EPREFIX}/usr/share/junit-4/lib/junit.jar"
-		else
-			myconf+=" --without-junit"
-		fi
-	fi
-
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_with apache2 apxs "${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 kde kwallet) \
-		$(use_enable nls) \
-		$(use_with sasl) \
-		$(use_with webdav-neon neon) \
-		$(use_with webdav-serf serf "${EPREFIX}/usr") \
-		${myconf} \
-		--with-apr="${EPREFIX}/usr/bin/apr-1-config" \
-		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \
-		--disable-experimental-libtool \
-		--without-jikes \
-		--enable-local-library-preloading \
-		--disable-mod-activation \
-		--disable-neon-version-check \
-		--with-sqlite="${EPREFIX}/usr"
-}
-
-src_compile() {
-	print
-	print "Building of core of Subversion"
-	print
-	emake local-all || die "Building of core of Subversion failed"
-
-	if use ctypes-python; then
-		print
-		print "Building of Subversion Ctypes Python bindings"
-		print
-		python_copy_sources subversion/bindings/ctypes-python
-		rm -fr subversion/bindings/ctypes-python
-		ctypes_python_bindings_building() {
-			rm -f subversion/bindings/ctypes-python
-			ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python
-			emake ctypes-python
-		}
-		python_execute_function \
-			--action-message 'Building of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Building of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			ctypes_python_bindings_building
-	fi
-
-	if use python; then
-		print
-		print "Building of Subversion SWIG Python bindings"
-		print
-		python_copy_sources subversion/bindings/swig/python
-		rm -fr subversion/bindings/swig/python
-		swig_python_bindings_building() {
-			rm -f subversion/bindings/swig/python
-			ln -s python-${PYTHON_ABI} subversion/bindings/swig/python
-			emake \
-				PYTHON_INCLUDES="-I${EPREFIX}$(python_get_includedir)" \
-				PYTHON_VERSION="$(python_get_version)" \
-				swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \
-				swig-py
-		}
-		python_execute_function \
-			--action-message 'Building of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Building of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			swig_python_bindings_building
-	fi
-
-	if use perl; then
-		print
-		print "Building of Subversion SWIG Perl bindings"
-		print
-		emake -j1 swig-pl || die "Building of Subversion SWIG Perl bindings failed"
-	fi
-
-	if use ruby; then
-		print
-		print "Building of Subversion SWIG Ruby bindings"
-		print
-		emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed"
-	fi
-
-	if use java; then
-		print
-		print "Building of Subversion JavaHL library"
-		print
-		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Building of Subversion JavaHL library failed"
-	fi
-
-	if use emacs; then
-		print
-		print "Compilation of Emacs modules"
-		print
-		elisp-compile contrib/client-side/emacs/{dsvn,psvn,vc-svn}.el doc/svn-doc.el doc/tools/svnbook.el || die "Compilation of Emacs modules failed"
-	fi
-
-	if use extras; then
-		print
-		print "Building of contrib and tools"
-		print
-		emake contrib || die "Building of contrib failed"
-		emake tools || die "Building of tools failed"
-	fi
-
-	if use doc; then
-		print
-		print "Building of Subversion HTML documentation"
-		print
-		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
-		if use java; then
-			print
-			print "Building of Subversion JavaHL library HTML documentation"
-			print
-			emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed"
-		fi
-	fi
-}
-
-create_apache_tests_configuration() {
-	get_loadmodule_directive() {
-		if [[ "$("${APACHE_BIN}" -l)" != *"mod_$1.c"* ]]; then
-			echo "LoadModule $1_module \"${APACHE_MODULESDIR}/mod_$1.so\""
-		fi
-	}
-	get_loadmodule_directives() {
-		if has_version "=www-servers/apache-2.4*"; then
-			get_loadmodule_directive auth_basic
-			get_loadmodule_directive authn_core
-			get_loadmodule_directive authn_file
-			get_loadmodule_directive authz_core
-			get_loadmodule_directive authz_user
-			get_loadmodule_directive dav
-			get_loadmodule_directive log_config
-			get_loadmodule_directive unixd
-		else
-			get_loadmodule_directive auth_basic
-			get_loadmodule_directive authn_file
-			get_loadmodule_directive dav
-			get_loadmodule_directive log_config
-		fi
-	}
-
-	mkdir -p "${T}/apache"
-	cat << EOF > "${T}/apache/apache.conf"
-$(get_loadmodule_directives)
-LoadModule dav_svn_module "${S}/subversion/mod_dav_svn/.libs/mod_dav_svn.so"
-LoadModule authz_svn_module "${S}/subversion/mod_authz_svn/.libs/mod_authz_svn.so"
-
-User                $(id -un)
-Group               $(id -gn)
-Listen              localhost:${SVN_TEST_APACHE_PORT}
-ServerName          localhost
-ServerRoot          "${T}"
-DocumentRoot        "${T}"
-CoreDumpDirectory   "${T}"
-PidFile             "${T}/apache.pid"
-CustomLog           "${T}/apache/access_log" "%h %l %u %{%Y-%m-%dT%H:%M:%S}t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""
-CustomLog           "${T}/apache/svn_log" "%{%Y-%m-%dT%H:%M:%S}t %u %{SVN-REPOS-NAME}e %{SVN-ACTION}e" env=SVN-ACTION
-ErrorLog            "${T}/apache/error_log"
-LogLevel            Debug
-MaxRequestsPerChild 0
-
-<Directory />
-	AllowOverride None
-</Directory>
-
-<Location /svn-test-work/repositories>
-	DAV svn
-	SVNParentPath "${S}/subversion/tests/cmdline/svn-test-work/repositories"
-	AuthzSVNAccessFile "${S}/subversion/tests/cmdline/svn-test-work/authz"
-	AuthType Basic
-	AuthName "Subversion Repository"
-	AuthUserFile "${T}/apache/users"
-	Require valid-user
-</Location>
-
-<Location /svn-test-work/local_tmp/repos>
-	DAV svn
-	SVNPath "${S}/subversion/tests/cmdline/svn-test-work/local_tmp/repos"
-	AuthzSVNAccessFile "${S}/subversion/tests/cmdline/svn-test-work/authz"
-	AuthType Basic
-	AuthName "Subversion Repository"
-	AuthUserFile "${T}/apache/users"
-	Require valid-user
-</Location>
-EOF
-
-	cat << EOF > "${T}/apache/users"
-jrandom:xCGl35kV9oWCY
-jconstant:xCGl35kV9oWCY
-EOF
-}
-
-set_tests_variables() {
-	if [[ "$1" == "local" ]]; then
-		base_url="file://${S}/subversion/tests/cmdline"
-		http_library=""
-	fi
-	if [[ "$1" == "svn" ]]; then
-		base_url="svn://127.0.0.1:${SVN_TEST_SVNSERVE_PORT}"
-		http_library=""
-	fi
-	if [[ "$1" == "neon" || "$1" == "serf" ]]; then
-		base_url="http://127.0.0.1:${SVN_TEST_APACHE_PORT}"
-		http_library="$1"
-	fi
-}
-
-src_test() {
-	if ! use test; then
-		die "Invalid configuration"
-	fi
-
-	local fs_type fs_types ra_type ra_types options failed_tests
-
-	fs_types="fsfs"
-	use berkdb && fs_types+=" bdb"
-
-	ra_types="local svn"
-	use webdav-neon && ra_types+=" neon"
-	use webdav-serf && ra_types+=" serf"
-
-	local pid_file
-	for pid_file in svnserve.pid apache.pid memcached.pid; do
-		rm -f "${T}/${pid_file}"
-	done
-
-	termination() {
-		local die="$1" pid_file
-		if [[ -n "${die}" ]]; then
-			echo -e "\n\e[1;31mKilling of child processes...\e[0m\a" > /dev/tty
-		fi
-		for pid_file in svnserve.pid apache.pid memcached.pid; do
-			if [[ -f "${T}/${pid_file}" ]]; then
-				kill "$(<"${T}/${pid_file}")"
-			fi
-		done
-		if [[ -n "${die}" ]]; then
-			sleep 6
-			die "Termination"
-		fi
-	}
-
-	trap 'termination 1 &' SIGINT SIGTERM
-
-	SVN_TEST_SVNSERVE_PORT="${SVN_TEST_SVNSERVE_PORT:-62209}"
-	LC_ALL="C" subversion/svnserve/svnserve -dr "subversion/tests/cmdline" --listen-port "${SVN_TEST_SVNSERVE_PORT}" --log-file "${T}/svnserve.log" --pid-file "${T}/svnserve.pid"
-	if use webdav-neon || use webdav-serf; then
-		SVN_TEST_APACHE_PORT="${SVN_TEST_APACHE_PORT:-62208}"
-		create_apache_tests_configuration
-		"${APACHE_BIN}" -f "${T}/apache/apache.conf"
-	fi
-	if [[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]]; then
-		SVN_TEST_FSFS_MEMCACHED_PORT="${SVN_TEST_FSFS_MEMCACHED_PORT:-62210}"
-		sed -e "/\[memcached-servers\]/akey = 127.0.0.1:${SVN_TEST_FSFS_MEMCACHED_PORT}" -i subversion/tests/tests.conf
-		memcached -dp "${SVN_TEST_FSFS_MEMCACHED_PORT}" -P "${T}/memcached.pid"
-	fi
-	if [[ -n "${SVN_TEST_FSFS_SHARDING}" ]]; then
-		options+=" FSFS_SHARDING=${SVN_TEST_FSFS_SHARDING}"
-	fi
-	if [[ -n "${SVN_TEST_FSFS_PACKING}" ]]; then
-		options+=" FSFS_PACKING=1"
-	fi
-#	if [[ -n "${SVN_TEST_SASL}" ]]; then
-#		options+=" ENABLE_SASL=1"
-#	fi
-
-	sleep 6
-
-	for ra_type in ${ra_types}; do
-		for fs_type in ${fs_types}; do
-			[[ "${ra_type}" == "local" && "${fs_type}" == "bdb" ]] && continue
-			print
-			print --blue "Testing of ra_${ra_type} + $(echo ${fs_type} | tr '[:lower:]' '[:upper:]')"
-			print
-			set_tests_variables ${ra_type}
-			time emake check FS_TYPE="${fs_type}" BASE_URL="${base_url}" HTTP_LIBRARY="${http_library}" CLEANUP="1" ${options} || failed_tests="1"
-			mv tests.log "${T}/tests-ra_${ra_type}-${fs_type}.log"
-		done
-	done
-	unset base_url http_library
-	termination
-	trap - SIGINT SIGTERM
-
-	if [[ -n "${SVN_TEST_BINDINGS}" ]]; then
-		local swig_lingua swig_linguas
-		local -A linguas
-
-		if use ctypes-python; then
-			print
-			print --blue "Testing of Subversion Ctypes Python bindings"
-			print
-			ctypes_python_bindings_testing() {
-				rm -f subversion/bindings/ctypes-python
-				ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python
-				time emake check-ctypes-python || failed_tests="1"
-			}
-			python_execute_function \
-				--action-message 'Testing of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \
-				--failure-message 'Testing of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-				ctypes_python_bindings_testing
-		fi
-
-		if use python; then
-			print
-			print --blue "Testing of Subversion SWIG Python bindings"
-			print
-			swig_python_bindings_testing() {
-				rm -f subversion/bindings/swig/python
-				ln -s python-${PYTHON_ABI} subversion/bindings/swig/python
-				time emake PYTHON_VERSION="$(python_get_version)" check-swig-py || failed_tests="1"
-			}
-			python_execute_function \
-				--action-message 'Testing of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \
-				--failure-message 'Testing of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-				swig_python_bindings_testing
-		fi
-
-		use perl && swig_linguas+=" pl"
-		use ruby && swig_linguas+=" rb"
-
-		linguas[pl]="Perl"
-		linguas[rb]="Ruby"
-
-		for swig_lingua in ${swig_linguas}; do
-			print
-			print --blue "Testing of Subversion SWIG ${linguas[${swig_lingua}]} bindings"
-			print
-			time emake check-swig-${swig_lingua} || failed_tests="1"
-		done
-
-		if use java; then
-			print
-			print --blue "Testing of Subversion JavaHL library"
-			print
-			time emake check-javahl || failed_tests="1"
-		fi
-	fi
-
-	if [[ -n "${failed_tests}" ]]; then
-		ewarn
-		ewarn "\e[1;31mTests failed\e[0m"
-		ewarn
-	fi
-}
-
-src_install() {
-	print
-	print "Installation of core of Subversion"
-	print
-	emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed"
-
-	if use ctypes-python; then
-		print
-		print "Installation of Subversion Ctypes Python bindings"
-		print
-		ctypes_python_bindings_installation() {
-			rm -f subversion/bindings/ctypes-python
-			ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python
-			emake DESTDIR="${D}" install-ctypes-python
-		}
-		python_execute_function \
-			--action-message 'Installation of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Installation of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			ctypes_python_bindings_installation
-	fi
-
-	if use python; then
-		print
-		print "Installation of Subversion SWIG Python bindings"
-		print
-		swig_python_bindings_installation() {
-			rm -f subversion/bindings/swig/python
-			ln -s python-${PYTHON_ABI} subversion/bindings/swig/python
-			emake -j1 \
-				DESTDIR="${D}" \
-				PYTHON_VERSION="$(python_get_version)" \
-				swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \
-				install-swig-py
-		}
-		python_execute_function \
-			--action-message 'Installation of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Installation of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			swig_python_bindings_installation
-
-		delete_static_libraries() {
-			find "${ED}$(python_get_sitedir)" -name "*.a" -print0 | xargs -0 rm -f
-		}
-		python_execute_function -q delete_static_libraries
-	fi
-
-	if use ctypes-python || use python; then
-		python_clean_installation_image -q
-	fi
-
-	if use perl; then
-		print
-		print "Installation of Subversion SWIG Perl bindings"
-		print
-		emake -j1 DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed"
-		fixlocalpod
-		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr
-	fi
-
-	if use ruby; then
-		print
-		print "Installation of Subversion SWIG Ruby bindings"
-		print
-		emake -j1 DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed"
-		find "${ED}usr/$(get_libdir)/ruby" "(" -name "*.a" -o -name "*.la" ")" -print0 | xargs -0 rm -f
-	fi
-
-	if use java; then
-		print
-		print "Installation of Subversion JavaHL library"
-		print
-		emake -j1 DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
-		java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*.so
-		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
-		mkdir -p "${D}${APACHE_MODULES_CONFDIR}"
-		cat << EOF > "${D}${APACHE_MODULES_CONFDIR}"/47_mod_dav_svn.conf
-<IfDefine SVN>
-LoadModule dav_svn_module modules/mod_dav_svn.so
-<IfDefine SVN_AUTHZ>
-LoadModule authz_svn_module modules/mod_authz_svn.so
-</IfDefine>
-
-# Example configuration:
-#<Location /svn/repos>
-#	DAV svn
-#	SVNPath ${SVN_REPOS_LOC}/repos
-#	AuthType Basic
-#	AuthName "Subversion repository"
-#	AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers
-#	Require valid-user
-#</Location>
-</IfDefine>
-EOF
-	fi
-
-	# Install Bash Completion, bug 43179.
-	dobashcompletion tools/client-side/bash_completion subversion
-	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 svn_load_dirs.pl.
-	if use perl; then
-		dobin contrib/client-side/svn_load_dirs/svn_load_dirs.pl
-	fi
-	rm -f contrib/client-side/svn_load_dirs/svn_load_dirs.pl
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245.
-	newinitd "${FILESDIR}"/svnserve.initd svnserve
-	newconfd "${FILESDIR}"/svnserve.confd svnserve
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dodoc tools/xslt/svnindex.{css,xsl}
-	rm -fr tools/xslt
-
-	# Install Vim syntax files.
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins contrib/client-side/vim/svn.vim
-	fi
-	rm -f contrib/client-side/vim/svn.vim
-
-	# Install Emacs Lisps.
-	if use emacs; then
-		elisp-install ${PN} contrib/client-side/emacs/{dsvn,psvn}.{el,elc} doc/svn-doc.{el,elc} doc/tools/svnbook.{el,elc} || die "Installation of Emacs modules failed"
-		elisp-install ${PN}/compat contrib/client-side/emacs/vc-svn.{el,elc} || die "Installation of Emacs modules failed"
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}/70svn-gentoo.el" || die "Installation of Emacs site-init file failed"
-	fi
-	rm -fr contrib/client-side/emacs
-
-	# Install extra files.
-	if use extras; then
-		print
-		print "Installation of contrib and tools"
-		print
-
-		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}" contribdir="/usr/$(get_libdir)/subversion/bin" install-contrib || die "Installation of contrib failed"
-		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed"
-
-		find contrib tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
-		rm -fr contrib/client-side/svn-push
-		rm -fr contrib/server-side/svnstsw
-		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}
-		doins -r contrib tools
-	fi
-
-	if use doc; then
-		print
-		print "Installation of Subversion HTML documentation"
-		print
-		dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed"
-
-		insinto /usr/share/doc/${PF}
-		doins -r notes
-		ecompressdir /usr/share/doc/${PF}/notes
-
-#		if use ruby; then
-#			emake DESTDIR="${D}" install-swig-rb-doc
-#		fi
-
-		if use java; then
-			java-pkg_dojavadoc doc/javadoc
-		fi
-	fi
-}
-
-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.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1.so.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() {
-	use emacs && elisp-site-regen
-	use perl && perl-module_pkg_postinst
-
-	if use ctypes-python; then
-		python_mod_optimize csvn
-	fi
-
-	if use python; then
-		python_mod_optimize libsvn svn
-	fi
-
-	elog "Subversion Server Notes"
-	elog "-----------------------"
-	elog
-	elog "If you intend to run a server, a repository needs to be created using"
-	elog "svnadmin (see man svnadmin) or the following command to create it in"
-	elog "${SVN_REPOS_LOC}:"
-	elog
-	elog "    emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "Subversion has multiple server types, take your pick:"
-	elog
-	elog " - svnserve daemon: "
-	elog "   1. Edit /etc/conf.d/svnserve"
-	elog "   2. Fix the repository permissions (see \"Fixing the repository permissions\")"
-	elog "   3. Start daemon: /etc/init.d/svnserve start"
-	elog "   4. Make persistent: rc-update add svnserve default"
-	elog
-	elog " - svnserve via xinetd:"
-	elog "   1. Edit /etc/xinetd.d/svnserve (remove disable line)"
-	elog "   2. Fix the repository permissions (see \"Fixing the repository permissions\")"
-	elog "   3. Restart xinetd.d: /etc/init.d/xinetd restart"
-	elog
-	elog " - svn over ssh:"
-	elog "   1. Fix the repository permissions (see \"Fixing the repository permissions\")"
-	elog "      Additionally run:"
-	elog "        groupadd svnusers"
-	elog "        chown -R root:svnusers ${SVN_REPOS_LOC}/repos"
-	elog "   2. Create an svnserve wrapper in /usr/local/bin to set the umask you"
-	elog "      want, for example:"
-	elog "         #!/bin/bash"
-	elog "         . /etc/conf.d/svnserve"
-	elog "         umask 007"
-	elog "         exec /usr/bin/svnserve \${SVNSERVE_OPTS} \"\$@\""
-	elog
-
-	if use apache2; then
-		elog " - http-based server:"
-		elog "   1. Edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
-		elog "   2. Create an htpasswd file:"
-		elog "      htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
-		elog "   3. Fix the repository permissions (see \"Fixing the repository permissions\")"
-		elog "   4. Restart Apache: /etc/init.d/apache2 restart"
-		elog
-	fi
-
-	elog " Fixing the repository permissions:"
-	elog "      chmod -Rf go-rwx ${SVN_REPOS_LOC}/conf"
-	elog "      chmod -Rf g-w,o-rwx ${SVN_REPOS_LOC}/repos"
-	elog "      chmod -Rf g+rw ${SVN_REPOS_LOC}/repos/db"
-	elog "      chmod -Rf g+rw ${SVN_REPOS_LOC}/repos/locks"
-	elog
-
-	elog "If you intend to use svn-hot-backup, you can specify the number of"
-	elog "backups to keep per repository by specifying an environment variable."
-	elog "If you want to keep e.g. 2 backups, do the following:"
-	elog "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion"
-	elog "echo 'SVN_HOTBACKUP_BACKUPS_NUMBER=2' >> /etc/env.d/80subversion"
-	elog
-
-	elog "Subversion contains support for the use of Memcached"
-	elog "to cache data of FSFS repositories."
-	elog "You should install \"net-misc/memcached\", start memcached"
-	elog "and configure your FSFS repositories, if you want to use this feature."
-	elog "See the documentation for details."
-	elog
-
-	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
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use perl && perl-module_pkg_postrm
-
-	if use ctypes-python; then
-		python_mod_cleanup csvn
-	fi
-
-	if use python; then
-		python_mod_cleanup libsvn svn
-	fi
-}
-
-pkg_config() {
-	einfo "Initializing the database in ${EROOT}${SVN_REPOS_LOC}..."
-	if [[ -e "${EROOT}${SVN_REPOS_LOC}/repos" ]]; then
-		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete \"${EROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
-	else
-		mkdir -p "${EROOT}${SVN_REPOS_LOC}/conf"
-
-		einfo "Populating repository directory..."
-		# Create initial repository.
-		"${EROOT}usr/bin/svnadmin" create "${EROOT}${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"
-			enewgroup "${SVNSERVE_GROUP}"
-			enewuser "${SVNSERVE_USER}" -1 -1 "${SVN_REPOS_LOC}" "${SVNSERVE_GROUP}"
-		fi
-		chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${EROOT}${SVN_REPOS_LOC}/repos"
-		chmod -Rf go-rwx "${EROOT}${SVN_REPOS_LOC}/conf"
-		chmod -Rf o-rwx "${EROOT}${SVN_REPOS_LOC}/repos"
-	fi
-}
diff --git a/dev-vcs/subversion/subversion-1.6.16.ebuild b/dev-vcs/subversion/subversion-1.6.16.ebuild
deleted file mode 100644
index fadde16d08e3..000000000000
--- a/dev-vcs/subversion/subversion-1.6.16.ebuild
+++ /dev/null
@@ -1,937 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.16.ebuild,v 1.6 2011/03/06 11:48:14 hwoarang Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-WANT_AUTOMAKE="none"
-
-inherit autotools bash-completion db-use depend.apache elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module python
-
-DESCRIPTION="Advanced version control system"
-HOMEPAGE="http://subversion.apache.org/"
-SRC_URI="http://subversion.tigris.org/downloads/${P/_/-}.tar.bz2"
-
-LICENSE="Subversion"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="apache2 berkdb ctypes-python debug doc +dso emacs extras gnome-keyring java kde nls perl python ruby sasl test vim-syntax +webdav-neon webdav-serf"
-
-CDEPEND=">=dev-db/sqlite-3.4[threadsafe]
-	>=dev-libs/apr-1.3:1
-	>=dev-libs/apr-util-1.3:1
-	dev-libs/expat
-	sys-libs/zlib
-	berkdb? ( =sys-libs/db-4* )
-	ctypes-python? ( =dev-lang/python-2* )
-	emacs? ( virtual/emacs )
-	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring )
-	kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >=kde-base/kdelibs-4 )
-	perl? ( dev-lang/perl )
-	python? ( =dev-lang/python-2* )
-	ruby? ( >=dev-lang/ruby-1.8.2 )
-	sasl? ( dev-libs/cyrus-sasl )
-	webdav-neon? ( >=net-libs/neon-0.28 )
-	webdav-serf? ( >=net-libs/serf-0.3.0 )"
-RDEPEND="${CDEPEND}
-	apache2? ( www-servers/apache[apache2_modules_dav] )
-	java? ( >=virtual/jre-1.5 )
-	kde? ( kde-base/kwalletd )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )"
-APACHE_TEST_DEPEND="|| (
-	=www-servers/apache-2.4*[apache2_modules_auth_basic,apache2_modules_authn_core,apache2_modules_authn_file,apache2_modules_authz_core,apache2_modules_authz_user,apache2_modules_dav,apache2_modules_log_config,apache2_modules_unixd]
-	=www-servers/apache-2.2*[apache2_modules_auth_basic,apache2_modules_authn_file,apache2_modules_dav,apache2_modules_log_config]
-	)"
-DEPEND="${CDEPEND}
-	!!<sys-apps/sandbox-1.6
-	ctypes-python? ( dev-python/ctypesgen )
-	doc? ( app-doc/doxygen )
-	gnome-keyring? ( dev-util/pkgconfig )
-	java? ( >=virtual/jdk-1.5 )
-	kde? ( dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )
-	test? (
-		=dev-lang/python-2*
-		webdav-neon? ( ${APACHE_TEST_DEPEND} )
-		webdav-serf? ( ${APACHE_TEST_DEPEND} )
-	)
-	webdav-neon? ( dev-util/pkgconfig )"
-
-want_apache
-
-S="${WORKDIR}/${P/_/-}"
-
-print() {
-	local blue color green normal red
-
-	if [[ "${NOCOLOR:-false}" =~ ^(false|no)$ ]]; then
-		red=$'\e[1;31m'
-		green=$'\e[1;32m'
-		blue=$'\e[1;34m'
-		normal=$'\e[0m'
-	fi
-
-	while (($#)); do
-		case "$1" in
-			--red)
-				color="${red}"
-				;;
-			--green)
-				color="${green}"
-				;;
-			--blue)
-				color="${blue}"
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				break
-				;;
-		esac
-		shift
-	done
-
-	echo " ${green}*${normal} ${color}$@${normal}"
-}
-
-pkg_setup() {
-	if use kde && ! use nls; then
-		eerror "Support for KWallet (KDE) requires Native Language Support (NLS)."
-		die "Enable \"nls\" USE flag"
-	fi
-
-	if use berkdb; then
-		einfo
-		if [[ -z "${SVN_BDB_VERSION}" ]]; then
-			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
-		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
-		einfo
-
-		local apu_bdb_version="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libaprutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		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 ctypes-python || use python || use test; then
-		python_pkg_setup
-	fi
-
-	if ! use webdav-neon && ! use webdav-serf; then
-		ewarn
-		ewarn "WebDAV support is disabled. You need WebDAV to"
-		ewarn "access repositories through the HTTP protocol."
-		ewarn
-		ewarn "WebDAV support needs one of the following USE flags enabled:"
-		ewarn "  webdav-neon webdav-serf"
-		ewarn
-		ewarn "You can do this by enabling one of these flags in /etc/portage/package.use:"
-		ewarn "    ${CATEGORY}/${PN} webdav-neon webdav-serf"
-		ewarn
-		echo -ne "\a"
-	fi
-
-	if use test; then
-		print
-		print --red "************************************************************************************************"
-		print
-		print "NOTES ABOUT TESTS"
-		print
-		print "You can set the following variables to enable testing of some features and configure testing:"
-		if use webdav-neon || use webdav-serf; then
-			print "  SVN_TEST_APACHE_PORT=integer          - Set Apache port number (Default value: 62208)"
-		fi
-		print "  SVN_TEST_SVNSERVE_PORT=integer        - Set svnserve port number (Default value: 62209)"
-		print "  SVN_TEST_FSFS_MEMCACHED=1             - Enable using of Memcached for FSFS repositories"
-		print "  SVN_TEST_FSFS_MEMCACHED_PORT=integer  - Set Memcached port number (Default value: 62210)"
-		print "  SVN_TEST_FSFS_SHARDING=integer        - Enable sharding of FSFS repositories and set default shard size for FSFS repositories"
-		print "  SVN_TEST_FSFS_PACKING=1               - Enable packing of FSFS repositories"
-		print "                                          (SVN_TEST_FSFS_PACKING requires SVN_TEST_FSFS_SHARDING)"
-#		if use sasl; then
-#	 		print "  SVN_TEST_SASL=1                       - Enable SASL authentication"
-#		fi
-		if use ctypes-python || use java || use perl || use python || use ruby; then
-			print "  SVN_TEST_BINDINGS=1                   - Enable testing of bindings"
-		fi
-		if use java || use perl || use python || use ruby; then
-			print "                                          (Testing of bindings requires ${CATEGORY}/${PF})"
-		fi
-		if use java; then
-			print "                                          (Testing of JavaHL library requires dev-java/junit:4)"
-		fi
-		print
-		print --red "************************************************************************************************"
-		print
-
-		if ! use apache2 && { use webdav-neon || use webdav-serf; }; then
-			eerror "Testing of libsvn_ra_neon / libsvn_ra_serf requires support for Apache."
-			die "Enable \"apache2\" USE flag."
-		fi
-
-		if [[ -n "${SVN_TEST_APACHE_PORT}" ]] && ! ([[ "$((${SVN_TEST_APACHE_PORT}))" == "${SVN_TEST_APACHE_PORT}" ]]) &>/dev/null; then
-			die "Value of SVN_TEST_APACHE_PORT must be an integer"
-		fi
-
-		if [[ -n "${SVN_TEST_SVNSERVE_PORT}" ]] && ! ([[ "$((${SVN_TEST_SVNSERVE_PORT}))" == "${SVN_TEST_SVNSERVE_PORT}" ]]) &>/dev/null; then
-			die "Value of SVN_TEST_SVNSERVE_PORT must be an integer"
-		fi
-
-		if [[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]] && ! has_version net-misc/memcached; then
-			die "net-misc/memcached must be installed"
-		fi
-		if [[ -n "${SVN_TEST_FSFS_MEMCACHED_PORT}" ]] && ! ([[ "$((${SVN_TEST_FSFS_MEMCACHED_PORT}))" == "${SVN_TEST_FSFS_MEMCACHED_PORT}" ]]) &>/dev/null; then
-			die "Value of SVN_TEST_FSFS_MEMCACHED_PORT must be an integer"
-		fi
-		if [[ -n "${SVN_TEST_FSFS_SHARDING}" ]] && ! ([[ "$((${SVN_TEST_FSFS_SHARDING}))" == "${SVN_TEST_FSFS_SHARDING}" ]]) &>/dev/null; then
-			die "Value of SVN_TEST_FSFS_SHARDING must be an integer"
-		fi
-		if [[ -n "${SVN_TEST_FSFS_PACKING}" && -z "${SVN_TEST_FSFS_SHARDING}" ]]; then
-			die "SVN_TEST_FSFS_PACKING requires SVN_TEST_FSFS_SHARDING"
-		fi
-
-		if [[ -n "${SVN_TEST_BINDINGS}" ]]; then
-			if { use java || use perl || use python || use ruby; } && ! has_version "=${CATEGORY}/${PF}"; then
-				die "${CATEGORY}/${PF} must be installed"
-			fi
-			if use java && ! has_version dev-java/junit:4; then
-				die "dev-java/junit:4 must be installed"
-			fi
-		fi
-	fi
-
-	if use debug; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-
-	# Allow for custom repository locations.
-	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.6.0-disable_linking_against_unneeded_libraries.patch"
-	epatch "${FILESDIR}/${PN}-1.6.2-local_library_preloading.patch"
-	epatch "${FILESDIR}/${PN}-1.6.3-kwallet_window.patch"
-	chmod +x build/transform_libtool_scripts.sh || die "chmod failed"
-
-	if ! use test; then
-		sed -i \
-			-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-			-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-	fi
-
-	sed -e "/SWIG_PY_INCLUDES=/s/\$ac_cv_python_includes/\\\\\$(PYTHON_INCLUDES)/" -i build/ac-macros/swig.m4 || die "sed failed"
-
-	eautoconf
-	elibtoolize
-
-	sed -e "s/libsvn_swig_py-1\.la/libsvn_swig_py-\$(PYTHON_VERSION)-1.la/" -i build-outputs.mk || die "sed failed"
-}
-
-src_configure() {
-	local myconf
-
-	if use python || use perl || use ruby; then
-		myconf+=" --with-swig"
-	else
-		myconf+=" --without-swig"
-	fi
-
-	if use java; then
-		if use test && [[ -n "${SVN_TEST_BINDINGS}" ]]; then
-			myconf+=" --with-junit=${EPREFIX}/usr/share/junit-4/lib/junit.jar"
-		else
-			myconf+=" --without-junit"
-		fi
-	fi
-
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_with apache2 apxs "${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 kde kwallet) \
-		$(use_enable nls) \
-		$(use_with sasl) \
-		$(use_with webdav-neon neon) \
-		$(use_with webdav-serf serf "${EPREFIX}/usr") \
-		${myconf} \
-		--with-apr="${EPREFIX}/usr/bin/apr-1-config" \
-		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \
-		--disable-experimental-libtool \
-		--without-jikes \
-		--enable-local-library-preloading \
-		--disable-mod-activation \
-		--disable-neon-version-check \
-		--with-sqlite="${EPREFIX}/usr"
-}
-
-src_compile() {
-	print
-	print "Building of core of Subversion"
-	print
-	emake local-all || die "Building of core of Subversion failed"
-
-	if use ctypes-python; then
-		print
-		print "Building of Subversion Ctypes Python bindings"
-		print
-		python_copy_sources subversion/bindings/ctypes-python
-		rm -fr subversion/bindings/ctypes-python
-		ctypes_python_bindings_building() {
-			rm -f subversion/bindings/ctypes-python
-			ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python
-			emake ctypes-python
-		}
-		python_execute_function \
-			--action-message 'Building of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Building of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			ctypes_python_bindings_building
-	fi
-
-	if use python; then
-		print
-		print "Building of Subversion SWIG Python bindings"
-		print
-		python_copy_sources subversion/bindings/swig/python
-		rm -fr subversion/bindings/swig/python
-		swig_python_bindings_building() {
-			rm -f subversion/bindings/swig/python
-			ln -s python-${PYTHON_ABI} subversion/bindings/swig/python
-			emake \
-				PYTHON_INCLUDES="-I${EPREFIX}$(python_get_includedir)" \
-				PYTHON_VERSION="$(python_get_version)" \
-				swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \
-				swig-py
-		}
-		python_execute_function \
-			--action-message 'Building of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Building of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			swig_python_bindings_building
-	fi
-
-	if use perl; then
-		print
-		print "Building of Subversion SWIG Perl bindings"
-		print
-		emake -j1 swig-pl || die "Building of Subversion SWIG Perl bindings failed"
-	fi
-
-	if use ruby; then
-		print
-		print "Building of Subversion SWIG Ruby bindings"
-		print
-		emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed"
-	fi
-
-	if use java; then
-		print
-		print "Building of Subversion JavaHL library"
-		print
-		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Building of Subversion JavaHL library failed"
-	fi
-
-	if use emacs; then
-		print
-		print "Compilation of Emacs modules"
-		print
-		elisp-compile contrib/client-side/emacs/{dsvn,psvn,vc-svn}.el doc/svn-doc.el doc/tools/svnbook.el || die "Compilation of Emacs modules failed"
-	fi
-
-	if use extras; then
-		print
-		print "Building of contrib and tools"
-		print
-		emake contrib || die "Building of contrib failed"
-		emake tools || die "Building of tools failed"
-	fi
-
-	if use doc; then
-		print
-		print "Building of Subversion HTML documentation"
-		print
-		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
-		if use java; then
-			print
-			print "Building of Subversion JavaHL library HTML documentation"
-			print
-			emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed"
-		fi
-	fi
-}
-
-create_apache_tests_configuration() {
-	get_loadmodule_directive() {
-		if [[ "$("${APACHE_BIN}" -l)" != *"mod_$1.c"* ]]; then
-			echo "LoadModule $1_module \"${APACHE_MODULESDIR}/mod_$1.so\""
-		fi
-	}
-	get_loadmodule_directives() {
-		if has_version "=www-servers/apache-2.4*"; then
-			get_loadmodule_directive auth_basic
-			get_loadmodule_directive authn_core
-			get_loadmodule_directive authn_file
-			get_loadmodule_directive authz_core
-			get_loadmodule_directive authz_user
-			get_loadmodule_directive dav
-			get_loadmodule_directive log_config
-			get_loadmodule_directive unixd
-		else
-			get_loadmodule_directive auth_basic
-			get_loadmodule_directive authn_file
-			get_loadmodule_directive dav
-			get_loadmodule_directive log_config
-		fi
-	}
-
-	mkdir -p "${T}/apache"
-	cat << EOF > "${T}/apache/apache.conf"
-$(get_loadmodule_directives)
-LoadModule dav_svn_module "${S}/subversion/mod_dav_svn/.libs/mod_dav_svn.so"
-LoadModule authz_svn_module "${S}/subversion/mod_authz_svn/.libs/mod_authz_svn.so"
-
-User                $(id -un)
-Group               $(id -gn)
-Listen              localhost:${SVN_TEST_APACHE_PORT}
-ServerName          localhost
-ServerRoot          "${T}"
-DocumentRoot        "${T}"
-CoreDumpDirectory   "${T}"
-PidFile             "${T}/apache.pid"
-CustomLog           "${T}/apache/access_log" "%h %l %u %{%Y-%m-%dT%H:%M:%S}t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""
-CustomLog           "${T}/apache/svn_log" "%{%Y-%m-%dT%H:%M:%S}t %u %{SVN-REPOS-NAME}e %{SVN-ACTION}e" env=SVN-ACTION
-ErrorLog            "${T}/apache/error_log"
-LogLevel            Debug
-MaxRequestsPerChild 0
-
-<Directory />
-	AllowOverride None
-</Directory>
-
-<Location /svn-test-work/repositories>
-	DAV svn
-	SVNParentPath "${S}/subversion/tests/cmdline/svn-test-work/repositories"
-	AuthzSVNAccessFile "${S}/subversion/tests/cmdline/svn-test-work/authz"
-	AuthType Basic
-	AuthName "Subversion Repository"
-	AuthUserFile "${T}/apache/users"
-	Require valid-user
-</Location>
-
-<Location /svn-test-work/local_tmp/repos>
-	DAV svn
-	SVNPath "${S}/subversion/tests/cmdline/svn-test-work/local_tmp/repos"
-	AuthzSVNAccessFile "${S}/subversion/tests/cmdline/svn-test-work/authz"
-	AuthType Basic
-	AuthName "Subversion Repository"
-	AuthUserFile "${T}/apache/users"
-	Require valid-user
-</Location>
-EOF
-
-	cat << EOF > "${T}/apache/users"
-jrandom:xCGl35kV9oWCY
-jconstant:xCGl35kV9oWCY
-EOF
-}
-
-set_tests_variables() {
-	if [[ "$1" == "local" ]]; then
-		base_url="file://${S}/subversion/tests/cmdline"
-		http_library=""
-	fi
-	if [[ "$1" == "svn" ]]; then
-		base_url="svn://127.0.0.1:${SVN_TEST_SVNSERVE_PORT}"
-		http_library=""
-	fi
-	if [[ "$1" == "neon" || "$1" == "serf" ]]; then
-		base_url="http://127.0.0.1:${SVN_TEST_APACHE_PORT}"
-		http_library="$1"
-	fi
-}
-
-src_test() {
-	if ! use test; then
-		die "Invalid configuration"
-	fi
-
-	local fs_type fs_types ra_type ra_types options failed_tests
-
-	fs_types="fsfs"
-	use berkdb && fs_types+=" bdb"
-
-	ra_types="local svn"
-	use webdav-neon && ra_types+=" neon"
-	use webdav-serf && ra_types+=" serf"
-
-	local pid_file
-	for pid_file in svnserve.pid apache.pid memcached.pid; do
-		rm -f "${T}/${pid_file}"
-	done
-
-	termination() {
-		local die="$1" pid_file
-		if [[ -n "${die}" ]]; then
-			echo -e "\n\e[1;31mKilling of child processes...\e[0m\a" > /dev/tty
-		fi
-		for pid_file in svnserve.pid apache.pid memcached.pid; do
-			if [[ -f "${T}/${pid_file}" ]]; then
-				kill "$(<"${T}/${pid_file}")"
-			fi
-		done
-		if [[ -n "${die}" ]]; then
-			sleep 6
-			die "Termination"
-		fi
-	}
-
-	trap 'termination 1 &' SIGINT SIGTERM
-
-	SVN_TEST_SVNSERVE_PORT="${SVN_TEST_SVNSERVE_PORT:-62209}"
-	LC_ALL="C" subversion/svnserve/svnserve -dr "subversion/tests/cmdline" --listen-port "${SVN_TEST_SVNSERVE_PORT}" --log-file "${T}/svnserve.log" --pid-file "${T}/svnserve.pid"
-	if use webdav-neon || use webdav-serf; then
-		SVN_TEST_APACHE_PORT="${SVN_TEST_APACHE_PORT:-62208}"
-		create_apache_tests_configuration
-		"${APACHE_BIN}" -f "${T}/apache/apache.conf"
-	fi
-	if [[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]]; then
-		SVN_TEST_FSFS_MEMCACHED_PORT="${SVN_TEST_FSFS_MEMCACHED_PORT:-62210}"
-		sed -e "/\[memcached-servers\]/akey = 127.0.0.1:${SVN_TEST_FSFS_MEMCACHED_PORT}" -i subversion/tests/tests.conf
-		memcached -dp "${SVN_TEST_FSFS_MEMCACHED_PORT}" -P "${T}/memcached.pid"
-	fi
-	if [[ -n "${SVN_TEST_FSFS_SHARDING}" ]]; then
-		options+=" FSFS_SHARDING=${SVN_TEST_FSFS_SHARDING}"
-	fi
-	if [[ -n "${SVN_TEST_FSFS_PACKING}" ]]; then
-		options+=" FSFS_PACKING=1"
-	fi
-#	if [[ -n "${SVN_TEST_SASL}" ]]; then
-#		options+=" ENABLE_SASL=1"
-#	fi
-
-	sleep 6
-
-	for ra_type in ${ra_types}; do
-		for fs_type in ${fs_types}; do
-			[[ "${ra_type}" == "local" && "${fs_type}" == "bdb" ]] && continue
-			print
-			print --blue "Testing of ra_${ra_type} + $(echo ${fs_type} | tr '[:lower:]' '[:upper:]')"
-			print
-			set_tests_variables ${ra_type}
-			time emake check FS_TYPE="${fs_type}" BASE_URL="${base_url}" HTTP_LIBRARY="${http_library}" CLEANUP="1" ${options} || failed_tests="1"
-			mv tests.log "${T}/tests-ra_${ra_type}-${fs_type}.log"
-		done
-	done
-	unset base_url http_library
-	termination
-	trap - SIGINT SIGTERM
-
-	if [[ -n "${SVN_TEST_BINDINGS}" ]]; then
-		local swig_lingua swig_linguas
-		local -A linguas
-
-		if use ctypes-python; then
-			print
-			print --blue "Testing of Subversion Ctypes Python bindings"
-			print
-			ctypes_python_bindings_testing() {
-				rm -f subversion/bindings/ctypes-python
-				ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python
-				time emake check-ctypes-python || failed_tests="1"
-			}
-			python_execute_function \
-				--action-message 'Testing of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \
-				--failure-message 'Testing of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-				ctypes_python_bindings_testing
-		fi
-
-		if use python; then
-			print
-			print --blue "Testing of Subversion SWIG Python bindings"
-			print
-			swig_python_bindings_testing() {
-				rm -f subversion/bindings/swig/python
-				ln -s python-${PYTHON_ABI} subversion/bindings/swig/python
-				time emake PYTHON_VERSION="$(python_get_version)" check-swig-py || failed_tests="1"
-			}
-			python_execute_function \
-				--action-message 'Testing of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \
-				--failure-message 'Testing of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-				swig_python_bindings_testing
-		fi
-
-		use perl && swig_linguas+=" pl"
-		use ruby && swig_linguas+=" rb"
-
-		linguas[pl]="Perl"
-		linguas[rb]="Ruby"
-
-		for swig_lingua in ${swig_linguas}; do
-			print
-			print --blue "Testing of Subversion SWIG ${linguas[${swig_lingua}]} bindings"
-			print
-			time emake check-swig-${swig_lingua} || failed_tests="1"
-		done
-
-		if use java; then
-			print
-			print --blue "Testing of Subversion JavaHL library"
-			print
-			time emake check-javahl || failed_tests="1"
-		fi
-	fi
-
-	if [[ -n "${failed_tests}" ]]; then
-		ewarn
-		ewarn "\e[1;31mTests failed\e[0m"
-		ewarn
-	fi
-}
-
-src_install() {
-	print
-	print "Installation of core of Subversion"
-	print
-	emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed"
-
-	if use ctypes-python; then
-		print
-		print "Installation of Subversion Ctypes Python bindings"
-		print
-		ctypes_python_bindings_installation() {
-			rm -f subversion/bindings/ctypes-python
-			ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python
-			emake DESTDIR="${D}" install-ctypes-python
-		}
-		python_execute_function \
-			--action-message 'Installation of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Installation of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			ctypes_python_bindings_installation
-	fi
-
-	if use python; then
-		print
-		print "Installation of Subversion SWIG Python bindings"
-		print
-		swig_python_bindings_installation() {
-			rm -f subversion/bindings/swig/python
-			ln -s python-${PYTHON_ABI} subversion/bindings/swig/python
-			emake -j1 \
-				DESTDIR="${D}" \
-				PYTHON_VERSION="$(python_get_version)" \
-				swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \
-				install-swig-py
-		}
-		python_execute_function \
-			--action-message 'Installation of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Installation of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			swig_python_bindings_installation
-
-		delete_static_libraries() {
-			find "${ED}$(python_get_sitedir)" -name "*.a" -print0 | xargs -0 rm -f
-		}
-		python_execute_function -q delete_static_libraries
-	fi
-
-	if use ctypes-python || use python; then
-		python_clean_installation_image -q
-	fi
-
-	if use perl; then
-		print
-		print "Installation of Subversion SWIG Perl bindings"
-		print
-		emake -j1 DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed"
-		fixlocalpod
-		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr
-	fi
-
-	if use ruby; then
-		print
-		print "Installation of Subversion SWIG Ruby bindings"
-		print
-		emake -j1 DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed"
-		find "${ED}usr/$(get_libdir)/ruby" "(" -name "*.a" -o -name "*.la" ")" -print0 | xargs -0 rm -f
-	fi
-
-	if use java; then
-		print
-		print "Installation of Subversion JavaHL library"
-		print
-		emake -j1 DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
-		java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*.so
-		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
-		mkdir -p "${D}${APACHE_MODULES_CONFDIR}"
-		cat << EOF > "${D}${APACHE_MODULES_CONFDIR}"/47_mod_dav_svn.conf
-<IfDefine SVN>
-LoadModule dav_svn_module modules/mod_dav_svn.so
-<IfDefine SVN_AUTHZ>
-LoadModule authz_svn_module modules/mod_authz_svn.so
-</IfDefine>
-
-# Example configuration:
-#<Location /svn/repos>
-#	DAV svn
-#	SVNPath ${SVN_REPOS_LOC}/repos
-#	AuthType Basic
-#	AuthName "Subversion repository"
-#	AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers
-#	Require valid-user
-#</Location>
-</IfDefine>
-EOF
-	fi
-
-	# Install Bash Completion, bug 43179.
-	dobashcompletion tools/client-side/bash_completion subversion
-	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 svn_load_dirs.pl.
-	if use perl; then
-		dobin contrib/client-side/svn_load_dirs/svn_load_dirs.pl
-	fi
-	rm -f contrib/client-side/svn_load_dirs/svn_load_dirs.pl
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245.
-	newinitd "${FILESDIR}"/svnserve.initd svnserve
-	newconfd "${FILESDIR}"/svnserve.confd svnserve
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dodoc tools/xslt/svnindex.{css,xsl}
-	rm -fr tools/xslt
-
-	# Install Vim syntax files.
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins contrib/client-side/vim/svn.vim
-	fi
-	rm -f contrib/client-side/vim/svn.vim
-
-	# Install Emacs Lisps.
-	if use emacs; then
-		elisp-install ${PN} contrib/client-side/emacs/{dsvn,psvn}.{el,elc} doc/svn-doc.{el,elc} doc/tools/svnbook.{el,elc} || die "Installation of Emacs modules failed"
-		elisp-install ${PN}/compat contrib/client-side/emacs/vc-svn.{el,elc} || die "Installation of Emacs modules failed"
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}/70svn-gentoo.el" || die "Installation of Emacs site-init file failed"
-	fi
-	rm -fr contrib/client-side/emacs
-
-	# Install extra files.
-	if use extras; then
-		print
-		print "Installation of contrib and tools"
-		print
-
-		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}" contribdir="/usr/$(get_libdir)/subversion/bin" install-contrib || die "Installation of contrib failed"
-		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed"
-
-		find contrib tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
-		rm -fr contrib/client-side/svn-push
-		rm -fr contrib/server-side/svnstsw
-		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}
-		doins -r contrib tools
-	fi
-
-	if use doc; then
-		print
-		print "Installation of Subversion HTML documentation"
-		print
-		dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed"
-
-		insinto /usr/share/doc/${PF}
-		doins -r notes
-		ecompressdir /usr/share/doc/${PF}/notes
-
-#		if use ruby; then
-#			emake DESTDIR="${D}" install-swig-rb-doc
-#		fi
-
-		if use java; then
-			java-pkg_dojavadoc doc/javadoc
-		fi
-	fi
-}
-
-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.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1.so.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() {
-	use emacs && elisp-site-regen
-	use perl && perl-module_pkg_postinst
-
-	if use ctypes-python; then
-		python_mod_optimize csvn
-	fi
-
-	if use python; then
-		python_mod_optimize libsvn svn
-	fi
-
-	elog "Subversion Server Notes"
-	elog "-----------------------"
-	elog
-	elog "If you intend to run a server, a repository needs to be created using"
-	elog "svnadmin (see man svnadmin) or the following command to create it in"
-	elog "${SVN_REPOS_LOC}:"
-	elog
-	elog "    emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "Subversion has multiple server types, take your pick:"
-	elog
-	elog " - svnserve daemon: "
-	elog "   1. Edit /etc/conf.d/svnserve"
-	elog "   2. Fix the repository permissions (see \"Fixing the repository permissions\")"
-	elog "   3. Start daemon: /etc/init.d/svnserve start"
-	elog "   4. Make persistent: rc-update add svnserve default"
-	elog
-	elog " - svnserve via xinetd:"
-	elog "   1. Edit /etc/xinetd.d/svnserve (remove disable line)"
-	elog "   2. Fix the repository permissions (see \"Fixing the repository permissions\")"
-	elog "   3. Restart xinetd.d: /etc/init.d/xinetd restart"
-	elog
-	elog " - svn over ssh:"
-	elog "   1. Fix the repository permissions (see \"Fixing the repository permissions\")"
-	elog "      Additionally run:"
-	elog "        groupadd svnusers"
-	elog "        chown -R root:svnusers ${SVN_REPOS_LOC}/repos"
-	elog "   2. Create an svnserve wrapper in /usr/local/bin to set the umask you"
-	elog "      want, for example:"
-	elog "         #!/bin/bash"
-	elog "         . /etc/conf.d/svnserve"
-	elog "         umask 007"
-	elog "         exec /usr/bin/svnserve \${SVNSERVE_OPTS} \"\$@\""
-	elog
-
-	if use apache2; then
-		elog " - http-based server:"
-		elog "   1. Edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
-		elog "   2. Create an htpasswd file:"
-		elog "      htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
-		elog "   3. Fix the repository permissions (see \"Fixing the repository permissions\")"
-		elog "   4. Restart Apache: /etc/init.d/apache2 restart"
-		elog
-	fi
-
-	elog " Fixing the repository permissions:"
-	elog "      chmod -Rf go-rwx ${SVN_REPOS_LOC}/conf"
-	elog "      chmod -Rf g-w,o-rwx ${SVN_REPOS_LOC}/repos"
-	elog "      chmod -Rf g+rw ${SVN_REPOS_LOC}/repos/db"
-	elog "      chmod -Rf g+rw ${SVN_REPOS_LOC}/repos/locks"
-	elog
-
-	elog "If you intend to use svn-hot-backup, you can specify the number of"
-	elog "backups to keep per repository by specifying an environment variable."
-	elog "If you want to keep e.g. 2 backups, do the following:"
-	elog "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion"
-	elog "echo 'SVN_HOTBACKUP_BACKUPS_NUMBER=2' >> /etc/env.d/80subversion"
-	elog
-
-	elog "Subversion contains support for the use of Memcached"
-	elog "to cache data of FSFS repositories."
-	elog "You should install \"net-misc/memcached\", start memcached"
-	elog "and configure your FSFS repositories, if you want to use this feature."
-	elog "See the documentation for details."
-	elog
-
-	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
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use perl && perl-module_pkg_postrm
-
-	if use ctypes-python; then
-		python_mod_cleanup csvn
-	fi
-
-	if use python; then
-		python_mod_cleanup libsvn svn
-	fi
-}
-
-pkg_config() {
-	einfo "Initializing the database in ${EROOT}${SVN_REPOS_LOC}..."
-	if [[ -e "${EROOT}${SVN_REPOS_LOC}/repos" ]]; then
-		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete \"${EROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
-	else
-		mkdir -p "${EROOT}${SVN_REPOS_LOC}/conf"
-
-		einfo "Populating repository directory..."
-		# Create initial repository.
-		"${EROOT}usr/bin/svnadmin" create "${EROOT}${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"
-			enewgroup "${SVNSERVE_GROUP}"
-			enewuser "${SVNSERVE_USER}" -1 -1 "${SVN_REPOS_LOC}" "${SVNSERVE_GROUP}"
-		fi
-		chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${EROOT}${SVN_REPOS_LOC}/repos"
-		chmod -Rf go-rwx "${EROOT}${SVN_REPOS_LOC}/conf"
-		chmod -Rf o-rwx "${EROOT}${SVN_REPOS_LOC}/repos"
-	fi
-}
diff --git a/dev-vcs/subversion/subversion-1.6.17-r4.ebuild b/dev-vcs/subversion/subversion-1.6.17-r4.ebuild
deleted file mode 100644
index 59818f1f4b25..000000000000
--- a/dev-vcs/subversion/subversion-1.6.17-r4.ebuild
+++ /dev/null
@@ -1,460 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r4.ebuild,v 1.4 2011/08/26 15:17:35 darkside Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-WANT_AUTOMAKE="none"
-MY_P="${P/_/-}"
-
-inherit autotools base bash-completion db-use depend.apache elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module python
-
-DESCRIPTION="Advanced version control system"
-HOMEPAGE="http://subversion.apache.org/"
-SRC_URI="http://subversion.tigris.org/downloads/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Subversion"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="apache2 berkdb ctypes-python debug doc +dso emacs extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
-
-CDEPEND=">=dev-db/sqlite-3.4
-	>=dev-libs/apr-1.3:1
-	>=dev-libs/apr-util-1.3:1
-	dev-libs/expat
-	sys-libs/zlib
-	berkdb? ( >=sys-libs/db-4.0.14 )
-	ctypes-python? ( =dev-lang/python-2* )
-	emacs? ( virtual/emacs )
-	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring )
-	kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >=kde-base/kdelibs-4 )
-	perl? ( dev-lang/perl )
-	python? ( =dev-lang/python-2* )
-	ruby? ( >=dev-lang/ruby-1.8.2 )
-	sasl? ( dev-libs/cyrus-sasl )
-	webdav-neon? ( >=net-libs/neon-0.28 )
-	webdav-serf? ( >=net-libs/serf-0.3.0 )"
-RDEPEND="${CDEPEND}
-	apache2? ( www-servers/apache[apache2_modules_dav] )
-	java? ( >=virtual/jre-1.5 )
-	kde? ( kde-base/kwalletd )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )"
-DEPEND="${CDEPEND}
-	!!<sys-apps/sandbox-1.6
-	ctypes-python? ( dev-python/ctypesgen )
-	doc? ( app-doc/doxygen )
-	gnome-keyring? ( dev-util/pkgconfig )
-	java? ( >=virtual/jdk-1.5 )
-	kde? ( dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )
-	webdav-neon? ( dev-util/pkgconfig )"
-
-PATCHES=(
-		"${FILESDIR}/${PN}-1.6.0-disable_linking_against_unneeded_libraries.patch"
-		"${FILESDIR}/${PN}-1.6.2-local_library_preloading.patch"
-		"${FILESDIR}/${PN}-1.6.3-kwallet_window.patch"
-)
-
-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 ctypes-python || use python; then
-		python_pkg_setup
-	fi
-
-	if ! use webdav-neon && ! use webdav-serf; then
-		ewarn "WebDAV support is disabled. You need WebDAV to"
-		ewarn "access repositories through the HTTP protocol."
-		ewarn "Consider enabling one of the following USE-flags:"
-		ewarn "  webdav-neon webdav-serf"
-		echo -ne "\a"
-	fi
-
-	if use debug; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-
-	# Allow for custom repository locations.
-	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-}
-
-src_prepare() {
-	base_src_prepare
-	fperms +x build/transform_libtool_scripts.sh
-
-	sed -i \
-		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
-	sed -e "/SWIG_PY_INCLUDES=/s/\$ac_cv_python_includes/\\\\\$(PYTHON_INCLUDES)/" -i build/ac-macros/swig.m4 || die "sed failed"
-
-	eautoconf
-	elibtoolize
-
-	sed -e "s/libsvn_swig_py-1\.la/libsvn_swig_py-\$(PYTHON_VERSION)-1.la/" -i build-outputs.mk || die "sed failed"
-}
-
-src_configure() {
-	local myconf
-
-	if use python || use perl || use ruby; then
-		myconf+=" --with-swig"
-	else
-		myconf+=" --without-swig"
-	fi
-
-	if use java; then
-		myconf+=" --without-junit"
-	fi
-
-	if use kde || use nls; then
-		myconf+=" --enable-nls"
-	else
-		myconf+=" --disable-nls"
-	fi
-
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_with apache2 apxs "${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 kde kwallet) \
-		$(use_with sasl) \
-		$(use_with webdav-neon neon) \
-		$(use_with webdav-serf serf "${EPREFIX}/usr") \
-		${myconf} \
-		--with-apr="${EPREFIX}/usr/bin/apr-1-config" \
-		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \
-		--disable-experimental-libtool \
-		--without-jikes \
-		--enable-local-library-preloading \
-		--disable-mod-activation \
-		--disable-neon-version-check \
-		--with-sqlite="${EPREFIX}/usr"
-}
-
-src_compile() {
-	emake local-all || die "Building of core of Subversion failed"
-
-	if use ctypes-python; then
-		python_copy_sources subversion/bindings/ctypes-python
-		rm -fr subversion/bindings/ctypes-python
-		ctypes_python_bindings_building() {
-			rm -f subversion/bindings/ctypes-python
-			ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python
-			emake ctypes-python
-		}
-		python_execute_function \
-			--action-message 'Building of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Building of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			ctypes_python_bindings_building
-	fi
-
-	if use python; then
-		python_copy_sources subversion/bindings/swig/python
-		rm -fr subversion/bindings/swig/python
-		swig_python_bindings_building() {
-			rm -f subversion/bindings/swig/python
-			ln -s python-${PYTHON_ABI} subversion/bindings/swig/python
-			emake \
-				PYTHON_INCLUDES="-I${EPREFIX}$(python_get_includedir)" \
-				PYTHON_VERSION="$(python_get_version)" \
-				swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \
-				swig-py
-		}
-		python_execute_function \
-			--action-message 'Building of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Building of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			swig_python_bindings_building
-	fi
-
-	if use perl; then
-		emake swig-pl || die "Building of Subversion SWIG Perl bindings failed"
-	fi
-
-	if use ruby; then
-		emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed"
-	fi
-
-	if use java; then
-		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Building of Subversion JavaHL library failed"
-	fi
-
-	if use emacs; then
-		elisp-compile contrib/client-side/emacs/{dsvn,psvn,vc-svn}.el doc/svn-doc.el doc/tools/svnbook.el || die "Compilation of Emacs modules failed"
-	fi
-
-	if use extras; then
-		emake contrib || die "Building of contrib failed"
-		emake tools || die "Building of tools failed"
-	fi
-
-	if use doc; then
-		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
-		if use java; then
-			emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed"
-		fi
-	fi
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed"
-
-	if use ctypes-python; then
-		ctypes_python_bindings_installation() {
-			rm -f subversion/bindings/ctypes-python
-			ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python
-			emake DESTDIR="${D}" install-ctypes-python
-		}
-		python_execute_function \
-			--action-message 'Installation of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Installation of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			ctypes_python_bindings_installation
-	fi
-
-	if use python; then
-		swig_python_bindings_installation() {
-			rm -f subversion/bindings/swig/python
-			ln -s python-${PYTHON_ABI} subversion/bindings/swig/python
-			emake \
-				DESTDIR="${D}" \
-				PYTHON_VERSION="$(python_get_version)" \
-				swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \
-				install-swig-py
-		}
-		python_execute_function \
-			--action-message 'Installation of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Installation of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			swig_python_bindings_installation
-	fi
-
-	if use ctypes-python || use python; then
-		python_clean_installation_image -q
-	fi
-
-	if use perl; then
-		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed"
-		fixlocalpod
-		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr
-	fi
-
-	if use ruby; then
-		emake DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed"
-	fi
-
-	if use java; then
-		emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
-		java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*.so
-		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.
-	dobashcompletion tools/client-side/bash_completion subversion
-	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 svn_load_dirs.pl.
-	if use perl; then
-		dobin contrib/client-side/svn_load_dirs/svn_load_dirs.pl
-	fi
-	rm -f contrib/client-side/svn_load_dirs/svn_load_dirs.pl
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245.
-	newinitd "${FILESDIR}"/svnserve.initd2 svnserve
-	newconfd "${FILESDIR}"/svnserve.confd svnserve
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dodoc tools/xslt/svnindex.{css,xsl}
-	rm -fr tools/xslt
-
-	# Install Vim syntax files.
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins contrib/client-side/vim/svn.vim
-	fi
-	rm -f contrib/client-side/vim/svn.vim
-
-	# Install Emacs Lisps.
-	if use emacs; then
-		elisp-install ${PN} contrib/client-side/emacs/{dsvn,psvn}.{el,elc} doc/svn-doc.{el,elc} doc/tools/svnbook.{el,elc} || die "Installation of Emacs modules failed"
-		elisp-install ${PN}/compat contrib/client-side/emacs/vc-svn.{el,elc} || die "Installation of Emacs modules failed"
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}/70svn-gentoo.el" || die "Installation of Emacs site-init file failed"
-	fi
-	rm -fr contrib/client-side/emacs
-
-	# 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}" contribdir="/usr/$(get_libdir)/subversion/bin" install-contrib || die "Installation of contrib failed"
-		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed"
-
-		find contrib tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
-		rm -fr contrib/client-side/svn-push
-		rm -fr contrib/server-side/svnstsw
-		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}
-		doins -r contrib tools
-	fi
-
-	if use doc; then
-		dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed"
-
-		dodoc -r notes
-
-		if use java; then
-			java-pkg_dojavadoc doc/javadoc
-		fi
-	fi
-
-	find "${D}" '(' -name '*.la' -o -name '*.a' ')' -print0 | xargs -0 rm -f
-}
-
-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.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1.so.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() {
-	use emacs && elisp-site-regen
-	use perl && perl-module_pkg_postinst
-
-	if use ctypes-python; then
-		python_mod_optimize csvn
-	fi
-
-	if use python; then
-		python_mod_optimize libsvn svn
-	fi
-
-	if use apache2; then
-		elog " - http-based server:"
-		elog "   1. Edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
-		elog "   2. Create an htpasswd file:"
-		elog "      htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
-		elog "   3. Fix the repository permissions (see \"Fixing the repository permissions\")"
-		elog "   4. Restart Apache: /etc/init.d/apache2 restart"
-		elog
-	fi
-
-	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() {
-	use emacs && elisp-site-regen
-	use perl && perl-module_pkg_postrm
-
-	if use ctypes-python; then
-		python_mod_cleanup csvn
-	fi
-
-	if use python; then
-		python_mod_cleanup libsvn svn
-	fi
-}
-
-pkg_config() {
-	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
-	# already has EPREFIX in it
-	einfo "Initializing the database in ${ROOT}${SVN_REPOS_LOC}..."
-	if [[ -e "${ROOT}${SVN_REPOS_LOC}/repos" ]]; then
-		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete \"${ROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
-	else
-		mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf"
-
-		einfo "Populating repository directory..."
-		# Create initial repository.
-		"${EROOT}usr/bin/svnadmin" create "${ROOT}${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"
-			enewgroup "${SVNSERVE_GROUP}"
-			enewuser "${SVNSERVE_USER}" -1 -1 "${SVN_REPOS_LOC}" "${SVNSERVE_GROUP}"
-		fi
-		chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos"
-		chmod -Rf go-rwx "${ROOT}${SVN_REPOS_LOC}/conf"
-		chmod -Rf o-rwx "${ROOT}${SVN_REPOS_LOC}/repos"
-	fi
-}
diff --git a/dev-vcs/subversion/subversion-1.6.17-r5.ebuild b/dev-vcs/subversion/subversion-1.6.17-r5.ebuild
deleted file mode 100644
index 847bb8d0bd73..000000000000
--- a/dev-vcs/subversion/subversion-1.6.17-r5.ebuild
+++ /dev/null
@@ -1,461 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r5.ebuild,v 1.1 2011/08/30 11:19:41 chainsaw Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-WANT_AUTOMAKE="none"
-MY_P="${P/_/-}"
-
-inherit autotools base bash-completion db-use depend.apache elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module python
-
-DESCRIPTION="Advanced version control system"
-HOMEPAGE="http://subversion.apache.org/"
-SRC_URI="http://subversion.tigris.org/downloads/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Subversion"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="apache2 berkdb ctypes-python debug doc +dso emacs extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
-
-CDEPEND=">=dev-db/sqlite-3.4
-	>=dev-libs/apr-1.3:1
-	>=dev-libs/apr-util-1.3:1
-	dev-libs/expat
-	sys-libs/zlib
-	berkdb? ( >=sys-libs/db-4.0.14 )
-	ctypes-python? ( =dev-lang/python-2* )
-	emacs? ( virtual/emacs )
-	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring )
-	kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >=kde-base/kdelibs-4 )
-	perl? ( dev-lang/perl )
-	python? ( =dev-lang/python-2* )
-	ruby? ( >=dev-lang/ruby-1.8.2 )
-	sasl? ( dev-libs/cyrus-sasl )
-	webdav-neon? ( >=net-libs/neon-0.28 )
-	webdav-serf? ( >=net-libs/serf-0.3.0 )"
-RDEPEND="${CDEPEND}
-	apache2? ( www-servers/apache[apache2_modules_dav] )
-	java? ( >=virtual/jre-1.5 )
-	kde? ( kde-base/kwalletd )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )"
-DEPEND="${CDEPEND}
-	!!<sys-apps/sandbox-1.6
-	ctypes-python? ( dev-python/ctypesgen )
-	doc? ( app-doc/doxygen )
-	gnome-keyring? ( dev-util/pkgconfig )
-	java? ( >=virtual/jdk-1.5 )
-	kde? ( dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )
-	webdav-neon? ( dev-util/pkgconfig )"
-
-PATCHES=(
-		"${FILESDIR}/${PN}-1.6.0-disable_linking_against_unneeded_libraries.patch"
-		"${FILESDIR}/${PN}-1.6.2-local_library_preloading.patch"
-		"${FILESDIR}/${PN}-1.6.3-kwallet_window.patch"
-)
-
-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 ctypes-python || use python; then
-		python_pkg_setup
-	fi
-
-	if ! use webdav-neon && ! use webdav-serf; then
-		ewarn "WebDAV support is disabled. You need WebDAV to"
-		ewarn "access repositories through the HTTP protocol."
-		ewarn "Consider enabling one of the following USE-flags:"
-		ewarn "  webdav-neon webdav-serf"
-		echo -ne "\a"
-	fi
-
-	if use debug; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-
-	# Allow for custom repository locations.
-	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-}
-
-src_prepare() {
-	base_src_prepare
-	fperms +x build/transform_libtool_scripts.sh
-
-	sed -i \
-		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
-	sed -e "/SWIG_PY_INCLUDES=/s/\$ac_cv_python_includes/\\\\\$(PYTHON_INCLUDES)/" -i build/ac-macros/swig.m4 || die "sed failed"
-
-	eautoconf
-	elibtoolize
-
-	sed -e "s/libsvn_swig_py-1\.la/libsvn_swig_py-\$(PYTHON_VERSION)-1.la/" -i build-outputs.mk || die "sed failed"
-}
-
-src_configure() {
-	local myconf
-
-	if use python || use perl || use ruby; then
-		myconf+=" --with-swig"
-	else
-		myconf+=" --without-swig"
-	fi
-
-	if use java; then
-		myconf+=" --without-junit"
-	fi
-
-	if use kde || use nls; then
-		myconf+=" --enable-nls"
-	else
-		myconf+=" --disable-nls"
-	fi
-
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_with apache2 apxs "${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 kde kwallet) \
-		$(use_with sasl) \
-		$(use_with webdav-neon neon) \
-		$(use_with webdav-serf serf "${EPREFIX}/usr") \
-		${myconf} \
-		--with-apr="${EPREFIX}/usr/bin/apr-1-config" \
-		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \
-		--disable-experimental-libtool \
-		--without-jikes \
-		--enable-local-library-preloading \
-		--disable-mod-activation \
-		--disable-neon-version-check \
-		--disable-static \
-		--with-sqlite="${EPREFIX}/usr"
-}
-
-src_compile() {
-	emake local-all || die "Building of core of Subversion failed"
-
-	if use ctypes-python; then
-		python_copy_sources subversion/bindings/ctypes-python
-		rm -fr subversion/bindings/ctypes-python
-		ctypes_python_bindings_building() {
-			rm -f subversion/bindings/ctypes-python
-			ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python
-			emake ctypes-python
-		}
-		python_execute_function \
-			--action-message 'Building of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Building of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			ctypes_python_bindings_building
-	fi
-
-	if use python; then
-		python_copy_sources subversion/bindings/swig/python
-		rm -fr subversion/bindings/swig/python
-		swig_python_bindings_building() {
-			rm -f subversion/bindings/swig/python
-			ln -s python-${PYTHON_ABI} subversion/bindings/swig/python
-			emake \
-				PYTHON_INCLUDES="-I${EPREFIX}$(python_get_includedir)" \
-				PYTHON_VERSION="$(python_get_version)" \
-				swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \
-				swig-py
-		}
-		python_execute_function \
-			--action-message 'Building of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Building of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			swig_python_bindings_building
-	fi
-
-	if use perl; then
-		emake swig-pl || die "Building of Subversion SWIG Perl bindings failed"
-	fi
-
-	if use ruby; then
-		emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed"
-	fi
-
-	if use java; then
-		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Building of Subversion JavaHL library failed"
-	fi
-
-	if use emacs; then
-		elisp-compile contrib/client-side/emacs/{dsvn,psvn,vc-svn}.el doc/svn-doc.el doc/tools/svnbook.el || die "Compilation of Emacs modules failed"
-	fi
-
-	if use extras; then
-		emake contrib || die "Building of contrib failed"
-		emake tools || die "Building of tools failed"
-	fi
-
-	if use doc; then
-		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
-		if use java; then
-			emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed"
-		fi
-	fi
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed"
-
-	if use ctypes-python; then
-		ctypes_python_bindings_installation() {
-			rm -f subversion/bindings/ctypes-python
-			ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python
-			emake DESTDIR="${D}" install-ctypes-python
-		}
-		python_execute_function \
-			--action-message 'Installation of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Installation of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			ctypes_python_bindings_installation
-	fi
-
-	if use python; then
-		swig_python_bindings_installation() {
-			rm -f subversion/bindings/swig/python
-			ln -s python-${PYTHON_ABI} subversion/bindings/swig/python
-			emake \
-				DESTDIR="${D}" \
-				PYTHON_VERSION="$(python_get_version)" \
-				swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \
-				install-swig-py
-		}
-		python_execute_function \
-			--action-message 'Installation of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Installation of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			swig_python_bindings_installation
-	fi
-
-	if use ctypes-python || use python; then
-		python_clean_installation_image -q
-	fi
-
-	if use perl; then
-		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed"
-		fixlocalpod
-		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr
-	fi
-
-	if use ruby; then
-		emake DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed"
-	fi
-
-	if use java; then
-		emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
-		java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*.so
-		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.
-	dobashcompletion tools/client-side/bash_completion subversion
-	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 svn_load_dirs.pl.
-	if use perl; then
-		dobin contrib/client-side/svn_load_dirs/svn_load_dirs.pl
-	fi
-	rm -f contrib/client-side/svn_load_dirs/svn_load_dirs.pl
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245.
-	newinitd "${FILESDIR}"/svnserve.initd2 svnserve
-	newconfd "${FILESDIR}"/svnserve.confd svnserve
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dodoc tools/xslt/svnindex.{css,xsl}
-	rm -fr tools/xslt
-
-	# Install Vim syntax files.
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins contrib/client-side/vim/svn.vim
-	fi
-	rm -f contrib/client-side/vim/svn.vim
-
-	# Install Emacs Lisps.
-	if use emacs; then
-		elisp-install ${PN} contrib/client-side/emacs/{dsvn,psvn}.{el,elc} doc/svn-doc.{el,elc} doc/tools/svnbook.{el,elc} || die "Installation of Emacs modules failed"
-		elisp-install ${PN}/compat contrib/client-side/emacs/vc-svn.{el,elc} || die "Installation of Emacs modules failed"
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}/70svn-gentoo.el" || die "Installation of Emacs site-init file failed"
-	fi
-	rm -fr contrib/client-side/emacs
-
-	# 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}" contribdir="/usr/$(get_libdir)/subversion/bin" install-contrib || die "Installation of contrib failed"
-		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed"
-
-		find contrib tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
-		rm -fr contrib/client-side/svn-push
-		rm -fr contrib/server-side/svnstsw
-		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}
-		doins -r contrib tools
-	fi
-
-	if use doc; then
-		dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed"
-
-		dodoc -r notes
-
-		if use java; then
-			java-pkg_dojavadoc doc/javadoc
-		fi
-	fi
-
-	find "${D}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f
-}
-
-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.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1.so.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() {
-	use emacs && elisp-site-regen
-	use perl && perl-module_pkg_postinst
-
-	if use ctypes-python; then
-		python_mod_optimize csvn
-	fi
-
-	if use python; then
-		python_mod_optimize libsvn svn
-	fi
-
-	if use apache2; then
-		elog " - http-based server:"
-		elog "   1. Edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
-		elog "   2. Create an htpasswd file:"
-		elog "      htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
-		elog "   3. Fix the repository permissions (see \"Fixing the repository permissions\")"
-		elog "   4. Restart Apache: /etc/init.d/apache2 restart"
-		elog
-	fi
-
-	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() {
-	use emacs && elisp-site-regen
-	use perl && perl-module_pkg_postrm
-
-	if use ctypes-python; then
-		python_mod_cleanup csvn
-	fi
-
-	if use python; then
-		python_mod_cleanup libsvn svn
-	fi
-}
-
-pkg_config() {
-	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
-	# already has EPREFIX in it
-	einfo "Initializing the database in ${ROOT}${SVN_REPOS_LOC}..."
-	if [[ -e "${ROOT}${SVN_REPOS_LOC}/repos" ]]; then
-		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete \"${ROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
-	else
-		mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf"
-
-		einfo "Populating repository directory..."
-		# Create initial repository.
-		"${EROOT}usr/bin/svnadmin" create "${ROOT}${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"
-			enewgroup "${SVNSERVE_GROUP}"
-			enewuser "${SVNSERVE_USER}" -1 -1 "${SVN_REPOS_LOC}" "${SVNSERVE_GROUP}"
-		fi
-		chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos"
-		chmod -Rf go-rwx "${ROOT}${SVN_REPOS_LOC}/conf"
-		chmod -Rf o-rwx "${ROOT}${SVN_REPOS_LOC}/repos"
-	fi
-}