fix #221673

Package-Manager: portage-2.1.5.2

8 files changed, 41 insertions, 416 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 89209f856364..1e6f180fcba2 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.306 2008/05/20 15:32:58 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.307 2008/06/01 10:16:08 hollow Exp $
+
+  01 Jun 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
+  subversion-1.4.5.ebuild, subversion-1.4.6.ebuild,
+  subversion-1.4.6-r2.ebuild, -subversion-1.5.0_rc4.ebuild,
+  subversion-1.5.0_rc5.ebuild:
+  fix #221673
 
   20 May 2008; Ferris McCormick <fmccor@gentoo.org>
   subversion-1.5.0_rc5.ebuild:
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 8a7d038d9c80..630ef0a4d8e3 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.5.0/70svn-gentoo.el 435 RMD160 e9f4b2e5511523c124f9ba3781249db2860fe5a7 SHA1 c3a3081f79a579b848369cfae76662a98e97687e SHA256 a39bea9a821aa91c7990dd07e1c2d0cec79f1efaac04e2d61882b7c8d5346a34
 AUX 1.5.0/80subversion-extras 62 RMD160 c334b15a86eaf19129afa5b62558dd47504a4e3d SHA1 ba05e978e7ff7b047ec99225e4d932036c340d26 SHA256 758d07cf161fff5e0afef5791dca641d3af58192ad1e4874c5f5c2c285c1149d
 AUX 1.5.0/disable-unneeded-linking.patch 2409 RMD160 0d7c34cc83eff7d08369128762ed714fabcd1dde SHA1 92b80f6cb30fe569f79368aea66027a6da022c53 SHA256 2ef8fcd9fabfd1a71bdd50e1156cb9d421a7008fccd73b7ae3536e9a30886231
@@ -16,12 +19,17 @@ AUX svnserve.xinetd 332 RMD160 c2fc4eb02da7e7405756fce650b8897f0a9da7f7 SHA1 d7d
 AUX vc-svn.el 16847 RMD160 8665b9a34c8fd9acae40e18aac33026aff3a39d7 SHA1 4d1a5a9331ff96e943244a6d5538e4f0abeac9e7 SHA256 b4979d5df9fba02dbc8ad71d813229222e95ee1e8e89dec3060611d2d6be87aa
 DIST subversion-1.4.5.tar.bz2 4722624 RMD160 159f3eac9168d856a19ffb235c5417757cd5a496 SHA1 acc80381cb670736ad626fee1eb04f36ba7e5fc8 SHA256 763b8c9c16c03adc3ad00ccf1b5b47a08b5ffe94e499d3c87bb02acbc1026b53
 DIST subversion-1.4.6.tar.bz2 4680316 RMD160 ae63877b5d0eeb1c4f28c4388f97897efde7244c SHA1 a9c941e2309744f6a2986200698b60da057a7527 SHA256 6c480c3493b25c4b73fa62d5fef2f8dd40dde1eb1294c53d3495d864230fc124
-DIST subversion-1.5.0-rc4.tar.bz2 4760310 RMD160 42d77068b3ca035b1a6152a3b4c4e4af18489217 SHA1 b4a10cf4adda2b92f3e0e23a9dbf386206c7d9a4 SHA256 67d7bf354cbbce48e0718b60d3610661552696160f785a0ebd917e120462bd91
 DIST subversion-1.5.0-rc5.tar.bz2 4764055 RMD160 1f3c2b3263096233fb812f9342f31af39626f677 SHA1 f1f52ef0c8b6801216a6093934ca982b5469c6af SHA256 40e5f2d2d905c9183b23cf216c994363da27358a78716d8953b42b9ef3524c06
