version bump, and cleaning up various old versions

14 files changed, 30 insertions, 1049 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 6f5fe4a54033..a9d734d76c3c 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.35 2003/09/28 11:29:59 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.36 2003/10/10 19:18:22 pauldv Exp $
+
+  10 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> subversion-0.24.2-r1.ebuild,
+  subversion-0.25.0.ebuild, subversion-0.26.0.ebuild,
+  subversion-0.28.0.ebuild, subversion-0.30.0.ebuild,
+  files/subversion-db4.patch:
+  Clean up old versions, and add the 0.31.0 version
+
+  02 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> subversion-0.30.0.ebuild:
+  Add a static precompiled svnadmin-pre28 instead of the old dynamic one. This
+  one should work in all cases
 
 *subversion-0.30.0 (27 Sep 2003)
 
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index e85a42660e36..2497f55f1647 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,16 +1,18 @@
-MD5 14ce2a9934e060355bc1368e3aba0f84 ChangeLog 6046
+MD5 3f89443a31a652841bcfd9e82e0f5a1c ChangeLog 6233
 MD5 c3b0246707b2aa961e44699ce262aa27 subversion-0.26.0.ebuild 7837
 MD5 5beb0e419efb23ad3ddf0332fadb63ea subversion-0.27.0.ebuild 7887
 MD5 89266fb7e77d77ad113dc7629d529514 subversion-0.28.0.ebuild 8033
-MD5 8faa417ccb8774fb00266c710b388a2c subversion-0.30.0.ebuild 7698
+MD5 8f1e3295bad4f779add17fd8857498a9 subversion-0.30.0.ebuild 7572
+MD5 c8bae2259c6cb1b1a3d74d51abede4fc subversion-0.31.0.ebuild 7966
 MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
 MD5 1f5748ec13720b5a278645ffc36e263e subversion-0.24.2-r1.ebuild 7782
 MD5 8b88a5fa7e85c4539f0e47b53c865299 subversion-0.25.0.ebuild 7851
 MD5 e232822bee0a8ed00f6b9d7805b83307 files/digest-subversion-0.27.0 132
-MD5 1f42fff75bc526cdf45d9ee89a1ac8bf files/subversion-db4.patch 549
+MD5 72aa5ab58a4d6274b6035ce3370e5c3f files/subversion-db4.patch 556
 MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
 MD5 c055aef559559580f75e60ede5051e79 files/digest-subversion-0.28.0 130
-MD5 20b4e57be412367e9fda69161249b201 files/digest-subversion-0.30.0 70
+MD5 c239e1be5d94572ff970508d3ac8f9b0 files/digest-subversion-0.30.0 135
+MD5 86365b02198a65328b2f189759d9e3d3 files/digest-subversion-0.31.0 132
 MD5 bb4349313fa71bbb1a2578101c8aa7b6 files/digest-subversion-0.24.2-r1 132
 MD5 ea42402d74d0a58036f40ab88b679b6d files/digest-subversion-0.25.0 130
 MD5 72848499bf4d3322db7ef26bbf411773 files/digest-subversion-0.26.0 132
diff --git a/dev-util/subversion/files/digest-subversion-0.24.2-r1 b/dev-util/subversion/files/digest-subversion-0.24.2-r1
deleted file mode 100644
index 186085b7ec85..000000000000
--- a/dev-util/subversion/files/digest-subversion-0.24.2-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799
-MD5 535956794859aab9da34b78b6c783210 subversion-0.24.2.tar.gz 7828990
diff --git a/dev-util/subversion/files/digest-subversion-0.25.0 b/dev-util/subversion/files/digest-subversion-0.25.0
deleted file mode 100644
index 63dba431ecb9..000000000000
--- a/dev-util/subversion/files/digest-subversion-0.25.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799
-MD5 a018220d5c790161bc712ccb7d0f1b38 subversion-0.25.tar.gz 5821703
diff --git a/dev-util/subversion/files/digest-subversion-0.26.0 b/dev-util/subversion/files/digest-subversion-0.26.0
deleted file mode 100644
index a13e6799689d..000000000000
--- a/dev-util/subversion/files/digest-subversion-0.26.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799
-MD5 700caa3f59b585d173812c4a078feeba subversion-0.26.0.tar.gz 5852551
diff --git a/dev-util/subversion/files/digest-subversion-0.28.0 b/dev-util/subversion/files/digest-subversion-0.28.0
deleted file mode 100644
index 480464e8eba7..000000000000
--- a/dev-util/subversion/files/digest-subversion-0.28.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799
-MD5 62a10c5ec13815e29f9bc100a1ee6dcc subversion-0.28.tar.gz 7126235
diff --git a/dev-util/subversion/files/digest-subversion-0.30.0 b/dev-util/subversion/files/digest-subversion-0.30.0
index e1bb46a1f14c..ac9845476430 100644
--- a/dev-util/subversion/files/digest-subversion-0.30.0
+++ b/dev-util/subversion/files/digest-subversion-0.30.0
@@ -1 +1,2 @@
 MD5 9dac76a67a217dc6b7f63259761ff93f subversion-0.30.0.tar.gz 7453334
