Clean up old versions

16 files changed, 8 insertions, 2222 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 0f57184e5674..d47204a25bae 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.104 2004/10/01 11:58:02 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.105 2004/10/01 12:03:27 pauldv Exp $
+
+  01 Oct 2004; <pauldv@gentoo.org> -files/subversion-pre-1.0.5.patch,
+  -subversion-1.0.1.ebuild, -subversion-1.0.2.ebuild,
+  -subversion-1.0.3.ebuild, -subversion-1.0.4-r1.ebuild,
+  -subversion-1.0.4.ebuild, -subversion-1.0.6.ebuild,
+  -subversion-1.1.0_rc4.ebuild:
+  Clean up old versions
 
 *subversion-1.1.0 (01 Oct 2004)
 
diff --git a/dev-util/subversion/files/digest-subversion-1.0.1 b/dev-util/subversion/files/digest-subversion-1.0.1
deleted file mode 100644
index 5590408f17d4..000000000000
--- a/dev-util/subversion/files/digest-subversion-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 50ca608d260b76d99ed85909acb7ae92 subversion-1.0.1.tar.bz2 6121252
diff --git a/dev-util/subversion/files/digest-subversion-1.0.2 b/dev-util/subversion/files/digest-subversion-1.0.2
deleted file mode 100644
index 6e1f9fed45ae..000000000000
--- a/dev-util/subversion/files/digest-subversion-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 246ffcc67ca629ae523956c4c1a67cce subversion-1.0.2.tar.bz2 5953050
diff --git a/dev-util/subversion/files/digest-subversion-1.0.3 b/dev-util/subversion/files/digest-subversion-1.0.3
deleted file mode 100644
index 703d7a810647..000000000000
--- a/dev-util/subversion/files/digest-subversion-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a8961f86a2bbd8deb59b2b62db303461 subversion-1.0.3.tar.bz2 6069514
diff --git a/dev-util/subversion/files/digest-subversion-1.0.4 b/dev-util/subversion/files/digest-subversion-1.0.4
deleted file mode 100644
index 07f7ef91db63..000000000000
--- a/dev-util/subversion/files/digest-subversion-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 313bd03f353683de7561eadf477f7612 subversion-1.0.4.tar.bz2 6081806
diff --git a/dev-util/subversion/files/digest-subversion-1.0.4-r1 b/dev-util/subversion/files/digest-subversion-1.0.4-r1
deleted file mode 100644
index 07f7ef91db63..000000000000
--- a/dev-util/subversion/files/digest-subversion-1.0.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 313bd03f353683de7561eadf477f7612 subversion-1.0.4.tar.bz2 6081806
diff --git a/dev-util/subversion/files/digest-subversion-1.0.6 b/dev-util/subversion/files/digest-subversion-1.0.6
deleted file mode 100644
index e3bc141d0384..000000000000
--- a/dev-util/subversion/files/digest-subversion-1.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb05fe041fef7491b3555904d97f5e1c subversion-1.0.6.tar.bz2 6022074
diff --git a/dev-util/subversion/files/digest-subversion-1.1.0_rc4 b/dev-util/subversion/files/digest-subversion-1.1.0_rc4
deleted file mode 100644
index 880925ed8ff9..000000000000
--- a/dev-util/subversion/files/digest-subversion-1.1.0_rc4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 41bb75f16f337bff2dedb7ee51ee43a1 subversion-1.1.0-rc4.tar.bz2 6649685
diff --git a/dev-util/subversion/files/subversion-pre-1.0.5.patch b/dev-util/subversion/files/subversion-pre-1.0.5.patch
deleted file mode 100644
index a73338552201..000000000000
--- a/dev-util/subversion/files/subversion-pre-1.0.5.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Index: subversion/libsvn_ra_svn/marshal.c
-===================================================================
---- subversion/libsvn_ra_svn/marshal.c	(revision 9837)
-+++ subversion/libsvn_ra_svn/marshal.c	(working copy)
-@@ -479,13 +479,49 @@
- 
- /* --- READING DATA ITEMS --- */
- 
-+/* Read LEN bytes from CONN into already-allocated structure ITEM.
-+ * Afterwards, *ITEM is of type 'SVN_RA_SVN_STRING', and its string
-+ * data is allocated in POOL. */
-+static svn_error_t *read_string(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
-+                                svn_ra_svn_item_t *item, apr_uint64_t len)
-+{
-+  char readbuf[4096];
-+  apr_size_t readbuf_len;
-+  svn_stringbuf_t *stringbuf = svn_stringbuf_create ("", pool);
-+
-+  /* We can't store strings longer than the maximum size of apr_size_t,
-+   * so check for wrapping */
-+  if (((apr_size_t) len) < len) 
-+    return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
-+                            "String length larger than maximum");
-+
-+  while (len)
-+    {
-+      readbuf_len = len > sizeof(readbuf) ? sizeof(readbuf) : len;
-+
-+      SVN_ERR(readbuf_read(conn, pool, readbuf, readbuf_len));
-+      /* Read into a stringbuf_t to so we don't allow the sender to allocate
-+       * an arbitrary amount of memory without actually sending us that much
-+       * data */
-+      svn_stringbuf_appendbytes(stringbuf, readbuf, readbuf_len);
-+      len -= readbuf_len;
-+    }
-+  
-+  item->kind = SVN_RA_SVN_STRING;
-+  item->u.string = apr_palloc(pool, sizeof(*item->u.string));
-+  item->u.string->data = stringbuf->data;
-+  item->u.string->len = stringbuf->len;
-+
-+  return SVN_NO_ERROR; 
-+}
-+
- /* Given the first non-whitespace character FIRST_CHAR, read an item
-  * into the already allocated structure ITEM. */
- static svn_error_t *read_item(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
-                               svn_ra_svn_item_t *item, char first_char)
- {
--  char c = first_char, *strdata;
--  apr_uint64_t val;
-+  char c = first_char;
-+  apr_uint64_t val, prev_val=0;
-   svn_stringbuf_t *str;
-   svn_ra_svn_item_t *listitem;
- 
-@@ -498,21 +534,19 @@
-       val = c - '0';
-       while (1)
-         {
-+          prev_val = val;
-           SVN_ERR(readbuf_getchar(conn, pool, &c));
-           if (!apr_isdigit(c))
-             break;
-           val = val * 10 + (c - '0');
-+          if ((val / 10) != prev_val) /* val wrapped past maximum value */
-+            return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
-+                                    "Number is larger than maximum"); 
-         }
-       if (c == ':')
-         {
-           /* It's a string. */
--          strdata = apr_palloc(pool, val + 1);
--          SVN_ERR(readbuf_read(conn, pool, strdata, val));
--          strdata[val] = '\0';
--          item->kind = SVN_RA_SVN_STRING;
--          item->u.string = apr_palloc(pool, sizeof(*item->u.string));
--          item->u.string->data = strdata;
--          item->u.string->len = val;
-+          SVN_ERR(read_string(conn, pool, item, val));
-           SVN_ERR(readbuf_getchar(conn, pool, &c));
-         }
-       else
-@@ -521,7 +555,6 @@
-           item->kind = SVN_RA_SVN_NUMBER;
-           item->u.number = val;
-         }
--      return SVN_NO_ERROR;
-     }
-   else if (apr_isalpha(c))
-     {
\ No newline at end of file
diff --git a/dev-util/subversion/subversion-1.0.1.ebuild b/dev-util/subversion/subversion-1.0.1.ebuild
deleted file mode 100644
index 7fb9b11c2ce5..000000000000
--- a/dev-util/subversion/subversion-1.0.1.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.0.1.ebuild,v 1.7 2004/09/03 16:53:53 pvdabeel Exp $
-
-inherit elisp-common libtool python eutils
-
-DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="http://subversion.tigris.org/tarballs/${P}.tar.bz2"
-HOMEPAGE="http://subversion.tigris.org/"
-
-python_version
-PYTHON_DIR=/usr/lib/python${PYVER}
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="x86 ~sparc ppc ~amd64"
-IUSE="ssl apache2 berkdb python emacs perl"
-
-S=${WORKDIR}/${PN}-${PV}
-
-#Allow for custion repository locations
-if [ "${SVN_REPOS_LOC}x" = "x" ]; then
-	SVN_REPOS_LOC="/var/svn"
-fi
-
-#
-#
-# Note that to disable the server part of subversion you need to specify
-# USE="-berkdb" emerge subversion.
-#
-#
-
-RDEPEND="python? ( >=dev-lang/python-2.0 )
-	apache2? ( >=net-www/apache-2.0.48 )
-	!apache2? ( !>=net-www/apache-2* )
-	!dev-libs/apr
-	python? ( || ( >=dev-lang/swig-1.3.21
-			=dev-lang/swig-1.3.19
-	) )
-	perl? ( !python? ( || ( >=dev-lang/swig-1.3.21
-			=dev-lang/swig-1.3.19
-		) )
-		>=dev-lang/perl-5.8 )
-	>=net-misc/neon-0.24.4
-	berkdb? ( =sys-libs/db-4* )
-	emacs? ( virtual/emacs )"
-
-DEPEND="${RDEPEND}
-	|| (
-		>=sys-devel/autoconf-2.59
-		=sys-devel/autoconf-2.57*
-	)"
-
-pkg_setup() {
-	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [ "${SVN_DUMPED}" == "" ]; then
-		einfo ""
-		ewarn ":  Now you have $(best_version subversion)"
-		ewarn " Subversion has changed the repository filesystem schema from 0.34.0."
-		ewarn " So you MUST dump your repositories before upgrading."
-		ewarn ""
-		ewarn "After doing so call emerge with SVN_DUMPED=1 emerge !!"
-		einfo ""
-		einfo "More details on dumping:"
-		einfo "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
-		die "ensure that you dump your repository first"
-	fi
-
-	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. Specifying the apache2 useflag will also enable the building of"
-		einfo "the apache2 module."
-	fi
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${PN}-${PV}.tar.bz2
-	cd ${S}
-
-	epatch ${FILESDIR}/subversion-db4.patch
-	export WANT_AUTOCONF_2_5=1
-	elibtoolize
-	autoconf
-	(cd apr; autoconf)
-	(cd apr-util; autoconf)
-	sed -i -e 's,\(subversion/svnversion/svnversion\)\(>.*svn-revision.txt\),echo "external" \2,' Makefile.in
-}
-
-src_compile() {
-	local myconf
-
-	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"
-
-	use berkdb && myconf="${myconf} --with-berkeley-db"
-	use berkdb || myconf="${myconf} --without-berkeley-db"
-
-	use python && myconf="${myconf} --with-python=/usr/bin/python --with-swig"
-	use python || myconf="${myconf} --without-python --without-swig"
-
-	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 berkdb; then
-		if use python; 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
-		if use perl; then
-			make swig-pl-lib || die "Perl library building failed"
-			cd subversion/bindings/swig/perl
-			APR_CONFIG=/usr/bin/apr-config DESTDIR=${D} perl Makefile.PL
-			make all
-			cd ${S}
-		fi
-	fi
-	cd ${S}
-	if use emacs; then
-		einfo "compiling emacs support"
-		elisp-compile ${S}/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
-		elisp-compile ${S}/contrib/client-side/vc-svn.el || die "emacs modules failed"
-	fi
-}
-
-
-src_install () {
-	use apache2 && mkdir -p ${D}/etc/apache2/conf
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-	if [ -e ${D}/usr/lib/apache2 ]; then
-		if has_version '>=net-www/apache-2.0.48-r2'; then
-			mv ${D}/usr/lib/apache2/modules ${D}/usr/lib/apache2-extramodules
-			rmdir ${D}/usr/lib/apache2
-		else
-			mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
-		fi
-	fi
-
-	if use berkdb; then
-		dobin svn-config
-		if use python; then
-			make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}  LD_LIBRARY_PATH="-L${D}/usr/lib" || die "Installation of subversion python bindings failed"
-			# 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}${PYTHON_DIR}/site-packages
-			cp -r tools/cvs2svn/rcsparse ${D}${PYTHON_DIR}/site-packages
-			mv ${D}/usr/lib/svn-python/svn ${D}${PYTHON_DIR}/site-packages
-			mv ${D}/usr/lib/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages
-			rmdir ${D}/usr/lib/svn-python
-		fi
-		if use perl; then
-			make DESTDIR=${D} install-swig-pl-lib || die "Perl library building failed"
-			cd subversion/bindings/swig/perl
-			make DESTDIR=${D} install
-			cd ${S}
-		fi
-	fi
-
-	dodoc BUGS COMMITTERS COPYING HACKING INSTALL 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
-
-	# install emacs lisps
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp/subversion
-		doins contrib/client-side/psvn/psvn.el*
-		doins  contrib/client-side/vc-svn.el*
-
-		elisp-site-file-install ${FILESDIR}/70svn-gentoo.el
-	fi
-
-
-
-	#Install apache module config
-	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() {
-
-	use emacs && elisp-site-regen
-	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"
-		einfo ""
-		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\""
-
-		if use apache2; then
-			einfo ""
-			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_postrm() {
-	has_version virtual/emacs && elisp-site-regen
-}
-
-pkg_config() {
-	if [ ! -x /usr/bin/svnadmin ]; then
-		die "You seem to only have build the subversion client"
-	fi
-	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
-	if [ -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}/conf
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
-
-		einfo ">>> Setting repository permissions ..."
-		chown -Rf apache:apache ${SVN_REPOS_LOC}/repos
-		chmod -Rf 755 ${SVN_REPOS_LOC}/repos
-	fi
-}
diff --git a/dev-util/subversion/subversion-1.0.2.ebuild b/dev-util/subversion/subversion-1.0.2.ebuild
deleted file mode 100644
index f3b58346f90b..000000000000
--- a/dev-util/subversion/subversion-1.0.2.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.0.2.ebuild,v 1.7 2004/09/03 16:53:53 pvdabeel Exp $
-
-inherit elisp-common libtool python eutils
-
-DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="http://subversion.tigris.org/tarballs/${P}.tar.bz2"
-HOMEPAGE="http://subversion.tigris.org/"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="x86 ~sparc ppc ~amd64"
-IUSE="ssl apache2 berkdb python emacs perl java"
-
-S=${WORKDIR}/${PN}-${PV}
-
-#Allow for custion repository locations
-if [ "${SVN_REPOS_LOC}x" = "x" ]; then
-	SVN_REPOS_LOC="/var/svn"
-fi
-
-#
-#
-# Note that to disable the server part of subversion you need to specify
-# USE="-berkdb" emerge subversion.
-#
-#
-
-RDEPEND="python? ( >=dev-lang/python-2.0 )
-	apache2? ( >=net-www/apache-2.0.48 )
-	!apache2? ( !>=net-www/apache-2* )
-	!dev-libs/apr
-	python? ( || ( >=dev-lang/swig-1.3.21
-			=dev-lang/swig-1.3.19
-	) )
-	perl? ( !python? ( || ( >=dev-lang/swig-1.3.21
-			=dev-lang/swig-1.3.19
-		) )
-		>=dev-lang/perl-5.8 )
-	>=net-misc/neon-0.24.4
-	berkdb? ( =sys-libs/db-4*
-		java? ( virtual/jdk ) )
-	emacs? ( virtual/emacs )"
-
-DEPEND="${RDEPEND}
-	|| (
-		>=sys-devel/autoconf-2.59
-		=sys-devel/autoconf-2.57*
-	)"
-
-pkg_setup() {
-	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [ "${SVN_DUMPED}" == "" ]; then
-		einfo ""
-		ewarn ":  Now you have $(best_version subversion)"
-		ewarn " Subversion has changed the repository filesystem schema from 0.34.0."
-		ewarn " So you MUST dump your repositories before upgrading."
-		ewarn ""
-		ewarn "After doing so call emerge with SVN_DUMPED=1 emerge !!"
-		einfo ""
-		einfo "More details on dumping:"
-		einfo "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
-		die "ensure that you dump your repository first"
-	fi
-
-	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. Specifying the apache2 useflag will also enable the building of"
-		einfo "the apache2 module."
-	fi
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${PN}-${PV}.tar.bz2
-	cd ${S}
-
-	epatch ${FILESDIR}/subversion-db4.patch
-	export WANT_AUTOCONF_2_5=1
-	elibtoolize
-	autoconf
-	(cd apr; autoconf)
-	(cd apr-util; autoconf)
-	sed -i -e 's,\(subversion/svnversion/svnversion\)\(>.*svn-revision.txt\),echo "external" \2,' Makefile.in
-}
-
-src_compile() {
-	local myconf
-
-	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"
-
-	use berkdb && myconf="${myconf} --with-berkeley-db"
-	use berkdb || myconf="${myconf} --without-berkeley-db"
-
-	use python && myconf="${myconf} --with-python=/usr/bin/python --with-swig"
-	use python || myconf="${myconf} --without-python --without-swig"
-
-	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 berkdb; then
-		if use python; 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
-		if use perl; then
-			make swig-pl-lib || die "Perl library building failed"
-			cd subversion/bindings/swig/perl
-			APR_CONFIG=/usr/bin/apr-config DESTDIR=${D} perl Makefile.PL
-			make all
-			cd ${S}
-		fi
-		if use java; then
-			cd ${S}/subversion/bindings/java/javahl
-			WANT_AUTOMAKE=1.6 WANT_AUTOCONF=2.53 ./autogen.sh
-			use apache2 && myconfj="--with-apxs=/usr/sbin/apxs2 \
-				--with-apr=/usr --with-apr-util=/usr"
-			use apache2 || myconfj=""
-			econf ${myconfj} || die "Configuration failed"
-			make || die "Compilation failed"
-			cd ${S}
-		fi
-	fi
-	cd ${S}
-	if use emacs; then
-		einfo "compiling emacs support"
-		elisp-compile ${S}/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
-		elisp-compile ${S}/contrib/client-side/vc-svn.el || die "emacs modules failed"
-	fi
-}
-
-
-src_install () {
-	use apache2 && mkdir -p ${D}/etc/apache2/conf
-
-	python_version
-	PYTHON_DIR=/usr/lib/python${PYVER}
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-	if [ -e ${D}/usr/lib/apache2 ]; then
-		if has_version '>=net-www/apache-2.0.48-r2'; then
-			mv ${D}/usr/lib/apache2/modules ${D}/usr/lib/apache2-extramodules
-			rmdir ${D}/usr/lib/apache2
-		else
-			mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
-		fi
-	fi
-
-	if use berkdb; then
-		dobin svn-config
-		if use python; then
-			make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}  LD_LIBRARY_PATH="-L${D}/usr/lib" || die "Installation of subversion python bindings failed"
-			# 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}${PYTHON_DIR}/site-packages
-			cp -r tools/cvs2svn/rcsparse ${D}${PYTHON_DIR}/site-packages
-			mv ${D}/usr/lib/svn-python/svn ${D}${PYTHON_DIR}/site-packages
-			mv ${D}/usr/lib/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages
-			rmdir ${D}/usr/lib/svn-python
-		fi
-		if use perl; then
-			make DESTDIR=${D} install-swig-pl-lib || die "Perl library building failed"
-			cd subversion/bindings/swig/perl
-			make DESTDIR=${D} install
-			cd ${S}
-		fi
-		if use java; then
-			cd ${S}/subversion/bindings/java/javahl
-			make DESTDIR="${D}" install || die "installation failed"
-			cd ${S}
-		fi
-	fi
-
-	dodoc BUGS COMMITTERS COPYING HACKING INSTALL 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
-
-	# install emacs lisps
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp/subversion
-		doins contrib/client-side/psvn/psvn.el*
-		doins  contrib/client-side/vc-svn.el*
-
-		elisp-site-file-install ${FILESDIR}/70svn-gentoo.el
-	fi
-
-
-
-	#Install apache module config
-	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() {
-
-	use emacs && elisp-site-regen
-	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"
-		einfo ""
-		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\""
-
-		if use apache2; then
-			einfo ""
-			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_postrm() {
-	has_version virtual/emacs && elisp-site-regen
-}
-
-pkg_config() {
-	if [ ! -x /usr/bin/svnadmin ]; then
-		die "You seem to only have build the subversion client"
-	fi
-	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
-	if [ -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}/conf
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
-
-		einfo ">>> Setting repository permissions ..."
-		chown -Rf apache:apache ${SVN_REPOS_LOC}/repos
-		chmod -Rf 755 ${SVN_REPOS_LOC}/repos
-	fi
-}
diff --git a/dev-util/subversion/subversion-1.0.3.ebuild b/dev-util/subversion/subversion-1.0.3.ebuild
deleted file mode 100644
index 9c5dad25e8b9..000000000000
--- a/dev-util/subversion/subversion-1.0.3.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.0.3.ebuild,v 1.5 2004/09/03 16:53:53 pvdabeel Exp $
-
-inherit elisp-common libtool python eutils
-
-DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="http://subversion.tigris.org/tarballs/${P}.tar.bz2"
-HOMEPAGE="http://subversion.tigris.org/"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="x86 ~sparc ppc amd64 ~alpha"
-IUSE="ssl apache2 berkdb python emacs perl java"
-
-S=${WORKDIR}/${PN}-${PV}
-
-#Allow for custion repository locations
-if [ "${SVN_REPOS_LOC}x" = "x" ]; then
-	SVN_REPOS_LOC="/var/svn"
-fi
-
-#
-#
-# Note that to disable the server part of subversion you need to specify
-# USE="-berkdb" emerge subversion.
-#
-#
-
-RDEPEND="python? ( >=dev-lang/python-2.0 )
-	apache2? ( >=net-www/apache-2.0.48 )
-	!apache2? ( !>=net-www/apache-2* )
-	!dev-libs/apr
-	python? ( || ( >=dev-lang/swig-1.3.21
-			=dev-lang/swig-1.3.19
-	) )
-	perl? ( !python? ( || ( >=dev-lang/swig-1.3.21
-			=dev-lang/swig-1.3.19
-		) )
-		>=dev-lang/perl-5.8 )
-	>=net-misc/neon-0.24.4
-	berkdb? ( =sys-libs/db-4*
-		java? ( virtual/jdk ) )
-	emacs? ( virtual/emacs )"
-
-DEPEND="${RDEPEND}
-	|| (
-		>=sys-devel/autoconf-2.59
-		=sys-devel/autoconf-2.57*
-	)"
-
-pkg_setup() {
-	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [ "${SVN_DUMPED}" == "" ]; then
-		einfo ""
-		ewarn ":  Now you have $(best_version subversion)"
-		ewarn " Subversion has changed the repository filesystem schema from 0.34.0."
-		ewarn " So you MUST dump your repositories before upgrading."
-		ewarn ""
-		ewarn "After doing so call emerge with SVN_DUMPED=1 emerge !!"
-		einfo ""
-		einfo "More details on dumping:"
-		einfo "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
-		die "ensure that you dump your repository first"
-	fi
-
-	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. Specifying the apache2 useflag will also enable the building of"
-		einfo "the apache2 module."
-	fi
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${PN}-${PV}.tar.bz2
-	cd ${S}
-
-	epatch ${FILESDIR}/subversion-db4.patch
-	export WANT_AUTOCONF_2_5=1
-	elibtoolize
-	autoconf
-	(cd apr; autoconf)
-	(cd apr-util; autoconf)
-	sed -i -e 's,\(subversion/svnversion/svnversion\)\(>.*svn-revision.txt\),echo "external" \2,' Makefile.in
-}
-
-src_compile() {
-	local myconf
-
-	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"
-
-	use berkdb && myconf="${myconf} --with-berkeley-db"
-	use berkdb || myconf="${myconf} --without-berkeley-db"
-
-	use python && myconf="${myconf} --with-python=/usr/bin/python --with-swig"
-	use python || myconf="${myconf} --without-python --without-swig"
-
-	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 berkdb; then
-		if use python; 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
-		if use perl; then
-			make swig-pl-lib || die "Perl library building failed"
-			cd subversion/bindings/swig/perl
-			APR_CONFIG=/usr/bin/apr-config DESTDIR=${D} perl Makefile.PL
-			make all
-			cd ${S}
-		fi
-		if use java; then
-			cd ${S}/subversion/bindings/java/javahl
-			WANT_AUTOMAKE=1.6 WANT_AUTOCONF=2.53 ./autogen.sh
-			use apache2 && myconfj="--with-apxs=/usr/sbin/apxs2 \
-				--with-apr=/usr --with-apr-util=/usr"
-			use apache2 || myconfj=""
-			econf ${myconfj} || die "Configuration failed"
-			make || die "Compilation failed"
-			cd ${S}
-		fi
-	fi
-	cd ${S}
-	if use emacs; then
-		einfo "compiling emacs support"
-		elisp-compile ${S}/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
-		elisp-compile ${S}/contrib/client-side/vc-svn.el || die "emacs modules failed"
-	fi
-}
-
-
-src_install () {
-	use apache2 && mkdir -p ${D}/etc/apache2/conf
-
-	python_version
-	PYTHON_DIR=/usr/lib/python${PYVER}
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-	if [ -e ${D}/usr/lib/apache2 ]; then
-		if has_version '>=net-www/apache-2.0.48-r2'; then
-			mv ${D}/usr/lib/apache2/modules ${D}/usr/lib/apache2-extramodules
-			rmdir ${D}/usr/lib/apache2
-		else
-			mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
-		fi
-	fi
-
-	if use berkdb; then
-		dobin svn-config
-		if use python; then
-			make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}  LD_LIBRARY_PATH="-L${D}/usr/lib" || die "Installation of subversion python bindings failed"
-			# 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}${PYTHON_DIR}/site-packages
-			cp -r tools/cvs2svn/rcsparse ${D}${PYTHON_DIR}/site-packages
-			mv ${D}/usr/lib/svn-python/svn ${D}${PYTHON_DIR}/site-packages
-			mv ${D}/usr/lib/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages
-			rmdir ${D}/usr/lib/svn-python
-		fi
-		if use perl; then
-			make DESTDIR=${D} install-swig-pl-lib || die "Perl library building failed"
-			cd subversion/bindings/swig/perl
-			make DESTDIR=${D} install
-			cd ${S}
-		fi
-		if use java; then
-			cd ${S}/subversion/bindings/java/javahl
-			make DESTDIR="${D}" install || die "installation failed"
-			cd ${S}
-		fi
-	fi
-
-	dodoc BUGS COMMITTERS COPYING HACKING INSTALL 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
-
-	# install emacs lisps
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp/subversion
-		doins contrib/client-side/psvn/psvn.el*
-		doins  contrib/client-side/vc-svn.el*
-
-		elisp-site-file-install ${FILESDIR}/70svn-gentoo.el
-	fi
-
-
-
-	#Install apache module config
-	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() {
-
-	use emacs && elisp-site-regen
-	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"
-		einfo ""
-		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\""
-
-		if use apache2; then
-			einfo ""
-			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_postrm() {
-	has_version virtual/emacs && elisp-site-regen
-}
-
-pkg_config() {
-	if [ ! -x /usr/bin/svnadmin ]; then
-		die "You seem to only have build the subversion client"
-	fi
-	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
-	if [ -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}/conf
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
-
-		einfo ">>> Setting repository permissions ..."
-		chown -Rf apache:apache ${SVN_REPOS_LOC}/repos
-		chmod -Rf 755 ${SVN_REPOS_LOC}/repos
-	fi
-}
diff --git a/dev-util/subversion/subversion-1.0.4-r1.ebuild b/dev-util/subversion/subversion-1.0.4-r1.ebuild
deleted file mode 100644
index 088b7e9d5c4a..000000000000
--- a/dev-util/subversion/subversion-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.0.4-r1.ebuild,v 1.9 2004/09/03 16:53:53 pvdabeel Exp $
-
-inherit elisp-common libtool python eutils
-
-DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="http://subversion.tigris.org/tarballs/${P}.tar.bz2"
-HOMEPAGE="http://subversion.tigris.org/"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="x86 sparc ppc amd64 alpha hppa"
-IUSE="ssl apache2 berkdb python emacs perl java"
-
-S=${WORKDIR}/${PN}-${PV}
-
-#Allow for custion repository locations
-if [ "${SVN_REPOS_LOC}x" = "x" ]; then
-	SVN_REPOS_LOC="/var/svn"
-fi
-
-#
-#
-# Note that to disable the server part of subversion you need to specify
-# USE="-berkdb" emerge subversion.
-#
-#
-
-RDEPEND="python? ( >=dev-lang/python-2.0 )
-	apache2? ( >=net-www/apache-2.0.48 )
-	!apache2? ( !>=net-www/apache-2* )
-	!dev-libs/apr
-	python? ( || ( >=dev-lang/swig-1.3.21
-			=dev-lang/swig-1.3.19
-	) )
-	perl? ( !python? ( || ( >=dev-lang/swig-1.3.21
-			=dev-lang/swig-1.3.19
-		) )
-		>=dev-lang/perl-5.8 )
-	>=net-misc/neon-0.24.4
-	berkdb? ( =sys-libs/db-4*
-		java? ( virtual/jdk ) )
-	emacs? ( virtual/emacs )"
-
-DEPEND="${RDEPEND}
-	|| (
-		>=sys-devel/autoconf-2.59
-		=sys-devel/autoconf-2.57*
-	)
-	!=sys-devel/autoconf-2.58"
-
-pkg_setup() {
-	if has_version =sys-devel/autoconf-2.58*; then
-		die "Subversion WILL NOT BUILD with autoconf-2.58"
-	fi
-
-	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [ "${SVN_DUMPED}" == "" ]; then
-		einfo ""
-		ewarn ":  Now you have $(best_version subversion)"
-		ewarn " Subversion has changed the repository filesystem schema from 0.34.0."
-		ewarn " So you MUST dump your repositories before upgrading."
-		ewarn ""
-		ewarn "After doing so call emerge with SVN_DUMPED=1 emerge !!"
-		einfo ""
-		einfo "More details on dumping:"
-		einfo "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
-		die "ensure that you dump your repository first"
-	fi
-
-	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. Specifying the apache2 useflag will also enable the building of"
-		einfo "the apache2 module."
-	fi
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${PN}-${PV}.tar.bz2
-	cd ${S}
-
-	epatch ${FILESDIR}/subversion-db4.patch
-	epatch ${FILESDIR}/${PN}-pre-1.0.5.patch
-
-	export WANT_AUTOCONF_2_5=1
-	elibtoolize
-	autoconf
-	(cd apr; autoconf)
-	(cd apr-util; autoconf)
-	sed -i -e 's,\(subversion/svnversion/svnversion\)\(>.*svn-revision.txt\),echo "external" \2,' Makefile.in
-}
-
-src_compile() {
-	local myconf
-
-	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"
-
-	use berkdb && myconf="${myconf} --with-berkeley-db"
-	use berkdb || myconf="${myconf} --without-berkeley-db"
-
-	use python && myconf="${myconf} --with-python=/usr/bin/python --with-swig"
-	use python || myconf="${myconf} --without-python --without-swig"
-
-	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 berkdb; then
-		if use python; 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
-		if use perl; then
-			make swig-pl-lib || die "Perl library building failed"
-			cd subversion/bindings/swig/perl
-			APR_CONFIG=/usr/bin/apr-config DESTDIR=${D} perl Makefile.PL
-			make all
-			cd ${S}
-		fi
-		if use java; then
-			cd ${S}/subversion/bindings/java/javahl
-			WANT_AUTOMAKE=1.6 WANT_AUTOCONF=2.53 ./autogen.sh
-			use apache2 && myconfj="--with-apxs=/usr/sbin/apxs2 \
-				--with-apr=/usr --with-apr-util=/usr"
-			use apache2 || myconfj=""
-			econf ${myconfj} || die "Configuration failed"
-			make || die "Compilation failed"
-			cd ${S}
-		fi
-	fi
-	cd ${S}
-	if use emacs; then
-		einfo "compiling emacs support"
-		elisp-compile ${S}/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
-		elisp-compile ${S}/contrib/client-side/vc-svn.el || die "emacs modules failed"
-	fi
-}
-
-
-src_install () {
-	use apache2 && mkdir -p ${D}/etc/apache2/conf
-
-	python_version
-	PYTHON_DIR=/usr/lib/python${PYVER}
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-	if [ -e ${D}/usr/lib/apache2 ]; then
-		if has_version '>=net-www/apache-2.0.48-r2'; then
-			mv ${D}/usr/lib/apache2/modules ${D}/usr/lib/apache2-extramodules
-			rmdir ${D}/usr/lib/apache2
-		else
-			mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
-		fi
-	fi
-
-	if use berkdb; then
-		dobin svn-config
-		if use python; then
-			make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}  LD_LIBRARY_PATH="-L${D}/usr/lib" || die "Installation of subversion python bindings failed"
-			# 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}${PYTHON_DIR}/site-packages
-			cp -r tools/cvs2svn/rcsparse ${D}${PYTHON_DIR}/site-packages
-			mv ${D}/usr/lib/svn-python/svn ${D}${PYTHON_DIR}/site-packages
-			mv ${D}/usr/lib/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages
-			rmdir ${D}/usr/lib/svn-python
-		fi
-		if use perl; then
-			make DESTDIR=${D} install-swig-pl-lib || die "Perl library building failed"
-			cd subversion/bindings/swig/perl
-			make DESTDIR=${D} install
-			cd ${S}
-		fi
-		if use java; then
-			cd ${S}/subversion/bindings/java/javahl
-			make DESTDIR="${D}" install || die "installation failed"
-			cd ${S}
-		fi
-	fi
-
-	dodoc BUGS COMMITTERS COPYING HACKING INSTALL 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
-
-	# install emacs lisps
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp/subversion
-		doins contrib/client-side/psvn/psvn.el*
-		doins  contrib/client-side/vc-svn.el*
-
-		elisp-site-file-install ${FILESDIR}/70svn-gentoo.el
-	fi
-
-
-
-	#Install apache module config
-	if useq apache2 && useq berkdb; 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() {
-
-	use emacs && elisp-site-regen
-	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 <path to ${PVR}.ebuild> config\" command"
-		einfo "or using svnadmin (see man svnadmin) if this subversion install is used as server"
-		einfo ""
-		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\""
-
-		if use apache2; then
-			einfo ""
-			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_postrm() {
-	has_version virtual/emacs && elisp-site-regen
-}
-
-pkg_config() {
-	if [ ! -x /usr/bin/svnadmin ]; then
-		die "You seem to only have build the subversion client"
-	fi
-	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
-	if [ -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}/conf
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
-
-		einfo ">>> Setting repository permissions ..."
-		chown -Rf apache:apache ${SVN_REPOS_LOC}/repos
-		chmod -Rf 755 ${SVN_REPOS_LOC}/repos
-	fi
-}
diff --git a/dev-util/subversion/subversion-1.0.4.ebuild b/dev-util/subversion/subversion-1.0.4.ebuild
deleted file mode 100644
index 9db0c4a7cc86..000000000000
--- a/dev-util/subversion/subversion-1.0.4.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.0.4.ebuild,v 1.3 2004/06/25 02:47:52 agriffis Exp $
-
-inherit elisp-common libtool python eutils
-
-DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="http://subversion.tigris.org/tarballs/${P}.tar.bz2"
-HOMEPAGE="http://subversion.tigris.org/"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~alpha"
-IUSE="ssl apache2 berkdb python emacs perl java"
-
-S=${WORKDIR}/${PN}-${PV}
-
-#Allow for custion repository locations
-if [ "${SVN_REPOS_LOC}x" = "x" ]; then
-	SVN_REPOS_LOC="/var/svn"
-fi
-
-#
-#
-# Note that to disable the server part of subversion you need to specify
-# USE="-berkdb" emerge subversion.
-#
-#
-
-RDEPEND="python? ( >=dev-lang/python-2.0 )
-	apache2? ( >=net-www/apache-2.0.48 )
-	!apache2? ( !>=net-www/apache-2* )
-	!dev-libs/apr
-	python? ( || ( >=dev-lang/swig-1.3.21
-			=dev-lang/swig-1.3.19
-	) )
-	perl? ( !python? ( || ( >=dev-lang/swig-1.3.21
-			=dev-lang/swig-1.3.19
-		) )
-		>=dev-lang/perl-5.8 )
-	>=net-misc/neon-0.24.4
-	berkdb? ( =sys-libs/db-4*
-		java? ( virtual/jdk ) )
-	emacs? ( virtual/emacs )"
-
-DEPEND="${RDEPEND}
-	|| (
-		>=sys-devel/autoconf-2.59
-		=sys-devel/autoconf-2.57*
-	)
-	!=sys-devel/autoconf-2.58"
-
-pkg_setup() {
-	if has_version =sys-devel/autoconf-2.58*; then
-		die "Subversion WILL NOT BUILD with autoconf-2.58"
-	fi
-
-	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [ "${SVN_DUMPED}" == "" ]; then
-		einfo ""
-		ewarn ":  Now you have $(best_version subversion)"
-		ewarn " Subversion has changed the repository filesystem schema from 0.34.0."
-		ewarn " So you MUST dump your repositories before upgrading."
-		ewarn ""
-		ewarn "After doing so call emerge with SVN_DUMPED=1 emerge !!"
-		einfo ""
-		einfo "More details on dumping:"
-		einfo "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
-		die "ensure that you dump your repository first"
-	fi
-
-	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. Specifying the apache2 useflag will also enable the building of"
-		einfo "the apache2 module."
-	fi
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${PN}-${PV}.tar.bz2
-	cd ${S}
-
-	epatch ${FILESDIR}/subversion-db4.patch
-	export WANT_AUTOCONF_2_5=1
-	elibtoolize
-	autoconf
-	(cd apr; autoconf)
-	(cd apr-util; autoconf)
-	sed -i -e 's,\(subversion/svnversion/svnversion\)\(>.*svn-revision.txt\),echo "external" \2,' Makefile.in
-}
-
-src_compile() {
-	local myconf
-
-	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"
-
-	use berkdb && myconf="${myconf} --with-berkeley-db"
-	use berkdb || myconf="${myconf} --without-berkeley-db"
-
-	use python && myconf="${myconf} --with-python=/usr/bin/python --with-swig"
-	use python || myconf="${myconf} --without-python --without-swig"
-
-	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 berkdb; then
-		if use python; 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
-		if use perl; then
-			make swig-pl-lib || die "Perl library building failed"
-			cd subversion/bindings/swig/perl
-			APR_CONFIG=/usr/bin/apr-config DESTDIR=${D} perl Makefile.PL
-			make all
-			cd ${S}
-		fi
-		if use java; then
-			cd ${S}/subversion/bindings/java/javahl
-			WANT_AUTOMAKE=1.6 WANT_AUTOCONF=2.53 ./autogen.sh
-			use apache2 && myconfj="--with-apxs=/usr/sbin/apxs2 \
-				--with-apr=/usr --with-apr-util=/usr"
-			use apache2 || myconfj=""
-			econf ${myconfj} || die "Configuration failed"
-			make || die "Compilation failed"
-			cd ${S}
-		fi
-	fi
-	cd ${S}
-	if use emacs; then
-		einfo "compiling emacs support"
-		elisp-compile ${S}/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
-		elisp-compile ${S}/contrib/client-side/vc-svn.el || die "emacs modules failed"
-	fi
-}
-
-
-src_install () {
-	use apache2 && mkdir -p ${D}/etc/apache2/conf
-
-	python_version
-	PYTHON_DIR=/usr/lib/python${PYVER}
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-	if [ -e ${D}/usr/lib/apache2 ]; then
-		if has_version '>=net-www/apache-2.0.48-r2'; then
-			mv ${D}/usr/lib/apache2/modules ${D}/usr/lib/apache2-extramodules
-			rmdir ${D}/usr/lib/apache2
-		else
-			mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
-		fi
-	fi
-
-	if use berkdb; then
-		dobin svn-config
-		if use python; then
-			make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}  LD_LIBRARY_PATH="-L${D}/usr/lib" || die "Installation of subversion python bindings failed"
-			# 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}${PYTHON_DIR}/site-packages
-			cp -r tools/cvs2svn/rcsparse ${D}${PYTHON_DIR}/site-packages
-			mv ${D}/usr/lib/svn-python/svn ${D}${PYTHON_DIR}/site-packages
-			mv ${D}/usr/lib/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages
-			rmdir ${D}/usr/lib/svn-python
-		fi
-		if use perl; then
-			make DESTDIR=${D} install-swig-pl-lib || die "Perl library building failed"
-			cd subversion/bindings/swig/perl
-			make DESTDIR=${D} install
-			cd ${S}
-		fi
-		if use java; then
-			cd ${S}/subversion/bindings/java/javahl
-			make DESTDIR="${D}" install || die "installation failed"
-			cd ${S}
-		fi
-	fi
-
-	dodoc BUGS COMMITTERS COPYING HACKING INSTALL 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
-
-	# install emacs lisps
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp/subversion
-		doins contrib/client-side/psvn/psvn.el*
-		doins  contrib/client-side/vc-svn.el*
-
-		elisp-site-file-install ${FILESDIR}/70svn-gentoo.el
-	fi
-
-
-
-	#Install apache module config
-	if useq apache2 && useq berkdb; 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() {
-
-	use emacs && elisp-site-regen
-	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"
-		einfo ""
-		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\""
-
-		if use apache2; then
-			einfo ""
-			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_postrm() {
-	has_version virtual/emacs && elisp-site-regen
-}
-
-pkg_config() {
-	if [ ! -x /usr/bin/svnadmin ]; then
-		die "You seem to only have build the subversion client"
-	fi
-	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
-	if [ -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}/conf
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
-
-		einfo ">>> Setting repository permissions ..."
-		chown -Rf apache:apache ${SVN_REPOS_LOC}/repos
-		chmod -Rf 755 ${SVN_REPOS_LOC}/repos
-	fi
-}
diff --git a/dev-util/subversion/subversion-1.0.6.ebuild b/dev-util/subversion/subversion-1.0.6.ebuild
deleted file mode 100644
index 2a08fce744f5..000000000000
--- a/dev-util/subversion/subversion-1.0.6.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.0.6.ebuild,v 1.10 2004/09/21 08:25:31 pauldv Exp $
-
-inherit elisp-common libtool python eutils
-
-DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="http://subversion.tigris.org/tarballs/${P}.tar.bz2"
-HOMEPAGE="http://subversion.tigris.org/"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="x86 sparc ppc amd64 alpha hppa"
-IUSE="ssl apache2 berkdb python emacs perl java"
-
-S=${WORKDIR}/${PN}-${PV}
-
-#Allow for custion repository locations
-if [ "${SVN_REPOS_LOC}x" = "x" ]; then
-	SVN_REPOS_LOC="/var/svn"
-fi
-
-#
-#
-# Note that to disable the server part of subversion you need to specify
-# USE="-berkdb" emerge subversion.
-#
-#
-
-RDEPEND="python? ( >=dev-lang/python-2.0 )
-	apache2? ( >=net-www/apache-2.0.48 )
-	!apache2? ( !>=net-www/apache-2* )
-	!dev-libs/apr
-	python? ( || ( >=dev-lang/swig-1.3.21
-			=dev-lang/swig-1.3.19
-	) )
-	perl? ( !python? ( || ( >=dev-lang/swig-1.3.21
-			=dev-lang/swig-1.3.19
-		) )
-		>=dev-lang/perl-5.8 )
-	>=net-misc/neon-0.24.7
-	berkdb? ( =sys-libs/db-4*
-		java? ( virtual/jdk ) )
-	emacs? ( virtual/emacs )"
-
-DEPEND="${RDEPEND}
-	|| (
-		>=sys-devel/autoconf-2.59
-		=sys-devel/autoconf-2.57*
-	)
-	!=sys-devel/autoconf-2.58"
-
-pkg_setup() {
-	if has_version =sys-devel/autoconf-2.58*; then
-		die "Subversion WILL NOT BUILD with autoconf-2.58"
-	fi
-
-	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [ "${SVN_DUMPED}" == "" ]; then
-		einfo ""
-		ewarn ":  Now you have $(best_version subversion)"
-		ewarn " Subversion has changed the repository filesystem schema from 0.34.0."
-		ewarn " So you MUST dump your repositories before upgrading."
-		ewarn ""
-		ewarn "After doing so call emerge with SVN_DUMPED=1 emerge !!"
-		einfo ""
-		einfo "More details on dumping:"
-		einfo "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
-		die "ensure that you dump your repository first"
-	fi
-
-	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. Specifying the apache2 useflag will also enable the building of"
-		einfo "the apache2 module."
-	fi
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${PN}-${PV}.tar.bz2
-	cd ${S}
-
-	epatch ${FILESDIR}/subversion-db4.patch
-
-	export WANT_AUTOCONF_2_5=1
-	elibtoolize
-	autoconf
-	(cd apr; autoconf)
-	(cd apr-util; autoconf)
-	sed -i -e 's,\(subversion/svnversion/svnversion\)\(>.*svn-revision.txt\),echo "external" \2,' Makefile.in
-}
-
-src_compile() {
-	local myconf
-
-	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"
-
-	use berkdb && myconf="${myconf} --with-berkeley-db"
-	use berkdb || myconf="${myconf} --without-berkeley-db"
-
-	use python && myconf="${myconf} --with-python=/usr/bin/python"
-	use python || myconf="${myconf} --without-python"
-
-	if use python || use perl; then
-		myconf="${myconf} --with-swig"
-	else
-		myconf="${myconf} --without-swig"
-	fi
-
-	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 berkdb; then
-		if use python; 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
-		if use perl; then
-			make swig-pl-lib || die "Perl library building failed"
-			cd subversion/bindings/swig/perl
-			APR_CONFIG=/usr/bin/apr-config DESTDIR=${D} perl Makefile.PL
-			make all
-			cd ${S}
-		fi
-		if use java; then
-			cd ${S}/subversion/bindings/java/javahl
-			WANT_AUTOMAKE=1.6 WANT_AUTOCONF=2.53 ./autogen.sh
-			use apache2 && myconfj="--with-apxs=/usr/sbin/apxs2 \
-				--with-apr=/usr --with-apr-util=/usr"
-			use apache2 || myconfj=""
-			econf ${myconfj} || die "Configuration failed"
-			make JAVACFLAGS="-source 1.3 -encoding iso8859-1" || die "Compilation failed"
-			cd ${S}
-		fi
-	fi
-	cd ${S}
-	if use emacs; then
-		einfo "compiling emacs support"
-		elisp-compile ${S}/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
-		elisp-compile ${S}/contrib/client-side/vc-svn.el || die "emacs modules failed"
-	fi
-}
-
-
-src_install () {
-	use apache2 && mkdir -p ${D}/etc/apache2/conf
-
-	python_version
-	PYTHON_DIR=/usr/lib/python${PYVER}
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-	if [ -e ${D}/usr/lib/apache2 ]; then
-		if has_version '>=net-www/apache-2.0.48-r2'; then
-			mv ${D}/usr/lib/apache2/modules ${D}/usr/lib/apache2-extramodules
-			rmdir ${D}/usr/lib/apache2
-		else
-			mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
-		fi
-	fi
-
-	if use berkdb; then
-		dobin svn-config
-		if use python; then
-			make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}  LD_LIBRARY_PATH="-L${D}/usr/lib" || die "Installation of subversion python bindings failed"
-			# 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}${PYTHON_DIR}/site-packages
-			cp -r tools/cvs2svn/rcsparse ${D}${PYTHON_DIR}/site-packages
-			mv ${D}/usr/lib/svn-python/svn ${D}${PYTHON_DIR}/site-packages
-			mv ${D}/usr/lib/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages
-			rmdir ${D}/usr/lib/svn-python
-		fi
-		if use perl; then
-			make DESTDIR=${D} install-swig-pl-lib || die "Perl library building failed"
-			cd subversion/bindings/swig/perl
-			make DESTDIR=${D} install
-			cd ${S}
-		fi
-		if use java; then
-			cd ${S}/subversion/bindings/java/javahl
-			make DESTDIR="${D}" install || die "installation failed"
-			mkdir -p ${D}/usr/lib/svn-javahl/
-			mv ${D}/usr/share/svn-javahl.jar ${D}/usr/lib/svn-javahl/
-			cd ${S}
-		fi
-	fi
-
-	dodoc BUGS COMMITTERS COPYING HACKING INSTALL 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
-
-	# install emacs lisps
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp/subversion
-		doins contrib/client-side/psvn/psvn.el*
-		doins  contrib/client-side/vc-svn.el*
-
-		elisp-site-file-install ${FILESDIR}/70svn-gentoo.el
-	fi
-
-
-
-	#Install apache module config
-	if useq apache2 && useq berkdb; 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() {
-
-	use emacs && elisp-site-regen
-	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 <path to ${PVR}.ebuild> config\" command"
-		einfo "or using svnadmin (see man svnadmin) if this subversion install is used as server"
-		einfo ""
-		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\""
-
-		if use apache2; then
-			einfo ""
-			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_postrm() {
-	has_version virtual/emacs && elisp-site-regen
-}
-
-pkg_config() {
-	if [ ! -x /usr/bin/svnadmin ]; then
-		die "You seem to only have build the subversion client"
-	fi
-	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
-	if [ -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}/conf
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
-
-		einfo ">>> Setting repository permissions ..."
-		chown -Rf apache:apache ${SVN_REPOS_LOC}/repos
-		chmod -Rf 755 ${SVN_REPOS_LOC}/repos
-	fi
-}
diff --git a/dev-util/subversion/subversion-1.1.0_rc4.ebuild b/dev-util/subversion/subversion-1.1.0_rc4.ebuild
deleted file mode 100644
index 98704cc9e1c1..000000000000
--- a/dev-util/subversion/subversion-1.1.0_rc4.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.0_rc4.ebuild,v 1.2 2004/09/27 10:30:06 pauldv Exp $
-
-inherit elisp-common libtool python eutils
-
-DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="http://subversion.tigris.org/tarballs/${P/_rc/-rc}.tar.bz2"
-HOMEPAGE="http://subversion.tigris.org/"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~alpha ~hppa"
-IUSE="ssl apache2 berkdb python emacs perl java"
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-#Allow for custion repository locations
-if [ "${SVN_REPOS_LOC}x" = "x" ]; then
-	SVN_REPOS_LOC="/var/svn"
-fi
-
-RDEPEND="python? ( >=dev-lang/python-2.0 )
-	apache2? ( >=net-www/apache-2.0.49 )
-	!apache2? ( !>=net-www/apache-2* )
-	!dev-libs/apr
-	python? ( || ( =dev-lang/swig-1.3.21
-			=dev-lang/swig-1.3.19
-	) )
-	perl? ( !python? ( || ( =dev-lang/swig-1.3.21
-			=dev-lang/swig-1.3.19
-		) )
-		>=dev-lang/perl-5.8 )
-	>=net-misc/neon-0.24.7
-	berkdb? ( =sys-libs/db-4*
-		java? ( virtual/jdk ) )
-	emacs? ( virtual/emacs )"
-
-DEPEND="${RDEPEND}
-	|| (
-		>=sys-devel/autoconf-2.59
-		=sys-devel/autoconf-2.57*
-	)
-	!=sys-devel/autoconf-2.58"
-
-pkg_setup() {
-	if has_version =sys-devel/autoconf-2.58*; then
-		die "Subversion WILL NOT BUILD with autoconf-2.58"
-	fi
-
-	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [ "${SVN_DUMPED}" == "" ]; then
-		einfo ""
-		ewarn ":  Now you have $(best_version subversion)"
-		ewarn " Subversion has changed the repository filesystem schema from 0.34.0."
-		ewarn " So you MUST dump your repositories before upgrading."
-		ewarn ""
-		ewarn "After doing so call emerge with SVN_DUMPED=1 emerge !!"
-		einfo ""
-		einfo "More details on dumping:"
-		einfo "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
-		die "ensure that you dump your repository first"
-	fi
-
-	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. Specifying the apache2 useflag will also enable the building of"
-		einfo "the apache2 module."
-	fi
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${P/_rc/-rc}.tar.bz2 || die "unpacking failed for some strange reason"
-	cd ${S}
-
-	epatch ${FILESDIR}/subversion-db4.patch
-
-	export WANT_AUTOCONF_2_5=1
-	elibtoolize
-	autoconf
-	(cd apr; autoconf)
-	(cd apr-util; autoconf)
-	sed -i -e 's,\(subversion/svnversion/svnversion\)\(>.*svn-revision.txt\),echo "external" \2,' Makefile.in
-}
-
-src_compile() {
-	local myconf
-
-	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"
-
-	use berkdb && myconf="${myconf} --with-berkeley-db"
-	use berkdb || myconf="${myconf} --without-berkeley-db"
-
-	use python && myconf="${myconf} --with-python=/usr/bin/python"
-	use python || myconf="${myconf} --without-python"
-
-	if use python || use perl; then
-		myconf="${myconf} --with-swig"
-	else
-		myconf="${myconf} --without-swig"
-	fi
-
-	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
-
-	if use python; then
-		#building fails without the apache apr-util as includes are wrong.
-		if use apache2; then
-			emake swig-py || die "subversion python bindings failed"
-		else
-			emake SVN_APR_INCLUDES="-I${S}/apr/include -I${S}/apr-util/include" swig-py || die "subversion python bindings failed"
-		fi
-	fi
-	if use perl; then
-		make swig-pl || die "Perl library building failed"
-	fi
-	if use java; then
-		make JAVACFLAGS="-source 1.3 -encoding iso8859-1" javahl || die "Compilation failed"
-	fi
-
-	cd ${S}
-	if use emacs; then
-		einfo "compiling emacs support"
-		elisp-compile ${S}/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
-		elisp-compile ${S}/contrib/client-side/vc-svn.el || die "emacs modules failed"
-	fi
-}
-
-
-src_install () {
-	use apache2 && mkdir -p ${D}/etc/apache2/conf
-
-	python_version
-	PYTHON_DIR=/usr/lib/python${PYVER}
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-	if [ -e ${D}/usr/lib/apache2 ]; then
-		if has_version '>=net-www/apache-2.0.48-r2'; then
-			mv ${D}/usr/lib/apache2/modules ${D}/usr/lib/apache2-extramodules
-			rmdir ${D}/usr/lib/apache2
-		else
-			mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
-		fi
-	fi
-
-	dobin svn-config
-	if use python; then
-		make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}  LD_LIBRARY_PATH="-L${D}/usr/lib" || die "Installation of subversion python bindings failed"
-
-		# move python bindings
-		mkdir -p ${D}${PYTHON_DIR}/site-packages
-		mv ${D}/usr/lib/svn-python/svn ${D}${PYTHON_DIR}/site-packages
-		mv ${D}/usr/lib/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages
-		rmdir ${D}/usr/lib/svn-python
-	fi
-	if use perl; then
-		make DESTDIR=${D} install-swig-pl || die "Perl library building failed"
-	fi
-	if use java; then
-		make DESTDIR="${D}" install-javahl || die "installation failed"
-	fi
-
-	dodoc BUGS COMMITTERS COPYING HACKING INSTALL README
-	dodoc CHANGES
-	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
-	cp -r tools/hook-scripts ${D}/usr/share/doc/${PF}/
-
-	# install documentation
-	docinto notes
-	for f in notes/*
-	do
-		[ -f ${f} ] && dodoc ${f}
-	done
-
-	# Install the book in it's own dir
-	docinto book
-	cd ${S}
-	echo "installing html book"
-	dohtml -r doc/book/book/book.html doc/book/book/styles.css doc/book/book/images || die "Installing book failed"
-
-	# install emacs lisps
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp/subversion
-		doins contrib/client-side/psvn/psvn.el*
-		doins  contrib/client-side/vc-svn.el*
-
-		elisp-site-file-install ${FILESDIR}/70svn-gentoo.el
-	fi
-
-
-
-	#Install apache module config
-	if useq apache2; then
-		mkdir -p ${D}/etc/apache2/conf/modules.d
-		cat <<EOF >${D}/etc/apache2/conf/modules.d/47_mod_dav_svn.conf
-<IfDefine SVN>
-	<IfModule !mod_dav_svn.c>
-		LoadModule dav_svn_module	extramodules/mod_dav_svn.so
-	</IfModule>
-	<Location /svn/repos>
-		DAV svn
-		SVNPath ${SVN_REPOS_LOC}/repos
-		AuthType Basic
-		AuthName "Subversion repository"
-		AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers
-		Require valid-user
-	</Location>
-	<IfDefine SVN_AUTHZ>
-		<IfModule !authz_svn_module.c>
-			LoadModule authz_svn_module	extramodules/mod_authz_svn.so
-		</IfModule>
-	</IfDefine>
-</IfDefine>
-EOF
-	fi
-}
-
-pkg_postinst() {
-
-	use emacs && elisp-site-regen
-	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 <path to ${PVR}.ebuild> config\" command"
-	einfo "or using svnadmin (see man svnadmin) if this subversion install is used as server"
-	einfo ""
-	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\""
-
-	if use apache2; then
-		einfo ""
-		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
-}
-
-pkg_postrm() {
-	has_version virtual/emacs && elisp-site-regen
-}
-
-pkg_config() {
-	if [ ! -x /usr/bin/svnadmin ]; then
-		die "You seem to only have build the subversion client"
-	fi
-	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
-	if [ -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}/conf
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
-
-		einfo ">>> Setting repository permissions ..."
-		chown -Rf apache:apache ${SVN_REPOS_LOC}/repos
-		chmod -Rf 755 ${SVN_REPOS_LOC}/repos
-	fi
-}