Deal with bug 167522 and configure with neon 0.26.3.

Package-Manager: portage-2.1.2.7

9 files changed, 824 insertions, 21 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 91f13aabf61e..5ea19e0b4d0c 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,15 @@
 # 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.256 2007/05/08 07:37:11 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.257 2007/05/15 18:44:40 carlo Exp $
+
+*subversion-1.4.3-r1 (15 May 2007)
+*subversion-1.3.2-r4 (15 May 2007)
+
+  15 May 2007; Carsten Lohrke <carlo@gentoo.org>
+  +files/subversion-1.3.2-neon-0.26.patch,
+  +files/subversion-1.4.3-neon-0.26.3.patch, subversion-1.3.2-r3.ebuild,
+  +subversion-1.3.2-r4.ebuild, +subversion-1.4.3-r1.ebuild:
+  Deal with bug 167522 and configure with neon 0.26.3.
 
   08 May 2007; Christian Heim <phreak@gentoo.org> metadata.xml,
   subversion-1.3.2-r3.ebuild:
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 59031468c7f7..e63e2f84e6e7 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
@@ -17,6 +14,10 @@ AUX subversion-1.3.1-neon-config.patch 1237 RMD160 ccf7449e030afe6ef6388c1215783
 MD5 c357b009b610db967d0df27d61cd3704 files/subversion-1.3.1-neon-config.patch 1237
 RMD160 ccf7449e030afe6ef6388c12157831d5f2d59d6b files/subversion-1.3.1-neon-config.patch 1237
 SHA256 6e0f152a8254b7e7c0b498ce011f1798d475b2acf18d779b4dfe0758de1f3049 files/subversion-1.3.1-neon-config.patch 1237
+AUX subversion-1.3.2-neon-0.26.patch 1983 RMD160 e5709e58868dddd4f0b23ee45511c64a3d7b564a SHA1 92bb0b805fce7d0d3c48cc6c646f1f631532dfa8 SHA256 51983fe1f4686be2692008aef6861988a146368deb5182e01b4957306a51ac01
+MD5 ab214523f5398a14ac5de1d2592cb0a8 files/subversion-1.3.2-neon-0.26.patch 1983
+RMD160 e5709e58868dddd4f0b23ee45511c64a3d7b564a files/subversion-1.3.2-neon-0.26.patch 1983
+SHA256 51983fe1f4686be2692008aef6861988a146368deb5182e01b4957306a51ac01 files/subversion-1.3.2-neon-0.26.patch 1983
 AUX subversion-1.4-db4.patch 570 RMD160 e07111ed95b08289b9e145dad7798430cb45e405 SHA1 7fc6c3dd48b5d018a9794973ecb085abdf262d89 SHA256 73f2915a8334c0ebd95abb3bc1239237c683f71662281b1a183b7885f075e236
 MD5 783cc1d1bbce7e8c5e4ae97a3384b23a files/subversion-1.4-db4.patch 570
 RMD160 e07111ed95b08289b9e145dad7798430cb45e405 files/subversion-1.4-db4.patch 570
@@ -25,6 +26,10 @@ AUX subversion-1.4.3-debug-config.patch 886 RMD160 0d95f3b50617469f1c5466b2e34d4
 MD5 5a3233a471e13f2926b3da7704e2d8fe files/subversion-1.4.3-debug-config.patch 886
 RMD160 0d95f3b50617469f1c5466b2e34d45ecdb1238a8 files/subversion-1.4.3-debug-config.patch 886
 SHA256 b84b31b7a49b79d68ad71feb186882da495e31cec0b8ff3f42b9f261c3e03448 files/subversion-1.4.3-debug-config.patch 886
+AUX subversion-1.4.3-neon-0.26.3.patch 605 RMD160 4cc8ffa588b796120486e272cc4611ed0db2f8cd SHA1 922a13064bfe0c57a6d6d6a54733f272426ea8fd SHA256 760041386bc6caca06e506af9b4df013ba052dcd101c024246c11d3946822395
+MD5 2dbd1b41f94c7e69616ae370e8b66246 files/subversion-1.4.3-neon-0.26.3.patch 605
+RMD160 4cc8ffa588b796120486e272cc4611ed0db2f8cd files/subversion-1.4.3-neon-0.26.3.patch 605
+SHA256 760041386bc6caca06e506af9b4df013ba052dcd101c024246c11d3946822395 files/subversion-1.4.3-neon-0.26.3.patch 605
 AUX subversion-apr-version.patch 2867 RMD160 cc34107d60f3e1df7cb926b87e0c9cda094bbc25 SHA1 f10969a38efb1b9019340bdc5caa5ac98c795176 SHA256 3c466fa14da964999aceabd19ca5c64176cf563a0fca54498bc36c881e163601
 MD5 25d9476112d0d6e3a4f7efc5be8d6a21 files/subversion-apr-version.patch 2867
 RMD160 cc34107d60f3e1df7cb926b87e0c9cda094bbc25 files/subversion-apr-version.patch 2867
