Fix bug #182453 (should be again Apache-2.0 compatible), cleanup ebuild.

Package-Manager: portage-2.1.2.7

9 files changed, 140 insertions, 1274 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 60959dccedad..8eaa29a28e75 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.265 2007/06/17 16:37:31 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.266 2007/06/22 08:21:43 chtekk Exp $
+
+  22 Jun 2007; Luca Longinotti <chtekk@gentoo.org>
+  subversion-1.3.2-r4.ebuild, -subversion-1.4.3.ebuild,
+  -subversion-1.4.3-r1.ebuild, -subversion-1.4.4.ebuild:
+  Fix bug #182453 (should be again Apache-2.0 compatible), cleanup ebuild.
 
 *subversion-1.4.4-r1 (17 Jun 2007)
 
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index d5d043502a7b..fa91870886f7 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70svn-gentoo.el 331 RMD160 1de1310ae7e4bdbecef3c685ef8d7ff95b9aab87 SHA1 48eb99e9d494a4a674de32e599914df234b627cd SHA256 c0d733bd3f7c75c47acaea4fd0c816d45ee2cd765da70dc494666f38c91e3d87
 MD5 23c250f0b440c1df1bc142a7d76b4c62 files/70svn-gentoo.el 331
 RMD160 1de1310ae7e4bdbecef3c685ef8d7ff95b9aab87 files/70svn-gentoo.el 331
@@ -80,7 +77,6 @@ SHA256 b4979d5df9fba02dbc8ad71d813229222e95ee1e8e89dec3060611d2d6be87aa files/vc
 DIST subversion-1.1.3.tar.bz2 6793419 RMD160 08ff9d6736c842b829d3256bd48732a64755a81e SHA1 ea7fb4411e906dabc0ae26a6054c9699901867af SHA256 f14f19db2da379523c63a08991ac4ae997cb1fb14e472258f64291b529ec7a9e
 DIST subversion-1.2.3.tar.bz2 7238176 RMD160 46de1455fb61a5814b9d67bada10216e70ea6795 SHA1 513a217ba4a8045ea3daba5c3b0816f80ce0041b SHA256 af25cf282c9f5605148e223699fcf3e78f13bab70a3f9a3a8f4e626098ed1cd2
 DIST subversion-1.3.2.tar.bz2 6834364 RMD160 dc9fbe683379ce25a62b91810eb5652ead19abcf SHA1 688ab178db1f6acb2ad3bd99f030402621f837b6 SHA256 805cb0ee894d2c219fe979dde98ccd56c06de6c3ca3986d87c80a2a2bcc08185
-DIST subversion-1.4.3.tar.bz2 4721031 RMD160 62b1ab174ae4aab39c1768d04a9e602fc08ca66d SHA1 7e740c469b61977b7b623642892470207ae64a50 SHA256 8260a2d3a67c5cebc100e7662f81679582c0f05a2a28260e235bdf051e72aee3
 DIST subversion-1.4.4.tar.bz2 4723349 RMD160 24ec3733d337206a3106be434c4505f5cc2e20ec SHA1 1ba850187b3cedb3265850acf32341b7dbe4f945 SHA256 91769f992e142eaeb5017e9ec95be52505a056ef05f93427868a3c0c89e2e966
 EBUILD subversion-1.1.3.ebuild 11340 RMD160 4bd8e0d7fa291ceb22328cb22f39c57b4eb9e23b SHA1 8108f40b64bbad7f151218f510dc8fd24e0d9938 SHA256 883187e5e6ff9f7166990bc839f362d8667f3f1867fd566e3a51dc834e5d21c9
 MD5 31fe3a3d4b2836ec63c7456225602377 subversion-1.1.3.ebuild 11340
@@ -94,30 +90,18 @@ EBUILD subversion-1.3.2-r3.ebuild 11681 RMD160 f3ea21144b373d4ee4845eb2e1b67d681
 MD5 7f6936a27fd088173dfbcfaad3104f93 subversion-1.3.2-r3.ebuild 11681
 RMD160 f3ea21144b373d4ee4845eb2e1b67d68181fe510 subversion-1.3.2-r3.ebuild 11681
 SHA256 89f2be7bcef35c766068e72db2aadd8e18a96629aa37d763c012f49eb6212078 subversion-1.3.2-r3.ebuild 11681
-EBUILD subversion-1.3.2-r4.ebuild 11837 RMD160 d5907fe237749efe047d8995bfb4bb1deb78ad85 SHA1 13946d70356af6624fc38a96e337835f93634823 SHA256 a6cfa49d4c3576329e6bf47c2b1f484db78218a9fcf1624e6eec095c00ca01ff
-MD5 e23b1ba7113de6acf87a5558b25eec5d subversion-1.3.2-r4.ebuild 11837
-RMD160 d5907fe237749efe047d8995bfb4bb1deb78ad85 subversion-1.3.2-r4.ebuild 11837
-SHA256 a6cfa49d4c3576329e6bf47c2b1f484db78218a9fcf1624e6eec095c00ca01ff subversion-1.3.2-r4.ebuild 11837
-EBUILD subversion-1.4.3-r1.ebuild 12061 RMD160 2ddb72f2ac2af9d4f3e618d6fc490bfa8d82064e SHA1 f930dcbf9c8298fe3dd7b5e03ac0e0c72f280f46 SHA256 1ab1d3a997d2b8fc50efa96fdd2bea3fa28525ad704432635f8e6ce854abaeba
-MD5 0a85c1d43f7c8d5fb084ba695cca8d83 subversion-1.4.3-r1.ebuild 12061
-RMD160 2ddb72f2ac2af9d4f3e618d6fc490bfa8d82064e subversion-1.4.3-r1.ebuild 12061
-SHA256 1ab1d3a997d2b8fc50efa96fdd2bea3fa28525ad704432635f8e6ce854abaeba subversion-1.4.3-r1.ebuild 12061
-EBUILD subversion-1.4.3.ebuild 11792 RMD160 40446a6a8fbc93dc31ef301a7cfac744c7ddfa5c SHA1 14864bde84ade301c3b1b4b363b1079d6b5431f6 SHA256 a2bb7e556ac8b920935b080b0b6c5da31e8e021e29f66736c4c06de84255f7e4
-MD5 9169e73dc9f8990ff1c07605753347cc subversion-1.4.3.ebuild 11792
-RMD160 40446a6a8fbc93dc31ef301a7cfac744c7ddfa5c subversion-1.4.3.ebuild 11792
-SHA256 a2bb7e556ac8b920935b080b0b6c5da31e8e021e29f66736c4c06de84255f7e4 subversion-1.4.3.ebuild 11792
+EBUILD subversion-1.3.2-r4.ebuild 11897 RMD160 5b1fb952f1a96db1f5cfa5249b8edfd7ffc15f04 SHA1 1243e7b245b509d4c1749d4f4f29873b85c25126 SHA256 0d5348b9e355c3dc959dd3e6cfae839998fbe3c139818dd3ea259f4da771cdaf
+MD5 2f6846a4a14c18fee7063da5030ddcba subversion-1.3.2-r4.ebuild 11897
+RMD160 5b1fb952f1a96db1f5cfa5249b8edfd7ffc15f04 subversion-1.3.2-r4.ebuild 11897
+SHA256 0d5348b9e355c3dc959dd3e6cfae839998fbe3c139818dd3ea259f4da771cdaf subversion-1.3.2-r4.ebuild 11897
 EBUILD subversion-1.4.4-r1.ebuild 12018 RMD160 b90c1e2d689451fe502ec01d110bb8e33bf0f622 SHA1 9dc461bf2f7658e553afa5d8497dcdafed9904cb SHA256 6d91667febc5335816e0ad0e3d1353dd7aff91a079b36f8bfb95c67eb3bcdf25
 MD5 066533b145451900ee13b02f622c751d subversion-1.4.4-r1.ebuild 12018
 RMD160 b90c1e2d689451fe502ec01d110bb8e33bf0f622 subversion-1.4.4-r1.ebuild 12018
 SHA256 6d91667febc5335816e0ad0e3d1353dd7aff91a079b36f8bfb95c67eb3bcdf25 subversion-1.4.4-r1.ebuild 12018