+MD5 2703ba7e3e0b06a91d3aa01d6856e4a8 svnadmin-pre0.28.bz2 542719
diff --git a/dev-util/subversion/files/digest-subversion-0.31.0 b/dev-util/subversion/files/digest-subversion-0.31.0
new file mode 100644
index 000000000000..023f7593383b
--- /dev/null
+++ b/dev-util/subversion/files/digest-subversion-0.31.0
@@ -0,0 +1,2 @@
+MD5 a58df76993c1e6b1bfe80dd77d290ab2 subversion-0.31.0.tar.gz 7398957
+MD5 6b13bf7122876fa7a93a6194bc21efd4 svnadmin-0.27.bz2 582304
diff --git a/dev-util/subversion/files/subversion-db4.patch b/dev-util/subversion/files/subversion-db4.patch
index 99c5c2b766e8..1c1ef85aef60 100644
--- a/dev-util/subversion/files/subversion-db4.patch
+++ b/dev-util/subversion/files/subversion-db4.patch
@@ -6,7 +6,7 @@ diff -rNu subversion-0.27.0.orig/configure.in subversion-0.27.0/configure.in
  # Look for libdb4.so first:
  SVN_LIB_BERKELEY_DB($SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MINOR,
 -                    $SVN_FS_WANT_DB_PATCH, [db4 db])
-+                    $SVN_FS_WANT_DB_PATCH, [db-4 db-4.0 db4 db])
++                    $SVN_FS_WANT_DB_PATCH, [db-4.0 db-4 db-4.1 db4 db])
  
  
  # Only add *_APACHE_RULE if we also have db, since mod_dav_svn depends on it.