@@ -81,18 +86,26 @@ EBUILD subversion-1.2.3-r3.ebuild 11654 RMD160 8fd9717b9b2ade7456b107fdbc24a04f5
 MD5 6e3f62198b31205da916c6878ae12ec1 subversion-1.2.3-r3.ebuild 11654
 RMD160 8fd9717b9b2ade7456b107fdbc24a04f5632f88a subversion-1.2.3-r3.ebuild 11654
 SHA256 6764a5ad36ac50218db31e3821c3fb87ddbe9713d3deef538e64790b9f8cc3d4 subversion-1.2.3-r3.ebuild 11654
-EBUILD subversion-1.3.2-r3.ebuild 11678 RMD160 4cde5126f3c5137ea6af129f570978fa59a9610b SHA1 9e8617eb779545494532b4be6fc88793604df1fb SHA256 bd88af7055c93f61cdd824e7f5ad7f2d2dee2602dd639c83e73bb72eb8558155
-MD5 1e29de05ae1cd792412a21a21bfd8255 subversion-1.3.2-r3.ebuild 11678
-RMD160 4cde5126f3c5137ea6af129f570978fa59a9610b subversion-1.3.2-r3.ebuild 11678
-SHA256 bd88af7055c93f61cdd824e7f5ad7f2d2dee2602dd639c83e73bb72eb8558155 subversion-1.3.2-r3.ebuild 11678
+EBUILD subversion-1.3.2-r3.ebuild 11681 RMD160 f3ea21144b373d4ee4845eb2e1b67d68181fe510 SHA1 b76ad776c64d56e54cb5d620ff0f25cd1d56273c SHA256 89f2be7bcef35c766068e72db2aadd8e18a96629aa37d763c012f49eb6212078
+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 11841 RMD160 ed9900404fe5b74e311c9584c011af0860dae947 SHA1 70c333f6eae9abf9b07fae2af35ece785f3f17b0 SHA256 d7e867ec1bb97149d49a56f5d62e63e5754bc21ba4b5183c5056687d1b79daea
+MD5 332d1e106cbc479e9e02ef20cf63f72b subversion-1.3.2-r4.ebuild 11841
+RMD160 ed9900404fe5b74e311c9584c011af0860dae947 subversion-1.3.2-r4.ebuild 11841
+SHA256 d7e867ec1bb97149d49a56f5d62e63e5754bc21ba4b5183c5056687d1b79daea subversion-1.3.2-r4.ebuild 11841
+EBUILD subversion-1.4.3-r1.ebuild 11850 RMD160 01a0500dfe1715e7c7ce5970c9b0934b6fc2c961 SHA1 9751a5f2749fbf60d355d57618e4775976f8d029 SHA256 eb7c24db7d3da0aa28749062c61efe60120c6270615d424798525d2fa0c455ca
+MD5 2e87be4aeeee10a09b03a1d27b3ed0a1 subversion-1.4.3-r1.ebuild 11850
+RMD160 01a0500dfe1715e7c7ce5970c9b0934b6fc2c961 subversion-1.4.3-r1.ebuild 11850
+SHA256 eb7c24db7d3da0aa28749062c61efe60120c6270615d424798525d2fa0c455ca subversion-1.4.3-r1.ebuild 11850
 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