-EBUILD subversion-1.4.4.ebuild 12012 RMD160 f8489a78a51756d2ae597736645ec51d63c55da9 SHA1 3c555182b07895dfadb7cad264a2747a7838c1d7 SHA256 e1238e58ac19d3c435686d28719c2097f0e9c91cb7c11e10189b05aa97155b7e
-MD5 07e33c1a1bdcdf1cfbe094797713900d subversion-1.4.4.ebuild 12012
-RMD160 f8489a78a51756d2ae597736645ec51d63c55da9 subversion-1.4.4.ebuild 12012
-SHA256 e1238e58ac19d3c435686d28719c2097f0e9c91cb7c11e10189b05aa97155b7e subversion-1.4.4.ebuild 12012
-MISC ChangeLog 46210 RMD160 25d70dcb704b64e05debb0214a46daf88fae8c85 SHA1 b26434d777b82d9d63b794557bdbf34d6bcb495c SHA256 ec462d8583c3f20ab70a0e9e6cb43855fa54db9036945e80b0fb22eccd29cf85
-MD5 f11f5c9a62af83bb90b3db7d88164fb7 ChangeLog 46210
-RMD160 25d70dcb704b64e05debb0214a46daf88fae8c85 ChangeLog 46210
-SHA256 ec462d8583c3f20ab70a0e9e6cb43855fa54db9036945e80b0fb22eccd29cf85 ChangeLog 46210
+MISC ChangeLog 46450 RMD160 9d605b678d4ed16d120354ada69f83942f42732a SHA1 1a18ead994a91a4bc67e9e9f6eecde7af6ee8c01 SHA256 c03042635a32da157faff78c918c58441fd1ee945b33304b6d867a717c9ac9a2
+MD5 c56dffa37239b6ba0eaef2ac0e7b65ff ChangeLog 46450
+RMD160 9d605b678d4ed16d120354ada69f83942f42732a ChangeLog 46450
+SHA256 c03042635a32da157faff78c918c58441fd1ee945b33304b6d867a717c9ac9a2 ChangeLog 46450
 MISC metadata.xml 224 RMD160 5da25d639360542842990baf18b1ae0f0837c0fd SHA1 e096d8a898bd3b957d86654e0e7fb835e2a6a0df SHA256 e6df82c1a36b5df70e15425e6059fb9f486fd31dc453404dfdd2f6b90b7f8aec
 MD5 9d26ecca44906061085842dba1505615 metadata.xml 224
 RMD160 5da25d639360542842990baf18b1ae0f0837c0fd metadata.xml 224
@@ -134,22 +118,6 @@ SHA256 b77de6fcac8e868c91fb08f21a08d8e45e26d50f7efa510c9940722746b37cc5 files/di
 MD5 f451fb992815e387265f7dd7afb3ddb6 files/digest-subversion-1.3.2-r4 256
 RMD160 2f2fa8d1f158c558014773611365d6488f55ea09 files/digest-subversion-1.3.2-r4 256
 SHA256 b77de6fcac8e868c91fb08f21a08d8e45e26d50f7efa510c9940722746b37cc5 files/digest-subversion-1.3.2-r4 256
-MD5 dbe03357818a0675ab3ff9a0d6afa1fa files/digest-subversion-1.4.3 256
-RMD160 062f9c03c0ce5ec74e40294938f796e03d6fa41e files/digest-subversion-1.4.3 256
-SHA256 84e50e103dcf562174d9e6337847220a875b7607f73e8307fd60ac18aeb05e27 files/digest-subversion-1.4.3 256
-MD5 dbe03357818a0675ab3ff9a0d6afa1fa files/digest-subversion-1.4.3-r1 256
-RMD160 062f9c03c0ce5ec74e40294938f796e03d6fa41e files/digest-subversion-1.4.3-r1 256
-SHA256 84e50e103dcf562174d9e6337847220a875b7607f73e8307fd60ac18aeb05e27 files/digest-subversion-1.4.3-r1 256
-MD5 576f84ed7a5fe7a243604aa6c516d496 files/digest-subversion-1.4.4 256
-RMD160 35c635369a31ed9e54e627d5bca04b2f1154c2ff files/digest-subversion-1.4.4 256
-SHA256 affa1aa33296aa4c7537a386e05b71801ba31437fe10b59dbdab602193315d22 files/digest-subversion-1.4.4 256
 MD5 576f84ed7a5fe7a243604aa6c516d496 files/digest-subversion-1.4.4-r1 256
 RMD160 35c635369a31ed9e54e627d5bca04b2f1154c2ff files/digest-subversion-1.4.4-r1 256
 SHA256 affa1aa33296aa4c7537a386e05b71801ba31437fe10b59dbdab602193315d22 files/digest-subversion-1.4.4-r1 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGdWNSyuNVb5qfaOYRApj2AJ9LDlRnHv2Gahz/vaw6FT8Tt/s2kwCaA25r
-Y54j3pmCbh4bBSVrw93w93Q=
-=ceha
------END PGP SIGNATURE-----
diff --git a/dev-util/subversion/files/digest-subversion-1.4.3 b/dev-util/subversion/files/digest-subversion-1.4.3
deleted file mode 100644
index 8bec3298f6c5..000000000000
--- a/dev-util/subversion/files/digest-subversion-1.4.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 de0e792c9804c7bce397d267af5eb30d subversion-1.4.3.tar.bz2 4721031
-RMD160 62b1ab174ae4aab39c1768d04a9e602fc08ca66d subversion-1.4.3.tar.bz2 4721031
-SHA256 8260a2d3a67c5cebc100e7662f81679582c0f05a2a28260e235bdf051e72aee3 subversion-1.4.3.tar.bz2 4721031
diff --git a/dev-util/subversion/files/digest-subversion-1.4.3-r1 b/dev-util/subversion/files/digest-subversion-1.4.3-r1
deleted file mode 100644
index 8bec3298f6c5..000000000000
--- a/dev-util/subversion/files/digest-subversion-1.4.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 de0e792c9804c7bce397d267af5eb30d subversion-1.4.3.tar.bz2 4721031
-RMD160 62b1ab174ae4aab39c1768d04a9e602fc08ca66d subversion-1.4.3.tar.bz2 4721031
-SHA256 8260a2d3a67c5cebc100e7662f81679582c0f05a2a28260e235bdf051e72aee3 subversion-1.4.3.tar.bz2 4721031
diff --git a/dev-util/subversion/files/digest-subversion-1.4.4 b/dev-util/subversion/files/digest-subversion-1.4.4
deleted file mode 100644
index e3c9fe8133a5..000000000000
--- a/dev-util/subversion/files/digest-subversion-1.4.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d4aa5aeb09acb3307841022d279ab895 subversion-1.4.4.tar.bz2 4723349
-RMD160 24ec3733d337206a3106be434c4505f5cc2e20ec subversion-1.4.4.tar.bz2 4723349
-SHA256 91769f992e142eaeb5017e9ec95be52505a056ef05f93427868a3c0c89e2e966 subversion-1.4.4.tar.bz2 4723349
diff --git a/dev-util/subversion/subversion-1.3.2-r4.ebuild b/dev-util/subversion/subversion-1.3.2-r4.ebuild
index e99f5d9f411f..6d6d9b563900 100644
--- a/dev-util/subversion/subversion-1.3.2-r4.ebuild
+++ b/dev-util/subversion/subversion-1.3.2-r4.ebuild
@@ -1,36 +1,36 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.3.2-r4.ebuild,v 1.5 2007/06/15 15:54:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.3.2-r4.ebuild,v 1.6 2007/06/22 08:21:43 chtekk Exp $
 
-inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2
+inherit elisp-common libtool python eutils multilib bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2
 
-DESCRIPTION="A compelling replacement for CVS"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+
+DESCRIPTION="A compelling replacement for CVS."
 HOMEPAGE="http://subversion.tigris.org/"
 SRC_URI="http://subversion.tigris.org/downloads/${P/_rc/-rc}.tar.bz2"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="apache2 berkdb python emacs perl java nls nowebdav zlib ruby"
+IUSE="apache2 berkdb emacs java nls nowebdav perl python ruby zlib"
 RESTRICT="test"
 
 COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} )
-	>=dev-libs/apr-util-1.2.8
-	python? ( >=dev-lang/python-2.0 )
-	perl? ( >=dev-lang/perl-5.8.6-r6
-		!=dev-lang/perl-5.8.7 )
-	ruby? ( >=dev-lang/ruby-1.8.2 )
-	!nowebdav? ( >=net-misc/neon-0.26 )
-	berkdb? ( =sys-libs/db-4* )
-	zlib? ( sys-libs/zlib )
-	java? ( >=virtual/jdk-1.4 )
-	emacs? ( virtual/emacs )"
+			>=dev-libs/apr-util-1.2.8
+			perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 )
+			python? ( >=dev-lang/python-2.0 )
+			ruby? ( >=dev-lang/ruby-1.8.2 )
+			!nowebdav? ( >=net-misc/neon-0.26 )
+			berkdb? ( =sys-libs/db-4* )
+			emacs? ( virtual/emacs )
+			zlib? ( sys-libs/zlib )"
+
 RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.4 )"
+		java? ( >=virtual/jre-1.4 )"
 
 DEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jdk-1.4 )
-	>=sys-devel/autoconf-2.59"
+		java? ( >=virtual/jdk-1.4 )
+		>=sys-devel/autoconf-2.59"
 
 S=${WORKDIR}/${P/_rc/-rc}
 
@@ -39,10 +39,24 @@ S=${WORKDIR}/${P/_rc/-rc}
 # pkg_config.
 : ${SVN_REPOS_LOC:=/var/svn}
 
