Remove older ebuilds. Remove most keywords from 1.5.6.

Package-Manager: portage-13924-svn/cvs/Linux x86_64

9 files changed, 13 insertions, 2521 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 859a85d95fea..64a7d25fd144 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/subversion
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.396 2009/07/28 18:00:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.397 2009/08/05 19:48:53 arfrever Exp $
+
+  05 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -subversion-1.5.5.ebuild, subversion-1.5.6.ebuild,
+  -subversion-1.6.1.ebuild,
+  -files/subversion-1.6.1-fix_sqlite_configuration.patch,
+  -subversion-1.6.2.ebuild, -subversion-1.6.2-r10.ebuild,
+  -files/subversion-1.6.2-fix_undefined_references.patch:
+  Remove older ebuilds. Remove most keywords from 1.5.6.
 
   28 Jul 2009; Jeroen Roovers <jer@gentoo.org> subversion-1.6.3.ebuild:
   Stable for HPPA (bug #278623).
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 03f2dca05e1f..9229a7d0c5b1 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -3,8 +3,6 @@ AUX 1.5.0/80subversion-extras 62 RMD160 c334b15a86eaf19129afa5b62558dd47504a4e3d
 AUX 1.5.0/disable-unneeded-linking.patch 2409 RMD160 0d7c34cc83eff7d08369128762ed714fabcd1dde SHA1 92b80f6cb30fe569f79368aea66027a6da022c53 SHA256 2ef8fcd9fabfd1a71bdd50e1156cb9d421a7008fccd73b7ae3536e9a30886231
 AUX 70svn-gentoo.el 443 RMD160 300189eea80dfefa0f2a8479f67d255b39fd2adb SHA1 245b5ed611755276016bc76de2eabdc117e2c511 SHA256 23aa9effa5aea7ae73d14ae4df1a9269135137a5e483b4ff2a501dc130d7d1be
 AUX subversion-1.6.0-disable_linking_against_unneeded_libraries.patch 1769 RMD160 89d165463a2e8a7e2ae5855bc4e4e290f20416ae SHA1 3fc9a49e80992b13b016d1c56babae43957f1b91 SHA256 a54a4dd37e197d030b9d56b2954e4cd38f8a7f1b191cfe59f863b75a164d5f96
-AUX subversion-1.6.1-fix_sqlite_configuration.patch 828 RMD160 2633e4ff6e80d2ecca0ec18c28c29c7388d509d7 SHA1 f264ca03d4b48e631c0edba3df7790021312b341 SHA256 5bd115dfa246b0b524f22442d0af6a90bd97bbc5ec844f9f5be4452419e4137d
-AUX subversion-1.6.2-fix_undefined_references.patch 1206 RMD160 71d4ddcdd3401a80c0b93aa5b623ef464300c097 SHA1 141d7703c9bb4533564c5a5d754568769e4dd0f7 SHA256 96b3bade86f9c99d5655f12ad4c629e1d435d755cf897136a74f7988d103670f
 AUX subversion-1.6.2-local_library_preloading.patch 5543 RMD160 1d2f45523863404f48cce586a0facc048b76452e SHA1 e55e894456b314f6d2b798aacc522f583ff5fcdd SHA256 68b4770da13acca72f471d485f7bd443a245da551540b6736c98121e3572c21e
 AUX subversion-1.6.3-apache-2.4.patch 847 RMD160 68df653aa3a320a88d7d7658eea45620374b9555 SHA1 633bc6f251c30ab5b4b36bd91338530a8e233a87 SHA256 c28ed9bb07270c6885317da9c55809de4f83c894d06d2b6d750624f247c7f5b7
 AUX subversion-1.6.3-kwallet_window.patch 10012 RMD160 d469e0fc8d9fd2ef8c857e5e303eeb24309e7f0d SHA1 9c99b63bc5abf54f642e447af1aa2f814cecb8ab SHA256 5304f39189bed6f83a8342593f23819cf2e12c2288c9daba23dcd78913fd79de
@@ -13,17 +11,10 @@ AUX svnserve.confd2 320 RMD160 dc1e74d06d9bd3eeb1a8dfd20aacebecd8378abb SHA1 557
 AUX svnserve.initd 817 RMD160 59f4e8e983d4595b7c27615889a9c0809d015a18 SHA1 483b47512fb444c0f752ad4eb6c3252f659a967e SHA256 6b483e211b5c311079605e246fca9228c7e5762d27a023fa4c4529fdaa766b08
 AUX svnserve.xinetd 332 RMD160 c2fc4eb02da7e7405756fce650b8897f0a9da7f7 SHA1 d7d478fc257a40626888f9b12ee218df55dac570 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2
 AUX vc-svn.el 16847 RMD160 8665b9a34c8fd9acae40e18aac33026aff3a39d7 SHA1 4d1a5a9331ff96e943244a6d5538e4f0abeac9e7 SHA256 b4979d5df9fba02dbc8ad71d813229222e95ee1e8e89dec3060611d2d6be87aa
-DIST subversion-1.5.5.tar.bz2 4940482 RMD160 6400e387b3505180206b61729cb0b11baeae70d3 SHA1 61c9a7209ccef8eff3c0499629d62ed4d3c89988 SHA256 88cf24ba5d589351791709ff7556ababc019ec59f3240ac2087dacabb9ad77be
 DIST subversion-1.5.6.tar.bz2 4946600 RMD160 5883f925e19e719c8656b5488ed9b00c0f7c3a79 SHA1 774b6dbd4245c36e86289393e651e36dedf17018 SHA256 f701fe75fecc43d9aecf717260ca18661469128a2f28a57c7e6672f3f64f46c2
-DIST subversion-1.6.1.tar.bz2 5462507 RMD160 b3cc8e6cf46c8e4ad4adbee6e3dec186ae790257 SHA1 de01efed25505d689c369a67fbf9b2d2f02e4795 SHA256 cdd4a7a4e2c6e67967b99fe7857a409b2ff5e57126214fdc0f6d835ff789e6ca
-DIST subversion-1.6.2.tar.bz2 5470969 RMD160 b20b4950188f2482984a1e7b0e5e0bdfccb06b09 SHA1 f3b7f35dee4772a25646fe1fbb5108a6569803d1 SHA256 9788a5a19d032b7711b54f462f40b72ee0c6180069335db6994d96b7b23c4075
 DIST subversion-1.6.3.tar.bz2 5483625 RMD160 2f604f97a7b087be8bd337e112eebe93b2e9456f SHA1 88a4a21509f9d8f95a64f7545f3294d356f619c8 SHA256 1dfd4550ae87687c5031665d3b1624082130b4dc235b1084eb0c6279f8e2ee6c
-EBUILD subversion-1.5.5.ebuild 13419 RMD160 73f39c2107995846e249135a90fd9c9f76db2e7f SHA1 36462e2c37f7b20f04ff4f1c274565f69a66dcbf SHA256 fab6e710e6d26f16661964378499b4649ac72a545d7f7e3ccdea706aad575ea2
-EBUILD subversion-1.5.6.ebuild 13452 RMD160 fb3ea80c24ba77186e181848d0d38c3876086903 SHA1 cfb7388239014503ac4931b635b265c4907c6100 SHA256 72d150bf80bd01bf9d05f3f597f56e34ad3fa3af5dc8598276cdff2224aba528
-EBUILD subversion-1.6.1.ebuild 17094 RMD160 8bab64e4d8ecf283c6402b42b7e3a45a5252e4d0 SHA1 36dde599532738402cea840358658fb5d8981e3c SHA256 3eccbc96d87e28f79c05b3e23de018cfcf0cc48a326b7704387ae52e001a9a87
-EBUILD subversion-1.6.2-r10.ebuild 26165 RMD160 78670f7a64642b157165b16600c5e705ede29b68 SHA1 3809ccbd50c9658b0786b5af6c420ae6314c46a9 SHA256 adaf03550cccbb221ecb4e6975cc7d94a47e13a314203ae8036e6402d4601e82
-EBUILD subversion-1.6.2.ebuild 25822 RMD160 c77f6e754bcdf5c2c23be901cfb687d4c4e6098c SHA1 3841ea6883e3699576e25d8a2b7ec4adbcca2732 SHA256 29e95ebd95c69b08db5783495a479b35ee16adc3f2feb78bb9d1d69b71d0373f
+EBUILD subversion-1.5.6.ebuild 13388 RMD160 ef3c4a59c1f26ad4a8594e65a93b19e97bb84822 SHA1 3152150da728e37c326268cb74d1d511debb1852 SHA256 370896d95e44b0d4488530a633f5e060bce096a5214e1575ebfc3833c9ade640
 EBUILD subversion-1.6.3-r10.ebuild 27393 RMD160 07b207472935048fe19e4de48d8553ab160d59b6 SHA1 32c8592662b75c92120de97694cdafa323f24520 SHA256 7bf86b85d1b3e3bf9cf0bd2e436831a2235d41f966ff3fba1f2bc8635d17daff
 EBUILD subversion-1.6.3.ebuild 27046 RMD160 f58e96ca5e3326c3b972108f7f26cdfe66de4542 SHA1 1710db2836888a094ead63e3b63d819c440a2255 SHA256 18e7cd130c9ecd5b4f52deb76840b3150a9ecb317648dc8af65e1a413cad5f08
-MISC ChangeLog 66054 RMD160 27d2f635c8d8b3e5058dc9c7a2bd0630575bb0fb SHA1 ce43484fa2aa5af9021402a64bd4e37ca48230fc SHA256 ee85fc6d4e7c056530e8437cd47107c44b0e0d1b12c2ee7eb603bf75ed14dab1
+MISC ChangeLog 66445 RMD160 c418de941ade1ea054d3dc733232697003b935d1 SHA1 317d27cbf845aeb333cc2e53acb67009f97a157d SHA256 117ff00f6e0bae272c1dc7a9337304627320efaaf8deec5b280e2eaaa461cead
 MISC metadata.xml 794 RMD160 6e8968481ac256000ec54f71bac21c7b4cbde1cc SHA1 c753273c54c52d52187cb886e35dc08726f1b97e SHA256 3d7a28065aaf0e28837de71ccde29de53a074b5b3ede715c1b412cf5a43aaeac
diff --git a/dev-util/subversion/files/subversion-1.6.1-fix_sqlite_configuration.patch b/dev-util/subversion/files/subversion-1.6.1-fix_sqlite_configuration.patch
deleted file mode 100644
index 4cef0a25c879..000000000000
--- a/dev-util/subversion/files/subversion-1.6.1-fix_sqlite_configuration.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://svn.collab.net/viewvc/svn?view=revision&revision=37185
-
---- subversion/libsvn_subr/sqlite.c
-+++ subversion/libsvn_subr/sqlite.c
-@@ -503,8 +503,12 @@
-                               "thread-safe mode"));
- #endif
- #if SQLITE_VERSION_AT_LEAST(3,6,0)
--  SQLITE_ERR_MSG(sqlite3_config(SQLITE_CONFIG_MULTITHREAD),
--                 "Could not configure SQLite");
-+  /* If SQLite has been already initialized, sqlite3_config() returns
-+     SQLITE_MISUSE. */
-+  int err = sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
-+  if (err != SQLITE_OK && err != SQLITE_MISUSE)
-+    return svn_error_create(SQLITE_ERROR_CODE(err), NULL,
-+                            "Could not configure SQLite");
-   SQLITE_ERR_MSG(sqlite3_initialize(), "Could not initialize SQLite");
- #endif
- 
-Tylko w subversion-1.6.1/subversion/libsvn_subr: sqlite.c.orig
diff --git a/dev-util/subversion/files/subversion-1.6.2-fix_undefined_references.patch b/dev-util/subversion/files/subversion-1.6.2-fix_undefined_references.patch
deleted file mode 100644
index 0ee6c08b0b78..000000000000
--- a/dev-util/subversion/files/subversion-1.6.2-fix_undefined_references.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://svn.collab.net/viewvc/svn?view=revision&revision=37710
-
---- subversion/libsvn_fs_base/bdb/changes-table.c
-+++ subversion/libsvn_fs_base/bdb/changes-table.c
-@@ -33,7 +33,7 @@
- #include "dbt.h"
- #include "changes-table.h"
- 
--
-+#include "private/svn_fs_util.h"
- #include "svn_private_config.h"
- 
- 
-@@ -217,7 +217,7 @@
-       /* This change is new to the hash, so make a new public change
-          structure from the internal one (in the hash's pool), and dup
-          the path into the hash's pool, too. */
--      new_change = svn_fs_path_change2_create(
-+      new_change = svn_fs__path_change2_create(
-                        svn_fs_base__id_copy(change->noderev_id, pool),
-                        change->kind,
-                        pool);
---- subversion/libsvn_fs_fs/fs_fs.c
-+++ subversion/libsvn_fs_fs/fs_fs.c
-@@ -4780,7 +4780,7 @@
-                            APR_APPEND | APR_WRITE | APR_CREATE
-                            | APR_BUFFERED, APR_OS_DEFAULT, pool));
- 
--  change = svn_fs_path_change2_create(id, change_kind, pool);
-+  change = svn_fs__path_change2_create(id, change_kind, pool);
-   change->text_mod = text_mod;
-   change->prop_mod = prop_mod;
-   change->node_kind = node_kind;
diff --git a/dev-util/subversion/subversion-1.5.5.ebuild b/dev-util/subversion/subversion-1.5.5.ebuild
deleted file mode 100644
index f242c516e839..000000000000
--- a/dev-util/subversion/subversion-1.5.5.ebuild
+++ /dev/null
@@ -1,413 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.5.5.ebuild,v 1.8 2009/05/26 17:02:05 arfrever Exp $
-
-EAPI="1"
-WANT_AUTOMAKE="none"
-
-inherit autotools bash-completion confutils 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.tigris.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 ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="apache2 berkdb debug doc +dso emacs extras java nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
-RESTRICT="test"
-
-CDEPEND=">=dev-libs/apr-1.2.8
-	>=dev-libs/apr-util-1.2.8
-	dev-libs/expat
-	sys-libs/zlib
-	berkdb? ( =sys-libs/db-4* )
-	emacs? ( virtual/emacs )
-	ruby? ( >=dev-lang/ruby-1.8.2 )
-	sasl? ( dev-libs/cyrus-sasl )
-	webdav-neon? ( >=net-misc/neon-0.28 )
-	webdav-serf? ( net-libs/serf )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.5 )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )"
-
-DEPEND="${CDEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.5 )
-	nls? ( sys-devel/gettext )"
-
-want_apache
-
-S="${WORKDIR}"/${P/_/-}
-
-# Allow for custom repository locations.
-# This can't be in pkg_setup because the variable needs to be available to
-# pkg_config.
-: ${SVN_REPOS_LOC:=/var/svn}
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	confutils_use_depend_built_with_all berkdb dev-libs/apr-util berkdb
-	java-pkg-opt-2_pkg_setup
-
-	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}/${PF} webdav-neon webdav-serf"
-		ewarn
-		ebeep
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/1.5.0/disable-unneeded-linking.patch
-
-	sed -i \
-		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
-	sed -e 's:@bindir@/svn-contrib:@libdir@/subversion/bin:' \
-		-e 's:@bindir@/svn-tools:@libdir@/subversion/bin:' \
-		-i Makefile.in
-
-	eautoconf
-	elibtoolize
-}
-
-src_compile() {
-	local myconf
-
-	if use python || use perl || use ruby; then
-		myconf="${myconf} --with-swig"
-	else
-		myconf="${myconf} --without-swig"
-	fi
-
-	if use debug; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	econf ${myconf} \
-		$(use_with apache2 apxs "${APXS}") \
-		$(use_with berkdb berkeley-db) \
-		$(use_enable dso runtime-module-search) \
-		$(use_enable java javahl) \
-		$(use_with java jdk "${JAVA_HOME}") \
-		$(use_enable nls) \
-		$(use_with sasl) \
-		$(use_with webdav-neon neon /usr) \
-		$(use_with webdav-serf serf /usr) \
-		--with-apr=/usr/bin/apr-1-config \
-		--with-apr-util=/usr/bin/apu-1-config \
-		--disable-experimental-libtool \
-		--without-jikes \
-		--without-junit \
-		--disable-mod-activation
-
-	emake local-all || die "Building of core Subversion failed"
-
-	if use python; then
-		emake swig-py || die "Building of Subversion Python bindings failed"
-	fi
-
-	if use perl; then
-		emake -j1 swig-pl || die "Building of Subversion Perl bindings failed"
-	fi
-
-	if use ruby; then
-		emake swig-rb || die "Building of Subversion Ruby bindings failed"
-	fi
-
-	if use java; then
-		make 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() {
-	python_version
-	PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}
-
-	emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed"
-
-	if use python; then
-		emake -j1 DESTDIR="${D}" DISTUTIL_PARAM="--prefix=${D}" LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" install-swig-py \
-			|| die "Installation of Subversion Python bindings failed"
-
-		# Move Python bindings.
-		dodir "${PYTHON_DIR}/site-packages"
-		mv "${D}"/usr/$(get_libdir)/svn-python/svn "${D}${PYTHON_DIR}/site-packages"
-		mv "${D}"/usr/$(get_libdir)/svn-python/libsvn "${D}${PYTHON_DIR}/site-packages"
-		rm -Rf "${D}"/usr/$(get_libdir)/svn-python
-	fi
-
-	if use perl; then
-		emake -j1 DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion Perl bindings failed"
-		fixlocalpod
-	fi
-
-	if use ruby; then
-		emake -j1 DESTDIR="${D}" install-swig-rb || die "Installation of Subversion Ruby bindings failed"
-	fi
-
-	if use java; then
-		emake -j1 DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
-		java-pkg_regso "${D}"/usr/$(get_libdir)/libsvnjavahl*.so
-		java-pkg_dojar "${D}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-		rm -Rf "${D}"/usr/$(get_libdir)/svn-javahl/*.jar
-	fi
-
-	# Install Apache module configuration.
-	if use apache2; then
-		dodir "${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
-		newbin contrib/client-side/svn_load_dirs/svn_load_dirs.pl svn-load-dirs
-	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
-	if use apache2; then
-		newconfd "${FILESDIR}"/svnserve.confd svnserve
-	else
-		newconfd "${FILESDIR}"/svnserve.confd2 svnserve
-	fi
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dohtml www/hacking.html
-	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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/1.5.0/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
-		doenvd "${FILESDIR}"/1.5.0/80subversion-extras
-
-		emake DESTDIR="${D}" install-contrib || die "Installation of contrib failed"
-		emake DESTDIR="${D}" 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,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 doc/doxygen/html/*
-
-		insinto /usr/share/doc/${PF}
-		doins -r notes
-		ecompressdir /usr/share/doc/${PF}/notes
-
-		if use java; then
-			java-pkg_dojavadoc doc/javadoc
-		fi
-	fi
-}
-
-pkg_preinst() {
-	# Compare versions of Berkeley DB, bug 122877.
-	if use berkdb && [[ -f "${ROOT}usr/bin/svn" ]] ; then
-		OLD_BDB_VERSION="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${D}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
-
-	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
-
-	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
-}
-
-pkg_config() {
-	if [[ ! -x "${ROOT}usr/bin/svnadmin" ]] ; then
-		die "You seem to only have built the Subversion client"
-	fi
-
-	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.
-		"${ROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos"
-
-		einfo ">>> Setting repository permissions ..."
-		SVNSERVE_USER="$(. "${ROOT}etc/conf.d/svnserve" ; echo "${SVNSERVE_USER}")"
-		SVNSERVE_GROUP="$(. "${ROOT}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-util/subversion/subversion-1.5.6.ebuild b/dev-util/subversion/subversion-1.5.6.ebuild
index 26afae6c6ca9..ab238bbf5f57 100644
--- a/dev-util/subversion/subversion-1.5.6.ebuild
+++ b/dev-util/subversion/subversion-1.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.5.6.ebuild,v 1.7 2009/05/26 17:02:05 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.5.6.ebuild,v 1.8 2009/08/05 19:48:53 arfrever Exp $
 
 EAPI="1"
 WANT_AUTOMAKE="none"
@@ -13,7 +13,7 @@ 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 ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="~mips ~sparc-fbsd"
 IUSE="apache2 berkdb debug doc +dso emacs extras java nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
 RESTRICT="test"
 
diff --git a/dev-util/subversion/subversion-1.6.1.ebuild b/dev-util/subversion/subversion-1.6.1.ebuild
deleted file mode 100644
index 03096965a126..000000000000
--- a/dev-util/subversion/subversion-1.6.1.ebuild
+++ /dev/null
@@ -1,522 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.1.ebuild,v 1.6 2009/05/26 17:02:05 arfrever Exp $
-
-EAPI="1"
-
-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.tigris.org/"
-SRC_URI="http://subversion.tigris.org/downloads/${P/_/-}.tar.bz2"
-
-LICENSE="Subversion"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86"
-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"
-RESTRICT="test"
-
-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* )
-	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 )
-	ruby? ( >=dev-lang/ruby-1.8.2 )
-	sasl? ( dev-libs/cyrus-sasl )
-	webdav-neon? ( >=net-misc/neon-0.28 )
-	webdav-serf? ( >=net-libs/serf-0.3.0 )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.5 )
-	kde? ( kde-base/kwalletd )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )"
-
-DEPEND="${CDEPEND}
-	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 )"
-
-want_apache
-
-S="${WORKDIR}/${P/_/-}"
-
-# Allow for custom repository locations.
-# This can't be in pkg_setup() because the variable needs to be available to pkg_config().
-: ${SVN_REPOS_LOC:=/var/svn}
-
-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 "${ROOT}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 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
-		ebeep
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	if use debug; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.6.0-disable_linking_against_unneeded_libraries.patch"
-	epatch "${FILESDIR}/${P}-fix_sqlite_configuration.patch"
-
-	sed -i \
-		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
-	sed -e "s:@bindir@/svn-contrib:@libdir@/subversion/bin:" \
-		-e "s:@bindir@/svn-tools:@libdir@/subversion/bin:" \
-		-i Makefile.in
-
-	eautoconf
-	elibtoolize
-}
-
-src_compile() {
-	local myconf
-
-	if use python || use perl || use ruby; then
-		myconf="${myconf} --with-swig"
-	else
-		myconf="${myconf} --without-swig"
-	fi
-
-	econf --libdir="/usr/$(get_libdir)" \
-		${myconf} \
-		$(use_with apache2 apxs "${APXS}") \
-		$(use_with berkdb berkeley-db "db.h:/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \
-		$(use_with ctypes-python ctypesgen /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 /usr) \
-		--with-apr=/usr/bin/apr-1-config \
-		--with-apr-util=/usr/bin/apu-1-config \
-		--disable-experimental-libtool \
-		--without-jikes \
-		--without-junit \
-		--disable-mod-activation \
-		--disable-neon-version-check \
-		--with-sqlite=/usr
-
-	einfo
-	einfo "Building of core of Subversion"
-	einfo
-	emake local-all || die "Building of core of Subversion failed"
-
-	if use ctypes-python; then
-		einfo
-		einfo "Building of Subversion Ctypes Python bindings"
-		einfo
-		emake ctypes-python || die "Building of Subversion Ctypes Python bindings failed"
-	fi
-
-	if use python; then
-		einfo
-		einfo "Building of Subversion SWIG Python bindings"
-		einfo
-		emake swig_pydir="$(python_get_sitedir)/libsvn" swig_pydir_extra="$(python_get_sitedir)/svn" swig-py \
-			|| die "Building of Subversion SWIG Python bindings failed"
-	fi
-
-	if use perl; then
-		einfo
-		einfo "Building of Subversion SWIG Perl bindings"
-		einfo
-		emake -j1 swig-pl || die "Building of Subversion SWIG Perl bindings failed"
-	fi
-
-	if use ruby; then
-		einfo
-		einfo "Building of Subversion SWIG Ruby bindings"
-		einfo
-		emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed"
-	fi
-
-	if use java; then
-		einfo
-		einfo "Building of Subversion JavaHL library"
-		einfo
-		make JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl \
-			|| die "Building of Subversion JavaHL library failed"
-	fi
-
-	if use emacs; then
-		einfo
-		einfo "Compilation of Emacs support"
-		einfo
-		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
-		einfo
-		einfo "Building of contrib and tools"
-		einfo
-		emake contrib || die "Building of contrib failed"
-		emake tools || die "Building of tools failed"
-	fi
-
-	if use doc; then
-		einfo
-		einfo "Building of Subversion HTML documentation"
-		einfo
-		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
-		if use java; then
-			einfo
-			einfo "Building of Subversion JavaHL library HTML documentation"
-			einfo
-			emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed"
-		fi
-	fi
-}
-
-src_install() {
-	einfo
-	einfo "Installation of core of Subversion"
-	einfo
-	emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed"
-
-	if use ctypes-python; then
-		einfo
-		einfo "Installation of Subversion Ctypes Python bindings"
-		einfo
-		emake DESTDIR="${D}" install-ctypes-python || die "Installation of Subversion Ctypes Python bindings failed"
-	fi
-
-	if use python; then
-		einfo
-		einfo "Installation of Subversion SWIG Python bindings"
-		einfo
-		emake -j1 DESTDIR="${D}" swig_pydir="$(python_get_sitedir)/libsvn" swig_pydir_extra="$(python_get_sitedir)/svn" install-swig-py \
-			|| die "Installation of Subversion SWIG Python bindings failed"
-	fi
-
-	if use perl; then
-		einfo
-		einfo "Installation of Subversion SWIG Perl bindings"
-		einfo
-		emake -j1 DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed"
-		fixlocalpod
-		find "${D}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr
-	fi
-
-	if use ruby; then
-		einfo
-		einfo "Installation of Subversion SWIG Ruby bindings"
-		einfo
-		emake -j1 DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed"
-	fi
-
-	if use java; then
-		einfo
-		einfo "Installation of Subversion JavaHL library"
-		einfo
-		emake -j1 DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
-		java-pkg_regso "${D}"usr/$(get_libdir)/libsvnjavahl*.so
-		java-pkg_dojar "${D}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-		rm -fr "${D}"usr/$(get_libdir)/svn-javahl/*.jar
-	fi
-
-	# Install Apache module configuration.
-	if use apache2; then
-		dodir "${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
-	if use apache2; then
-		newconfd "${FILESDIR}"/svnserve.confd svnserve
-	else
-		newconfd "${FILESDIR}"/svnserve.confd2 svnserve
-	fi
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dohtml www/hacking.html
-	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 "${D}${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
-		einfo
-		einfo "Installation of contrib and tools"
-		einfo
-		doenvd "${FILESDIR}/1.5.0/80subversion-extras"
-		emake DESTDIR="${D}" install-contrib || die "Installation of contrib failed"
-		emake DESTDIR="${D}" 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
-		einfo
-		einfo "Installation of Subversion HTML documentation"
-		einfo
-		dohtml 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
-#			make 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 "${ROOT}usr/bin/svn" ]]; then
-		OLD_BDB_VERSION="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${D}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_compile "$(python_get_sitedir)/csvn/"{.,core,ext}/*.py
-	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
-	epause 6
-
-	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
-	fi
-}
-
-pkg_config() {
-	if [[ ! -x "${ROOT}usr/bin/svnadmin" ]]; then
-		die "You seem to only have built the Subversion client"
-	fi
-
-	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.
-		"${ROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos"
-
-		einfo ">>> Setting repository permissions ..."
-		SVNSERVE_USER="$(. "${ROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
-		SVNSERVE_GROUP="$(. "${ROOT}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-util/subversion/subversion-1.6.2-r10.ebuild b/dev-util/subversion/subversion-1.6.2-r10.ebuild
deleted file mode 100644
index 57abeeff362a..000000000000
--- a/dev-util/subversion/subversion-1.6.2-r10.ebuild
+++ /dev/null
@@ -1,764 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.2-r10.ebuild,v 1.4 2009/07/06 19:14:54 arfrever Exp $
-
-EAPI="2"
-
-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.tigris.org/"
-SRC_URI="http://subversion.tigris.org/downloads/${P/_/-}.tar.bz2"
-
-LICENSE="Subversion"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-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* )
-	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 )
-	ruby? ( >=dev-lang/ruby-1.8.2 )
-	sasl? ( dev-libs/cyrus-sasl )
-	webdav-neon? ( >=net-misc/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 )"
-
-want_apache
-
-S="${WORKDIR}/${P/_/-}"
-
-# Allow for custom repository locations.
-# This can't be in pkg_setup() because the variable needs to be available to pkg_config().
-: ${SVN_REPOS_LOC:=/var/svn}
-
-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 "${ROOT}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 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
-		ebeep
-	fi
-
-	if use test; then
-		elog
-		elog "\e[31m************************************************************************************************\e[0m"
-		elog
-		elog "NOTES ABOUT TESTS"
-		elog
-		elog "You can set the following variables to enable testing of some features and configure testing:"
-		if use webdav-neon || use webdav-serf; then
-			elog "  SVN_TEST_APACHE=1                     - Enable testing of mod_dav_svn, mod_authz_svn and libsvn_ra_neon / libsvn_ra_serf"
-			elog "                                          (See \"Testing of mod_dav_svn, mod_authz_svn and libsvn_ra_neon / libsvn_ra_serf\")"
-		fi
-		elog "  SVN_TEST_SVNSERVE_PORT=integer        - Set svnserve port number (Default value: 3690)"
-		elog "  SVN_TEST_FSFS_MEMCACHED=1             - Enable using of Memcached for FSFS repositories"
-		elog "  SVN_TEST_FSFS_MEMCACHED_PORT=integer  - Set Memcached port number (Default value: 11211)"
-		elog "  SVN_TEST_FSFS_SHARDING=integer        - Enable sharding of FSFS repositories and set default shard size for FSFS repositories"
-		elog "  SVN_TEST_FSFS_PACKING=1               - Enable packing of FSFS repositories"
-		elog "                                          (SVN_TEST_FSFS_PACKING requires SVN_TEST_FSFS_SHARDING)"
-#		if use sasl; then
-#	 		elog "  SVN_TEST_SASL=1                       - Enable SASL authentication"
-#		fi
-		if use ctypes-python || use java || use perl || use python || use ruby; then
-			elog "  SVN_TEST_BINDINGS=1                   - Enable testing of bindings"
-		fi
-		if use java || use perl || use python || use ruby; then
-			elog "                                          (Testing of bindings requires ${CATEGORY}/${PF})"
-		fi
-		if use java; then
-			elog "                                          (Testing of JavaHL library requires dev-java/junit:4)"
-		fi
-		elog
-		if ! use webdav-neon && ! use webdav-serf; then
-			elog "\e[31m************************************************************************************************\e[0m"
-			elog
-			epause 24
-		fi
-
-		if { use webdav-neon || use webdav-serf; } && [[ -n "${SVN_TEST_APACHE}" ]] && ! has_version "${CATEGORY}/${PN}[apache2]"; then
-			die "${CATEGORY}/${PN} must be installed with USE=\"apache2\""
-		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
-
-	append-flags -fno-strict-aliasing
-
-	if use debug; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-}
-
-src_unpack() {
-	if use test && { use webdav-neon || use webdav-serf; }; then
-		create_apache_tests_configuration
-
-		elog
-		elog "Testing of mod_dav_svn, mod_authz_svn and libsvn_ra_neon / libsvn_ra_serf:"
-		elog " If you want to test mod_dav_svn, mod_authz_svn and libsvn_ra_neon / libsvn_ra_serf,"
-		elog " ensure that ${CATEGORY}/${PN} is installed with USE=\"apache2\","
-		elog " copy \"${T}/99_subversion_tests.conf\""
-		elog " to \"/etc/apache2/modules.d\" directory, add definitions of DAV, SVN, SVN_AUTHZ"
-		elog " and SVN_TESTS to APACHE2_OPTS variable in \"/etc/conf.d/apache2\" configuration file,"
-		elog " (re)start Apache and run \`SVN_TEST_APACHE=1 emerge ${CATEGORY}/${PN}\`."
-		elog
-		elog "\e[31m************************************************************************************************\e[0m"
-		elog
-
-		if [[ -z "${SVN_TEST_APACHE}" ]]; then
-			ebeep 6
-			epause 18
-		else
-			if [[ ! -f "/etc/apache2/modules.d/99_subversion_tests.conf" ]]; then
-				die "/etc/apache2/modules.d/99_subversion_tests.conf doesn't exist"
-			fi
-			if ! cmp -s "${T}/99_subversion_tests.conf" "/etc/apache2/modules.d/99_subversion_tests.conf"; then
-				die "/etc/apache2/modules.d/99_subversion_tests.conf mismatch"
-			fi
-
-			epause 24
-		fi
-	fi
-
-	unpack ${A}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.6.0-disable_linking_against_unneeded_libraries.patch"
-	epatch "${FILESDIR}/${P}-fix_undefined_references.patch"
-	epatch "${FILESDIR}/${P}-local_library_preloading.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
-
-	eautoconf
-	elibtoolize
-}
-
-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=/usr/share/junit-4/lib/junit.jar"
-		else
-			myconf+=" --without-junit"
-		fi
-	fi
-
-	econf --libdir="/usr/$(get_libdir)" \
-		$(use_with apache2 apxs "${APXS}") \
-		$(use_with berkdb berkeley-db "db.h:/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \
-		$(use_with ctypes-python ctypesgen /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 /usr) \
-		${myconf} \
-		--with-apr=/usr/bin/apr-1-config \
-		--with-apr-util=/usr/bin/apu-1-config \
-		--disable-experimental-libtool \
-		--without-jikes \
-		--enable-local-library-preloading \
-		--disable-mod-activation \
-		--disable-neon-version-check \
-		--with-sqlite=/usr
-}
-
-src_compile() {
-	einfo
-	einfo "Building of core of Subversion"
-	einfo
-	emake local-all || die "Building of core of Subversion failed"
-
-	if use ctypes-python; then
-		einfo
-		einfo "Building of Subversion Ctypes Python bindings"
-		einfo
-		emake ctypes-python || die "Building of Subversion Ctypes Python bindings failed"
-	fi
-
-	if use python; then
-		einfo
-		einfo "Building of Subversion SWIG Python bindings"
-		einfo
-		emake swig_pydir="$(python_get_sitedir)/libsvn" swig_pydir_extra="$(python_get_sitedir)/svn" swig-py \
-			|| die "Building of Subversion SWIG Python bindings failed"
-	fi
-
-	if use perl; then
-		einfo
-		einfo "Building of Subversion SWIG Perl bindings"
-		einfo
-		emake -j1 swig-pl || die "Building of Subversion SWIG Perl bindings failed"
-	fi
-
-	if use ruby; then
-		einfo
-		einfo "Building of Subversion SWIG Ruby bindings"
-		einfo
-		emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed"
-	fi
-
-	if use java; then
-		einfo
-		einfo "Building of Subversion JavaHL library"
-		einfo
-		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl \
-			|| die "Building of Subversion JavaHL library failed"
-	fi
-
-	if use emacs; then
-		einfo
-		einfo "Compilation of Emacs modules"
-		einfo
-		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
-		einfo
-		einfo "Building of contrib and tools"
-		einfo
-		emake contrib || die "Building of contrib failed"
-		emake tools || die "Building of tools failed"
-	fi
-
-	if use doc; then
-		einfo
-		einfo "Building of Subversion HTML documentation"
-		einfo
-		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
-		if use java; then
-			einfo
-			einfo "Building of Subversion JavaHL library HTML documentation"
-			einfo
-			emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed"
-		fi
-	fi
-}
-
-create_apache_tests_configuration() {
-cat << EOF > "${T}/99_subversion_tests.conf"
-<IfDefine SVN_TESTS>
-	User $(id -un)
-	Group $(id -gn)
-
-	<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>
-</IfDefine>
-EOF
-
-cat << EOF > "${T}/apache-users"
-jrandom:xCGl35kV9oWCY
-jconstant:xCGl35kV9oWCY
-EOF
-}
-
-initialize_tests_environment() {
-	[[ "$1" == "local" ]] && base_url="file://${S}/subversion/tests/cmdline" http_library=""
-	[[ "$1" == "svn" ]] && base_url="svn://127.0.0.1" http_library=""
-	[[ "$1" == "neon" ]] && base_url="http://127.0.0.1" http_library="neon"
-	[[ "$1" == "serf" ]] && base_url="http://127.0.0.1" http_library="serf"
-
-	[[ "$1" == "svn" ]] && LC_ALL="C" subversion/svnserve/svnserve -dr "subversion/tests/cmdline" --listen-port "${SVN_TEST_SVNSERVE_PORT}" --pid-file "${T}/svnserve.pid"
-	[[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]] && memcached -dp "${SVN_TEST_FSFS_MEMCACHED_PORT}" -P "${T}/memcached.pid"
-}
-
-terminate_tests_environment() {
-	[[ "$1" == "svn" ]] && kill "$(<"${T}/svnserve.pid")"
-	[[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]] && kill "$(<"${T}/memcached.pid")"
-}
-
-src_test() {
-	local fs_type fs_types ra_type ra_types options failed_tests
-
-	fs_types="fsfs"
-	use berkdb && fs_types+=" bdb"
-
-	ra_types="local svn"
-	if [[ -n "${SVN_TEST_APACHE}" ]]; then
-		use webdav-neon && ra_types+=" neon"
-		use webdav-serf && ra_types+=" serf"
-	fi
-
-	[[ -z "${SVN_TEST_SVNSERVE_PORT}" ]] && SVN_TEST_SVNSERVE_PORT="3690"
-	if [[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]]; then
-		[[ -z "${SVN_TEST_FSFS_MEMCACHED_PORT}" ]] && SVN_TEST_FSFS_MEMCACHED_PORT="11211"
-		sed -e "/\[memcached-servers\]/akey = 127.0.0.1:${SVN_TEST_FSFS_MEMCACHED_PORT}" -i subversion/tests/tests.conf
-	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
-
-	for ra_type in ${ra_types}; do
-		for fs_type in ${fs_types}; do
-			[[ "${ra_type}" == "local" && "${fs_type}" == "bdb" ]] && continue
-			einfo
-			einfo "\e[1;34mTesting of ra_${ra_type} + $(echo ${fs_type} | tr '[:lower:]' '[:upper:]')\e[0m"
-			einfo
-			initialize_tests_environment ${ra_type}
-			emake check FS_TYPE="${fs_type}" BASE_URL="${base_url}" HTTP_LIBRARY="${http_library}" CLEANUP="1" ${options} || failed_tests="1"
-			terminate_tests_environment ${ra_type}
-			mv tests.log tests-ra_${ra_type}-${fs_type}.log
-		done
-	done
-	unset base_url http_library
-
-	if [[ -n "${SVN_TEST_BINDINGS}" ]]; then
-		local swig_lingua swig_linguas
-		local -A linguas
-		if use ctypes-python; then
-			einfo
-			einfo "\e[1;34mTesting of Subversion Ctypes Python bindings\e[0m"
-			einfo
-			emake check-ctypes-python || failed_tests="1"
-		fi
-
-		use perl && swig_linguas+=" pl"
-		use python && swig_linguas+=" py"
-		use ruby && swig_linguas+=" rb"
-
-		linguas[pl]="Perl"
-		linguas[py]="Python"
-		linguas[rb]="Ruby"
-
-		for swig_lingua in ${swig_linguas}; do
-			einfo
-			einfo "\e[1;34mTesting of Subversion SWIG ${linguas[${swig_lingua}]} bindings\e[0m"
-			einfo
-			emake check-swig-${swig_lingua} || failed_tests="1"
-		done
-
-		if use java; then
-			einfo
-			einfo "\e[1;34mTesting of Subversion JavaHL library\e[0m"
-			einfo
-			emake check-javahl || failed_tests="1"
-		fi
-	fi
-
-	if [[ -n "${failed_tests}" ]]; then
-		ewarn
-		ewarn "\e[1;31mSome tests failed\e[0m"
-		ewarn
-		ebeep 12
-	fi
-}
-
-src_install() {
-	einfo
-	einfo "Installation of core of Subversion"
-	einfo
-	emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed"
-
-	if use ctypes-python; then
-		einfo
-		einfo "Installation of Subversion Ctypes Python bindings"
-		einfo
-		emake DESTDIR="${D}" install-ctypes-python || die "Installation of Subversion Ctypes Python bindings failed"
-	fi
-
-	if use python; then
-		einfo
-		einfo "Installation of Subversion SWIG Python bindings"
-		einfo
-		emake -j1 DESTDIR="${D}" swig_pydir="$(python_get_sitedir)/libsvn" swig_pydir_extra="$(python_get_sitedir)/svn" install-swig-py \
-			|| die "Installation of Subversion SWIG Python bindings failed"
-	fi
-
-	if use perl; then
-		einfo
-		einfo "Installation of Subversion SWIG Perl bindings"
-		einfo
-		emake -j1 DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed"
-		fixlocalpod
-		find "${D}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr
-	fi
-
-	if use ruby; then
-		einfo
-		einfo "Installation of Subversion SWIG Ruby bindings"
-		einfo
-		emake -j1 DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed"
-	fi
-
-	if use java; then
-		einfo
-		einfo "Installation of Subversion JavaHL library"
-		einfo
-		emake -j1 DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
-		java-pkg_regso "${D}"usr/$(get_libdir)/libsvnjavahl*.so
-		java-pkg_dojar "${D}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-		rm -fr "${D}"usr/$(get_libdir)/svn-javahl/*.jar
-	fi
-
-	# Install Apache module configuration.
-	if use apache2; then
-		dodir "${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
-	if use apache2; then
-		newconfd "${FILESDIR}"/svnserve.confd svnserve
-	else
-		newconfd "${FILESDIR}"/svnserve.confd2 svnserve
-	fi
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dohtml www/hacking.html
-	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 "${D}${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
-		einfo
-		einfo "Installation of contrib and tools"
-		einfo
-
-		cat << EOF > 80subversion-extras
-PATH=/usr/$(get_libdir)/subversion/bin
-ROOTPATH=/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
-		einfo
-		einfo "Installation of Subversion HTML documentation"
-		einfo
-		dohtml 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 "${ROOT}usr/bin/svn" ]]; then
-		OLD_BDB_VERSION="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${D}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_compile "$(python_get_sitedir)/csvn/"{.,core,ext}/*.py
-	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
-	epause 6
-
-	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
-	fi
-}
-
-pkg_config() {
-	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.
-		"${ROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos"
-
-		einfo ">>> Setting repository permissions ..."
-		SVNSERVE_USER="$(. "${ROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
-		SVNSERVE_GROUP="$(. "${ROOT}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-util/subversion/subversion-1.6.2.ebuild b/dev-util/subversion/subversion-1.6.2.ebuild
deleted file mode 100644
index 05615793eaa1..000000000000
--- a/dev-util/subversion/subversion-1.6.2.ebuild
+++ /dev/null
@@ -1,755 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.2.ebuild,v 1.13 2009/07/06 19:14:54 arfrever Exp $
-
-EAPI="2"
-
-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.tigris.org/"
-SRC_URI="http://subversion.tigris.org/downloads/${P/_/-}.tar.bz2"
-
-LICENSE="Subversion"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="apache2 berkdb ctypes-python debug doc +dso emacs extras gnome-keyring java 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* )
-	emacs? ( virtual/emacs )
-	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring )
-	ruby? ( >=dev-lang/ruby-1.8.2 )
-	sasl? ( dev-libs/cyrus-sasl )
-	webdav-neon? ( >=net-misc/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 )
-	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 )
-	nls? ( sys-devel/gettext )
-	webdav-neon? ( dev-util/pkgconfig )"
-
-want_apache
-
-S="${WORKDIR}/${P/_/-}"
-
-# Allow for custom repository locations.
-# This can't be in pkg_setup() because the variable needs to be available to pkg_config().
-: ${SVN_REPOS_LOC:=/var/svn}
-
-pkg_setup() {
-	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 "${ROOT}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 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
-		ebeep
-	fi
-
-	if use test; then
-		elog
-		elog "\e[31m************************************************************************************************\e[0m"
-		elog
-		elog "NOTES ABOUT TESTS"
-		elog
-		elog "You can set the following variables to enable testing of some features and configure testing:"
-		if use webdav-neon || use webdav-serf; then
-			elog "  SVN_TEST_APACHE=1                     - Enable testing of mod_dav_svn, mod_authz_svn and libsvn_ra_neon / libsvn_ra_serf"
-			elog "                                          (See \"Testing of mod_dav_svn, mod_authz_svn and libsvn_ra_neon / libsvn_ra_serf\")"
-		fi
-		elog "  SVN_TEST_SVNSERVE_PORT=integer        - Set svnserve port number (Default value: 3690)"
-		elog "  SVN_TEST_FSFS_MEMCACHED=1             - Enable using of Memcached for FSFS repositories"
-		elog "  SVN_TEST_FSFS_MEMCACHED_PORT=integer  - Set Memcached port number (Default value: 11211)"
-		elog "  SVN_TEST_FSFS_SHARDING=integer        - Enable sharding of FSFS repositories and set default shard size for FSFS repositories"
-		elog "  SVN_TEST_FSFS_PACKING=1               - Enable packing of FSFS repositories"
-		elog "                                          (SVN_TEST_FSFS_PACKING requires SVN_TEST_FSFS_SHARDING)"
-#		if use sasl; then
-#	 		elog "  SVN_TEST_SASL=1                       - Enable SASL authentication"
-#		fi
-		if use ctypes-python || use java || use perl || use python || use ruby; then
-			elog "  SVN_TEST_BINDINGS=1                   - Enable testing of bindings"
-		fi
-		if use java || use perl || use python || use ruby; then
-			elog "                                          (Testing of bindings requires ${CATEGORY}/${PF})"
-		fi
-		if use java; then
-			elog "                                          (Testing of JavaHL library requires dev-java/junit:4)"
-		fi
-		elog
-		if ! use webdav-neon && ! use webdav-serf; then
-			elog "\e[31m************************************************************************************************\e[0m"
-			elog
-			epause 24
-		fi
-
-		if { use webdav-neon || use webdav-serf; } && [[ -n "${SVN_TEST_APACHE}" ]] && ! has_version "${CATEGORY}/${PN}[apache2]"; then
-			die "${CATEGORY}/${PN} must be installed with USE=\"apache2\""
-		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
-
-	append-flags -fno-strict-aliasing
-
-	if use debug; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-}
-
-src_unpack() {
-	if use test && { use webdav-neon || use webdav-serf; }; then
-		create_apache_tests_configuration
-
-		elog
-		elog "Testing of mod_dav_svn, mod_authz_svn and libsvn_ra_neon / libsvn_ra_serf:"
-		elog " If you want to test mod_dav_svn, mod_authz_svn and libsvn_ra_neon / libsvn_ra_serf,"
-		elog " ensure that ${CATEGORY}/${PN} is installed with USE=\"apache2\","
-		elog " copy \"${T}/99_subversion_tests.conf\""
-		elog " to \"/etc/apache2/modules.d\" directory, add definitions of DAV, SVN, SVN_AUTHZ"
-		elog " and SVN_TESTS to APACHE2_OPTS variable in \"/etc/conf.d/apache2\" configuration file,"
-		elog " (re)start Apache and run \`SVN_TEST_APACHE=1 emerge ${CATEGORY}/${PN}\`."
-		elog
-		elog "\e[31m************************************************************************************************\e[0m"
-		elog
-
-		if [[ -z "${SVN_TEST_APACHE}" ]]; then
-			ebeep 6
-			epause 18
-		else
-			if [[ ! -f "/etc/apache2/modules.d/99_subversion_tests.conf" ]]; then
-				die "/etc/apache2/modules.d/99_subversion_tests.conf doesn't exist"
-			fi
-			if ! cmp -s "${T}/99_subversion_tests.conf" "/etc/apache2/modules.d/99_subversion_tests.conf"; then
-				die "/etc/apache2/modules.d/99_subversion_tests.conf mismatch"
-			fi
-
-			epause 24
-		fi
-	fi
-
-	unpack ${A}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.6.0-disable_linking_against_unneeded_libraries.patch"
-	epatch "${FILESDIR}/${P}-fix_undefined_references.patch"
-	epatch "${FILESDIR}/${P}-local_library_preloading.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
-
-	eautoconf
-	elibtoolize
-}
-
-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=/usr/share/junit-4/lib/junit.jar"
-		else
-			myconf+=" --without-junit"
-		fi
-	fi
-
-	econf --libdir="/usr/$(get_libdir)" \
-		$(use_with apache2 apxs "${APXS}") \
-		$(use_with berkdb berkeley-db "db.h:/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \
-		$(use_with ctypes-python ctypesgen /usr) \
-		$(use_enable dso runtime-module-search) \
-		$(use_with gnome-keyring) \
-		$(use_enable java javahl) \
-		$(use_with java jdk "${JAVA_HOME}") \
-		$(use_enable nls) \
-		$(use_with sasl) \
-		$(use_with webdav-neon neon) \
-		$(use_with webdav-serf serf /usr) \
-		${myconf} \
-		--with-apr=/usr/bin/apr-1-config \
-		--with-apr-util=/usr/bin/apu-1-config \
-		--disable-experimental-libtool \
-		--without-jikes \
-		--enable-local-library-preloading \
-		--disable-mod-activation \
-		--disable-neon-version-check \
-		--with-sqlite=/usr
-}
-
-src_compile() {
-	einfo
-	einfo "Building of core of Subversion"
-	einfo
-	emake local-all || die "Building of core of Subversion failed"
-
-	if use ctypes-python; then
-		einfo
-		einfo "Building of Subversion Ctypes Python bindings"
-		einfo
-		emake ctypes-python || die "Building of Subversion Ctypes Python bindings failed"
-	fi
-
-	if use python; then
-		einfo
-		einfo "Building of Subversion SWIG Python bindings"
-		einfo
-		emake swig_pydir="$(python_get_sitedir)/libsvn" swig_pydir_extra="$(python_get_sitedir)/svn" swig-py \
-			|| die "Building of Subversion SWIG Python bindings failed"
-	fi
-
-	if use perl; then
-		einfo
-		einfo "Building of Subversion SWIG Perl bindings"
-		einfo
-		emake -j1 swig-pl || die "Building of Subversion SWIG Perl bindings failed"
-	fi
-
-	if use ruby; then
-		einfo
-		einfo "Building of Subversion SWIG Ruby bindings"
-		einfo
-		emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed"
-	fi
-
-	if use java; then
-		einfo
-		einfo "Building of Subversion JavaHL library"
-		einfo
-		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl \
-			|| die "Building of Subversion JavaHL library failed"
-	fi
-
-	if use emacs; then
-		einfo
-		einfo "Compilation of Emacs modules"
-		einfo
-		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
-		einfo
-		einfo "Building of contrib and tools"
-		einfo
-		emake contrib || die "Building of contrib failed"
-		emake tools || die "Building of tools failed"
-	fi
-
-	if use doc; then
-		einfo
-		einfo "Building of Subversion HTML documentation"
-		einfo
-		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
-		if use java; then
-			einfo
-			einfo "Building of Subversion JavaHL library HTML documentation"
-			einfo
-			emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed"
-		fi
-	fi
-}
-
-create_apache_tests_configuration() {
-cat << EOF > "${T}/99_subversion_tests.conf"
-<IfDefine SVN_TESTS>
-	User $(id -un)
-	Group $(id -gn)
-
-	<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>
-</IfDefine>
-EOF
-
-cat << EOF > "${T}/apache-users"
-jrandom:xCGl35kV9oWCY
-jconstant:xCGl35kV9oWCY
-EOF
-}
-
-initialize_tests_environment() {
-	[[ "$1" == "local" ]] && base_url="file://${S}/subversion/tests/cmdline" http_library=""
-	[[ "$1" == "svn" ]] && base_url="svn://127.0.0.1" http_library=""
-	[[ "$1" == "neon" ]] && base_url="http://127.0.0.1" http_library="neon"
-	[[ "$1" == "serf" ]] && base_url="http://127.0.0.1" http_library="serf"
-
-	[[ "$1" == "svn" ]] && LC_ALL="C" subversion/svnserve/svnserve -dr "subversion/tests/cmdline" --listen-port "${SVN_TEST_SVNSERVE_PORT}" --pid-file "${T}/svnserve.pid"
-	[[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]] && memcached -dp "${SVN_TEST_FSFS_MEMCACHED_PORT}" -P "${T}/memcached.pid"
-}
-
-terminate_tests_environment() {
-	[[ "$1" == "svn" ]] && kill "$(<"${T}/svnserve.pid")"
-	[[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]] && kill "$(<"${T}/memcached.pid")"
-}
-
-src_test() {
-	local fs_type fs_types ra_type ra_types options failed_tests
-
-	fs_types="fsfs"
-	use berkdb && fs_types+=" bdb"
-
-	ra_types="local svn"
-	if [[ -n "${SVN_TEST_APACHE}" ]]; then
-		use webdav-neon && ra_types+=" neon"
-		use webdav-serf && ra_types+=" serf"
-	fi
-
-	[[ -z "${SVN_TEST_SVNSERVE_PORT}" ]] && SVN_TEST_SVNSERVE_PORT="3690"
-	if [[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]]; then
-		[[ -z "${SVN_TEST_FSFS_MEMCACHED_PORT}" ]] && SVN_TEST_FSFS_MEMCACHED_PORT="11211"
-		sed -e "/\[memcached-servers\]/akey = 127.0.0.1:${SVN_TEST_FSFS_MEMCACHED_PORT}" -i subversion/tests/tests.conf
-	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
-
-	for ra_type in ${ra_types}; do
-		for fs_type in ${fs_types}; do
-			[[ "${ra_type}" == "local" && "${fs_type}" == "bdb" ]] && continue
-			einfo
-			einfo "\e[1;34mTesting of ra_${ra_type} + $(echo ${fs_type} | tr '[:lower:]' '[:upper:]')\e[0m"
-			einfo
-			initialize_tests_environment ${ra_type}
-			emake check FS_TYPE="${fs_type}" BASE_URL="${base_url}" HTTP_LIBRARY="${http_library}" CLEANUP="1" ${options} || failed_tests="1"
-			terminate_tests_environment ${ra_type}
-			mv tests.log tests-ra_${ra_type}-${fs_type}.log
-		done
-	done
-	unset base_url http_library
-
-	if [[ -n "${SVN_TEST_BINDINGS}" ]]; then
-		local swig_lingua swig_linguas
-		local -A linguas
-		if use ctypes-python; then
-			einfo
-			einfo "\e[1;34mTesting of Subversion Ctypes Python bindings\e[0m"
-			einfo
-			emake check-ctypes-python || failed_tests="1"
-		fi
-
-		use perl && swig_linguas+=" pl"
-		use python && swig_linguas+=" py"
-		use ruby && swig_linguas+=" rb"
-
-		linguas[pl]="Perl"
-		linguas[py]="Python"
-		linguas[rb]="Ruby"
-
-		for swig_lingua in ${swig_linguas}; do
-			einfo
-			einfo "\e[1;34mTesting of Subversion SWIG ${linguas[${swig_lingua}]} bindings\e[0m"
-			einfo
-			emake check-swig-${swig_lingua} || failed_tests="1"
-		done
-
-		if use java; then
-			einfo
-			einfo "\e[1;34mTesting of Subversion JavaHL library\e[0m"
-			einfo
-			emake check-javahl || failed_tests="1"
-		fi
-	fi
-
-	if [[ -n "${failed_tests}" ]]; then
-		ewarn
-		ewarn "\e[1;31mSome tests failed\e[0m"
-		ewarn
-		ebeep 12
-	fi
-}
-
-src_install() {
-	einfo
-	einfo "Installation of core of Subversion"
-	einfo
-	emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed"
-
-	if use ctypes-python; then
-		einfo
-		einfo "Installation of Subversion Ctypes Python bindings"
-		einfo
-		emake DESTDIR="${D}" install-ctypes-python || die "Installation of Subversion Ctypes Python bindings failed"
-	fi
-
-	if use python; then
-		einfo
-		einfo "Installation of Subversion SWIG Python bindings"
-		einfo
-		emake -j1 DESTDIR="${D}" swig_pydir="$(python_get_sitedir)/libsvn" swig_pydir_extra="$(python_get_sitedir)/svn" install-swig-py \
-			|| die "Installation of Subversion SWIG Python bindings failed"
-	fi
-
-	if use perl; then
-		einfo
-		einfo "Installation of Subversion SWIG Perl bindings"
-		einfo
-		emake -j1 DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed"
-		fixlocalpod
-		find "${D}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr
-	fi
-
-	if use ruby; then
-		einfo
-		einfo "Installation of Subversion SWIG Ruby bindings"
-		einfo
-		emake -j1 DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed"
-	fi
-
-	if use java; then
-		einfo
-		einfo "Installation of Subversion JavaHL library"
-		einfo
-		emake -j1 DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
-		java-pkg_regso "${D}"usr/$(get_libdir)/libsvnjavahl*.so
-		java-pkg_dojar "${D}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-		rm -fr "${D}"usr/$(get_libdir)/svn-javahl/*.jar
-	fi
-
-	# Install Apache module configuration.
-	if use apache2; then
-		dodir "${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
-	if use apache2; then
-		newconfd "${FILESDIR}"/svnserve.confd svnserve
-	else
-		newconfd "${FILESDIR}"/svnserve.confd2 svnserve
-	fi
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dohtml www/hacking.html
-	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 "${D}${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
-		einfo
-		einfo "Installation of contrib and tools"
-		einfo
-
-		cat << EOF > 80subversion-extras
-PATH=/usr/$(get_libdir)/subversion/bin
-ROOTPATH=/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
-		einfo
-		einfo "Installation of Subversion HTML documentation"
-		einfo
-		dohtml 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 "${ROOT}usr/bin/svn" ]]; then
-		OLD_BDB_VERSION="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${D}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_compile "$(python_get_sitedir)/csvn/"{.,core,ext}/*.py
-	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
-	epause 6
-
-	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
-	fi
-}
-
-pkg_config() {
-	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.
-		"${ROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos"
-
-		einfo ">>> Setting repository permissions ..."
-		SVNSERVE_USER="$(. "${ROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
-		SVNSERVE_GROUP="$(. "${ROOT}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
-}