-MISC ChangeLog 44241 RMD160 4bcc26afc484ba66269a0c06723b43191ad2f768 SHA1 dce1fb6a174ff7f0d8f233f3fc4f756029fc7b18 SHA256 d2ce2d64631fff1c247b1ecd766ab12a2aabf283864055735be1854d6ed0dfe0
-MD5 f05afbbdb9ffb46444f3bff3a026d07d ChangeLog 44241
-RMD160 4bcc26afc484ba66269a0c06723b43191ad2f768 ChangeLog 44241
-SHA256 d2ce2d64631fff1c247b1ecd766ab12a2aabf283864055735be1854d6ed0dfe0 ChangeLog 44241
+MISC ChangeLog 44592 RMD160 e310262c60fa9c0f31df64cb75ac105ae3cca09e SHA1 9bbfe9775f18fde2eac3ebd56e481223687c27f9 SHA256 854544866a6058c7dc652d4c3dbf03a61a65273d81986e899787fadf757ebb10
+MD5 cf54edd4851dc862829baca116234c9f ChangeLog 44592
+RMD160 e310262c60fa9c0f31df64cb75ac105ae3cca09e ChangeLog 44592
+SHA256 854544866a6058c7dc652d4c3dbf03a61a65273d81986e899787fadf757ebb10 ChangeLog 44592
 MISC metadata.xml 224 RMD160 5da25d639360542842990baf18b1ae0f0837c0fd SHA1 e096d8a898bd3b957d86654e0e7fb835e2a6a0df SHA256 e6df82c1a36b5df70e15425e6059fb9f486fd31dc453404dfdd2f6b90b7f8aec
 MD5 9d26ecca44906061085842dba1505615 metadata.xml 224
 RMD160 5da25d639360542842990baf18b1ae0f0837c0fd metadata.xml 224
@@ -106,13 +119,12 @@ SHA256 1bc32a0a7716e4158624d978e12872aeff5a87e77df8b552c8886178117dc709 files/di
 MD5 f451fb992815e387265f7dd7afb3ddb6 files/digest-subversion-1.3.2-r3 256
 RMD160 2f2fa8d1f158c558014773611365d6488f55ea09 files/digest-subversion-1.3.2-r3 256
 SHA256 b77de6fcac8e868c91fb08f21a08d8e45e26d50f7efa510c9940722746b37cc5 files/digest-subversion-1.3.2-r3 256
+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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGQCivyuNVb5qfaOYRAkziAKCu5XsNDVtn8oHKiVVW4hKTFAwSWQCffSZ5
-2a4NphkKt454X6jYd3Nwvvw=
-=/Nti
------END PGP SIGNATURE-----
+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
diff --git a/dev-util/subversion/files/digest-subversion-1.3.2-r4 b/dev-util/subversion/files/digest-subversion-1.3.2-r4
new file mode 100644
index 000000000000..3cbcc285bd36
--- /dev/null
+++ b/dev-util/subversion/files/digest-subversion-1.3.2-r4
@@ -0,0 +1,3 @@
+MD5 34aaac35a8326eba1c8076ee9e93fb6c subversion-1.3.2.tar.bz2 6834364
+RMD160 dc9fbe683379ce25a62b91810eb5652ead19abcf subversion-1.3.2.tar.bz2 6834364
+SHA256 805cb0ee894d2c219fe979dde98ccd56c06de6c3ca3986d87c80a2a2bcc08185 subversion-1.3.2.tar.bz2 6834364
diff --git a/dev-util/subversion/files/digest-subversion-1.4.3-r1 b/dev-util/subversion/files/digest-subversion-1.4.3-r1
new file mode 100644
index 000000000000..8bec3298f6c5
--- /dev/null
+++ b/dev-util/subversion/files/digest-subversion-1.4.3-r1
@@ -0,0 +1,3 @@
+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/subversion-1.3.2-neon-0.26.patch b/dev-util/subversion/files/subversion-1.3.2-neon-0.26.patch
new file mode 100644
index 000000000000..3efd014e7655
--- /dev/null
+++ b/dev-util/subversion/files/subversion-1.3.2-neon-0.26.patch
@@ -0,0 +1,39 @@
+--- subversion-1.3.1/build/ac-macros/neon.m4	2005-08-25 16:29:03.000000000 +0000
++++ subversion-1.3.1/build/ac-macros/neon.m4	2006-04-04 09:08:13.506590250 +0000
+@@ -50,9 +50,10 @@
+       NEON_VERSION=`cat $abs_srcdir/neon/.version`
+       AC_MSG_RESULT([$NEON_VERSION])
+ 
+-      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then
++      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" || \
++         test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then
+         AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
+-                           [Defined if have Neon 0.25.x instead of 0.24.7.])
++                           [Defined if have Neon 0.25.x/0.26.x instead of 0.24.7.])
+       fi
+ 
+       for svn_allowed_neon in $NEON_ALLOWED_LIST; do
+@@ -123,9 +123,10 @@
+       NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
+       AC_MSG_RESULT([$NEON_VERSION])
+ 
+-      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then
++      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" || \
++         test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then
+         AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
+-                           [Defined if have Neon 0.25.x instead of 0.24.7.])
++                           [Defined if have Neon 0.25.x/0.26.x instead of 0.24.7.])
+       fi
+ 
+       for svn_allowed_neon in $NEON_ALLOWED_LIST; do
+--- subversion-1.3.1/configure.in	2006-01-29 00:04:18.000000000 +0000
++++ subversion-1.3.1/configure.in	2006-04-04 09:08:37.508090250 +0000
+@@ -226,7 +226,7 @@
+ 
+ # Either a space-separated list of allowable Neon versions, or "any" to
+ # mean allow anything.
+-NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5"
++NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.3"
+ NEON_LATEST_WORKING_VER=0.25.5
+ NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
+ dnl You can skip the neon version check only if you know what you are doing 
diff --git a/dev-util/subversion/files/subversion-1.4.3-neon-0.26.3.patch b/dev-util/subversion/files/subversion-1.4.3-neon-0.26.3.patch
new file mode 100644
index 000000000000..1c97d559ff24
--- /dev/null
+++ b/dev-util/subversion/files/subversion-1.4.3-neon-0.26.3.patch
@@ -0,0 +1,11 @@
+--- configure.in.orig	2007-05-15 20:22:18.000000000 +0200
++++ configure.in	2007-05-15 20:22:55.000000000 +0200
+@@ -69,7 +69,7 @@
+ 
+ # Either a space-separated list of allowable Neon versions, or "any" to
+ # mean allow anything.
+-NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2"
++NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3"
+ NEON_LATEST_WORKING_VER=0.25.5
+ NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
+ dnl You can skip the neon version check only if you know what you are doing 
diff --git a/dev-util/subversion/subversion-1.3.2-r3.ebuild b/dev-util/subversion/subversion-1.3.2-r3.ebuild
index 3d637244ba38..865c465ff212 100644
--- a/dev-util/subversion/subversion-1.3.2-r3.ebuild
+++ b/dev-util/subversion/subversion-1.3.2-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r3.ebuild,v 1.18 2007/05/08 07:37:11 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.3.2-r3.ebuild,v 1.19 2007/05/15 18:44:40 carlo Exp $
 
 inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2
 