+discover_apr_suffix() {
+	if use apache2 ; then
+		if has_version '=net-www/apache-2.0*' ; then
+			aprsuffix=""
+		else
+			aprsuffix="-1"
+		fi
+	else
+		aprsuffix="-1"
+	fi
+
+	echo "${aprsuffix}"
+}
+
 pkg_setup() {
-	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [[ -z ${SVN_DUMPED} ]]; then
+	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [[ -z ${SVN_DUMPED} ]] ; then
 		echo
-		ewarn "Presently you have $(best_version dev-util/subversion)"
+		ewarn "Presently you have $(best_version dev-util/subversion) installed."
 		ewarn "Subversion has changed the repository filesystem schema from 0.34.0."
 		ewarn "So you MUST dump your repositories before upgrading."
 		ewarn
@@ -53,27 +67,29 @@ pkg_setup() {
 		echo
 		die "Ensure that you dump your repository first"
 	fi
+
 	java-pkg-opt-2_pkg_setup
 }
 
 src_unpack() {
-	unpack $A
-	cd ${S}
+	unpack ${A}
+	cd "${S}"
 
 	# assure we don't use the included libs by accident
-	rm -rf neon apr apr-util
-
-	epatch ${FILESDIR}/subversion-db4.patch
-	epatch ${FILESDIR}/subversion-1.1.1-perl-vendor.patch
-	epatch ${FILESDIR}/subversion-hotbackup-config.patch
-	epatch ${FILESDIR}/subversion-1.3.1-neon-config.patch
-	epatch ${FILESDIR}/subversion-apr_cppflags.patch
-	# rapidsvn developers work with 1.3.2
-	epatch ${FILESDIR}/subversion-1.3.2-neon-0.26.patch
-
-	sed -e s:apu-config:apu-1-config:g \
-		-e s:apr-config:apr-1-config:g \
-		-i build/ac-macros/{find_,}ap*
+	rm -Rf neon apr apr-util
+
+	epatch "${FILESDIR}"/subversion-db4.patch
+	epatch "${FILESDIR}"/subversion-1.1.1-perl-vendor.patch
+	epatch "${FILESDIR}"/subversion-hotbackup-config.patch
+	epatch "${FILESDIR}"/subversion-1.3.1-neon-config.patch
+	epatch "${FILESDIR}"/subversion-apr_cppflags.patch
+	epatch "${FILESDIR}"/subversion-1.3.2-neon-0.26.patch
+
+	if [[ "$(discover_apr_suffix)" == "-1" ]] ; then
+		sed -e s:apu-config:apu-1-config:g \
+			-e s:apr-config:apr-1-config:g \
+			-i build/ac-macros/{find_,}ap*
+	fi
 
 	export WANT_AUTOCONF=2.5
 	autoconf
@@ -82,42 +98,42 @@ src_unpack() {
 
 	elibtoolize
 
-	use emacs && cp ${FILESDIR}/vc-svn.el ${S}/contrib/client-side/vc-svn.el
+	use emacs && cp "${FILESDIR}"/vc-svn.el "${S}"/contrib/client-side/vc-svn.el
 }
 
 src_compile() {
-	local myconf
-	myconf="--with-apr=/usr --with-apr-util=/usr"
-
-	use apache2 && myconf="${myconf} --with-apxs=${APXS2}"
-	use apache2 || myconf="${myconf} --without-apxs"
+	local myconf=""
 
 	myconf="${myconf} $(use_enable java javahl)"
 	use java && myconf="${myconf} --without-jikes --with-jdk=${JAVA_HOME}"
 
-	if use python || use perl || use ruby; then
+	if use python || use perl || use ruby ; then
 		myconf="${myconf} --with-swig"
 	else
 		myconf="${myconf} --without-swig"
 	fi
 
-	if use nowebdav; then
+	if use nowebdav ; then
 		myconf="${myconf} --without-neon"
 	else
 		myconf="${myconf} --with-neon=/usr"
 	fi
 
-	append-flags `/usr/bin/apr-1-config --cppflags`
+	use apache2 && myconf="${myconf} --with-apxs=${APXS2}"
+	use apache2 || myconf="${myconf} --without-apxs"
+
+	apr_suffix="$(discover_apr_suffix)"
+	myconf="${myconf} --with-apr=/usr/bin/apr${apr_suffix}-config --with-apr-util=/usr/bin/apu${apr_suffix}-config"
+	append-flags $(/usr/bin/apr${apr_suffix}-config --cppflags)
 
 	econf ${myconf} \
 		$(use_with berkdb berkeley-db) \
-		$(use_with zlib) \
 		$(use_with python) \
+		$(use_with zlib) \
 		$(use_enable nls) \
-		--with-apr=/usr \
-		--with-apr-util=/usr \
 		--disable-experimental-libtool \
-		--disable-mod-activation || die "econf failed"
+		--disable-mod-activation \
+		|| die "econf failed"
 
 	# Respect the user LDFLAGS
 	export EXTRA_LDFLAGS="${LDFLAGS}"
@@ -126,87 +142,81 @@ src_compile() {
 	# Also apparently the included apr has a libtool that doesn't like -L flags.
 	# So not specifying it at all when not building apache modules and only
 	# specify it for internal parts otherwise.
-	( emake external-all && emake LT_LDFLAGS="-L${D}/usr/$(get_libdir)" local-all ) || die "make of subversion failed"
+	( emake external-all && emake LT_LDFLAGS="-L${D}/usr/$(get_libdir)" local-all ) || die "Compilation of ${PN} failed"
 
-	if use python; then
+	if use python ; then
 		# Building fails without the apache apr-util as includes are wrong.
-		emake swig-py || die "subversion python bindings failed"
+		emake swig-py || die "Compilation of ${PN} Python bindings failed"
 	fi
 
-	if use perl; then
+	if use perl ; then
 		# Work around a buggy Makefile.PL, bug 64634
 		mkdir -p subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
-		make swig-pl || die "Perl library building failed"
+		make swig-pl || die "Compilation of ${PN} Perl bindings failed"
 	fi
 
-	if use ruby; then
-		make swig-rb || die "Ruby library building failed"
+	if use ruby ; then
+		make swig-rb || die "Compilation of ${PN} Ruby bindings failed"
 	fi
 
-	if use java; then
+	if use java ; then
 		# ensure that the destination dir exists, else some compilation fails
-		mkdir -p ${S}/subversion/bindings/java/javahl/classes
+		mkdir -p "${S}"/subversion/bindings/java/javahl/classes
 		# Compile javahl
-		make JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Compilation failed"
+		make JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "make javahl failed"
 	fi
 
-	if use emacs; then
-		einfo "compiling emacs support"
-		elisp-compile ${S}/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
-		elisp-compile ${S}/contrib/client-side/vc-svn.el || die "emacs modules failed"
+	if use emacs ; then
+		einfo "Compiling emacs support"
+		elisp-compile "${S}"/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
+		elisp-compile "${S}"/contrib/client-side/vc-svn.el || die "emacs modules failed"
 	fi
 
-	# svn-config isn't quite built correctly; it contains references to
-	# @SVN_DB_LIBS@ and @SVN_DB_INCLUDES@.  It appears the best thing is to remove that.  #64634
-	sed -i 's/@SVN_DB_[^@]*@//g' svn-config || die "sed failed"
+	# svn-config isn't quite built correctly: it contains references to
+	# @SVN_DB_LIBS@ and @SVN_DB_INCLUDES@. It appears the best thing is to remove that. #64634
+	sed -i 's/@SVN_DB_[^@]*@//g' svn-config || die "svn-config sed failed"
 }
 
-
 src_install () {
 	python_version
 	PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}
 
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-
-#	This might not be necessary with the new install
-#	if [[ -e ${D}/usr/$(get_libdir)/apache2 ]]; then
-#		if [ "${APACHE2_MODULESDIR}" != "/usr/$(get_libdir)/apache2/modules" ]; then
-#			mkdir -p ${D}/`dirname ${APACHE2_MODULESDIR}`
-#			mv ${D}/usr/$(get_libdir)/apache2/modules ${D}/${APACHE2_MODULESDIR}
-#			rmdir ${D}/usr/$(get_libdir)/apache2 2>/dev/null
-#		fi
-#	fi
-
+	make DESTDIR="${D}" install || die "Installation of ${PN} failed"
 
 	dobin svn-config
-	if use python; then
-		make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}  LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" || die "Installation of subversion python bindings failed"
+
+	if use python ; then
+		make DESTDIR="${D}" DISTUTIL_PARAM="--prefix=${D}" LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" install-swig-py \
+			|| die "Installation of ${PN} Python bindings failed"
 
 		# move python bindings
-		mkdir -p ${D}${PYTHON_DIR}/site-packages
-		mv ${D}/usr/$(get_libdir)/svn-python/svn ${D}${PYTHON_DIR}/site-packages
-		mv ${D}/usr/$(get_libdir)/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages
-		rmdir ${D}/usr/$(get_libdir)/svn-python
+		mkdir -p "${D}${PYTHON_DIR}/site-packages"
+		mv "${D}"/usr/$(get_libdir)/svn-python/svn "${D}${PYTHON_DIR}/site-packages"
+		mv "${D}"/usr/$(get_libdir)/svn-python/libsvn "${D}${PYTHON_DIR}/site-packages"
+		rm -Rf "${D}"/usr/$(get_libdir)/svn-python
 	fi
-	if use perl; then
-		make DESTDIR=${D} install-swig-pl || die "Perl library building failed"
+
+	if use perl ; then
+		make DESTDIR="${D}" install-swig-pl || die "Installation of ${PN} Perl bindings failed"
 		fixlocalpod
 	fi
-	if use ruby; then
-		make DESTDIR=${D} install-swig-rb || die "Installation of subversion ruby bindings failed"
+
+	if use ruby ; then
+		make DESTDIR="${D}" install-swig-rb || die "Installation of ${PN} Ruby bindings failed"
 	fi
-	if use java; then
-		make DESTDIR="${D}" install-javahl || die "installation failed"
-		java-pkg_regso ${D}/usr/$(get_libdir)/libsvnjavahl*.so
-		java-pkg_dojar ${D}/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-		rm -r ${D}/usr/$(get_libdir)/svn-javahl/*.jar
+
+	if use java ; then
+		make DESTDIR="${D}" install-javahl || die "make install-javahl failed"
+		java-pkg_regso "${D}"/usr/$(get_libdir)/libsvnjavahl*.so
+		java-pkg_dojar "${D}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
+		rm -Rf "${D}"/usr/$(get_libdir)/svn-javahl/*.jar
 	fi
 
-	# Install apache module config
-	if useq apache2; then
+	# Install apache2 module config
+	if use apache2 ; then
 		MOD="${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"
-		mkdir -p ${D}/${APACHE2_MODULES_CONFDIR}
-		cat <<EOF >${D}/${APACHE2_MODULES_CONFDIR}/47_mod_dav_svn.conf
+		mkdir -p "${D}/${APACHE2_MODULES_CONFDIR}"
+		cat <<EOF >"${D}/${APACHE2_MODULES_CONFDIR}"/47_mod_dav_svn.conf
 <IfDefine SVN>
 	<IfModule !mod_dav_svn.c>
 		LoadModule dav_svn_module	${MOD}/mod_dav_svn.so
@@ -239,19 +249,18 @@ EOF
 	newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs
 
 	# Install svnserve init-script and xinet.d snippet, bug 43245
-	newinitd ${FILESDIR}/svnserve.initd svnserve
-	newconfd ${FILESDIR}/svnserve.confd svnserve
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/svnserve.xinetd svnserve
+	newinitd "${FILESDIR}"/svnserve.initd svnserve
+	newconfd "${FILESDIR}"/svnserve.confd svnserve
+	insinto /etc/xinetd.d ; newins "${FILESDIR}"/svnserve.xinetd svnserve
 
 	# Install documentation
-
 	dodoc BUGS COMMITTERS COPYING HACKING INSTALL README
 	dodoc CHANGES
 	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
 	find contrib tools -name \*.in -print0 | xargs -0 rm -f
-	mkdir -p ${D}/usr/share/doc/${PF}/
-	cp -r tools/{client-side,examples,hook-scripts} ${D}/usr/share/doc/${PF}/
-	cp -r contrib/hook-scripts ${D}/usr/share/doc/${PF}/
+	mkdir -p "${D}/usr/share/doc/${PF}/"
+	cp -R tools/{client-side,examples,hook-scripts} "${D}/usr/share/doc/${PF}/"
+	cp -R contrib/hook-scripts "${D}/usr/share/doc/${PF}/"
 
 	docinto notes
 	for f in notes/*
@@ -260,17 +269,17 @@ EOF
 	done
 
 	# Install emacs lisps
-	if use emacs; then
+	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
+		elisp-site-file-install "${FILESDIR}"/70svn-gentoo.el
 	fi
 }
 
 src_test() {
-	ewarn "Testing does not work for subversion"
+	ewarn "Testing disabled for ${PN}"
 }
 
 pkg_postinst() {
@@ -317,7 +326,7 @@ pkg_postinst() {
 	elog "         exec /usr/bin/svnserve \"\$@\""
 	elog
 
-	if use apache2 >/dev/null; then
+	if use apache2 ; then
 		elog " - http-based server:"
 		elog "   1. edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
 		elog "   2. create an htpasswd file:"
@@ -330,7 +339,7 @@ pkg_postinst() {
 	elog "If you want to keep e.g. 2 backups, do the following:"
 	elog "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion"
 	elog "echo 'SVN_HOTBACKUP_NUM_BACKUPS=2' >> /etc/env.d/80subversion"
-	elog ""
+	elog
 }
 
 pkg_postrm() {
@@ -339,22 +348,23 @@ pkg_postrm() {
 }
 
 pkg_config() {
-	if [[ ! -x /usr/bin/svnadmin ]]; then
-		die "You seem to only have built the subversion client"
+	if [[ ! -x /usr/bin/svnadmin ]] ; then
+		die "You seem to only have built the ${PN} client"
 	fi
 
-	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e ${SVN_REPOS_LOC}/repos ]]; then
+	einfo ">>> Initializing the database in ${SVN_REPOS_LOC} ..."
+	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
 		echo "A subversion repository already exists and I will not overwrite it."
 		echo "Delete ${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
 	else
-		mkdir -p ${SVN_REPOS_LOC}/conf
+		mkdir -p "${SVN_REPOS_LOC}/conf"
+
 		einfo ">>> Populating repository directory ..."
 		# create initial repository
-		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
+		/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
+		chown -Rf apache:apache "${SVN_REPOS_LOC}/repos"
+		chmod -Rf 755 "${SVN_REPOS_LOC}/repos"
 	fi
 }
diff --git a/dev-util/subversion/subversion-1.4.3-r1.ebuild b/dev-util/subversion/subversion-1.4.3-r1.ebuild
deleted file mode 100644
index 7b441d7b7b06..000000000000
--- a/dev-util/subversion/subversion-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.3-r1.ebuild,v 1.3 2007/06/15 09:09:34 phreak Exp $
-
-inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2 multilib
-
-DESCRIPTION="A compelling replacement for CVS"
-HOMEPAGE="http://subversion.tigris.org/"
-SRC_URI="http://subversion.tigris.org/downloads/${P/_rc/-rc}.tar.bz2"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="apache2 berkdb python emacs perl java nls nowebdav ruby"
-RESTRICT="test"
-
-COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} )
-	!apache2? ( >=dev-libs/apr-util-0.9.7 )
-	python? ( >=dev-lang/python-2.0 )
-	perl? ( >=dev-lang/perl-5.8.6-r6
-		!=dev-lang/perl-5.8.7 )
-	ruby? ( >=dev-lang/ruby-1.8.2 )
-	!nowebdav? ( net-misc/neon )
-	berkdb? ( =sys-libs/db-4* )
-	java? ( >=virtual/jdk-1.4 )
-	emacs? ( virtual/emacs )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.4 )"
-
-DEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jdk-1.4 )
-	>=sys-devel/autoconf-2.59"
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-# Allow for custion repository locations.
-# This can't be in pkg_setup because the variable needs to be available to
-# pkg_config.
-: ${SVN_REPOS_LOC:=/var/svn}
-
-pkg_setup() {
-	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [[ -z ${SVN_DUMPED} ]]; then
-		echo
-		ewarn "Presently you have $(best_version dev-util/subversion)"
-		ewarn "Subversion has changed the repository filesystem schema from 0.34.0."
-		ewarn "So you MUST dump your repositories before upgrading."
-		ewarn
-		ewarn 'After doing so call emerge with SVN_DUMPED=1 emerge !*'
-		ewarn
-		ewarn "More details on dumping:"
-		ewarn "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
-		echo
-		die "Ensure that you dump your repository first"
-	fi
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	unpack $A
-	cd ${S}
-
-	epatch ${FILESDIR}/subversion-1.4-db4.patch
-	epatch ${FILESDIR}/subversion-1.1.1-perl-vendor.patch
-	epatch ${FILESDIR}/subversion-hotbackup-config.patch
-	epatch ${FILESDIR}/subversion-1.3.1-neon-config.patch
-	epatch ${FILESDIR}/subversion-apr_cppflags.patch
-	epatch ${FILESDIR}/subversion-1.4.3-debug-config.patch
-	epatch ${FILESDIR}/subversion-1.4.3-neon-0.26.3.patch
-	# rapidsvn developers work with 1.3.2
-
-	export WANT_AUTOCONF=2.5
-	autoconf
-	sed -i -e 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in
-
-	elibtoolize
-}
-
-src_compile() {
-	local myconf
-	local apr_suffix=""
-
-	if use apache2; then
-		myconf="--with-apxs=${APXS2}"
-		apache_minor="$(best_version net-www/apache | cut -d. -f2)"
-		if [ ${apache_minor} -gt 0 ]; then
-			apr_suffix="-1"
-		fi
-	else
-		if has_version ">dev-libs/apr-util-1"; then
-			apr_suffix="-1"
-		fi
-		myconf="--without-apxs"
-	fi
-
-	myconf="${myconf} $(use_enable java javahl)"
-	use java && myconf="${myconf} --without-jikes --with-jdk=${JAVA_HOME}"
-
-	if use python || use perl || use ruby; then
-		myconf="${myconf} --with-swig"
-	else
-		myconf="${myconf} --without-swig"
-	fi
-
-	if use nowebdav; then
-		myconf="${myconf} --without-neon"
-	else
-		myconf="${myconf} --with-neon=/usr"
-	fi
-
-	append-flags `/usr/bin/apr-config${apr_suffix} --cppflags`
-
-	econf ${myconf} \
-		$(use_with berkdb berkeley-db) \
-		$(use_with python) \
-		$(use_enable nls) \
-		--with-apr="/usr/bin/apr${apr_suffix}-config" \
-		--with-apr-util="/usr/bin/apu${apr_suffix}-config" \
-		--disable-experimental-libtool \
-		--disable-mod-activation || die "econf failed"
-
-	# Respect the user LDFLAGS
-	export EXTRA_LDFLAGS="${LDFLAGS}"
-
-	# Build subversion, but do it in a way that is safe for parallel builds.
-	# Also apparently the included apr has a libtool that doesn't like -L flags.
-	# So not specifying it at all when not building apache modules and only
-	# specify it for internal parts otherwise.
-	( emake external-all && emake LT_LDFLAGS="-L${D}/usr/$(get_libdir)" local-all ) || die "make of subversion failed"
-
-	if use python; then
-		# Building fails without the apache apr-util as includes are wrong.
-		emake swig-py || die "subversion python bindings failed"
-	fi
-
-	if use perl; then
-		# Work around a buggy Makefile.PL, bug 64634
-		mkdir -p subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
-		make swig-pl || die "Perl library building failed"
-	fi
-
-	if use ruby; then
-		make swig-rb || die "Ruby library building failed"
-	fi
-
-	if use java; then
-		# ensure that the destination dir exists, else some compilation fails
-		mkdir -p ${S}/subversion/bindings/java/javahl/classes
-		# Compile javahl
-		make JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Compilation failed"
-	fi
-
-	if use emacs; then
-		einfo "compiling emacs support"
-		elisp-compile ${S}/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
-		elisp-compile ${S}/contrib/client-side/vc-svn.el || die "emacs modules failed"
-	fi
-}
-
-
-src_install () {
-	python_version
-	PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-
-#	This might not be necessary with the new install
-#	if [[ -e ${D}/usr/$(get_libdir)/apache2 ]]; then
-#		if [ "${APACHE2_MODULESDIR}" != "/usr/$(get_libdir)/apache2/modules" ]; then
-#			mkdir -p ${D}/`dirname ${APACHE2_MODULESDIR}`
-#			mv ${D}/usr/$(get_libdir)/apache2/modules ${D}/${APACHE2_MODULESDIR}
-#			rmdir ${D}/usr/$(get_libdir)/apache2 2>/dev/null
-#		fi
-#	fi
-
-
-	dobin svn-config
-	if use python; then
-		make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}	LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" || die "Installation of subversion python bindings failed"
-
-		# move python bindings
-		mkdir -p ${D}${PYTHON_DIR}/site-packages
-		mv ${D}/usr/$(get_libdir)/svn-python/svn ${D}${PYTHON_DIR}/site-packages
-		mv ${D}/usr/$(get_libdir)/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages
-		rmdir ${D}/usr/$(get_libdir)/svn-python
-	fi
-	if use perl; then
-		make DESTDIR=${D} install-swig-pl || die "Perl library building failed"
-		fixlocalpod
-	fi
-	if use ruby; then
-		make DESTDIR=${D} install-swig-rb || die "Installation of subversion ruby bindings failed"
-	fi
-	if use java; then
-		make DESTDIR="${D}" install-javahl || die "installation failed"
-		java-pkg_regso ${D}/usr/$(get_libdir)/libsvnjavahl*.so
-		java-pkg_dojar ${D}/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-		rm -r ${D}/usr/$(get_libdir)/svn-javahl/*.jar
-	fi
-
-	# Install apache module config
-	if useq apache2; then
-		MOD=`echo "${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"|sed -e "s,^//*,,"`
-		mkdir -p ${D}/${APACHE2_MODULES_CONFDIR}
-		cat <<EOF >${D}/${APACHE2_MODULES_CONFDIR}/47_mod_dav_svn.conf
-<IfDefine SVN>
-	<IfModule !mod_dav_svn.c>
-		LoadModule dav_svn_module	${MOD}/mod_dav_svn.so
-	</IfModule>
-	<Location /svn/repos>
-		DAV svn
-		SVNPath ${SVN_REPOS_LOC}/repos
-		AuthType Basic
-		AuthName "Subversion repository"
-		AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers
-		Require valid-user
-	</Location>
-	<IfDefine SVN_AUTHZ>
-		<IfModule !mod_authz_svn.c>
-			LoadModule authz_svn_module	${MOD}/mod_authz_svn.so
-		</IfModule>
-	</IfDefine>
-</IfDefine>
-EOF
-	fi
-
-	# Bug 43179 - Install bash-completion if user wishes
-	dobashcompletion tools/client-side/bash_completion subversion
-
-	# Install hot backup script, bug 54304
-	newbin tools/backup/hot-backup.py svn-hot-backup
-
-	# The svn_load_dirs script is installed by Debian and looks like a good
-	# candidate for us to install as well
-	newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245
-	newinitd ${FILESDIR}/svnserve.initd svnserve
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/svnserve.xinetd svnserve
-
-	if use apache2 >/dev/null; then
-		newconfd ${FILESDIR}/svnserve.confd svnserve
-	else
-		newconfd ${FILESDIR}/svnserve.confd2 svnserve
-	fi
-
-	# Install documentation
-
-	dodoc BUGS COMMITTERS COPYING HACKING INSTALL README
-	dodoc CHANGES
-	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
-	find contrib tools -name \*.in -print0 | xargs -0 rm -f
-	mkdir -p ${D}/usr/share/doc/${PF}/
-	cp -r tools/{client-side,examples,hook-scripts} ${D}/usr/share/doc/${PF}/
-	cp -r contrib/hook-scripts ${D}/usr/share/doc/${PF}/
-
-	docinto notes
-	for f in notes/*
-	do
-		[[ -f ${f} ]] && dodoc ${f}
-	done
-
-	# Install emacs lisps
-	if use emacs; then
-		elisp-install ${PN} contrib/client-side/psvn/psvn.el*
-		elisp-install ${PN}/compat contrib/client-side/vc-svn.el*
-		touch "${D}${SITELISP}/${PN}/compat/.nosearch"
-
-		elisp-site-file-install ${FILESDIR}/70svn-gentoo.el
-	fi
-}
-
-src_test() {
-	ewarn "Testing does not work for subversion"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use perl && perl-module_pkg_postinst
-
-	elog "Subversion Server Notes"
-	elog "-----------------------"
-	elog
-
-	elog "If you intend to run a server, a repository needs to be created using"
-	elog "svnadmin (see man svnadmin) or the following command to create it in"
-	elog "/var/svn:"
-	elog
-	elog "	  emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "If you upgraded from an older version of berkely db and experience"
-	elog "problems with your repository then run the following commands as root:"
-	elog "	  db4_recover -h ${SVN_REPOS_LOC}/repos"
-	elog "	  chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	elog
-	elog "Subversion has multiple server types, take your pick:"
-	elog
-	elog " - svnserve daemon: "
-	elog "	 1. edit /etc/conf.d/svnserve"
-	elog "	 2. start daemon: /etc/init.d/svnserve start"
-	elog "	 3. make persistent: rc-update add svnserve default"
-	elog
-	elog " - svnserve via xinetd:"
-	elog "	 1. edit /etc/xinetd.d/svnserve (remove disable line)"
-	elog "	 2. restart xinetd.d: /etc/init.d/xinetd restart"
-	elog
-	elog " - svn over ssh:"
-	elog "	 1. Fix the repository permissions:"
-	elog "		  groupadd svnusers"
-	elog "		  chown -R root:svnusers /var/svn/repos/"
-	elog "		  chmod -R g-w /var/svn/repos"
-	elog "		  chmod -R g+rw /var/svn/repos/db"
-	elog "		  chmod -R g+rw /var/svn/repos/locks"
-	elog "	 2. create an svnserve wrapper in /usr/local/bin to set the umask you"
-	elog "		want, for example:"
-	elog "		   #!/bin/bash"
-	elog "		   umask 002"
-	elog "		   exec /usr/bin/svnserve \"\$@\""
-	elog
-
-	if use apache2 >/dev/null; then
-		elog " - http-based server:"
-		elog "	 1. edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
-		elog "	 2. create an htpasswd file:"
-		elog "		htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
-		elog
-	fi
-
-	elog "If you intend to use svn-hot-backup, you can specify the number of"
-	elog "backups to keep per repository by specifying an environment variable."
-	elog "If you want to keep e.g. 2 backups, do the following:"
-	elog "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion"
-	elog "echo 'SVN_HOTBACKUP_NUM_BACKUPS=2' >> /etc/env.d/80subversion"
-	elog ""
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use perl && perl-module_pkg_postrm
-
-	# Cleanup bytecompiled python stuff
-	if use python ; then
-		python_mod_optimize ${ROOT}usr/$(get_libdir)/python*/site-packages/svn
-		python_mod_optimize ${ROOT}usr/$(get_libdir)/python*/site-packages/libsvn
-	fi
-}
-
-pkg_config() {
-	if [[ ! -x /usr/bin/svnadmin ]]; then
-		die "You seem to only have built the subversion client"
-	fi
-
-	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e ${SVN_REPOS_LOC}/repos ]]; then
-		echo "A subversion repository already exists and I will not overwrite it."
-		echo "Delete ${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
-	else
-		mkdir -p ${SVN_REPOS_LOC}/conf
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
-
-		einfo ">>> Setting repository permissions ..."
-		if use apache2 >/dev/null; then
-			chown -Rf apache:apache ${SVN_REPOS_LOC}/repos
-		else
-			enewgroup svnusers
-			enewuser svn -1 -1 /var/svn svnusers
-			chown -Rf svn:svnusers ${SVN_REPOS_LOC}/repos
-		fi
-		chmod -Rf 755 ${SVN_REPOS_LOC}/repos
-	fi
-}
diff --git a/dev-util/subversion/subversion-1.4.3.ebuild b/dev-util/subversion/subversion-1.4.3.ebuild
deleted file mode 100644
index 2814cc45a4d9..000000000000
--- a/dev-util/subversion/subversion-1.4.3.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.3.ebuild,v 1.11 2007/04/29 18:24:38 tove Exp $
-
-inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2
-
-DESCRIPTION="A compelling replacement for CVS"
-HOMEPAGE="http://subversion.tigris.org/"
-SRC_URI="http://subversion.tigris.org/downloads/${P/_rc/-rc}.tar.bz2"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="apache2 berkdb python emacs perl java nls nowebdav ruby"
-RESTRICT="test"
-
-COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} )
-	!apache2? ( >=dev-libs/apr-util-0.9.7 )
-	python? ( >=dev-lang/python-2.0 )
-	perl? ( >=dev-lang/perl-5.8.6-r6
-		!=dev-lang/perl-5.8.7 )
-	ruby? ( >=dev-lang/ruby-1.8.2 )
-	!nowebdav? ( net-misc/neon )
-	berkdb? ( =sys-libs/db-4* )
-	java? ( >=virtual/jdk-1.4 )
-	emacs? ( virtual/emacs )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.4 )"
-
-DEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jdk-1.4 )
-	>=sys-devel/autoconf-2.59"
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-# Allow for custion repository locations.
-# This can't be in pkg_setup because the variable needs to be available to
-# pkg_config.
-: ${SVN_REPOS_LOC:=/var/svn}
-
-pkg_setup() {
-	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [[ -z ${SVN_DUMPED} ]]; then
-		echo
-		ewarn "Presently you have $(best_version dev-util/subversion)"
-		ewarn "Subversion has changed the repository filesystem schema from 0.34.0."
-		ewarn "So you MUST dump your repositories before upgrading."
-		ewarn
-		ewarn 'After doing so call emerge with SVN_DUMPED=1 emerge !*'
-		ewarn
-		ewarn "More details on dumping:"
-		ewarn "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
-		echo
-		die "Ensure that you dump your repository first"
-	fi
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	unpack $A
-	cd ${S}
-
-	epatch ${FILESDIR}/subversion-1.4-db4.patch
-	epatch ${FILESDIR}/subversion-1.1.1-perl-vendor.patch
-	epatch ${FILESDIR}/subversion-hotbackup-config.patch
-	epatch ${FILESDIR}/subversion-1.3.1-neon-config.patch
-	epatch ${FILESDIR}/subversion-apr_cppflags.patch
-	epatch ${FILESDIR}/subversion-1.4.3-debug-config.patch
-	# rapidsvn developers work with 1.3.2
-
-	export WANT_AUTOCONF=2.5
-	autoconf
-	sed -i -e 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in
-
-	elibtoolize
-}
-
-src_compile() {
-	local myconf
-	local apr_suffix=""
-
-	if use apache2; then
-		myconf="--with-apxs=${APXS2}"
-		apache_minor="$(best_version net-www/apache | cut -d. -f2)"
-		if [ ${apache_minor} -gt 0 ]; then
-			apr_suffix="-1"
-		fi
-	else
-		if has_version ">dev-libs/apr-util-1"; then
-			apr_suffix="-1"
-		fi
-		myconf="--without-apxs"
-	fi
-
-	myconf="${myconf} $(use_enable java javahl)"
-	use java && myconf="${myconf} --without-jikes --with-jdk=${JAVA_HOME}"
-
-	if use python || use perl || use ruby; then
-		myconf="${myconf} --with-swig"
-	else
-		myconf="${myconf} --without-swig"
-	fi
-
-	if use nowebdav; then
-		myconf="${myconf} --without-neon"
-	else
-		myconf="${myconf} --with-neon=/usr"
-	fi
-
-	append-flags `/usr/bin/apr-config${apr_suffix} --cppflags`
-
-	econf ${myconf} \
-		$(use_with berkdb berkeley-db) \
-		$(use_with python) \
-		$(use_enable nls) \
-		--with-apr="${ROOT}usr/bin/apr${apr_suffix}-config" \
-		--with-apr-util="${ROOT}usr/bin/apu${apr_suffix}-config" \
-		--disable-experimental-libtool \
-		--disable-mod-activation || die "econf failed"
-
-	# Respect the user LDFLAGS
-	export EXTRA_LDFLAGS="${LDFLAGS}"
-
-	# Build subversion, but do it in a way that is safe for parallel builds.
-	# Also apparently the included apr has a libtool that doesn't like -L flags.
-	# So not specifying it at all when not building apache modules and only
-	# specify it for internal parts otherwise.
-	( emake external-all && emake LT_LDFLAGS="-L${D}/usr/$(get_libdir)" local-all ) || die "make of subversion failed"
-
-	if use python; then
-		# Building fails without the apache apr-util as includes are wrong.
-		emake swig-py || die "subversion python bindings failed"
-	fi
-
-	if use perl; then
-		# Work around a buggy Makefile.PL, bug 64634
-		mkdir -p subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
-		make swig-pl || die "Perl library building failed"
-	fi
-
-	if use ruby; then
-		make swig-rb || die "Ruby library building failed"
-	fi
-
-	if use java; then
-		# ensure that the destination dir exists, else some compilation fails
-		mkdir -p ${S}/subversion/bindings/java/javahl/classes
-		# Compile javahl
-		make JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Compilation failed"
-	fi
-
-	if use emacs; then
-		einfo "compiling emacs support"
-		elisp-compile ${S}/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
-		elisp-compile ${S}/contrib/client-side/vc-svn.el || die "emacs modules failed"
-	fi
-}
-
-
-src_install () {
-	python_version
-	PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-
-#	This might not be necessary with the new install
-#	if [[ -e ${D}/usr/$(get_libdir)/apache2 ]]; then
-#		if [ "${APACHE2_MODULESDIR}" != "/usr/$(get_libdir)/apache2/modules" ]; then
-#			mkdir -p ${D}/`dirname ${APACHE2_MODULESDIR}`
-#			mv ${D}/usr/$(get_libdir)/apache2/modules ${D}/${APACHE2_MODULESDIR}
-#			rmdir ${D}/usr/$(get_libdir)/apache2 2>/dev/null
-#		fi
-#	fi
-
-
-	dobin svn-config
-	if use python; then
-		make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}	LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" || die "Installation of subversion python bindings failed"
-
-		# move python bindings
-		mkdir -p ${D}${PYTHON_DIR}/site-packages
-		mv ${D}/usr/$(get_libdir)/svn-python/svn ${D}${PYTHON_DIR}/site-packages
-		mv ${D}/usr/$(get_libdir)/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages
-		rmdir ${D}/usr/$(get_libdir)/svn-python
-	fi
-	if use perl; then
-		make DESTDIR=${D} install-swig-pl || die "Perl library building failed"
-		fixlocalpod
-	fi
-	if use ruby; then
-		make DESTDIR=${D} install-swig-rb || die "Installation of subversion ruby bindings failed"
-	fi
-	if use java; then
-		make DESTDIR="${D}" install-javahl || die "installation failed"
-		java-pkg_regso ${D}/usr/$(get_libdir)/libsvnjavahl*.so
-		java-pkg_dojar ${D}/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-		rm -r ${D}/usr/$(get_libdir)/svn-javahl/*.jar
-	fi
-
-	# Install apache module config
-	if useq apache2; then
-		MOD=`echo "${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"|sed -e "s,^//*,,"`
-		mkdir -p ${D}/${APACHE2_MODULES_CONFDIR}
-		cat <<EOF >${D}/${APACHE2_MODULES_CONFDIR}/47_mod_dav_svn.conf
-<IfDefine SVN>
-	<IfModule !mod_dav_svn.c>
-		LoadModule dav_svn_module	${MOD}/mod_dav_svn.so
-	</IfModule>
-	<Location /svn/repos>
-		DAV svn
-		SVNPath ${SVN_REPOS_LOC}/repos
-		AuthType Basic
-		AuthName "Subversion repository"
-		AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers
-		Require valid-user
-	</Location>
-	<IfDefine SVN_AUTHZ>
-		<IfModule !mod_authz_svn.c>
-			LoadModule authz_svn_module	${MOD}/mod_authz_svn.so
-		</IfModule>
-	</IfDefine>
-</IfDefine>
-EOF
-	fi
-
-	# Bug 43179 - Install bash-completion if user wishes
-	dobashcompletion tools/client-side/bash_completion subversion
-
-	# Install hot backup script, bug 54304
-	newbin tools/backup/hot-backup.py svn-hot-backup
-
-	# The svn_load_dirs script is installed by Debian and looks like a good
-	# candidate for us to install as well
-	newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245
-	newinitd ${FILESDIR}/svnserve.initd svnserve
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/svnserve.xinetd svnserve
-
-	if use apache2 >/dev/null; then
-		newconfd ${FILESDIR}/svnserve.confd svnserve
-	else
-		newconfd ${FILESDIR}/svnserve.confd2 svnserve
-	fi
-
-	# Install documentation
-
-	dodoc BUGS COMMITTERS COPYING HACKING INSTALL README
-	dodoc CHANGES
-	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
-	find contrib tools -name \*.in -print0 | xargs -0 rm -f
-	mkdir -p ${D}/usr/share/doc/${PF}/
-	cp -r tools/{client-side,examples,hook-scripts} ${D}/usr/share/doc/${PF}/
-	cp -r contrib/hook-scripts ${D}/usr/share/doc/${PF}/
-
-	docinto notes
-	for f in notes/*
-	do
-		[[ -f ${f} ]] && dodoc ${f}
-	done
-
-	# Install emacs lisps
-	if use emacs; then
-		elisp-install ${PN} contrib/client-side/psvn/psvn.el*
-		elisp-install ${PN}/compat contrib/client-side/vc-svn.el*
-		touch "${D}${SITELISP}/${PN}/compat/.nosearch"
-
-		elisp-site-file-install ${FILESDIR}/70svn-gentoo.el
-	fi
-}
-
-src_test() {
-	ewarn "Testing does not work for subversion"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use perl && perl-module_pkg_postinst
-
-	elog "Subversion Server Notes"
-	elog "-----------------------"
-	elog
-
-	elog "If you intend to run a server, a repository needs to be created using"
-	elog "svnadmin (see man svnadmin) or the following command to create it in"
-	elog "/var/svn:"
-	elog
-	elog "	  emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "If you upgraded from an older version of berkely db and experience"
-	elog "problems with your repository then run the following commands as root:"
-	elog "	  db4_recover -h ${SVN_REPOS_LOC}/repos"
-	elog "	  chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	elog
-	elog "Subversion has multiple server types, take your pick:"
-	elog
-	elog " - svnserve daemon: "
-	elog "	 1. edit /etc/conf.d/svnserve"
-	elog "	 2. start daemon: /etc/init.d/svnserve start"
-	elog "	 3. make persistent: rc-update add svnserve default"
-	elog
-	elog " - svnserve via xinetd:"
-	elog "	 1. edit /etc/xinetd.d/svnserve (remove disable line)"
-	elog "	 2. restart xinetd.d: /etc/init.d/xinetd restart"
-	elog
-	elog " - svn over ssh:"
-	elog "	 1. Fix the repository permissions:"
-	elog "		  groupadd svnusers"
-	elog "		  chown -R root:svnusers /var/svn/repos/"
-	elog "		  chmod -R g-w /var/svn/repos"
-	elog "		  chmod -R g+rw /var/svn/repos/db"
-	elog "		  chmod -R g+rw /var/svn/repos/locks"
-	elog "	 2. create an svnserve wrapper in /usr/local/bin to set the umask you"
-	elog "		want, for example:"
-	elog "		   #!/bin/bash"
-	elog "		   umask 002"
-	elog "		   exec /usr/bin/svnserve \"\$@\""
-	elog
-
-	if use apache2 >/dev/null; then
-		elog " - http-based server:"
-		elog "	 1. edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
-		elog "	 2. create an htpasswd file:"
-		elog "		htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
-		elog
-	fi
-
-	elog "If you intend to use svn-hot-backup, you can specify the number of"
-	elog "backups to keep per repository by specifying an environment variable."
-	elog "If you want to keep e.g. 2 backups, do the following:"
-	elog "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion"
-	elog "echo 'SVN_HOTBACKUP_NUM_BACKUPS=2' >> /etc/env.d/80subversion"
-	elog ""
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use perl && perl-module_pkg_postrm
-}
-
-pkg_config() {
-	if [[ ! -x /usr/bin/svnadmin ]]; then
-		die "You seem to only have built the subversion client"
-	fi
-
-	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e ${SVN_REPOS_LOC}/repos ]]; then
-		echo "A subversion repository already exists and I will not overwrite it."
-		echo "Delete ${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
-	else
-		mkdir -p ${SVN_REPOS_LOC}/conf
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
-
-		einfo ">>> Setting repository permissions ..."
-		if use apache2 >/dev/null; then
-			chown -Rf apache:apache ${SVN_REPOS_LOC}/repos
-		else
-			enewgroup svnusers
-			enewuser svn -1 -1 /var/svn svnusers
-			chown -Rf svn:svnusers ${SVN_REPOS_LOC}/repos
-		fi
-		chmod -Rf 755 ${SVN_REPOS_LOC}/repos
-	fi
-}
diff --git a/dev-util/subversion/subversion-1.4.4.ebuild b/dev-util/subversion/subversion-1.4.4.ebuild
deleted file mode 100644
index bbac0c92055c..000000000000
--- a/dev-util/subversion/subversion-1.4.4.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.4.ebuild,v 1.3 2007/06/15 09:09:34 phreak Exp $
-
-inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2
-
-DESCRIPTION="A compelling replacement for CVS"
-HOMEPAGE="http://subversion.tigris.org/"
-SRC_URI="http://subversion.tigris.org/downloads/${P/_rc/-rc}.tar.bz2"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="apache2 berkdb python emacs perl java nls nowebdav ruby"
-RESTRICT="test"
-
-COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} )
-	!apache2? ( >=dev-libs/apr-util-0.9.7 )
-	python? ( >=dev-lang/python-2.0 )
-	perl? ( >=dev-lang/perl-5.8.6-r6
-		!=dev-lang/perl-5.8.7 )
-	ruby? ( >=dev-lang/ruby-1.8.2 )
-	!nowebdav? ( net-misc/neon )
-	berkdb? ( =sys-libs/db-4* )
-	java? ( >=virtual/jdk-1.4 )
-	emacs? ( virtual/emacs )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.4 )"
-
-DEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jdk-1.4 )
-	>=sys-devel/autoconf-2.59"
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-# Allow for custion repository locations.
-# This can't be in pkg_setup because the variable needs to be available to
-# pkg_config.
-: ${SVN_REPOS_LOC:=/var/svn}
-
-pkg_setup() {
-	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [[ -z ${SVN_DUMPED} ]]; then
-		echo
-		ewarn "Presently you have $(best_version dev-util/subversion)"
-		ewarn "Subversion has changed the repository filesystem schema from 0.34.0."
-		ewarn "So you MUST dump your repositories before upgrading."
-		ewarn
-		ewarn 'After doing so call emerge with SVN_DUMPED=1 emerge !*'
-		ewarn
-		ewarn "More details on dumping:"
-		ewarn "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
-		echo
-		die "Ensure that you dump your repository first"
-	fi
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	unpack $A
-	cd ${S}
-
-	epatch ${FILESDIR}/subversion-1.4-db4.patch
-	epatch ${FILESDIR}/subversion-1.1.1-perl-vendor.patch
-	epatch ${FILESDIR}/subversion-hotbackup-config.patch
-	epatch ${FILESDIR}/subversion-1.3.1-neon-config.patch
-	epatch ${FILESDIR}/subversion-apr_cppflags.patch
-	epatch ${FILESDIR}/subversion-1.4.3-debug-config.patch
-	epatch ${FILESDIR}/subversion-1.4.3-neon-0.26.3.patch
-	# rapidsvn developers work with 1.3.2
-
-	export WANT_AUTOCONF=2.5
-	autoconf
-	sed -i -e 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in
-
-	elibtoolize
-}
-
-src_compile() {
-	local myconf
-	local apr_suffix=""
-
-	if use apache2; then
-		myconf="--with-apxs=${APXS2}"
-		apache_minor="$(best_version net-www/apache | cut -d. -f2)"
-		if [ ${apache_minor} -gt 0 ]; then
-			apr_suffix="-1"
-		fi
-	else
-		if has_version ">dev-libs/apr-util-1"; then
-			apr_suffix="-1"
-		fi
-		myconf="--without-apxs"
-	fi
-
-	myconf="${myconf} $(use_enable java javahl)"
-	use java && myconf="${myconf} --without-jikes --with-jdk=${JAVA_HOME}"
-
-	if use python || use perl || use ruby; then
-		myconf="${myconf} --with-swig"
-	else
-		myconf="${myconf} --without-swig"
-	fi
-
-	if use nowebdav; then
-		myconf="${myconf} --without-neon"
-	else
-		myconf="${myconf} --with-neon=/usr"
-	fi
-
-	append-flags `/usr/bin/apr-config${apr_suffix} --cppflags`
-
-	econf ${myconf} \
-		$(use_with berkdb berkeley-db) \
-		$(use_with python) \
-		$(use_enable nls) \
-		--with-apr="/usr/bin/apr${apr_suffix}-config" \
-		--with-apr-util="/usr/bin/apu${apr_suffix}-config" \
-		--disable-experimental-libtool \
-		--disable-mod-activation || die "econf failed"
-
-	# Respect the user LDFLAGS
-	export EXTRA_LDFLAGS="${LDFLAGS}"
-
-	# Build subversion, but do it in a way that is safe for parallel builds.
-	# Also apparently the included apr has a libtool that doesn't like -L flags.
-	# So not specifying it at all when not building apache modules and only
-	# specify it for internal parts otherwise.
-	( emake external-all && emake LT_LDFLAGS="-L${D}/usr/$(get_libdir)" local-all ) || die "make of subversion failed"
-
-	if use python; then
-		# Building fails without the apache apr-util as includes are wrong.
-		emake swig-py || die "subversion python bindings failed"
-	fi
-
-	if use perl; then
-		# Work around a buggy Makefile.PL, bug 64634
-		mkdir -p subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
-		make swig-pl || die "Perl library building failed"
-	fi
-
-	if use ruby; then
-		make swig-rb || die "Ruby library building failed"
-	fi
-
-	if use java; then
-		# ensure that the destination dir exists, else some compilation fails
-		mkdir -p ${S}/subversion/bindings/java/javahl/classes
-		# Compile javahl
-		make JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Compilation failed"
-	fi
-
-	if use emacs; then
-		einfo "compiling emacs support"
-		elisp-compile ${S}/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
-		elisp-compile ${S}/contrib/client-side/vc-svn.el || die "emacs modules failed"
-	fi
-}
-
-
-src_install () {
-	python_version
-	PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-
-#	This might not be necessary with the new install
-#	if [[ -e ${D}/usr/$(get_libdir)/apache2 ]]; then
-#		if [ "${APACHE2_MODULESDIR}" != "/usr/$(get_libdir)/apache2/modules" ]; then
-#			mkdir -p ${D}/`dirname ${APACHE2_MODULESDIR}`
-#			mv ${D}/usr/$(get_libdir)/apache2/modules ${D}/${APACHE2_MODULESDIR}
-#			rmdir ${D}/usr/$(get_libdir)/apache2 2>/dev/null
-#		fi
-#	fi
-
-
-	dobin svn-config
-	if use python; then
-		make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}	LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" || die "Installation of subversion python bindings failed"
-
-		# move python bindings
-		mkdir -p ${D}${PYTHON_DIR}/site-packages
-		mv ${D}/usr/$(get_libdir)/svn-python/svn ${D}${PYTHON_DIR}/site-packages
-		mv ${D}/usr/$(get_libdir)/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages
-		rmdir ${D}/usr/$(get_libdir)/svn-python
-	fi
-	if use perl; then
-		make DESTDIR=${D} install-swig-pl || die "Perl library building failed"
-		fixlocalpod
-	fi
-	if use ruby; then
-		make DESTDIR=${D} install-swig-rb || die "Installation of subversion ruby bindings failed"
-	fi
-	if use java; then
-		make DESTDIR="${D}" install-javahl || die "installation failed"
-		java-pkg_regso ${D}/usr/$(get_libdir)/libsvnjavahl*.so
-		java-pkg_dojar ${D}/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-		rm -r ${D}/usr/$(get_libdir)/svn-javahl/*.jar
-	fi
-
-	# Install apache module config
-	if useq apache2; then
-		MOD=`echo "${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"|sed -e "s,^//*,,"`
-		mkdir -p ${D}/${APACHE2_MODULES_CONFDIR}
-		cat <<EOF >${D}/${APACHE2_MODULES_CONFDIR}/47_mod_dav_svn.conf
-<IfDefine SVN>
-	<IfModule !mod_dav_svn.c>
-		LoadModule dav_svn_module	${MOD}/mod_dav_svn.so
-	</IfModule>
-	<Location /svn/repos>
-		DAV svn
-		SVNPath ${SVN_REPOS_LOC}/repos
-		AuthType Basic
-		AuthName "Subversion repository"
-		AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers
-		Require valid-user
-	</Location>
-	<IfDefine SVN_AUTHZ>
-		<IfModule !mod_authz_svn.c>
-			LoadModule authz_svn_module	${MOD}/mod_authz_svn.so
-		</IfModule>
-	</IfDefine>
-</IfDefine>
-EOF
-	fi
-
-	# Bug 43179 - Install bash-completion if user wishes
-	dobashcompletion tools/client-side/bash_completion subversion
-
-	# Install hot backup script, bug 54304
-	newbin tools/backup/hot-backup.py svn-hot-backup
-
-	# The svn_load_dirs script is installed by Debian and looks like a good
-	# candidate for us to install as well
-	newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245
-	newinitd ${FILESDIR}/svnserve.initd svnserve
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/svnserve.xinetd svnserve
-
-	if use apache2 >/dev/null; then
-		newconfd ${FILESDIR}/svnserve.confd svnserve
-	else
-		newconfd ${FILESDIR}/svnserve.confd2 svnserve
-	fi
-
-	# Install documentation
-
-	dodoc BUGS COMMITTERS COPYING HACKING INSTALL README
-	dodoc CHANGES
-	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
-	find contrib tools -name \*.in -print0 | xargs -0 rm -f
-	mkdir -p ${D}/usr/share/doc/${PF}/
-	cp -r tools/{client-side,examples,hook-scripts} ${D}/usr/share/doc/${PF}/
-	cp -r contrib/hook-scripts ${D}/usr/share/doc/${PF}/
-
-	docinto notes
-	for f in notes/*
-	do
-		[[ -f ${f} ]] && dodoc ${f}
-	done
-
-	# Install emacs lisps
-	if use emacs; then
-		elisp-install ${PN} contrib/client-side/psvn/psvn.el*
-		elisp-install ${PN}/compat contrib/client-side/vc-svn.el*
-		touch "${D}${SITELISP}/${PN}/compat/.nosearch"
-
-		elisp-site-file-install ${FILESDIR}/70svn-gentoo.el
-	fi
-}
-
-src_test() {
-	ewarn "Testing does not work for subversion"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use perl && perl-module_pkg_postinst
-
-	elog "Subversion Server Notes"
-	elog "-----------------------"
-	elog
-
-	elog "If you intend to run a server, a repository needs to be created using"
-	elog "svnadmin (see man svnadmin) or the following command to create it in"
-	elog "/var/svn:"
-	elog
-	elog "	  emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "If you upgraded from an older version of berkely db and experience"
-	elog "problems with your repository then run the following commands as root:"
-	elog "	  db4_recover -h ${SVN_REPOS_LOC}/repos"
-	elog "	  chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	elog
-	elog "Subversion has multiple server types, take your pick:"
-	elog
-	elog " - svnserve daemon: "
-	elog "	 1. edit /etc/conf.d/svnserve"
-	elog "	 2. start daemon: /etc/init.d/svnserve start"
-	elog "	 3. make persistent: rc-update add svnserve default"
-	elog
-	elog " - svnserve via xinetd:"
-	elog "	 1. edit /etc/xinetd.d/svnserve (remove disable line)"
-	elog "	 2. restart xinetd.d: /etc/init.d/xinetd restart"
-	elog
-	elog " - svn over ssh:"
-	elog "	 1. Fix the repository permissions:"
-	elog "		  groupadd svnusers"
-	elog "		  chown -R root:svnusers /var/svn/repos/"
-	elog "		  chmod -R g-w /var/svn/repos"
-	elog "		  chmod -R g+rw /var/svn/repos/db"
-	elog "		  chmod -R g+rw /var/svn/repos/locks"
-	elog "	 2. create an svnserve wrapper in /usr/local/bin to set the umask you"
-	elog "		want, for example:"
-	elog "		   #!/bin/bash"
-	elog "		   umask 002"
-	elog "		   exec /usr/bin/svnserve \"\$@\""
-	elog
-
-	if use apache2 >/dev/null; then
-		elog " - http-based server:"
-		elog "	 1. edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
-		elog "	 2. create an htpasswd file:"
-		elog "		htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
-		elog
-	fi
-
-	elog "If you intend to use svn-hot-backup, you can specify the number of"
-	elog "backups to keep per repository by specifying an environment variable."
-	elog "If you want to keep e.g. 2 backups, do the following:"
-	elog "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion"
-	elog "echo 'SVN_HOTBACKUP_NUM_BACKUPS=2' >> /etc/env.d/80subversion"
-	elog ""
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use perl && perl-module_pkg_postrm
-
-	if use python ; then
-		python_mod_optimize ${ROOT}usr/$(get_libdir)/python*/site-packages/svn
-		python_mod_optimize ${ROOT}usr/$(get_libdir)/python*/site-packages/libsvn
-	fi
-}
-
-pkg_config() {
-	if [[ ! -x /usr/bin/svnadmin ]]; then
-		die "You seem to only have built the subversion client"
-	fi
-
-	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e ${SVN_REPOS_LOC}/repos ]]; then
-		echo "A subversion repository already exists and I will not overwrite it."
-		echo "Delete ${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
-	else
-		mkdir -p ${SVN_REPOS_LOC}/conf
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
-
-		einfo ">>> Setting repository permissions ..."
-		if use apache2 >/dev/null; then
-			chown -Rf apache:apache ${SVN_REPOS_LOC}/repos
-		else
-			enewgroup svnusers
-			enewuser svn -1 -1 /var/svn svnusers
-			chown -Rf svn:svnusers ${SVN_REPOS_LOC}/repos
-		fi
-		chmod -Rf 755 ${SVN_REPOS_LOC}/repos
-	fi
-}