-EBUILD subversion-1.4.5.ebuild 13743 RMD160 7361dda2a3124a316c48b723a5ff7807595c36cd SHA1 2421c432fbfcc751cad05f0fac858528d217aa6b SHA256 d900967828e6dfcb2735727a58704bafe1510ffa5bb730a7c8bf818e48a29d3a
-EBUILD subversion-1.4.6-r2.ebuild 13840 RMD160 b0d9f65488c3ce2d5e0589644455c640e9819b80 SHA1 53b407836acb7c2e5c844eeb8aa4441859bcc2bf SHA256 d0ed7cc06676e2227af5a7dd801764bc27628b29462aa436c4c1553640c0276c
-EBUILD subversion-1.4.6.ebuild 13829 RMD160 e26d9d16641a78664fdb283472b26e398b92c8a2 SHA1 3ac932f46971c2a94de2d64747e3adf20b943213 SHA256 bace8982529b24f8353814aafc125d755aee7e0dc4d5c87447936deacdaeab40
-EBUILD subversion-1.5.0_rc4.ebuild 12734 RMD160 5c521fb6ca707beb33e43c6c1e3a18b61492973a SHA1 f247731da8fdb1cc56f9f0899cb19e568211c987 SHA256 ea7e7996d641b8c813663df4dc9d8e1b7c324f673a63470a71b48543612aa616
-EBUILD subversion-1.5.0_rc5.ebuild 12758 RMD160 3ed7f439342581ae6d57f44e8d5969d1b8dbaaec SHA1 1c79d61f75183d63cf7e68e97dace8184780fc8b SHA256 0128769d6082b5e0299d90ae709ab15db03439bfd7bf2ad2f23c640fc5ffcee5
-MISC ChangeLog 52829 RMD160 d9c4e15dc9ec9091acc87737572e3d938d412673 SHA1 7ae51600be236cc7c59403bf2d282da9a309ab86 SHA256 8e545656a6cababa71633d03a5d61e37248394301de8df5e5e1ccd89da41a986
-MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe
+EBUILD subversion-1.4.5.ebuild 13742 RMD160 f59337fd0037112da505dde2696ad6a8020a8d10 SHA1 b016e47af2776cf08ac13cf85364e5444550a279 SHA256 05ed11d12544d3d360d0f5e77b17758d169b065f703f5a596c6ed4f283379417
+EBUILD subversion-1.4.6-r2.ebuild 13839 RMD160 e707dbbf190bf8921caba79b2bfb792290c2d16d SHA1 e975c9db56dd99385b5cb3bab5f0722f2758f74c SHA256 84445d756df2b5030cd700fc0e351016ff20ff94668bc0df5559b382e2835ddc
+EBUILD subversion-1.4.6.ebuild 13828 RMD160 2b62012f25b396d4387616b3371a605d22e22b5e SHA1 028dd59660ed3a2a6853318c16c95d8a410c340d SHA256 36f50b089fba4fc4e761acbb6ef96d7c994b3b3d8cf66793c831e00190fa3cee
+EBUILD subversion-1.5.0_rc5.ebuild 12758 RMD160 f2d535eda27b09b66c14732a6f0db7b5b7c7229c SHA1 8722f0a7ccacc0b31bfdbf1a980d0daf5822dae5 SHA256 89f86bb049d455bd8cf5374d01cd88cc7fe313fc836626198af63d3ef1cfab43
+MISC ChangeLog 53051 RMD160 1a009695f5e131832e85a2922a53b715359db8d5 SHA1 b7e25225c8c3e0f2724072d4b8d4cc5ebd68ec61 SHA256 2a17a71e9bb8f4a65c9d24c2bc9ff44de25e55635b4784e129b5156d83965203
+MISC metadata.xml 475 RMD160 35a4e8073bb62bf32979d116612f5d5f86ebdedd SHA1 d720a3115b14b1bddde539dbd5c0b9c7ac01a69a SHA256 cb50df87b319e096578046511d65f9209110829e4ef2874cd0386eeab8697234
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhCdvMACgkQmPFBzbX68WFI6gCfaVmVM31skjp7YezOfdck9SR3
+gBoAn0+0aXNNjMf247Hzyr/gHXWAgG+D
+=8kF0
+-----END PGP SIGNATURE-----
diff --git a/dev-util/subversion/metadata.xml b/dev-util/subversion/metadata.xml
index 64a719ea1bfd..dfd7d131fc54 100644
--- a/dev-util/subversion/metadata.xml
+++ b/dev-util/subversion/metadata.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>apache</herd>
+	<maintainer>
+		<email>hollow@gentoo.org</email>
+		<name>Benedikt Böhm</name>
+		<description>Gentoo Subversion maintainer</description>
+	</maintainer>
+	<maintainer>
+		<email>Arfrever.FTA@GMail.Com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+		<description>Subversion upstream representative</description>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/subversion/subversion-1.4.5.ebuild b/dev-util/subversion/subversion-1.4.5.ebuild
index b247b19ebd7d..c1b0f419379a 100644
--- a/dev-util/subversion/subversion-1.4.5.ebuild
+++ b/dev-util/subversion/subversion-1.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.5.ebuild,v 1.13 2008/04/13 16:49:23 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.5.ebuild,v 1.14 2008/06/01 10:16:08 hollow Exp $
 
 inherit bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
 
