New version of subversion

17 files changed, 36 insertions, 1396 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 111034259a80..0f80c3b5264a 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,15 @@
 # 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.28 2003/07/18 19:03:59 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.29 2003/07/24 20:39:47 pauldv Exp $
+
+*subversion-0.26.0 (24 Jul 2003)
+
+  24 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> subversion-0.10_pre1.ebuild,
+  subversion-0.21.0-r1.ebuild, subversion-0.21.0.ebuild,
+  subversion-0.22.2.ebuild, subversion-0.23.0.ebuild,
+  subversion-0.24.1.ebuild, subversion-0.24.2.ebuild,
+  subversion-0.26.0.ebuild:
+  Cleaning up old versions, and adding new upstream version
 
   18 Jul 2003; <paul@gentoo.org> subversion-0.25.0.ebuild:
   Have the ebuild output the location of the repository in the config function
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index e172f53c17ff..320cdc6a2c9b 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,20 +1,8 @@
-MD5 d88c10d1a71e1912fb8f47491e3ae05b subversion-0.21.0-r1.ebuild 5784
-MD5 c866c27917d94a227b66b5ce88274772 subversion-0.24.1.ebuild 7588
-MD5 61e052a1c91f8ba072d291fb658cae9e subversion-0.22.2.ebuild 6852
-MD5 63760c0eb65311b709cafd768855f5ea subversion-0.23.0.ebuild 6889
-MD5 d22cfd9948bf734132ceb12c0a65ddcd subversion-0.24.2-r1.ebuild 7801
-MD5 dc1cefd73b4fb39d7931d5c9ebea95ca ChangeLog 4539
-MD5 766fd60eb6ace2ac6e79b38001cb0881 subversion-0.24.2.ebuild 7665
+MD5 f8e0863c8c84504268d8bd45e2783b72 subversion-0.26.0.ebuild 7857
 MD5 94a82b90df7338731c1f8d4a654edb8a metadata.xml 151
-MD5 a343df53435bdcfc3a4c85f3e9912102 subversion-0.10_pre1.ebuild 8054
+MD5 352fc3286d8ca457e3719e8e57eed25e ChangeLog 4906
 MD5 928a2b0b2d39afb7969f92af61da2a57 subversion-0.25.0.ebuild 7871
-MD5 7a45c9dae1829ed6fa2b22ead64c4eab subversion-0.21.0.ebuild 6494
-MD5 8208be10eefcdc258afb4ca8d410a06c files/digest-subversion-0.10_pre1 446
-MD5 d3250565b5dca16ba84df4bb5075992b files/digest-subversion-0.21.0 132
-MD5 d862f716bef7a59fbbbab4c4d709d5a6 files/digest-subversion-0.22.2 132
-MD5 6e49364b7696df8f0ed1259fe8293d25 files/digest-subversion-0.23.0 132
-MD5 9b51238afa4c10c34a5a5d53c36823d1 files/digest-subversion-0.24.1 132
-MD5 bb4349313fa71bbb1a2578101c8aa7b6 files/digest-subversion-0.24.2 132
-MD5 ea42402d74d0a58036f40ab88b679b6d files/digest-subversion-0.25.0 130
-MD5 d3250565b5dca16ba84df4bb5075992b files/digest-subversion-0.21.0-r1 132
+MD5 d22cfd9948bf734132ceb12c0a65ddcd subversion-0.24.2-r1.ebuild 7801
+MD5 72848499bf4d3322db7ef26bbf411773 files/digest-subversion-0.26.0 132
 MD5 bb4349313fa71bbb1a2578101c8aa7b6 files/digest-subversion-0.24.2-r1 132