@@ -15,7 +15,7 @@ IUSE="apache2 berkdb python emacs perl java nls nowebdav zlib ruby"
 RESTRICT="test"
 
 COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} )
-	dev-libs/apr-util
+	=dev-libs/apr-util-0*
 	python? ( >=dev-lang/python-2.0 )
 	perl? ( >=dev-lang/perl-5.8.6-r6
 		!=dev-lang/perl-5.8.7 )
diff --git a/dev-util/subversion/subversion-1.3.2-r4.ebuild b/dev-util/subversion/subversion-1.3.2-r4.ebuild
new file mode 100644
index 000000000000..1b25ae943d41
--- /dev/null
+++ b/dev-util/subversion/subversion-1.3.2-r4.ebuild
@@ -0,0 +1,360 @@
+# 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.1 2007/05/15 18:44:40 carlo 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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="apache2 berkdb python emacs perl java nls nowebdav zlib ruby"
+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 )"
+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}
+
+	# 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*
+
+	export WANT_AUTOCONF=2.5
+	autoconf
+
+	sed -i -e 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in
+
+	elibtoolize
+
+	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"
+
+	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-1-config --cppflags`
+
+	econf ${myconf} \
+		$(use_with berkdb berkeley-db) \
+		$(use_with zlib) \
+		$(use_with python) \
+		$(use_enable nls) \
+		--with-apr=/usr \
+		--with-apr-util=/usr \
+		--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
+
+	# 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"
+}
+
+
+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="${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"
+		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
+	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}/
+
+	docinto notes
+	for f in notes/*
+	do
+		[[ -f ${f} ]] && dodoc ${f}
+	done
+
+	# 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
+}
+
+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() {
+	has_version virtual/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 ..."
+		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
new file mode 100644
index 000000000000..b684c05b46c9
--- /dev/null
+++ b/dev-util/subversion/subversion-1.4.3-r1.ebuild
@@ -0,0 +1,366 @@
+# 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.1 2007/05/15 18:44:40 carlo 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="${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
+}