@@ -17,7 +17,6 @@ RESTRICT="test"
 
 COMMONDEPEND=">=dev-libs/apr-util-1.2.8
 			berkdb? ( =sys-libs/db-4* )
-			doc? ( app-doc/doxygen )
 			emacs? ( virtual/emacs )
 			nls? ( sys-devel/gettext )
 			!nowebdav? ( =net-misc/neon-0.26* )
@@ -30,6 +29,7 @@ RDEPEND="${COMMONDEPEND}
 		perl? ( dev-perl/URI )"
 
 DEPEND="${COMMONDEPEND}
+		doc? ( app-doc/doxygen )
 		java? ( >=virtual/jdk-1.4 )
 		>=sys-devel/autoconf-2.59"
 
diff --git a/dev-util/subversion/subversion-1.4.6-r2.ebuild b/dev-util/subversion/subversion-1.4.6-r2.ebuild
index e49eabb3e01c..ab0a67a4c43a 100644
--- a/dev-util/subversion/subversion-1.4.6-r2.ebuild
+++ b/dev-util/subversion/subversion-1.4.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6-r2.ebuild,v 1.3 2008/04/13 16:49:23 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6-r2.ebuild,v 1.4 2008/06/01 10:16:08 hollow Exp $
 
 inherit autotools bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
 
@@ -17,7 +17,6 @@ RESTRICT="test"
 
 COMMONDEPEND=">=dev-libs/apr-util-1.2.8
 			berkdb? ( =sys-libs/db-4* )
-			doc? ( app-doc/doxygen )
 			emacs? ( virtual/emacs )
 			nls? ( sys-devel/gettext )
 			!nowebdav? ( >=net-misc/neon-0.26.4 )
@@ -31,6 +30,7 @@ RDEPEND="${COMMONDEPEND}
 
 DEPEND="${COMMONDEPEND}
 		>=sys-devel/autoconf-2.59
+		doc? ( app-doc/doxygen )
 		java? ( >=virtual/jdk-1.4 )
 		ruby? ( dev-lang/swig )
 		perl? ( dev-lang/swig )
diff --git a/dev-util/subversion/subversion-1.4.6.ebuild b/dev-util/subversion/subversion-1.4.6.ebuild
index 93950a7d680a..c401029ed782 100644
--- a/dev-util/subversion/subversion-1.4.6.ebuild
+++ b/dev-util/subversion/subversion-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild,v 1.12 2008/04/13 16:49:23 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild,v 1.13 2008/06/01 10:16:08 hollow Exp $
 
 inherit bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
 
@@ -17,7 +17,6 @@ RESTRICT="test"
 
 COMMONDEPEND=">=dev-libs/apr-util-1.2.8
 			berkdb? ( =sys-libs/db-4* )