+MD5 ea42402d74d0a58036f40ab88b679b6d files/digest-subversion-0.25.0 130
diff --git a/dev-util/subversion/files/digest-subversion-0.10_pre1 b/dev-util/subversion/files/digest-subversion-0.10_pre1
deleted file mode 100644
index 82387e95b7be..000000000000
--- a/dev-util/subversion/files/digest-subversion-0.10_pre1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799
-MD5 10c84c06700d841a2f50a7e49baa742b autoconf-2.52.tar.bz2 632887
-MD5 6037a6a73a208e7357dda5e9682c7bfe apr-subversion-200202261456.tar.bz2 614171
-MD5 528c8adcd6088e8f0c93b2f82b1ff3d8 apr-util-subversion-200202261456.tar.bz2 152437
-MD5 8d546fa682cc887e94a6f3cbd7433631 httpd-subversion-200202261456.tar.bz2 2228156
-MD5 606c9ef35648b2c1818abbe0a4a98703 svn-200202261456.tar.bz2 3412964
diff --git a/dev-util/subversion/files/digest-subversion-0.21.0 b/dev-util/subversion/files/digest-subversion-0.21.0
deleted file mode 100644
index 6e1c8346e8d0..000000000000
--- a/dev-util/subversion/files/digest-subversion-0.21.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799
-MD5 b2ad91127fb652e764b750f4c0002528 subversion-0.21.0.tar.gz 7713475
diff --git a/dev-util/subversion/files/digest-subversion-0.21.0-r1 b/dev-util/subversion/files/digest-subversion-0.21.0-r1
deleted file mode 100644
index 6e1c8346e8d0..000000000000
--- a/dev-util/subversion/files/digest-subversion-0.21.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799
-MD5 b2ad91127fb652e764b750f4c0002528 subversion-0.21.0.tar.gz 7713475
diff --git a/dev-util/subversion/files/digest-subversion-0.22.2 b/dev-util/subversion/files/digest-subversion-0.22.2
deleted file mode 100644
index 1dd5957af994..000000000000
--- a/dev-util/subversion/files/digest-subversion-0.22.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799
-MD5 68213306ec24b0d2189aea0f68a7c223 subversion-0.22.2.tar.gz 7713105
diff --git a/dev-util/subversion/files/digest-subversion-0.23.0 b/dev-util/subversion/files/digest-subversion-0.23.0
deleted file mode 100644
index 1f03ce5602e5..000000000000
--- a/dev-util/subversion/files/digest-subversion-0.23.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799
-MD5 59661f2145976437b371a0ab3a555dbd subversion-0.23.0.tar.gz 7700961
diff --git a/dev-util/subversion/files/digest-subversion-0.24.1 b/dev-util/subversion/files/digest-subversion-0.24.1
deleted file mode 100644
index 46aefecbee37..000000000000
--- a/dev-util/subversion/files/digest-subversion-0.24.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799
-MD5 8e1402528f0db97d9a187decddde89d1 subversion-0.24.1.tar.gz 7832674
diff --git a/dev-util/subversion/files/digest-subversion-0.24.2 b/dev-util/subversion/files/digest-subversion-0.24.2
deleted file mode 100644
index 186085b7ec85..000000000000
--- a/dev-util/subversion/files/digest-subversion-0.24.2
+++ /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.26.0 b/dev-util/subversion/files/digest-subversion-0.26.0
new file mode 100644
index 000000000000..a13e6799689d
--- /dev/null
+++ b/dev-util/subversion/files/digest-subversion-0.26.0
@@ -0,0 +1,2 @@
+MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799
+MD5 700caa3f59b585d173812c4a078feeba subversion-0.26.0.tar.gz 5852551
diff --git a/dev-util/subversion/subversion-0.10_pre1.ebuild b/dev-util/subversion/subversion-0.10_pre1.ebuild
deleted file mode 100644
index d0c0c2d67f38..000000000000
--- a/dev-util/subversion/subversion-0.10_pre1.ebuild
+++ /dev/null
@@ -1,252 +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.10_pre1.ebuild,v 1.13 2003/05/12 20:52:38 mholzer Exp $
-
-S=${WORKDIR}/svn
-S_APACHE=${WORKDIR}/httpd-2.0
-S_APR=${WORKDIR}/apr
-S_APRUTIL=${WORKDIR}/apr-util
-S_AUTOCONF=${WORKDIR}/autoconf-2.52
-S_BDB=${WORKDIR}/db-4.0.14/build_unix
-I_APACHE=${WORKDIR}/tmpinstall_httpd
-I_AUTOCONF=${WORKDIR}/tmpinstall_autoconf-2.52
-I_BDB=${WORKDIR}/tmpinstall_db-4.0.14
-I_SVN=${WORKDIR}/tmpinstall_svn
-
-DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz
-	ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.52.tar.bz2
-	http://www.gbevin.com/gentoo/apr-subversion-200202261456.tar.bz2
-	http://www.gbevin.com/gentoo/apr-util-subversion-200202261456.tar.bz2
-	http://www.gbevin.com/gentoo/httpd-subversion-200202261456.tar.bz2
-	http://www.gbevin.com/gentoo/svn-200202261456.tar.bz2"
-HOMEPAGE="http://subversion.tigris.org/"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="~x86 ~sparc "
-
-DEPEND=">=dev-lang/python-2.0
-	>=sys-apps/diffutils-2.7.7
-	>=sys-devel/libtool-1.4.1-r1
-	>=sys-devel/bison-1.28-r3
-	~sys-devel/m4-1.4
-	=net-misc/neon-0.19.2*"
-RDEPEND=">=dev-lang/python-2.0
-	>=sys-apps/diffutils-2.7.7
-	~sys-devel/m4-1.4
-	=net-misc/neon-0.19.2*"
-	
-src_bootstrap() {
-	cd ${WORKDIR}
-
-	# bootstrap subversion from version 0.9.0
-	unpack ${DISTDIR}/subversion-r1302.tar.gz
-	cd ${WORKDIR}/subversion-r1302
-	econf \
-		--with-berkeley-db=${I_BDB} \
-		--enable-maintainer-mode \
-		--disable-shared
-	emake || die "make of subversion bootstrap failed"
-
-	# get latest subversion version from cvs
-	cd ${WORKDIR}
-	subversion-r1302/subversion/clients/cmdline/svn checkout http://svn.collab.net/repos/svn/trunk -d svn
-}
-
-src_compile_bdb() {
-	# configure berkeley db
-	cd ${S_BDB}
-	../dist/configure \
-		--prefix=/usr/svn \
-		--mandir=/usr/svn/share/man \
-		--infodir=/usr/svn/share/info \
-		--datadir=/usr/svn/share \
-		--localstatedir=/var/lib \
-		--host=${CHOST} || die "../dist/configure of berkeley db failed"
-
-	# build berkeley db
-	emake || die "make of berkeley db failed"
-	# install temporary version of berkeley db
-	make prefix=${I_BDB} install || die "temporary installation of berkeley db failed"
-}
-
-src_compile_apache() {
-	# copy the apr and apr-util dirs
-	rm -rf ${S_APACHE}/srclib/apr ${S_APACHE}/srclib/apr-util
-	cp -a ${S_APR} ${S_APACHE}/srclib/apr
-	cp -a ${S_APRUTIL} ${S_APACHE}/srclib/apr-util
-
-	# configure apache
-	cd ${S_APACHE}
-	./buildconf
-	./configure \
-		--prefix=/usr/svn \
-	    --mandir=/usr/svn/share/man \
-	    --infodir=/usr/svn/share/info \
-	    --datadir=/usr/svn/share \
-	    --localstatedir=/var/lib \
-		--host=${CHOST} \
-		--enable-so \
-		--enable-dav \
-		--with-dbm=db4 \
-		--with-berkeley-db=${I_BDB} \
-		--enable-maintainer-mode || die "./configure of apache failed"
-	make depend
-	# fix the apache sources to correctly work with LD_LIBRARY_PATH
-	mv srclib/pcre/Makefile srclib/pcre/Makefile_orig
-	sed -e "s#./dftables#LD_LIBRARY_PATH=\"${LD_LIBRARY_PATH}\" ./dftables#" \
-		srclib/pcre/Makefile_orig > srclib/pcre/Makefile
-	mv server/Makefile server/Makefile_orig
-	sed -e "s#./gen_test_char#LD_LIBRARY_PATH=\"${LD_LIBRARY_PATH}\" ./gen_test_char#" \
-		server/Makefile_orig > server/Makefile
-	# build apache
-	emake || die "make of apache failed"
-	# install temporary version of apache
-	make prefix=${I_APACHE} install || die "temporary installation of apache failed"
-	# change the paths in apxs to point to the temporarly installed version of apache
-	# this will make subversions dav module install there
-	mv ${I_APACHE}/bin/apxs ${I_APACHE}/bin/apxs_orig
-	sed -e "s#/usr/svn#${I_APACHE}#" \
-		${I_APACHE}/bin/apxs_orig > ${I_APACHE}/bin/apxs
-	chmod +x ${I_APACHE}/bin/apxs
-}
-
-src_compile_autoconf() {
-	# configure autoconf
-	cd ${S_AUTOCONF}
-	./configure \
-		--prefix=${I_AUTOCONF} \
-		--infodir=${I_AUTOCONF}/share/info \
-		--mandir=${I_AUTOCONF}/share/man \
-		--target=${CHOST} || die "./configure of autoconf failed"
-	# build autoconf
-	emake || die "make of autoconf failed"
-	# install temporary version of autoconf
-	make install || die "temporary installation of autoconf failed"
-}
-
-src_compile_svn() {
-	cd ${S}
-	# create a copy of the most recent apr and apr-utils sources
-	rm -rf apr apr-util
-	cp -a ${S_APR} apr
-	cp -a ${S_APRUTIL} apr-util
-	# generate the configure scripts
-	sh ./autogen.sh || die "autoconf of subversion failed"
-	# configure subversion
-	# have to install in temporary location first and can't sue DESTDIR
-	# with make install since otherwise the libraries are wrongly installed
-	./configure \
-		--prefix=${I_SVN} \
-		--with-berkeley-db=${I_BDB} \
-		--with-neon=/usr \
-		--with-apxs=${I_APACHE}/bin/apxs \
-		--enable-maintainer-mode || die "./configure of subversion failed"
-	# build subversion
-	emake LD_LIBRARY_PATH="${I_BDB}/lib" || die "make of subversion failed"
-	# install temporary version of subversion
-	export LD_LIBRARY_PATH="${I_SVN}/lib:$LD_LIBRARY_PATH"
-	make LD_LIBRARY_PATH="${I_BDB}/lib:${I_APACHE}/lib:${I_SVN}/lib" install || die "temporary installation of subversion failed"
-}
-
-src_compile() {
-	src_compile_bdb
-	# make the system pick up the installed berkeley db libs before others
-	export LD_LIBRARY_PATH="${I_BDB}/lib"
-	
-	src_compile_apache
-	# make the system have access to the cvs head libraries of apache 2.0
-	export LD_LIBRARY_PATH="${I_APACHE}/lib:$LD_LIBRARY_PATH"
-	
-	src_compile_autoconf
-	# set the correct paths so that this new version of autoconf will be picked up instead
-	# of the old version that gentoo uses by default
-	export PATH="$I_AUTOCONF/bin:$PATH"
-
-	src_compile_svn
-}
-
-src_install () {
-	# copy the prior temporary installs to the image dir
-	dodir /usr/svn/lib
-	cp -av ${I_BDB}/lib/* ${D}/usr/svn/lib || die "installation of berkeley db failed"
-	cp -av ${I_APACHE}/* ${D}/usr/svn || die "installation of apache failed"
-	cp -av ${I_SVN}/* ${D}/usr/svn || die "installation of subversion failed"
-	
-	# install documentation
-	dodoc BUGS COMMITTERS COPYING HACKING IDEAS INSTALL PORTING README
-	cd notes
-	for f in *.txt
-	do
-		dodoc ${f}
-	done
-	
-	# remove portage /var/tmp paths from files
-	cd ${D}/usr/svn
-	for x in bin/apxs \
-		bin/apu-config \
-		bin/apr-config \
-		build/config_vars.mk \
-		conf/highperformance-std.conf \
-		conf/highperformance.conf \
-		conf/httpd-std.conf \
-		conf/httpd.conf \
-		conf/ssl-std.conf \
-		conf/ssl.conf \
-		conf/httpd.conf.bak \
-		lib/libsvn_delta.la \
-		lib/libsvn_ra_dav.la \
-		lib/libexpat.la \
-		lib/libsvn_subr.la \
-		lib/libaprutil.la \
-		lib/libsvn_ra_local.la \
-		lib/libsvn_repos.la \
-		lib/libapr.la \
-		lib/libsvn_client.la \
-		lib/libsvn_fs.la \
-		lib/libsvn_ra.la \
-		lib/libsvn_wc.la
-	do
-		mv ${x} ${x}_orig
-		sed -e "s#/var/tmp/portage/${P}/work/tmpinstall_svn#/usr/svn#g" \
-			-e "s#/var/tmp/portage/${P}/work/tmpinstall_httpd#/usr/svn#g" \
-			-e "s#/var/tmp/portage/${P}/work/tmpinstall_db-4.0.14#/usr/svn#g" \
-			${x}_orig > ${x}
-			rm ${x}_orig
-	done
-
-	# add the subversion path to the apache config
-	cat << ENDL >> ${D}/usr/svn/conf/httpd.conf
-<Location /svn/repos>
-	DAV svn
-	SVNPath /var/lib/svn
-</Location>
-ENDL
-
-	# setup gentoo to make using subversion easier
-	dodir /var/lib/svn/logs
-	touch ${D}/usr/svn/logs/.keep
-	insinto /usr/bin
-	dosym /usr/svn/bin/svn /usr/bin/svn
-	dosym /usr/svn/bin/svnadmin /usr/bin/svnadmin
-	dosym /usr/svn/bin/svnlook /usr/bin/svnlook
-	insinto /etc/env.d
-	echo "LDPATH=/usr/svn/lib" > ${D}/etc/env.d/10subversion
-}
-
-pkg_config() {
-	einfo ">>> Initializing the database ..."
-	if [ -f /var/lib/svn/db ] ; then
-        echo "A subversion repository already exists and I will not overwrite it."
-		echo "Delete /var/lib/svn first if you're sure you want to have a clean version."
-	else
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		LD_LIBRARY_PATH="/usr/svn/lib:$LD_LIBRARY_PATH" /usr/svn/bin/svnadmin create /var/lib/svn
-
-		einfo ">>> Setting repository permissions ..."
-		chown -Rf nobody.nobody /var/lib/svn
-		chmod -Rf 755 /var/lib/svn
-	fi
-}
diff --git a/dev-util/subversion/subversion-0.21.0-r1.ebuild b/dev-util/subversion/subversion-0.21.0-r1.ebuild
deleted file mode 100644
index 5980002261bc..000000000000
--- a/dev-util/subversion/subversion-0.21.0-r1.ebuild
+++ /dev/null
@@ -1,193 +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.21.0-r1.ebuild,v 1.5 2003/06/18 19:21:18 pauldv Exp $
-
-inherit libtool
-
-DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz
-	http://subversion.tigris.org/files/documents/15/3712/${P}.tar.gz"
-HOMEPAGE="http://subversion.tigris.org/"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="~x86"
-IUSE="ssl apache2"
-
-S_DB="${WORKDIR}/db-4.0.14/build_unix"
-
-DEPEND=">=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? ( !>=apache-2* )
-	!dev-libs/apr
-	~sys-devel/m4-1.4
-	>=dev-lang/swig-1.3.16
-	>=net-misc/neon-0.23.8"
-
-RDEPEND=">=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
-	has_version =db-4* || (
-		unpack db-4.0.14.tar.gz
-	)
-	cd ${S}
-}
-
-src_compile() {
-	elibtoolize
-
-	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
-		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"
-	has_version =db-4* || myconf="${myconf} --with-berkeley-db=${WORKDIR}/dbinst"
-
-	LDFLAGS=${LDFLAGS} econf ${myconf} \
-		--with-neon=/usr \
-		--disable-mod-activation \
-		--disable-expermimental-libtool \
-		--with-python=/usr/bin/python \
-		--with-swig ||die "configuration failed"
-	# build subversion
-	emake LT_LDFLAGS="-L${D}/usr/lib" || die "make of subversion failed"
-
-	#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
-}
-
-
-src_install () {
-	mkdir -p ${D}/etc/apache2/conf
-	mkdir -p ${D}/etc/share
-
-	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"
-	make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D} || die "Installation of subversion python bindings failed"
-	mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
-
-	# 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
-	rmdir ${D}/usr/lib/svn-python
-
-	dodoc BUGS COMMITTERS COPYING HACKING IDEAS INSTALL PORTING README
-	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
-
-	# install documentation
-	cd notes
-	for f in *.txt
-	do
-		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
-	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 /home/svn/repos
-    AuthType Basic
-    AuthName "Subversion repository"
-    AuthUserFile /home/svn/conf/svnusers
-    Require valid-user
-  </Location>
-</IfDefine>
-EOF
-
-}
-
-pkg_postinst() {
-	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 ""
-	einfo "A repository needs to be created using the ebuild ${PN} config command"
-	einfo "To allow web access a htpasswd file needs to be created using the"
-	einfo "following command:"
-	einfo "   htpasswd2 -m -c /home/svn/conf/svnusers USERNAME"
-}
-
-pkg_config() {
-	einfo ">>> Initializing the database ..."
-	if [ -f /home/svn/repos ] ; then
-        echo "A subversion repository already exists and I will not overwrite it."
-		echo "Delete /home/svn/repos first if you're sure you want to have a clean version."
-	else
-		mkdir -p /home/svn
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create /home/svn/repos
-
-		einfo ">>> Setting repository permissions ..."
-		chown -Rf apache.apache /home/svn/repos
-		chmod -Rf 755 /home/svn/repos
-	fi
-}
-
diff --git a/dev-util/subversion/subversion-0.21.0.ebuild b/dev-util/subversion/subversion-0.21.0.ebuild
deleted file mode 100644
index 452d9999aa6f..000000000000
--- a/dev-util/subversion/subversion-0.21.0.ebuild
+++ /dev/null
@@ -1,203 +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.21.0.ebuild,v 1.7 2003/05/12 20:52:38 mholzer Exp $
-
-
-DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz
-	http://subversion.tigris.org/files/documents/15/3712/${P}.tar.gz"
-HOMEPAGE="http://subversion.tigris.org/"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="~x86"
-IUSE="ssl apache2"
-
-S_DB="${WORKDIR}/db-4.0.14/build_unix"
-
-DEPEND=">=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? ( !>=apache-2* )
-	!dev-libs/apr
-	~sys-devel/m4-1.4
-	>=dev-lang/swig-1.3.16
-	>=net-misc/neon-0.23.8"
-
-RDEPEND=">=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
-	unpack db-4.0.14.tar.gz
-	cd ${S}
-#	cat packages/rpm/redhat-8.x/install.patch | \
-#	sed -e "s,RPM_BUILD_ROOT,DESTDIR,g" -e "s,usr/lib/httpd/modules,usr/lib/apache2-extramodules,g" | patch -p1
-}
-
-src_compile() {
-	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
-	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
-
-	cd ${S}
-	use ssl && myconf="${myconf} --with-ssl"
-	use ssl || myconf="${myconf} --without-ssl"
-
-	LDFLAGS="-L${S}/subversion/libsvn_client/.libs \
-        -L${S}/apr/.libs \
-        -L${S}/apr-util/.libs \
-        -L${S}/subversion/libsvn_delta/.libs \
-        -L${S}/subversion/libsvn_diff/.libs \
-        -L${S}/subversion/libsvn_fs/.libs \
-        -L${S}/subversion/libsvn_repos/.libs \
-        -L${S}/subversion/libsvn_ra/.libs \
-        -L${S}/subversion/libsvn_ra_dav/.libs \
-        -L${S}/subversion/libsvn_ra_local/.libs \
-        -L${S}/subversion/libsvn_ra_svn/.libs \
-        -L${S}/subversion/libsvn_subr/.libs \
-        -L${S}/subversion/libsvn_wc/.libs \
-	-L${WORKDIR}/dbinst/lib"
-
-
-	use apache2 && myconf="${myconf} --with-apxs=/usr/sbin/apxs2 \
-		--with-apr=/usr --with-apr-util=/usr"
-	use apache2 || myconf="${myconf} --without-apxs"
-
-	LDFLAGS=${LDFLAGS} econf ${myconf} \
-		--with-berkeley-db=${WORKDIR}/dbinst \
-		--with-neon=/usr \
-		--disable-mod-activation \
-		--with-python=/usr/bin/python \
-		--with-swig ||die "configuration failed"
-	# build subversion
-	emake || die "make of subversion failed"
-	#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
-}
-
-
-src_install () {
-	mkdir -p ${D}/etc/apache2/conf
-	mkdir -p ${D}/etc/share
-
-	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"
-	make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D} || die "Installation of subversion python bindings failed"
-	mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
-	# remove unwanted parts from the image dir
-
-	# 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
-	rmdir ${D}/usr/lib/svn-python
-
-	dodoc BUGS COMMITTERS COPYING HACKING IDEAS INSTALL PORTING README
-	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
-
-	# install documentation
-	cd notes
-	for f in *.txt
-	do
-		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
-#	mkdir -p ${D}/home/svn/repos
-#	mkdir -p ${D}/home/svn/conf
-	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 /home/svn/repos
-    AuthType Basic
-    AuthName "Subversion repository"
-    AuthUserFile /home/svn/conf/svnusers
-    Require valid-user
-  </Location>
-</IfDefine>
-EOF
-
-}
-
-pkg_postinst() {
-	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 ""
-	einfo "A repository needs to be created using the ebuild ${PN} config command"
-	einfo "To allow web access a htpasswd file needs to be created using the"
-	einfo "following command:"
-	einfo "   htpasswd2 -m -c /home/svn/conf/svnusers USERNAME"
-}
-
-pkg_config() {
-	einfo ">>> Initializing the database ..."
-	if [ -f /home/svn/repos ] ; then
-        echo "A subversion repository already exists and I will not overwrite it."
-		echo "Delete /home/svn/repos first if you're sure you want to have a clean version."
-	else
-		mkdir -p /home/svn
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create /home/svn/repos
-
-		einfo ">>> Setting repository permissions ..."
-		chown -Rf apache.apache /home/svn/repos
-		chmod -Rf 755 /home/svn/repos
-	fi
-}
-
diff --git a/dev-util/subversion/subversion-0.22.2.ebuild b/dev-util/subversion/subversion-0.22.2.ebuild
deleted file mode 100644
index 083a9e5a7eed..000000000000
--- a/dev-util/subversion/subversion-0.22.2.ebuild
+++ /dev/null
@@ -1,225 +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.22.2.ebuild,v 1.3 2003/06/18 19:21:18 pauldv Exp $
-
-inherit libtool
-
-DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz
-	http://subversion.tigris.org/files/documents/15/4097/${P}.tar.gz"
-HOMEPAGE="http://subversion.tigris.org/"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="~x86 ~ppc"
-IUSE="ssl apache2 berkdb python"
-
-S_DB="${WORKDIR}/db-4.0.14/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? ( !>=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-4.0.14.tar.gz
-	) )
-	cd ${S}
-}
-
-src_compile() {
-	local myconf
-	elibtoolize
-	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}"
-	LDFLAGS=${LDFLAGS} 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
-	( emake LT_LDFLAGS="-L${D}/usr/lib" external-all && emake LT_LDFLAGS="-L${D}/usr/lib" local-all ) || die "make of subversion failed"
-
-	#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
-			rmdir ${D}/usr/lib/svn-python
-		fi
-	fi
-
-	dodoc BUGS COMMITTERS COPYING HACKING IDEAS INSTALL PORTING README
-	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
-
-	# install documentation
-	cd notes
-	for f in *.txt
-	do
-		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 apache; 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 /home/svn/repos
-    AuthType Basic
-    AuthName "Subversion repository"
-    AuthUserFile /home/svn/conf/svnusers
-    Require valid-user
-  </Location>
-</IfDefine>
-EOF
-	fi
-}
-
-pkg_postinst() {
-	if use berkdb; then
-		if use apache; 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 use apache; then
-			einfo "To allow web access a htpasswd file needs to be created using the"
-			einfo "following command:"
-			einfo "   htpasswd2 -m -c /home/svn/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 /home/svn/repos ] ; then
-        echo "A subversion repository already exists and I will not overwrite it."
-		echo "Delete /home/svn/repos first if you're sure you want to have a clean version."
-	else
-		mkdir -p /home/svn
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create /home/svn/repos
-
-		einfo ">>> Setting repository permissions ..."
-		chown -Rf apache.apache /home/svn/repos
-		chmod -Rf 755 /home/svn/repos
-	fi
-}
-
diff --git a/dev-util/subversion/subversion-0.23.0.ebuild b/dev-util/subversion/subversion-0.23.0.ebuild
deleted file mode 100644
index 3ba7e00e9385..000000000000
--- a/dev-util/subversion/subversion-0.23.0.ebuild
+++ /dev/null
@@ -1,226 +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.23.0.ebuild,v 1.3 2003/06/18 19:21:18 pauldv Exp $
-
-inherit libtool
-
-DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz
-	http://subversion.tigris.org/files/documents/15/4218/${P}.tar.gz"
-HOMEPAGE="http://subversion.tigris.org/"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="~x86 ~ppc"
-IUSE="ssl apache2 berkdb python"
-
-S_DB="${WORKDIR}/db-4.0.14/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? ( !>=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-4.0.14.tar.gz
-	) )
-	cd ${S}
-}
-
-src_compile() {
-	local myconf
-	elibtoolize
-	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}"
-	LDFLAGS=${LDFLAGS} 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
-	( emake LT_LDFLAGS="-L${D}/usr/lib" external-all && emake LT_LDFLAGS="-L${D}/usr/lib" local-all ) || die "make of subversion failed"
-
-	#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
-			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 apache; 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 /home/svn/repos
-    AuthType Basic
-    AuthName "Subversion repository"
-    AuthUserFile /home/svn/conf/svnusers
-    Require valid-user
-  </Location>
-</IfDefine>
-EOF
-	fi
-}
-
-pkg_postinst() {
-	if use berkdb; then
-		if use apache; 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 use apache; then
-			einfo "To allow web access a htpasswd file needs to be created using the"
-			einfo "following command:"
-			einfo "   htpasswd2 -m -c /home/svn/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 /home/svn/repos ] ; then
-        echo "A subversion repository already exists and I will not overwrite it."
-		echo "Delete /home/svn/repos first if you're sure you want to have a clean version."
-	else
-		mkdir -p /home/svn
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create /home/svn/repos
-
-		einfo ">>> Setting repository permissions ..."
-		chown -Rf apache.apache /home/svn/repos
-		chmod -Rf 755 /home/svn/repos
-	fi
-}
-
diff --git a/dev-util/subversion/subversion-0.24.1.ebuild b/dev-util/subversion/subversion-0.24.1.ebuild
deleted file mode 100644
index b99a42f30c65..000000000000
--- a/dev-util/subversion/subversion-0.24.1.ebuild
+++ /dev/null
@@ -1,248 +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.1.ebuild,v 1.5 2003/06/26 20:17:17 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/4761/${P}.tar.gz"
-HOMEPAGE="http://subversion.tigris.org/"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="~x86 ~ppc"
-IUSE="ssl apache2 berkdb python"
-
-#
-#
-# 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? ( !>=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
-			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 apache; 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 /home/svn/repos
-    AuthType Basic
-    AuthName "Subversion repository"
-    AuthUserFile /home/svn/conf/svnusers
-    Require valid-user
-  </Location>
-</IfDefine>
-EOF
-	fi
-}
-
-pkg_postinst() {
-	if use berkdb; then
-		if use apache; 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 apache; then
-			einfo "To allow web access a htpasswd file needs to be created using the"
-			einfo "following command:"
-			einfo "   htpasswd2 -m -c /home/svn/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 /home/svn/repos ] ; then
-        echo "A subversion repository already exists and I will not overwrite it."
-		echo "Delete /home/svn/repos first if you're sure you want to have a clean version."
-	else
-		mkdir -p /home/svn
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create /home/svn/repos
-
-		einfo ">>> Setting repository permissions ..."
-		chown -Rf apache.apache /home/svn/repos
-		chmod -Rf 755 /home/svn/repos
-	fi
-}
-
diff --git a/dev-util/subversion/subversion-0.24.2.ebuild b/dev-util/subversion/subversion-0.26.0.ebuild
index aa73dc0660b6..aad3dfd2e966 100644
--- a/dev-util/subversion/subversion-0.24.2.ebuild
+++ b/dev-util/subversion/subversion-0.26.0.ebuild
@@ -1,13 +1,13 @@
 # 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.ebuild,v 1.2 2003/07/15 09:47:23 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.26.0.ebuild,v 1.1 2003/07/24 20:39:48 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"
+	http://subversion.tigris.org/files/documents/15/5322/${PN}-${PV}.tar.gz"
 HOMEPAGE="http://subversion.tigris.org/"
 
 SLOT="0"
@@ -15,6 +15,12 @@ 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
@@ -53,7 +59,7 @@ pkg_setup() {
 	
 src_unpack() {
 	cd ${WORKDIR}
-	unpack ${P}.tar.gz
+	unpack ${PN}-${PV}.tar.gz
 	use berkdb && ( has_version =db-4* || (
 		unpack db-${DB_VERSION}.tar.gz
 	) )
@@ -192,10 +198,10 @@ src_install () {
   </IfModule>
   <Location /svn/repos>
     DAV svn
-    SVNPath /home/svn/repos
+    SVNPath ${SVN_REPOS_LOC}/repos
     AuthType Basic
     AuthName "Subversion repository"
-    AuthUserFile /home/svn/conf/svnusers
+    AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers
     Require valid-user
   </Location>
 </IfDefine>
@@ -219,7 +225,7 @@ pkg_postinst() {
 		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 /home/svn/conf/svnusers USERNAME"
+			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"
@@ -231,19 +237,19 @@ 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 /home/svn/repos ] ; then
+	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 /home/svn/repos first if you're sure you want to have a clean version."
+		echo "Delete ${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
 	else
-		mkdir -p /home/svn
+		mkdir -p ${SVN_REPOS_LOC}
 		einfo ">>> Populating repository directory ..."
 		# create initial repository
-		/usr/bin/svnadmin create /home/svn/repos
+		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
 
 		einfo ">>> Setting repository permissions ..."
-		chown -Rf apache.apache /home/svn/repos
-		chmod -Rf 755 /home/svn/repos
+		chown -Rf apache.apache ${SVN_REPOS_LOC}/repos
+		chmod -Rf 755 ${SVN_REPOS_LOC}/repos
 	fi
 }