diff --git a/dev-util/subversion/subversion-0.24.2-r1.ebuild b/dev-util/subversion/subversion-0.24.2-r1.ebuild
deleted file mode 100644
index 338766e0766a..000000000000
--- a/dev-util/subversion/subversion-0.24.2-r1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.24.2-r1.ebuild,v 1.6 2003/09/28 11:29:59 pauldv Exp $
-
-inherit libtool
-
-DB_VERSION="4.0.14"
-DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="berkdb? ( http://www.sleepycat.com/update/snapshot/db-${DB_VERSION}.tar.gz )
-	http://subversion.tigris.org/files/documents/15/4807/${P}.tar.gz"
-HOMEPAGE="http://subversion.tigris.org/"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="~x86 ~ppc"
-IUSE="ssl apache2 berkdb python"
-
-if [ "${SVN_REPOS_LOC}x" = "x" ]; then
-	SVN_REPOS_LOC="/home/svn"
-fi
-
-#
-#
-# Note that to disable the server part of subversion you need to specify
-# USE="-berkdb" emerge subversion.
-#
-#
-
-S_DB="${WORKDIR}/db-${DB_VERSION}/build_unix"
-
-DEPEND="python? ( >=dev-lang/python-2.0 )
-	>=sys-apps/diffutils-2.7.7
-	>=sys-devel/libtool-1.4.1-r1
-	>=sys-devel/bison-1.28-r3
-	apache2? ( >=net-www/apache-2.0.45 )
-	!apache2? ( !>=net-www/apache-2* )
-	!dev-libs/apr
-	~sys-devel/m4-1.4
-	python? ( >=dev-lang/swig-1.3.16 )
-	>=net-misc/neon-0.23.8"
-
-RDEPEND="python? ( >=dev-lang/python-2.0 )
-	>=sys-apps/diffutils-2.7.7
-	~sys-devel/m4-1.4"
-
-pkg_setup() {
-	if use apache2; then
-		einfo "The apache2 subversion module will be built, and libapr from the"
-		einfo "apache package will be used instead of the included"
-	else
-		einfo "Please note that subversion and apache2 cannot be installed"
-		einfo "simultaneously without specifying the apache2 use flag. This is"
-		einfo "because subversion installs its own libapr and libapr-util in that"
-		einfo "case."
-	fi
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-	use berkdb && ( has_version =db-4* || (
-		unpack db-${DB_VERSION}.tar.gz
-	) )
-	cd ${S}
-	elibtoolize ${S}
-}
-
-src_compile() {
-	local myconf
-	use berkdb && ( has_version =db-4* || (
-		cd ${S_DB}
-		../dist/configure \
-			--prefix=/usr \
-	                --mandir=/usr/share/man \
-			--infodir=/usr/share/info \
-			--datadir=/usr/share \
-			--sysconfdir=/etc \
-			--localstatedir=/var/lib \
-			--disable-compat185 \
-			--disable-cxx \
-			--disable-tcl \
-			--disable-java \
-			--disable-shared \
-			--with-uniquename
-		emake || make || die "db make failed"
-		[ -e ${WORKDIR}/dbinst ] && rm -rf ${WORKDIR}/dbinst
-		mkdir -p ${WORKDIR}/dbinst/lib
-		make prefix=${WORKDIR}/dbinst install ||die
-		mkdir ${WORKDIR}/dbinst/include/db4
-		cp ${WORKDIR}/dbinst/include/*.h ${WORKDIR}/dbinst/include/db4
-		mv ${WORKDIR}/dbinst/lib/libdb.a ${WORKDIR}/dbinst/lib/libdb4.a
-		cat <<EOF >${WORKDIR}/dbinst/lib/libdb4.so
-GROUP( ${WORKDIR}/dbinst/lib/libdb4.a /usr/lib/libdb.so)
-EOF
-	) ) #no db4
-
-	cd ${S}
-	use ssl && myconf="${myconf} --with-ssl"
-	use ssl || myconf="${myconf} --without-ssl"
-
-	use apache2 && myconf="${myconf} --with-apxs=/usr/sbin/apxs2 \
-		--with-apr=/usr --with-apr-util=/usr"
-	use apache2 || myconf="${myconf} --without-apxs"
-
-	if use berkdb; then
-		has_version =db-4* && myconf="${myconf} --with-berkeley-db"
-		has_version =db-4* || myconf="${myconf} --with-berkeley-db=${WORKDIR}/dbinst"
-	else
-		myconf="${myconf} --without-berkeley-db"
-	fi
-
-	use python && myconf="${myconf} --with-python=/usr/bin/python --with-swig"
-	use python || myconf="${myconf} --without-python --without-swig"
-
-	echo "myconf=${myconf}"
-	econf ${myconf} \
-		--with-neon=/usr \
-		--disable-experimental-libtool \
-		--disable-mod-activation ||die "configuration failed"
-
-
-	# build subversion, but do it in a way that is safe for paralel builds
-	# Also apparently the included apr does have 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 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
-
-	#building fails without the apache apr-util as includes are wrong.
-	#Also the python bindings do not work without db installed
-	if use python; then
-		if use berkdb; then
-			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
-	fi
-}
-
-
-src_install () {
-	mkdir -p ${D}/etc/apache2/conf
-	mkdir -p ${D}/etc/share
-
-	use berkdb && ( has_version =db-4* || (
-		mkdir -p ${D}/usr/share/subversion/bin
-		cp ${WORKDIR}/dbinst/bin/* ${D}/usr/share/subversion/bin/
-	) )
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-	if [ -e ${D}/usr/lib/apache2 ]; then
-		mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
-	fi
-
-	if use python; then
-		if use berkdb; then
-			make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D} || die "Installation of subversion python bindings failed"
-			# install cvs2svn
-			dobin tools/cvs2svn/cvs2svn.py
-			mv ${D}/usr/bin/cvs2svn.py ${D}/usr/bin/cvs2svn
-			doman tools/cvs2svn/cvs2svn.1
-
-			# move python bindings
-			mkdir -p ${D}/usr/lib/python2.2/site-packages
-			cp -r tools/cvs2svn/rcsparse ${D}/usr/lib/python2.2/site-packages
-			mv ${D}/usr/lib/svn-python/svn ${D}/usr/lib/python2.2/site-packages
-			mv ${D}/usr/lib/svn-python/libsvn ${D}/usr/lib/python2.2/site-packages
-			rmdir ${D}/usr/lib/svn-python
-		fi
-	fi
-
-	dodoc BUGS COMMITTERS COPYING HACKING IDEAS INSTALL PORTING README
-	dodoc CHANGES
-	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
-
-	# install documentation
-	docinto notes
-	for f in notes/*
-	do
-		[ -f ${f} ] && dodoc ${f}
-	done
-	cd ${S}
-	echo "installing html book"
-	dohtml -r doc/book/book/book.html doc/book/book/styles.css doc/book/book/images
-	if use 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>
-EOF
-	fi
-}
-
-pkg_postinst() {
-	if use berkdb; then
-		if use apache2; then
-			einfo "Subversion has multiple server types. To enable the http based version"
-			einfo "you must edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
-			einfo ""
-		fi
-		einfo "A repository needs to be created using the ebuild ${PN} config command"
-		if has_version =sys-libs/db-4*; then
-			einfo "If you upgraded from an older version of berkely db and experience"
-			einfo "problems with your repository then run the following command:"
-			einfo "    su apache -c \"db4_recover -h /path/to/repos\""
-		fi
-		if use apache2; then
-			einfo "To allow web access a htpasswd file needs to be created using the"
-			einfo "following command:"
-			einfo "   htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
-		fi
-	else
-		einfo "Your subversion is client only as the server is only build when"
-		einfo "the berkdb flag is set"
-	fi
-}
-
-pkg_config() {
-	if [ ! -x /usr/bin/svnadmin ]; then
-		die "You seem to only have build the subversion client"
-	fi
-	einfo ">>> Initializing the database ..."
-	if [ -f ${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}
-		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-0.25.0.ebuild b/dev-util/subversion/subversion-0.25.0.ebuild
deleted file mode 100644
index 62e0e324f37f..000000000000
--- a/dev-util/subversion/subversion-0.25.0.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.25.0.ebuild,v 1.7 2003/09/28 11:29:59 pauldv Exp $
-
-inherit libtool
-
-DB_VERSION="4.0.14"
-DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="berkdb? ( http://www.sleepycat.com/update/snapshot/db-${DB_VERSION}.tar.gz )
-	http://subversion.tigris.org/files/documents/15/5110/${PN}-${PV//.0/}.tar.gz"
-HOMEPAGE="http://subversion.tigris.org/"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="~x86 ~ppc"
-IUSE="ssl apache2 berkdb python"
-
-S=${WORKDIR}/${PN}-${PV//.0}
-
-if [ "${SVN_REPOS_LOC}x" = "x" ]; then
-	SVN_REPOS_LOC="/home/svn"
-fi
-
-#
-#
-# Note that to disable the server part of subversion you need to specify
-# USE="-berkdb" emerge subversion.
-#
-#
-
-S_DB="${WORKDIR}/db-${DB_VERSION}/build_unix"
-
-DEPEND="python? ( >=dev-lang/python-2.0 )
-	>=sys-apps/diffutils-2.7.7
-	>=sys-devel/libtool-1.4.1-r1
-	>=sys-devel/bison-1.28-r3
-	apache2? ( >=net-www/apache-2.0.45 )
-	!apache2? ( !>=net-www/apache-2* )
-	!dev-libs/apr
-	~sys-devel/m4-1.4
-	python? ( >=dev-lang/swig-1.3.16 )
-	>=net-misc/neon-0.23.8"
-
-RDEPEND="python? ( >=dev-lang/python-2.0 )
-	>=sys-apps/diffutils-2.7.7
-	~sys-devel/m4-1.4"
-
-pkg_setup() {
-	if use apache2; then
-		einfo "The apache2 subversion module will be built, and libapr from the"
-		einfo "apache package will be used instead of the included"
-	else
-		einfo "Please note that subversion and apache2 cannot be installed"
-		einfo "simultaneously without specifying the apache2 use flag. This is"
-		einfo "because subversion installs its own libapr and libapr-util in that"
-		einfo "case."
-	fi
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${PN}-${PV//.0/}.tar.gz
-	use berkdb && ( has_version =db-4* || (
-		unpack db-${DB_VERSION}.tar.gz
-	) )
-	cd ${S}
-	elibtoolize ${S}
-}
-
-src_compile() {
-	local myconf
-	use berkdb && ( has_version =db-4* || (
-		cd ${S_DB}
-		../dist/configure \
-			--prefix=/usr \
-	                --mandir=/usr/share/man \
-			--infodir=/usr/share/info \
-			--datadir=/usr/share \
-			--sysconfdir=/etc \
-			--localstatedir=/var/lib \
-			--disable-compat185 \
-			--disable-cxx \
-			--disable-tcl \
-			--disable-java \
-			--disable-shared \
-			--with-uniquename
-		emake || make || die "db make failed"
-		[ -e ${WORKDIR}/dbinst ] && rm -rf ${WORKDIR}/dbinst
-		mkdir -p ${WORKDIR}/dbinst/lib
-		make prefix=${WORKDIR}/dbinst install ||die
-		mkdir ${WORKDIR}/dbinst/include/db4
-		cp ${WORKDIR}/dbinst/include/*.h ${WORKDIR}/dbinst/include/db4
-		mv ${WORKDIR}/dbinst/lib/libdb.a ${WORKDIR}/dbinst/lib/libdb4.a
-		cat <<EOF >${WORKDIR}/dbinst/lib/libdb4.so
-GROUP( ${WORKDIR}/dbinst/lib/libdb4.a /usr/lib/libdb.so)
-EOF
-	) ) #no db4
-
-	cd ${S}
-	use ssl && myconf="${myconf} --with-ssl"
-	use ssl || myconf="${myconf} --without-ssl"
-
-	use apache2 && myconf="${myconf} --with-apxs=/usr/sbin/apxs2 \
-		--with-apr=/usr --with-apr-util=/usr"
-	use apache2 || myconf="${myconf} --without-apxs"
-
-	if use berkdb; then
-		has_version =db-4* && myconf="${myconf} --with-berkeley-db"
-		has_version =db-4* || myconf="${myconf} --with-berkeley-db=${WORKDIR}/dbinst"
-	else
-		myconf="${myconf} --without-berkeley-db"
-	fi
-
-	use python && myconf="${myconf} --with-python=/usr/bin/python --with-swig"
-	use python || myconf="${myconf} --without-python --without-swig"
-
-	echo "myconf=${myconf}"
-	econf ${myconf} \
-		--with-neon=/usr \
-		--disable-experimental-libtool \
-		--disable-mod-activation ||die "configuration failed"
-
-
-	# build subversion, but do it in a way that is safe for paralel builds
-	# Also apparently the included apr does have 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 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
-
-	#building fails without the apache apr-util as includes are wrong.
-	#Also the python bindings do not work without db installed
-	if use python; then
-		if use berkdb; then
-			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
-	fi
-}
-
-
-src_install () {
-	mkdir -p ${D}/etc/apache2/conf
-	mkdir -p ${D}/etc/share
-
-	use berkdb && ( has_version =db-4* || (
-		mkdir -p ${D}/usr/share/subversion/bin
-		cp ${WORKDIR}/dbinst/bin/* ${D}/usr/share/subversion/bin/
-	) )
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-	if [ -e ${D}/usr/lib/apache2 ]; then
-		mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
-	fi
-
-	if use python; then
-		if use berkdb; then
-			make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D} || die "Installation of subversion python bindings failed"
-			# install cvs2svn
-			dobin tools/cvs2svn/cvs2svn.py
-			mv ${D}/usr/bin/cvs2svn.py ${D}/usr/bin/cvs2svn
-			doman tools/cvs2svn/cvs2svn.1
-
-			# move python bindings
-			mkdir -p ${D}/usr/lib/python2.2/site-packages
-			cp -r tools/cvs2svn/rcsparse ${D}/usr/lib/python2.2/site-packages
-			mv ${D}/usr/lib/svn-python/svn ${D}/usr/lib/python2.2/site-packages
-			mv ${D}/usr/lib/svn-python/libsvn ${D}/usr/lib/python2.2/site-packages
-			rmdir ${D}/usr/lib/svn-python
-		fi
-	fi
-
-	dodoc BUGS COMMITTERS COPYING HACKING IDEAS INSTALL PORTING README
-	dodoc CHANGES
-	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
-
-	# install documentation
-	docinto notes
-	for f in notes/*
-	do
-		[ -f ${f} ] && dodoc ${f}
-	done
-	cd ${S}
-	echo "installing html book"
-	dohtml -r doc/book/book/book.html doc/book/book/styles.css doc/book/book/images
-	if use 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>
-EOF
-	fi
-}
-
-pkg_postinst() {
-	if use berkdb; then
-		if use apache2; then
-			einfo "Subversion has multiple server types. To enable the http based version"
-			einfo "you must edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
-			einfo ""
-		fi
-		einfo "A repository needs to be created using the ebuild ${PN} config command"
-		if has_version =sys-libs/db-4*; then
-			einfo "If you upgraded from an older version of berkely db and experience"
-			einfo "problems with your repository then run the following command:"
-			einfo "    su apache -c \"db4_recover -h /path/to/repos\""
-		fi
-		if use apache2; then
-			einfo "To allow web access a htpasswd file needs to be created using the"
-			einfo "following command:"
-			einfo "   htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
-		fi
-	else
-		einfo "Your subversion is client only as the server is only build when"
-		einfo "the berkdb flag is set"
-	fi
-}
-
-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 [ -f ${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}
-		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-0.26.0.ebuild b/dev-util/subversion/subversion-0.26.0.ebuild
deleted file mode 100644
index 8004195ce313..000000000000
--- a/dev-util/subversion/subversion-0.26.0.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.26.0.ebuild,v 1.6 2003/09/28 11:29:59 pauldv Exp $
-
-inherit libtool
-
-DB_VERSION="4.0.14"
-DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="berkdb? ( http://www.sleepycat.com/update/snapshot/db-${DB_VERSION}.tar.gz )
-	http://subversion.tigris.org/files/documents/15/5322/${PN}-${PV}.tar.gz"
-HOMEPAGE="http://subversion.tigris.org/"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="~x86 ~ppc"
-IUSE="ssl apache2 berkdb python"
-
-S=${WORKDIR}/${PN}-${PV}
-
-if [ "${SVN_REPOS_LOC}x" = "x" ]; then
-	SVN_REPOS_LOC="/home/svn"
-fi
-
-#
-#
-# Note that to disable the server part of subversion you need to specify
-# USE="-berkdb" emerge subversion.
-#
-#
-
-S_DB="${WORKDIR}/db-${DB_VERSION}/build_unix"
-
-DEPEND="python? ( >=dev-lang/python-2.0 )
-	>=sys-apps/diffutils-2.7.7
-	>=sys-devel/libtool-1.4.1-r1
-	>=sys-devel/bison-1.28-r3
-	apache2? ( >=net-www/apache-2.0.45 )
-	!apache2? ( !>=net-www/apache-2* )
-	!dev-libs/apr
-	~sys-devel/m4-1.4
-	python? ( >=dev-lang/swig-1.3.16 )
-	>=net-misc/neon-0.23.8"
-
-RDEPEND="python? ( >=dev-lang/python-2.0 )
-	>=sys-apps/diffutils-2.7.7
-	~sys-devel/m4-1.4"
-
-pkg_setup() {
-	if use apache2; then
-		einfo "The apache2 subversion module will be built, and libapr from the"
-		einfo "apache package will be used instead of the included"
-	else
-		einfo "Please note that subversion and apache2 cannot be installed"
-		einfo "simultaneously without specifying the apache2 use flag. This is"
-		einfo "because subversion installs its own libapr and libapr-util in that"
-		einfo "case."
-	fi
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${PN}-${PV}.tar.gz
-	use berkdb && ( has_version =db-4* || (
-		unpack db-${DB_VERSION}.tar.gz
-	) )
-	cd ${S}
-	elibtoolize ${S}
-}
-
-src_compile() {
-	local myconf
-	use berkdb && ( has_version =db-4* || (
-		cd ${S_DB}
-		../dist/configure \
-			--prefix=/usr \
-	                --mandir=/usr/share/man \
-			--infodir=/usr/share/info \
-			--datadir=/usr/share \
-			--sysconfdir=/etc \
-			--localstatedir=/var/lib \
-			--disable-compat185 \
-			--disable-cxx \
-			--disable-tcl \
-			--disable-java \
-			--disable-shared \
-			--with-uniquename
-		emake || make || die "db make failed"
-		[ -e ${WORKDIR}/dbinst ] && rm -rf ${WORKDIR}/dbinst
-		mkdir -p ${WORKDIR}/dbinst/lib
-		make prefix=${WORKDIR}/dbinst install ||die
-		mkdir ${WORKDIR}/dbinst/include/db4
-		cp ${WORKDIR}/dbinst/include/*.h ${WORKDIR}/dbinst/include/db4
-		mv ${WORKDIR}/dbinst/lib/libdb.a ${WORKDIR}/dbinst/lib/libdb4.a
-		cat <<EOF >${WORKDIR}/dbinst/lib/libdb4.so
-GROUP( ${WORKDIR}/dbinst/lib/libdb4.a /usr/lib/libdb.so)
-EOF
-	) ) #no db4
-
-	cd ${S}
-	use ssl && myconf="${myconf} --with-ssl"
-	use ssl || myconf="${myconf} --without-ssl"
-
-	use apache2 && myconf="${myconf} --with-apxs=/usr/sbin/apxs2 \
-		--with-apr=/usr --with-apr-util=/usr"
-	use apache2 || myconf="${myconf} --without-apxs"
-
-	if use berkdb; then
-		has_version =db-4* && myconf="${myconf} --with-berkeley-db"
-		has_version =db-4* || myconf="${myconf} --with-berkeley-db=${WORKDIR}/dbinst"
-	else
-		myconf="${myconf} --without-berkeley-db"
-	fi
-
-	use python && myconf="${myconf} --with-python=/usr/bin/python --with-swig"
-	use python || myconf="${myconf} --without-python --without-swig"
-
-	echo "myconf=${myconf}"
-	econf ${myconf} \
-		--with-neon=/usr \
-		--disable-experimental-libtool \
-		--disable-mod-activation ||die "configuration failed"
-
-
-	# build subversion, but do it in a way that is safe for paralel builds
-	# Also apparently the included apr does have 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 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
-
-	#building fails without the apache apr-util as includes are wrong.
-	#Also the python bindings do not work without db installed
-	if use python; then
-		if use berkdb; then
-			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
-	fi
-}
-
-
-src_install () {
-	mkdir -p ${D}/etc/apache2/conf
-	mkdir -p ${D}/etc/share
-
-	use berkdb && ( has_version =db-4* || (
-		mkdir -p ${D}/usr/share/subversion/bin
-		cp ${WORKDIR}/dbinst/bin/* ${D}/usr/share/subversion/bin/
-	) )
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-	if [ -e ${D}/usr/lib/apache2 ]; then
-		mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
-	fi
-
-	if use python; then
-		if use berkdb; then
-			make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D} || die "Installation of subversion python bindings failed"
-			# install cvs2svn
-			dobin tools/cvs2svn/cvs2svn.py
-			mv ${D}/usr/bin/cvs2svn.py ${D}/usr/bin/cvs2svn
-			doman tools/cvs2svn/cvs2svn.1
-
-			# move python bindings
-			mkdir -p ${D}/usr/lib/python2.2/site-packages
-			cp -r tools/cvs2svn/rcsparse ${D}/usr/lib/python2.2/site-packages
-			mv ${D}/usr/lib/svn-python/svn ${D}/usr/lib/python2.2/site-packages
-			mv ${D}/usr/lib/svn-python/libsvn ${D}/usr/lib/python2.2/site-packages
-			rmdir ${D}/usr/lib/svn-python
-		fi
-	fi
-
-	dodoc BUGS COMMITTERS COPYING HACKING IDEAS INSTALL PORTING README
-	dodoc CHANGES
-	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
-
-	# install documentation
-	docinto notes
-	for f in notes/*
-	do
-		[ -f ${f} ] && dodoc ${f}
-	done
-	cd ${S}
-	echo "installing html book"
-	dohtml -r doc/book/book/book.html doc/book/book/styles.css doc/book/book/images
-	if use 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>
-EOF
-	fi
-}
-
-pkg_postinst() {
-	if use berkdb; then
-		if use apache2; then
-			einfo "Subversion has multiple server types. To enable the http based version"
-			einfo "you must edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
-			einfo ""
-		fi
-		einfo "A repository needs to be created using the ebuild ${PN} config command"
-		if has_version =sys-libs/db-4*; then
-			einfo "If you upgraded from an older version of berkely db and experience"
-			einfo "problems with your repository then run the following command:"
-			einfo "    su apache -c \"db4_recover -h /path/to/repos\""
-		fi
-		if use apache2; then
-			einfo "To allow web access a htpasswd file needs to be created using the"
-			einfo "following command:"
-			einfo "   htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
-		fi
-	else
-		einfo "Your subversion is client only as the server is only build when"
-		einfo "the berkdb flag is set"
-	fi
-}
-
-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 [ -f ${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}
-		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-0.28.0.ebuild b/dev-util/subversion/subversion-0.28.0.ebuild
deleted file mode 100644
index e9067a5536fa..000000000000
--- a/dev-util/subversion/subversion-0.28.0.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.28.0.ebuild,v 1.7 2003/09/28 11:29:59 pauldv Exp $
-
-inherit libtool
-
-# the tarball is oddly named for the release version
-PV="${PV/28.0/28}"
-
-DB_VERSION="4.0.14"
-DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="berkdb? ( http://www.sleepycat.com/update/snapshot/db-${DB_VERSION}.tar.gz )
-	http://subversion.tigris.org/files/documents/15/5870/${PN}-${PV}.tar.gz"
-HOMEPAGE="http://subversion.tigris.org/"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="~x86"
-IUSE="ssl apache2 berkdb python"
-
-S=${WORKDIR}/${PN}-${PV}
-
-if [ "${SVN_REPOS_LOC}x" = "x" ]; then
-	SVN_REPOS_LOC="/home/svn"
-fi
-
-#
-#
-# Note that to disable the server part of subversion you need to specify
-# USE="-berkdb" emerge subversion.
-#
-#
-
-S_DB="${WORKDIR}/db-${DB_VERSION}/build_unix"
-
-DEPEND="python? ( >=dev-lang/python-2.0 )
-	>=sys-apps/diffutils-2.7.7
-	>=sys-devel/libtool-1.4.1-r1
-	>=sys-devel/bison-1.28-r3
-	apache2? ( >=net-www/apache-2.0.45 )
-	!apache2? ( !>=net-www/apache-2* )
-	!dev-libs/apr
-	~sys-devel/m4-1.4
-	python? ( >=dev-lang/swig-1.3.16 )
-	>=net-misc/neon-0.23.8"
-
-RDEPEND="python? ( >=dev-lang/python-2.0 )
-	>=sys-apps/diffutils-2.7.7
-	~sys-devel/m4-1.4"
-
-pkg_setup() {
-	if use apache2; then
-		einfo "The apache2 subversion module will be built, and libapr from the"
-		einfo "apache package will be used instead of the included"
-	else
-		einfo "Please note that subversion and apache2 cannot be installed"
-		einfo "simultaneously without specifying the apache2 use flag. This is"
-		einfo "because subversion installs its own libapr and libapr-util in that"
-		einfo "case."
-	fi
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${PN}-${PV}.tar.gz
-	use berkdb && ( has_version =db-4* || (
-		unpack db-${DB_VERSION}.tar.gz
-	) )
-	cd ${S}
-	elibtoolize ${S}
-	patch -p1 <${FILESDIR}/subversion-db4.patch
-	export WANT_AUTOCONF_2_5=1
-	autoconf
-	(cd apr; autoconf)
-	(cd apr-util; autoconf)
-}
-
-src_compile() {
-	local myconf
-	use berkdb && ( has_version =db-4* || (
-		cd ${S_DB}
-		../dist/configure \
-			--prefix=/usr \
-	                --mandir=/usr/share/man \
-			--infodir=/usr/share/info \
-			--datadir=/usr/share \
-			--sysconfdir=/etc \
-			--localstatedir=/var/lib \
-			--disable-compat185 \
-			--disable-cxx \
-			--disable-tcl \
-			--disable-java \
-			--disable-shared \
-			--with-uniquename
-		emake || make || die "db make failed"
-		[ -e ${WORKDIR}/dbinst ] && rm -rf ${WORKDIR}/dbinst
-		mkdir -p ${WORKDIR}/dbinst/lib
-		make prefix=${WORKDIR}/dbinst install ||die
-		mkdir ${WORKDIR}/dbinst/include/db4
-		cp ${WORKDIR}/dbinst/include/*.h ${WORKDIR}/dbinst/include/db4
-		mv ${WORKDIR}/dbinst/lib/libdb.a ${WORKDIR}/dbinst/lib/libdb4.a
-		cat <<EOF >${WORKDIR}/dbinst/lib/libdb4.so
-GROUP( ${WORKDIR}/dbinst/lib/libdb4.a /usr/lib/libdb.so)
-EOF
-	) ) #no db4
-
-	cd ${S}
-	use ssl && myconf="${myconf} --with-ssl"
-	use ssl || myconf="${myconf} --without-ssl"
-
-	use apache2 && myconf="${myconf} --with-apxs=/usr/sbin/apxs2 \
-		--with-apr=/usr --with-apr-util=/usr"
-	use apache2 || myconf="${myconf} --without-apxs"
-
-	if use berkdb; then
-		has_version =db-4* && myconf="${myconf} --with-berkeley-db"
-		has_version =db-4* || myconf="${myconf} --with-berkeley-db=${WORKDIR}/dbinst"
-	else
-		myconf="${myconf} --without-berkeley-db"
-	fi
-
-	use python && myconf="${myconf} --with-python=/usr/bin/python --with-swig"
-	use python || myconf="${myconf} --without-python --without-swig"
-
-	echo "myconf=${myconf}"
-	econf ${myconf} \
-		--with-neon=/usr \
-		--disable-experimental-libtool \
-		--disable-mod-activation ||die "configuration failed"
-
-
-	# build subversion, but do it in a way that is safe for paralel builds
-	# Also apparently the included apr does have 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 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
-
-	#building fails without the apache apr-util as includes are wrong.
-	#Also the python bindings do not work without db installed
-	if use python; then
-		if use berkdb; then
-			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
-	fi
-}
-
-
-src_install () {
-	mkdir -p ${D}/etc/apache2/conf
-	mkdir -p ${D}/etc/share
-
-	use berkdb && ( has_version =db-4* || (
-		mkdir -p ${D}/usr/share/subversion/bin
-		cp ${WORKDIR}/dbinst/bin/* ${D}/usr/share/subversion/bin/
-	) )
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-	if [ -e ${D}/usr/lib/apache2 ]; then
-		mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
-	fi
-
-	if use python; then
-		if use berkdb; then
-			make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D} || die "Installation of subversion python bindings failed"
-			# install cvs2svn
-			dobin tools/cvs2svn/cvs2svn.py
-			mv ${D}/usr/bin/cvs2svn.py ${D}/usr/bin/cvs2svn
-			doman tools/cvs2svn/cvs2svn.1
-
-			# move python bindings
-			mkdir -p ${D}/usr/lib/python2.2/site-packages
-			cp -r tools/cvs2svn/rcsparse ${D}/usr/lib/python2.2/site-packages
-			mv ${D}/usr/lib/svn-python/svn ${D}/usr/lib/python2.2/site-packages
-			mv ${D}/usr/lib/svn-python/libsvn ${D}/usr/lib/python2.2/site-packages
-			rmdir ${D}/usr/lib/svn-python
-		fi
-	fi
-
-	dodoc BUGS COMMITTERS COPYING HACKING IDEAS INSTALL PORTING README
-	dodoc CHANGES
-	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
-
-	# install documentation
-	docinto notes
-	for f in notes/*
-	do
-		[ -f ${f} ] && dodoc ${f}
-	done
-	cd ${S}
-	echo "installing html book"
-	dohtml -r doc/book/book/book.html doc/book/book/styles.css doc/book/book/images
-	if use 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>
-EOF
-	fi
-}
-
-pkg_postinst() {
-	if use berkdb; then
-		if use apache2; then
-			einfo "Subversion has multiple server types. To enable the http based version"
-			einfo "you must edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
-			einfo ""
-		fi
-		einfo "A repository needs to be created using the ebuild ${PN} config command"
-		if has_version =sys-libs/db-4*; then
-			einfo "If you upgraded from an older version of berkely db and experience"
-			einfo "problems with your repository then run the following command:"
-			einfo "    su apache -c \"db4_recover -h /path/to/repos\""
-		fi
-		if use apache2; then
-			einfo "To allow web access a htpasswd file needs to be created using the"
-			einfo "following command:"
-			einfo "   htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
-		fi
-	else
-		einfo "Your subversion is client only as the server is only build when"
-		einfo "the berkdb flag is set"
-	fi
-}
-
-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 [ -f ${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}
-		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-0.30.0.ebuild b/dev-util/subversion/subversion-0.30.0.ebuild
index 991bcdd31e64..4139262ecb4a 100644
--- a/dev-util/subversion/subversion-0.30.0.ebuild
+++ b/dev-util/subversion/subversion-0.30.0.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.30.0.ebuild,v 1.3 2003/09/30 11:16:12 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.30.0.ebuild,v 1.4 2003/10/10 19:18:22 pauldv Exp $
 
 inherit elisp-common
 
+BACKUP_ADMIN="svnadmin-pre0.28"
+BACKUP_ADMIN_DIR="/usr/lib/subversion/bin"
 DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="http://svn.collab.net/tarballs/${P}.tar.gz"
+SRC_URI="http://svn.collab.net/tarballs/${P}.tar.gz
+	mirror://gentoo/${BACKUP_ADMIN}.bz2"
 HOMEPAGE="http://subversion.tigris.org/"
-BACKUP_ADMIN="/usr/lib/subversion/bin/svnadmin-pre0.28"
 
 SLOT="0"
 LICENSE="Apache-1.1"
@@ -144,15 +146,10 @@ src_install () {
 	do
 		[ -f ${f} ] && dodoc ${f}
 	done
-	if has_version \<dev-util/subversion-0.28; then
-		mkdir -p ${D}`dirname ${BACKUP_ADMIN}`
-		cp -p /usr/bin/svnadmin ${D}${BACKUP_ADMIN}
-	elif [ -x ${BACKUP_ADMIN} ]; then
-		mkdir -p ${D}`dirname ${BACKUP_ADMIN}`
-		cp -p ${BACKUP_ADMIN} ${D}${BACKUP_ADMIN}
-		#touch the file to make sure it is not removed when the old
-		#subversion gets unmerged
-		touch ${D}${BACKUP_ADMIN}
+	if use berkdb; then
+		mkdir -p ${D}`dirname ${BACKUP_ADMIN_DIR}`
+		cp ${DISTDIR}/${BACKUP_ADMIN}.bz2 ${D}${BACKUP_ADMIN_DIR} ||die
+		bunzip2 ${D}${BACKUP_ADMIN_DIR}/${BACKUP_ADMIN}.bz2 ||die
 	fi
 
 	cd ${S}