-			doc? ( app-doc/doxygen )
 			emacs? ( virtual/emacs )
 			nls? ( sys-devel/gettext )
 			!nowebdav? ( =net-misc/neon-0.26* )
@@ -31,6 +30,7 @@ RDEPEND="${COMMONDEPEND}
 
 DEPEND="${COMMONDEPEND}
 		>=sys-devel/autoconf-2.59
+		doc? ( app-doc/doxygen )
 		java? ( >=virtual/jdk-1.4 )
 		ruby? ( dev-lang/swig )
 		perl? ( dev-lang/swig )
diff --git a/dev-util/subversion/subversion-1.5.0_rc4.ebuild b/dev-util/subversion/subversion-1.5.0_rc4.ebuild
deleted file mode 100644
index f897b56e8a7e..000000000000
--- a/dev-util/subversion/subversion-1.5.0_rc4.ebuild
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.5.0_rc4.ebuild,v 1.3 2008/05/01 13:19:14 hollow Exp $
-
-EAPI="1"
-
-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="~amd64 ~x86"
-IUSE="apache2 berkdb debug doc 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* )
-	doc? ( app-doc/doxygen )
-	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.4 )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )"
-
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.4 )
-	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() {
-	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 -e 's:@bindir@/svn-contrib:@libdir@/subversion/bin:' \
-		-e 's:@bindir@/svn-tools:@libdir@/subversion/bin:' \
-		-i Makefile.in
-
-	# eautoreconf does not work with libtool 2.2
-	./autogen.sh || die "autogen.sh failed"
-	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 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 \
-		--enable-runtime-module-search
-
-	# Respect the user LDFLAGS when building Subversion SWIG bindings.
-	export SWIG_LDFLAGS="${LDFLAGS}"
-
-	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.el || die "Compilation of Emacs module failed"
-		elisp-compile contrib/client-side/emacs/psvn.el || die "Compilation of Emacs module failed"
-		elisp-compile doc/svn-doc.el || die "Compilation of Emacs module failed"
-		elisp-compile doc/tools/svnbook.el || die "Compilation of Emacs module 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 BUGS CHANGES COMMITTERS HACKING INSTALL README TRANSLATING
-	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.el*
-		elisp-install ${PN} contrib/client-side/emacs/psvn.el*
-		elisp-install ${PN} doc/svn-doc.el*
-		elisp-install ${PN} doc/tools/svnbook.el*
-		elisp-site-file-install "${FILESDIR}"/1.5.0/70svn-gentoo.el
-	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
-			doins -r 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 -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() {
-	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. 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 ${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 \${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
-	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_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 755 "${ROOT}${SVN_REPOS_LOC}/repos"
-	fi
-}
diff --git a/dev-util/subversion/subversion-1.5.0_rc5.ebuild b/dev-util/subversion/subversion-1.5.0_rc5.ebuild
index 0e7cd45261ed..7b94a1cae59b 100644
--- a/dev-util/subversion/subversion-1.5.0_rc5.ebuild
+++ b/dev-util/subversion/subversion-1.5.0_rc5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.5.0_rc5.ebuild,v 1.5 2008/05/20 15:32:58 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.5.0_rc5.ebuild,v 1.6 2008/06/01 10:16:08 hollow Exp $
 
 EAPI="1"
 
@@ -21,7 +21,6 @@ CDEPEND=">=dev-libs/apr-1.2.8
 	dev-libs/expat
 	sys-libs/zlib
 	berkdb? ( =sys-libs/db-4* )
-	doc? ( app-doc/doxygen )
 	emacs? ( virtual/emacs )
 	ruby? ( >=dev-lang/ruby-1.8.2 )
 	sasl? ( dev-libs/cyrus-sasl )
@@ -34,6 +33,7 @@ RDEPEND="${CDEPEND}
 	perl? ( dev-perl/URI )"
 
 DEPEND="${CDEPEND}
+	doc? ( app-doc/doxygen )
 	java? ( >=virtual/jdk-1.5 )
 	nls? ( sys-devel/gettext )"