9 files changed, 176 insertions, 845 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 0c6aadbd2ea6..b637397c991a 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.276 2007/09/26 12:37:40 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.277 2007/11/10 20:41:38 hollow Exp $
+
+*subversion-1.4.5 (10 Nov 2007)
+
+  10 Nov 2007; Benedikt Böhm <hollow@gentoo.org>
+  -files/subversion-swig.m4-ruby.patch, -subversion-1.1.3.ebuild,
+  -subversion-1.2.3-r3.ebuild, -subversion-1.4.4-r3.ebuild,
+  +subversion-1.4.5.ebuild:
+  version bump; fixes #84539, #168348, #179139, #188897, #194833
 
   26 Sep 2007; Caleb Tennis <caleb@gentoo.org> subversion-1.4.4-r4.ebuild:
   Fix perl dep to be more...up to date
diff --git a/dev-util/subversion/files/digest-subversion-1.1.3 b/dev-util/subversion/files/digest-subversion-1.1.3
deleted file mode 100644
index 15b5ce2293bd..000000000000
--- a/dev-util/subversion/files/digest-subversion-1.1.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a09c2b2fa1a09566c024547954a48478 subversion-1.1.3.tar.bz2 6793419
-RMD160 08ff9d6736c842b829d3256bd48732a64755a81e subversion-1.1.3.tar.bz2 6793419
-SHA256 f14f19db2da379523c63a08991ac4ae997cb1fb14e472258f64291b529ec7a9e subversion-1.1.3.tar.bz2 6793419
diff --git a/dev-util/subversion/files/digest-subversion-1.2.3-r3 b/dev-util/subversion/files/digest-subversion-1.2.3-r3
deleted file mode 100644
index ae29fedc86f2..000000000000
--- a/dev-util/subversion/files/digest-subversion-1.2.3-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a14bc6590241b6e5c2ff2b354cc184a1 subversion-1.2.3.tar.bz2 7238176
-RMD160 46de1455fb61a5814b9d67bada10216e70ea6795 subversion-1.2.3.tar.bz2 7238176
-SHA256 af25cf282c9f5605148e223699fcf3e78f13bab70a3f9a3a8f4e626098ed1cd2 subversion-1.2.3.tar.bz2 7238176
diff --git a/dev-util/subversion/files/digest-subversion-1.4.4-r3 b/dev-util/subversion/files/digest-subversion-1.4.4-r3
deleted file mode 100644
index e3c9fe8133a5..000000000000
--- a/dev-util/subversion/files/digest-subversion-1.4.4-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d4aa5aeb09acb3307841022d279ab895 subversion-1.4.4.tar.bz2 4723349
-RMD160 24ec3733d337206a3106be434c4505f5cc2e20ec subversion-1.4.4.tar.bz2 4723349
-SHA256 91769f992e142eaeb5017e9ec95be52505a056ef05f93427868a3c0c89e2e966 subversion-1.4.4.tar.bz2 4723349
diff --git a/dev-util/subversion/files/digest-subversion-1.4.5 b/dev-util/subversion/files/digest-subversion-1.4.5
new file mode 100644
index 000000000000..60953197839d
--- /dev/null
+++ b/dev-util/subversion/files/digest-subversion-1.4.5
@@ -0,0 +1,3 @@
+MD5 4c333a5fe827568c67d195cda7a5e154 subversion-1.4.5.tar.bz2 4722624
+RMD160 159f3eac9168d856a19ffb235c5417757cd5a496 subversion-1.4.5.tar.bz2 4722624
+SHA256 763b8c9c16c03adc3ad00ccf1b5b47a08b5ffe94e499d3c87bb02acbc1026b53 subversion-1.4.5.tar.bz2 4722624
diff --git a/dev-util/subversion/files/subversion-swig.m4-ruby.patch b/dev-util/subversion/files/subversion-swig.m4-ruby.patch
deleted file mode 100644
index de911b8758d3..000000000000
--- a/dev-util/subversion/files/subversion-swig.m4-ruby.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/ac-macros/swig.m4.old	2005-10-21 14:31:22.000000000 +0200
-+++ build/ac-macros/swig.m4	2005-10-21 14:31:47.000000000 +0200
-@@ -216,7 +216,7 @@
-       SWIG_RB_COMPILE="$svn_cv_ruby_compile"
- 
-       AC_CACHE_CHECK([how to link Ruby extensions], [svn_cv_ruby_link],[
--        svn_cv_ruby_link="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(LDSHARED)).sub(/^\w+/, Config::CONFIG.fetch(%q(CC)) + %q( -shrext .) + Config::CONFIG.fetch(%q(DLEXT)))'`"
-+        svn_cv_ruby_link="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(LDSHARED)).sub(/^\S+/, Config::CONFIG.fetch(%q(CC)) + %q( -shrext .) + Config::CONFIG.fetch(%q(DLEXT)))'`"
-       ])
-       SWIG_RB_LINK="$svn_cv_ruby_link"
- 
diff --git a/dev-util/subversion/subversion-1.1.3.ebuild b/dev-util/subversion/subversion-1.1.3.ebuild
deleted file mode 100644
index 97d6b05212a2..000000000000
--- a/dev-util/subversion/subversion-1.1.3.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.3.ebuild,v 1.31 2007/09/05 12:16:36 pauldv Exp $
-
-inherit elisp-common libtool python eutils bash-completion
-
-DESCRIPTION="A compelling replacement for CVS"
-HOMEPAGE="http://subversion.tigris.org/"
-SRC_URI="http://subversion.tigris.org/tarballs/${P/_rc/-rc}.tar.bz2"
-
-LICENSE="Subversion"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="ssl apache2 berkdb python emacs perl java nls"
-
-# Presently subversion doesn't build with swig-1.3.22, bug 65424
-RDEPEND="apache2? ( >=www-servers/apache-2.0.48 !>=www-servers/apache-2.0.54-r30 )
-	!apache2? ( !>=www-servers/apache-2 )
-	!dev-libs/apr
-	python? ( =dev-lang/swig-1.3.21 >=dev-lang/python-2.0 )
-	perl? ( =dev-lang/swig-1.3.21
-		>=dev-lang/perl-5.8 )
-	>=net-misc/neon-0.24.7
-	berkdb? ( =sys-libs/db-4* )
-	java? ( virtual/jdk )
-	emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.59"
-# Does not work because jikes is broken
-#	jikes? ( dev-java/jikes )"
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-# Allow for custion 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 has_version =sys-devel/autoconf-2.58*; then
-		die "Subversion WILL NOT BUILD with autoconf-2.58"
-	fi
-
-	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [[ -z ${SVN_DUMPED} ]]; then
-		echo
-		ewarn "Presently you have $(best_version dev-util/subversion)"
-		ewarn "Subversion has changed the repository filesystem schema from 0.34.0."
-		ewarn "So you MUST dump your repositories before upgrading."
-		ewarn
-		ewarn 'After doing so call emerge with SVN_DUMPED=1 emerge !*'
-		ewarn
-		ewarn "More details on dumping:"
-		ewarn "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
-		echo
-		die "Ensure that you dump your repository first"
-	fi
-
-	if use apache2; then
-		echo
-		elog "The apache2 subversion module will be built, and libapr from the"
-		elog "apache package will be used instead of the included."
-		echo
-	else
-		echo
-		elog "Please note that subversion and apache2 cannot be installed"
-		elog "simultaneously without specifying the apache2 use flag. This is"
-		elog "because subversion installs its own libapr and libapr-util in that"
-		elog "case. Specifying the apache2 useflag will also enable the building of"
-		elog "the apache2 module."
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${P/_rc/-rc}.tar.bz2
-	cd ${S}
-
-	epatch ${FILESDIR}/subversion-db4.patch
-	epatch ${FILESDIR}/subversion-1.1.1-perl-vendor.patch
-
-	export WANT_AUTOCONF=2.5
-	elibtoolize
-	autoconf
-	(cd apr; autoconf)
-	(cd apr-util; autoconf)
-	sed -i -e 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in
-}
-
-src_compile() {
-	local myconf
-
-	use apache2 && myconf="${myconf} --with-apxs=/usr/sbin/apxs2 \
-		--with-apr=/usr --with-apr-util=/usr"
-	use apache2 || myconf="${myconf} --without-apxs"
-
-	myconf="${myconf} $(use_enable java javahl)"
-#	use java && myconf="${myconf} $(use_with jikes)"
-	use java && myconf="${myconf} --without-jikes"
-
-	if use python || use perl; then
-		myconf="${myconf} --with-swig"
-	else
-		myconf="${myconf} --without-swig"
-	fi
-
-	econf ${myconf} \
-		$(use_with ssl) \
-		$(use_with berkdb berkeley-db) \
-		$(use_with python) \
-		$(use_enable nls) \
-		--with-neon=/usr \
-		--disable-experimental-libtool \
-		--disable-mod-activation || die "econf failed"
-
-	# Build subversion, but do it in a way that is safe for parallel builds.
-	# Also apparently the included apr has a libtool that doesn't like -L flags.
-	# So not specifying it at all when not building apache modules and only
-	# specify it for internal parts otherwise.
-	if use apache2; then
-		( emake LT_LDFLAGS="-L${D}/usr/lib" external-all && emake LT_LDFLAGS="-L${D}/usr/lib" local-all ) || die "make of subversion failed"
-	else
-		( emake external-all && emake local-all ) || die "make of subversion failed"
-	fi
-
-	if use python; then
-		# Building fails without the apache apr-util as includes are wrong.
-		if use apache2; then
-			emake swig-py || die "subversion python bindings failed"
-		else
-			emake SVN_APR_INCLUDES="-I${S}/apr/include -I${S}/apr-util/include" swig-py || die "subversion python bindings failed"
-		fi
-	fi
-
-	if use perl; then
-		# Work around a buggy Makefile.PL, bug 64634
-		mkdir -p subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
-		make swig-pl || die "Perl library building failed"
-	fi
-
-	if use java; then
-		# ensure that the destination dir exists, else some compilation fails
-		mkdir -p ${S}/subversion/bindings/java/javahl/classes
-		# Compile javahl
-		make JAVACFLAGS="-source 1.3 -encoding iso8859-1" javahl || die "Compilation failed"
-	fi
-
-	if use emacs; then
-		elog "compiling emacs support"
-		elisp-compile ${S}/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
-		elisp-compile ${S}/contrib/client-side/vc-svn.el || die "emacs modules failed"
-	fi
-
-	# svn-config isn't quite built correctly; it contains references to
-	# @SVN_DB_LIBS@ and @SVN_DB_INCLUDES@.  It appears the best thing is to remove that.  #64634
-	sed -i 's/@SVN_DB_[^@]*@//g' svn-config || die "sed failed"
-}
-
-src_install () {
-	use apache2 && mkdir -p ${D}/etc/apache2/conf
-
-	python_version
-	PYTHON_DIR=/usr/lib/python${PYVER}
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-	if [[ -e ${D}/usr/lib/apache2 ]]; then
-		if has_version '>=www-servers/apache-2.0.48-r2'; then
-			mv ${D}/usr/lib/apache2/modules ${D}/usr/lib/apache2-extramodules
-			rmdir ${D}/usr/lib/apache2
-		else
-			mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
-		fi
-	fi
-
-	if has_version '>=www-servers/apache-2.0.48-r2'; then
-		chown -R root:root ${D}/usr/include/apr-0/
-	fi
-
-	dobin svn-config
-	if use python; then
-		make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}  LD_LIBRARY_PATH="-L${D}/usr/lib" || die "Installation of subversion python bindings failed"
-
-		# move python bindings
-		mkdir -p ${D}${PYTHON_DIR}/site-packages
-		mv ${D}/usr/lib/svn-python/svn ${D}${PYTHON_DIR}/site-packages
-		mv ${D}/usr/lib/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages
-		rmdir ${D}/usr/lib/svn-python
-	fi
-	if use perl; then
-		make DESTDIR=${D} install-swig-pl || die "Perl library building failed"
-	fi
-	if use java; then
-		make DESTDIR="${D}" install-javahl || die "installation failed"
-	fi
-
-	# Install apache module config
-	if useq apache2; then
-		mkdir -p ${D}/etc/apache2/conf/modules.d
-		cat <<EOF >${D}/etc/apache2/conf/modules.d/47_mod_dav_svn.conf
-<IfDefine SVN>
-	<IfModule !mod_dav_svn.c>
-		LoadModule dav_svn_module	extramodules/mod_dav_svn.so
-	</IfModule>
-	<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 SVN_AUTHZ>
-		<IfModule !mod_authz_svn.c>
-			LoadModule authz_svn_module	extramodules/mod_authz_svn.so
-		</IfModule>
-	</IfDefine>
-</IfDefine>
-EOF
-	fi
-
-	# Bug 43179 - Install bash-completion if user wishes
-	dobashcompletion tools/client-side/bash_completion subversion
-
-	# Install hot backup script, bug 54304
-	newbin tools/backup/hot-backup.py svn-hot-backup
-
-	# The svn_load_dirs script is installed by Debian and looks like a good
-	# candidate for us to install as well
-	newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245
-	newinitd ${FILESDIR}/svnserve.initd svnserve
-	newconfd ${FILESDIR}/svnserve.confd svnserve
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/svnserve.xinetd svnserve
-
-	#
-	# Past here is all documentation and examples
-	#
-
-	dodoc BUGS COMMITTERS COPYING HACKING INSTALL README
-	dodoc CHANGES
-	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
-	find contrib tools -name \*.in -print0 | xargs -0 rm -f
-	mkdir -p ${D}/usr/share/doc/${PF}/
-	cp -r tools/{client-side,examples,hook-scripts} ${D}/usr/share/doc/${PF}/
-	cp -r contrib/hook-scripts ${D}/usr/share/doc/${PF}/
-
-	# Install documentation
-	docinto notes
-	for f in notes/*
-	do
-		[[ -f ${f} ]] && dodoc ${f}
-	done
-
-	# Install the book in it's own dir
-	docinto book
-	cd ${S}
-	echo "installing html book"
-	dohtml -r doc/book/book/svn-book.html doc/book/book/styles.css doc/book/book/images || die "Installing book failed"
-
-	# Install emacs lisps
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp/subversion
-		doins contrib/client-side/psvn/psvn.el*
-		doins contrib/client-side/vc-svn.el*
-
-		elisp-site-file-install ${FILESDIR}/70svn-gentoo.el
-	fi
-}
-
-src_test() {
-	ewarn "Testing does not work for subversion"
-}
-
-pkg_postinst() {
-	use emacs >/dev/null && elisp-site-regen
-
-	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 "/var/svn:"
-	elog
-	elog "    emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "If you upgraded from an older version of berkely db and experience"
-	elog "problems with your repository then run the following commands as root:"
-	elog "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-	elog "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	elog
-	elog "Subversion has multiple server types, take your pick:"
-	elog
-	elog " - svnserve daemon: "
-	elog "   1. edit /etc/conf.d/svnserve"
-	elog "   2. start daemon: /etc/init.d/svnserve start"
-	elog "   3. make persistent: rc-update add svnserve default"
-	elog
-	elog " - svnserve via xinetd:"
-	elog "   1. edit /etc/xinetd.d/svnserve (remove disable line)"
-	elog "   2. restart xinetd.d: /etc/init.d/xinetd restart"
-	elog
-	elog " - svn over ssh:"
-	elog "   1. Fix the repository permissions:"
-	elog "        groupadd svnusers"
-	elog "        chown -R root:svnusers /var/svn/repos/"
-	elog "        chmod -R g-w /var/svn/repos"
-	elog "        chmod -R g+rw /var/svn/repos/db"
-	elog "        chmod -R g+rw /var/svn/repos/locks"
-	elog "   2. create an svnserve wrapper in /usr/local/bin to set the umask you"
-	elog "      want, for example:"
-	elog "         #!/bin/bash"
-	elog "         umask 002"
-	elog "         exec /usr/bin/svnserve \"\$@\""
-	elog
-
-	if use apache2 >/dev/null; 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
-	fi
-}
-
-pkg_postrm() {
-	has_version virtual/emacs && elisp-site-regen
-}
-
-pkg_config() {
-	if [[ ! -x /usr/bin/svnadmin ]]; then
-		die "You seem to only have build the subversion client"
-	fi
-
-	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e ${SVN_REPOS_LOC}/repos ]]; then
-		echo "A subversion repository already exists and I will not overwrite it."
-		echo "Delete ${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
-	else
-		mkdir -p ${SVN_REPOS_LOC}/conf
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
-
-		einfo ">>> Setting repository permissions ..."
-		chown -Rf apache:apache ${SVN_REPOS_LOC}/repos
-		chmod -Rf 755 ${SVN_REPOS_LOC}/repos
-	fi
-}
diff --git a/dev-util/subversion/subversion-1.2.3-r3.ebuild b/dev-util/subversion/subversion-1.2.3-r3.ebuild
deleted file mode 100644
index ed74df011620..000000000000
--- a/dev-util/subversion/subversion-1.2.3-r3.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.2.3-r3.ebuild,v 1.21 2007/09/05 12:16:36 pauldv Exp $
-
-inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module
-
-DESCRIPTION="A compelling replacement for CVS"
-HOMEPAGE="http://subversion.tigris.org/"
-SRC_URI="http://subversion.tigris.org/tarballs/${P/_rc/-rc}.tar.bz2"
-
-LICENSE="Subversion"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86"
-IUSE="apache2 berkdb python emacs perl java nls nowebdav zlib ruby"
-RESTRICT="test"
-
-# Presently subversion doesn't build with swig-1.3.22, bug 65424
-COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} )
-	=dev-libs/apr-util-0*
-	python? ( <=dev-lang/swig-1.3.25 >=dev-lang/python-2.0 )
-	perl? ( <=dev-lang/swig-1.3.25
-		>=dev-lang/perl-5.8.6-r6
-		!=dev-lang/perl-5.8.7 )
-	ruby? ( =dev-lang/swig-1.3.25
-		>=dev-lang/ruby-1.8.2 )
-	!nowebdav? ( ~net-misc/neon-0.24.7 )
-	berkdb? ( =sys-libs/db-4* )
-	zlib? ( sys-libs/zlib )
-	java? ( virtual/jdk )
-	emacs? ( virtual/emacs )"
-RDEPEND="${COMMONDEPEND}
-	java? ( virtual/jre )"
-
-DEPEND="${COMMONDEPEND}
-	java? ( virtual/jdk )
-	>=sys-devel/autoconf-2.59"
-# Does not work because jikes is broken
-#	jikes? (dev-java/jikes)"
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-# Allow for custion 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 && has_version '<dev-util/subversion-0.34.0' && [[ -z ${SVN_DUMPED} ]]; then
-		echo
-		ewarn "Presently you have $(best_version dev-util/subversion)"
-		ewarn "Subversion has changed the repository filesystem schema from 0.34.0."
-		ewarn "So you MUST dump your repositories before upgrading."
-		ewarn
-		ewarn 'After doing so call emerge with SVN_DUMPED=1 emerge !*'
-		ewarn
-		ewarn "More details on dumping:"
-		ewarn "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
-		echo
-		die "Ensure that you dump your repository first"
-	fi
-}
-
-src_unpack() {
-	unpack ${P/_rc/-rc}.tar.bz2
-	cd ${S}
-
-	epatch ${FILESDIR}/subversion-db4.patch
-	epatch ${FILESDIR}/subversion-1.1.1-perl-vendor.patch
-	epatch ${FILESDIR}/subversion-hotbackup-config.patch
-	epatch ${FILESDIR}/subversion-swig.m4-ruby.patch
-
-	export WANT_AUTOCONF=2.5
-	elibtoolize
-	autoconf
-	(cd apr; autoconf)
-	(cd apr-util; autoconf)
-	sed -i -e 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in
-
-	use emacs && cp ${FILESDIR}/vc-svn.el ${S}/contrib/client-side/vc-svn.el
-}
-
-src_compile() {
-	local myconf
-	myconf="--with-apr=/usr --with-apr-util=/usr"
-
-	use apache2 && myconf="${myconf} --with-apxs=${APXS2}"
-	use apache2 || myconf="${myconf} --without-apxs"
-
-	myconf="${myconf} $(use_enable java javahl)"
-#	use java && myconf="${myconf} $(use_with jikes)"
-	use java && myconf="${myconf} --without-jikes"
-
-	if use python || use perl || use ruby; then
-		myconf="${myconf} --with-swig"
-	else
-		myconf="${myconf} --without-swig"
-	fi
-
-	if use nowebdav; then
-		myconf="${myconf} --without-neon"
-	else
-		myconf="${myconf} --with-neon=/usr"
-	fi
-
-	append-flags `/usr/bin/apr-config --cppflags`
-
-	econf ${myconf} \
-		$(use_with berkdb berkeley-db) \
-		$(use_with zlib) \
-		$(use_with python) \
-		$(use_enable nls) \
-		--with-apr=/usr \
-		--with-apr-util=/usr \
-		--disable-experimental-libtool \
-		--disable-mod-activation || die "econf failed"
-
-	# Build subversion, but do it in a way that is safe for parallel builds.
-	# Also apparently the included apr has a libtool that doesn't like -L flags.
-	# So not specifying it at all when not building apache modules and only
-	# specify it for internal parts otherwise.
-	( emake external-all && emake LT_LDFLAGS="-L${D}/usr/$(get_libdir)" local-all ) || die "make of subversion failed"
-
-	if use python; then
-		# Building fails without the apache apr-util as includes are wrong.
-		emake swig-py || die "subversion python bindings failed"
-	fi
-
-	if use perl; then
-		# Work around a buggy Makefile.PL, bug 64634
-		mkdir -p subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
-		make swig-pl || die "Perl library building failed"
-	fi
-
-	if use ruby; then
-		make swig-rb || die "Ruby library building failed"
-	fi
-
-	if use java; then
-		# ensure that the destination dir exists, else some compilation fails
-		mkdir -p ${S}/subversion/bindings/java/javahl/classes
-		# Compile javahl
-		make JAVACFLAGS="-source 1.3 -encoding iso8859-1" javahl || die "Compilation failed"
-	fi
-
-	if use emacs; then
-		einfo "compiling emacs support"
-		elisp-compile ${S}/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
-		elisp-compile ${S}/contrib/client-side/vc-svn.el || die "emacs modules failed"
-	fi
-
-	# svn-config isn't quite built correctly; it contains references to
-	# @SVN_DB_LIBS@ and @SVN_DB_INCLUDES@.  It appears the best thing is to remove that.  #64634
-	sed -i 's/@SVN_DB_[^@]*@//g' svn-config || die "sed failed"
-}
-
-src_install () {
-	python_version
-	PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-
-#	This might not be necessary with the new install
-#	if [[ -e ${D}/usr/$(get_libdir)/apache2 ]]; then
-#		if [ "${APACHE2_MODULESDIR}" != "/usr/$(get_libdir)/apache2/modules" ]; then
-#			mkdir -p ${D}/`dirname ${APACHE2_MODULESDIR}`
-#			mv ${D}/usr/$(get_libdir)/apache2/modules ${D}/${APACHE2_MODULESDIR}
-#			rmdir ${D}/usr/$(get_libdir)/apache2 2>/dev/null
-#		fi
-#	fi
-
-	dobin svn-config
-	if use python; then
-		make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}  LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" || die "Installation of subversion python bindings failed"
-
-		# move python bindings
-		mkdir -p ${D}${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
-		rmdir ${D}/usr/$(get_libdir)/svn-python
-	fi
-	if use perl; then
-		make DESTDIR=${D} install-swig-pl || die "Perl library building failed"
-		fixlocalpod
-	fi
-	if use ruby; then
-		make DESTDIR=${D} install-swig-rb || die "Installation of subversion ruby bindings failed"
-	fi
-	if use java; then
-		make DESTDIR="${D}" install-javahl || die "installation failed"
-	fi
-
-	# Install apache module config
-	if useq apache2; then
-		MOD="${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"
-		mkdir -p ${D}/${APACHE2_MODULES_CONFDIR}
-		cat <<EOF >${D}/${APACHE2_MODULES_CONFDIR}/47_mod_dav_svn.conf
-<IfDefine SVN>
-	<IfModule !mod_dav_svn.c>
-		LoadModule dav_svn_module	${MOD}/mod_dav_svn.so
-	</IfModule>
-	<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 SVN_AUTHZ>
-		<IfModule !mod_authz_svn.c>
-			LoadModule authz_svn_module	${MOD}/mod_authz_svn.so
-		</IfModule>
-	</IfDefine>
-</IfDefine>
-EOF
-	fi
-
-	# Bug 43179 - Install bash-completion if user wishes
-	dobashcompletion tools/client-side/bash_completion subversion
-
-	# Install hot backup script, bug 54304
-	newbin tools/backup/hot-backup.py svn-hot-backup
-
-	# The svn_load_dirs script is installed by Debian and looks like a good
-	# candidate for us to install as well
-	newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245
-	newinitd ${FILESDIR}/svnserve.initd svnserve
-	newconfd ${FILESDIR}/svnserve.confd svnserve
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/svnserve.xinetd svnserve
-
-	# Install documentation
-
-	dodoc BUGS COMMITTERS COPYING HACKING INSTALL README
-	dodoc CHANGES
-	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
-	find contrib tools -name \*.in -print0 | xargs -0 rm -f
-	mkdir -p ${D}/usr/share/doc/${PF}/
-	cp -r tools/{client-side,examples,hook-scripts} ${D}/usr/share/doc/${PF}/
-	cp -r contrib/hook-scripts ${D}/usr/share/doc/${PF}/
-
-	docinto notes
-	for f in notes/*
-	do
-		[[ -f ${f} ]] && dodoc ${f}
-	done
-
-	# Install the book in it's own dir
-	docinto book
-	cd ${S}
-	echo "installing html book"
-	dohtml -r doc/book/svn-book.html doc/book/styles.css doc/book/images || die "Installing book failed"
-
-	# Install emacs lisps
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp/subversion
-		doins contrib/client-side/psvn/psvn.el*
-		doins contrib/client-side/vc-svn.el*
-
-		elisp-site-file-install ${FILESDIR}/70svn-gentoo.el
-	fi
-}
-
-src_test() {
-	ewarn "Testing does not work for subversion"
-}
-
-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 "/var/svn:"
-	elog
-	elog "    emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "If you upgraded from an older version of berkely db and experience"
-	elog "problems with your repository then run the following commands as root:"
-	elog "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-	elog "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	elog
-	elog "Subversion has multiple server types, take your pick:"
-	elog
-	elog " - svnserve daemon: "
-	elog "   1. edit /etc/conf.d/svnserve"
-	elog "   2. start daemon: /etc/init.d/svnserve start"
-	elog "   3. make persistent: rc-update add svnserve default"
-	elog
-	elog " - svnserve via xinetd:"
-	elog "   1. edit /etc/xinetd.d/svnserve (remove disable line)"
-	elog "   2. restart xinetd.d: /etc/init.d/xinetd restart"
-	elog
-	elog " - svn over ssh:"
-	elog "   1. Fix the repository permissions:"
-	elog "        groupadd svnusers"
-	elog "        chown -R root:svnusers /var/svn/repos/"
-	elog "        chmod -R g-w /var/svn/repos"
-	elog "        chmod -R g+rw /var/svn/repos/db"
-	elog "        chmod -R g+rw /var/svn/repos/locks"
-	elog "   2. create an svnserve wrapper in /usr/local/bin to set the umask you"
-	elog "      want, for example:"
-	elog "         #!/bin/bash"
-	elog "         umask 002"
-	elog "         exec /usr/bin/svnserve \"\$@\""
-	elog
-
-	if use apache2 >/dev/null; 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
-	fi
-
-	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_NUM_BACKUPS=2' >> /etc/env.d/80subversion"
-	elog ""
-}
-
-pkg_postrm() {
-	has_version virtual/emacs && elisp-site-regen
-	use perl && perl-module_pkg_postrm
-}
-
-pkg_config() {
-	if [[ ! -x /usr/bin/svnadmin ]]; then
-		die "You seem to only have built the subversion client"
-	fi
-
-	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e ${SVN_REPOS_LOC}/repos ]]; then
-		echo "A subversion repository already exists and I will not overwrite it."
-		echo "Delete ${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
-	else
-		mkdir -p ${SVN_REPOS_LOC}/conf
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
-
-		einfo ">>> Setting repository permissions ..."
-		chown -Rf apache:apache ${SVN_REPOS_LOC}/repos
-		chmod -Rf 755 ${SVN_REPOS_LOC}/repos
-	fi
-}
diff --git a/dev-util/subversion/subversion-1.4.4-r3.ebuild b/dev-util/subversion/subversion-1.4.5.ebuild
index a8649148bde4..2d491615c7f6 100644
--- a/dev-util/subversion/subversion-1.4.4-r3.ebuild
+++ b/dev-util/subversion/subversion-1.4.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.4-r3.ebuild,v 1.3 2007/09/05 12:16:36 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.5.ebuild,v 1.1 2007/11/10 20:41:38 hollow Exp $
 
-inherit elisp-common libtool python eutils multilib bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2
+inherit bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 
@@ -12,60 +12,56 @@ SRC_URI="http://subversion.tigris.org/downloads/${P/_rc/-rc}.tar.bz2"
 
 LICENSE="Subversion"
 SLOT="0"
-IUSE="apache2 berkdb emacs java nls nowebdav perl python ruby"
+IUSE="apache2 berkdb debug doc emacs extras java nls nowebdav perl python ruby svnserve vim-syntax"
 RESTRICT="test"
 
-COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} )
-			>=dev-libs/apr-util-1.2.8
-			perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 )
-			python? ( >=dev-lang/python-2.0 )
-			ruby? ( >=dev-lang/ruby-1.8.2 )
-			!nowebdav? ( >=net-misc/neon-0.26 )
+COMMONDEPEND=">=dev-libs/apr-util-1.2.8
 			berkdb? ( =sys-libs/db-4* )
-			emacs? ( virtual/emacs )"
+			doc? ( app-doc/doxygen )
+			emacs? ( virtual/emacs )
+			nls? ( sys-devel/gettext )
+			!nowebdav? ( >=net-misc/neon-0.26 )
+			ruby? ( >=dev-lang/ruby-1.8.2 )
+			perl? ( >=dev-lang/perl-5.8.8 )
+			python? ( >=dev-lang/python-2.0 )"
 
 RDEPEND="${COMMONDEPEND}
-		java? ( >=virtual/jre-1.4 )"
+		java? ( >=virtual/jre-1.4 )
+		perl? ( dev-perl/URI )"
 
 DEPEND="${COMMONDEPEND}
 		java? ( >=virtual/jdk-1.4 )
 		>=sys-devel/autoconf-2.59"
 
-S=${WORKDIR}/${P/_rc/-rc}
+want_apache
+
+S="${WORKDIR}"/${P/_rc/-rc}
 
 # Allow for custion repository locations.
 # This can't be in pkg_setup because the variable needs to be available to
 # pkg_config.
 : ${SVN_REPOS_LOC:=/var/svn}
 
-discover_apr_suffix() {
-	if use apache2 ; then
-		if has_version '=www-servers/apache-2.0*' \
-		&& has_version '=dev-libs/apr-util-0.9*' ; then
-			aprsuffix=""
-		else
-			aprsuffix="-1"
+pkg_setup() {
+	if use berkdb ; then
+		if ! built_with_use 'dev-libs/apr-util' berkdb ; then
+			eerror "dev-libs/apr-util is missing USE=berkdb"
+			die "dev-libs/apr-util is missing USE=berkdb"
 		fi
-	else
-		aprsuffix="-1"
-	fi
-
-	echo "${aprsuffix}"
-}
 
-pkg_setup() {
-	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [[ -z ${SVN_DUMPED} ]] ; then
-		echo
-		ewarn "Presently you have $(best_version dev-util/subversion) installed."
-		ewarn "Subversion has changed the repository filesystem schema from 0.34.0."
-		ewarn "So you MUST dump your repositories before upgrading."
-		ewarn
-		ewarn 'After doing so call emerge with SVN_DUMPED=1 emerge !*'
-		ewarn
-		ewarn "More details on dumping:"
-		ewarn "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
-		echo
-		die "Ensure that you dump your repository first"
+		if has_version '<dev-util/subversion-0.34.0' && [[ -z ${SVN_DUMPED} ]] ; then
+			echo
+			ewarn "Presently you have $(best_version dev-util/subversion) installed."
+			ewarn "Subversion has changed the repository filesystem schema from 0.34.0."
+			ewarn "So you MUST dump your repositories before upgrading."
+			ewarn
+			ewarn 'After doing so call emerge with SVN_DUMPED=1 emerge !*'
+			ewarn
+			ewarn "More details on dumping:"
+			ewarn "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
+			echo
+			die "Ensure that you dump your repository first"
+		fi
 	fi
 
 	java-pkg-opt-2_pkg_setup
@@ -84,13 +80,13 @@ src_unpack() {
 	epatch "${FILESDIR}"/subversion-1.3.1-neon-config.patch
 	epatch "${FILESDIR}"/subversion-apr_cppflags.patch
 	epatch "${FILESDIR}"/subversion-1.4.3-debug-config.patch
-	epatch "${FILESDIR}"/subversion-1.4.3-neon-0.26.3.patch
 
-	if [[ "$(discover_apr_suffix)" == "-1" ]] ; then
-		sed -e s:apu-config:apu-1-config:g \
-			-e s:apr-config:apr-1-config:g \
-			-i build/ac-macros/{find_,}ap*
-	fi
+	sed -e 's/\(NEON_ALLOWED_LIST=.* 0.26.2\)"/\1 0.26.3 0.26.4"/' \
+		-i configure.in
+
+	sed -e "s:apr-config:$(apr_config):g" \
+		-e "s:apu-config:$(apu_config):g" \
+		-i build/ac-macros/{find_,}ap*
 
 	export WANT_AUTOCONF=2.5
 	autoconf
@@ -103,7 +99,7 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf=""
+	local myconf=
 
 	myconf="${myconf} $(use_enable java javahl)"
 	use java && myconf="${myconf} --without-jikes --with-jdk=${JAVA_HOME}"
@@ -120,23 +116,21 @@ src_compile() {
 		myconf="${myconf} --with-neon=/usr"
 	fi
 
-	use apache2 && myconf="${myconf} --with-apxs=${APXS2}"
-	use apache2 || myconf="${myconf} --without-apxs"
-
-	apr_suffix="$(discover_apr_suffix)"
-	myconf="${myconf} --with-apr=/usr/bin/apr${apr_suffix}-config --with-apr-util=/usr/bin/apu${apr_suffix}-config"
-	append-flags $(/usr/bin/apr${apr_suffix}-config --cppflags)
+	append-flags $(/usr/bin/$(apr_config) --cppflags)
 
 	econf ${myconf} \
+		--with-apr=/usr/bin/$(apr_config) \
+		--with-apr-util=/usr/bin/$(apu_config) \
+		$(use_with apache2 apxs ${APXS2}) \
 		$(use_with berkdb berkeley-db) \
-		$(use_with python) \
+		$(use_enable debug maintainer-mode) \
 		$(use_enable nls) \
 		--disable-experimental-libtool \
 		--disable-mod-activation \
 		|| die "econf failed"
 
 	# Respect the user LDFLAGS
-	export EXTRA_LDFLAGS="${LDFLAGS}"
+	export SWIG_LDFLAGS="${LDFLAGS}"
 
 	# Build subversion, but do it in a way that is safe for parallel builds.
 	# Also apparently the included apr has a libtool that doesn't like -L flags.
@@ -152,11 +146,11 @@ src_compile() {
 	if use perl ; then
 		# Work around a buggy Makefile.PL, bug 64634
 		mkdir -p subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
-		make swig-pl || die "Compilation of ${PN} Perl bindings failed"
+		emake swig-pl || die "Compilation of ${PN} Perl bindings failed"
 	fi
 
 	if use ruby ; then
-		make swig-rb || die "Compilation of ${PN} Ruby bindings failed"
+		emake swig-rb || die "Compilation of ${PN} Ruby bindings failed"
 	fi
 
 	if use java ; then
@@ -170,6 +164,12 @@ src_compile() {
 		einfo "Compiling emacs support"
 		elisp-compile "${S}"/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
 		elisp-compile "${S}"/contrib/client-side/vc-svn.el || die "emacs modules failed"
+		elisp-compile "${S}"/doc/svn-doc.el || die "emacs modules failed"
+		elisp-compile "${S}"/doc/tools/svnbook.el || die "emacs modules failed"
+	fi
+
+	if use doc ; then
+		doxygen doc/doxygen.conf || die "doxygen failed"
 	fi
 }
 
@@ -184,7 +184,7 @@ src_install () {
 			|| die "Installation of ${PN} Python bindings failed"
 
 		# move python bindings
-		mkdir -p "${D}${PYTHON_DIR}/site-packages"
+		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
@@ -209,75 +209,107 @@ src_install () {
 	# Install apache2 module config
 	if use apache2 ; then
 		MOD="${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"
-		mkdir -p "${D}/${APACHE2_MODULES_CONFDIR}"
+		dodir "${APACHE2_MODULES_CONFDIR}"
 		cat <<EOF >"${D}/${APACHE2_MODULES_CONFDIR}"/47_mod_dav_svn.conf
 <IfDefine SVN>
 	<IfModule !mod_dav_svn.c>
 		LoadModule dav_svn_module	${MOD}/mod_dav_svn.so
 	</IfModule>
-	<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 SVN_AUTHZ>
 		<IfModule !mod_authz_svn.c>
 			LoadModule authz_svn_module	${MOD}/mod_authz_svn.so
 		</IfModule>
 	</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
 
 	# Bug 43179 - Install bash-completion if user wishes
 	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
 
 	# The svn_load_dirs script is installed by Debian and looks like a good
 	# candidate for us to install as well
-	newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs
+	if use perl ; then
+		newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs
+	fi
+	rm -f contrib/client-side/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
+	if use svnserve; then
+		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
 	fi
-	insinto /etc/xinetd.d ; newins "${FILESDIR}"/svnserve.xinetd svnserve
 
 	# Install documentation
-	dodoc BUGS COMMITTERS COPYING HACKING INSTALL README
-	dodoc CHANGES
-	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
-	find contrib tools -name \*.in -print0 | xargs -0 rm -f
-	mkdir -p "${D}/usr/share/doc/${PF}/"
-	cp -R tools/{client-side,examples,hook-scripts} "${D}/usr/share/doc/${PF}/"
-	cp -R contrib/hook-scripts "${D}/usr/share/doc/${PF}/"
-
-	docinto notes
-	for f in notes/*
-	do
-		[[ -f ${f} ]] && dodoc ${f}
-	done
+	dodoc BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README TRANSLATING
+	dodoc tools/xslt/svnindex.{css,xsl}
+	rm -fr tools/xslt
+
+	if use doc ; then
+		dohtml doc/doxygen/html/*
+		cp -R notes "${D}usr/share/doc/${PF}"
+		ecompressdir "/usr/share/doc/${PF}/notes"
+	fi
+
+	# Install Vim syntax files.
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/client-side/svn.vim
+	fi
+	rm -f contrib/client-side/svn.vim
 
 	# Install emacs lisps
 	if use emacs ; then
 		elisp-install ${PN} contrib/client-side/psvn/psvn.el*
 		elisp-install ${PN}/compat contrib/client-side/vc-svn.el*
+		elisp-install ${PN} doc/svn-doc.el*
+		elisp-install ${PN} doc/tools/svnbook.el*
 		touch "${D}${SITELISP}/${PN}/compat/.nosearch"
 
 		elisp-site-file-install "${FILESDIR}"/70svn-gentoo.el
 	fi
+	rm -fr contrib/client-side/psvn/
+	rm -f contrib/client-side/vc-svn.el*
+
+	# Install extra files
+	if use extras ; then
+		find contrib tools '(' -name "*.bat" -o -name "*.in" ')' -print0 | xargs -0 rm -f
+		rm -fr tools/{dev,po}
+		dodir "/usr/share/${PN}"
+		cp -R contrib tools "${D}usr/share/${PN}"
+	fi
 }
 
-src_test() {
-	ewarn "Testing disabled for ${PN}"
+pkg_preinst() {
+	# Compare versions of Berkeley DB.
+	if use berkdb && [[ -f "${ROOT}usr/bin/svn" ]] ; then
+		OLD_BDB_VERSION="$(scanelf -qn "${ROOT}usr/lib/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		NEW_BDB_VERSION="$(scanelf -qn "${D}usr/lib/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() {
@@ -287,44 +319,40 @@ 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 "/var/svn:"
+	elog "${SVN_REPOS_LOC}:"
 	elog
 	elog "    emerge --config =${CATEGORY}/${PF}"
 	elog
-	elog "If you upgraded from an older version of berkely db and experience"
-	elog "problems with your repository then run the following commands as root:"
-	elog "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-	elog "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	elog
 	elog "Subversion has multiple server types, take your pick:"
 	elog
-	elog " - svnserve daemon: "
-	elog "   1. edit /etc/conf.d/svnserve"
-	elog "   2. start daemon: /etc/init.d/svnserve start"
-	elog "   3. make persistent: rc-update add svnserve default"
-	elog
-	elog " - svnserve via xinetd:"
-	elog "   1. edit /etc/xinetd.d/svnserve (remove disable line)"
-	elog "   2. restart xinetd.d: /etc/init.d/xinetd restart"
-	elog
+	if use svnserve; then
+		elog " - svnserve daemon: "
+		elog "   1. edit /etc/conf.d/svnserve"
+		elog "   2. start daemon: /etc/init.d/svnserve start"
+		elog "   3. make persistent: rc-update add svnserve default"
+		elog
+		elog " - svnserve via xinetd:"
+		elog "   1. edit /etc/xinetd.d/svnserve (remove disable line)"
+		elog "   2. restart xinetd.d: /etc/init.d/xinetd restart"
+		elog
+	fi
 	elog " - svn over ssh:"
 	elog "   1. Fix the repository permissions:"
 	elog "        groupadd svnusers"
-	elog "        chown -R root:svnusers /var/svn/repos/"
-	elog "        chmod -R g-w /var/svn/repos"
-	elog "        chmod -R g+rw /var/svn/repos/db"
-	elog "        chmod -R g+rw /var/svn/repos/locks"
+	elog "        chown -R root:svnusers ${SVN_REPOS_LOC}/repos/"
+	elog "        chmod -R g-w ${SVN_REPOS_LOC}/repos"
+	elog "        chmod -R g+rw ${SVN_REPOS_LOC}/repos/db"
+	elog "        chmod -R g+rw ${SVN_REPOS_LOC}/repos/locks"
 	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 002"
-	elog "         exec /usr/bin/svnserve \"\$@\""
+	elog "         exec /usr/bin/svnserve \${SVNSERVE_OPTS} \"\$@\""
 	elog
-
-	if use apache2 ; then
+	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:"
@@ -338,6 +366,13 @@ pkg_postinst() {
 	elog "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion"
 	elog "echo 'SVN_HOTBACKUP_NUM_BACKUPS=2' >> /etc/env.d/80subversion"
 	elog
+
+	if [[ -n "${CHANGED_BDB_VERSION}" ]]; then
+		ewarn "You upgraded from an older version of Berkely 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() {
@@ -346,29 +381,36 @@ pkg_postrm() {
 }
 
 pkg_config() {
-	if [[ ! -x /usr/bin/svnadmin ]] ; then
-		die "You seem to only have built the ${PN} client"
+	if [[ ! -x "${ROOT}usr/bin/svnadmin" ]] ; then
+		die "You seem to only have built the Subversion client"
 	fi
 
-	einfo ">>> Initializing the database in ${SVN_REPOS_LOC} ..."
-	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
+	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 ${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
+		echo "Delete ${ROOT}${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
 	else
-		mkdir -p "${SVN_REPOS_LOC}/conf"
+		mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf"
 
 		einfo ">>> Populating repository directory ..."
 		# create initial repository
-		/usr/bin/svnadmin create "${SVN_REPOS_LOC}/repos"
+		"${ROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos"
 
 		einfo ">>> Setting repository permissions ..."
+		if use svnserve; then
+			SVNSERVE_USER="$(. ${ROOT}etc/conf.d/svnserve ; echo ${SVNSERVE_USER})"
+			SVNSERVE_GROUP="$(. ${ROOT}etc/conf.d/svnserve ; echo ${SVNSERVE_GROUP})"
+		fi
 		if use apache2 ; then
-			chown -Rf apache:apache "${SVN_REPOS_LOC}/repos"
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
 		else
-			enewgroup svnusers
-			enewuser svn -1 -1 /var/svn svnusers
-			chown -Rf svn:svnusers "${SVN_REPOS_LOC}/repos"
+			[[ -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
-		chmod -Rf 755 "${SVN_REPOS_LOC}/repos"
+		chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos"
+		chmod -Rf 755 "${ROOT}${SVN_REPOS_LOC}/repos"
 	fi
 }