added support for newer versions of neon (required for rapidsvn)

Package-Manager: portage-2.1.1_pre2-r2

6 files changed, 425 insertions, 9 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 03ed803b8ae3..823842fbd7fb 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.219 2006/07/03 07:25:44 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.220 2006/07/05 03:37:46 nerdboy Exp $
+
+*subversion-1.3.2-r1 (05 Jul 2006)
+
+  05 Jul 2006; Steve Arnold <nerdboy@gentoo.org>
+  +files/subversion-1.3.1-neon-0.26.patch, +subversion-1.3.2-r1.ebuild:
+  Added support for newer versions of neon (required for rapidsvn), see bugs
+  #131221 and #137563.  This syncs up the versions of neon between svn and
+  rapidsvn (and they should stay that way).
 
   03 Jul 2006; Simon Stelling <blubb@gentoo.org> subversion-1.3.1.ebuild:
   stable on amd64
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 8dfbd984867b..4dcc7bcdd632 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -6,6 +6,10 @@ AUX subversion-1.1.1-perl-vendor.patch 713 RMD160 fdc54d38c44c3e1273b654b3d1a2f4
 MD5 b8146e2661f55257aef6d41e79897b63 files/subversion-1.1.1-perl-vendor.patch 713
 RMD160 fdc54d38c44c3e1273b654b3d1a2f4a76f91aec3 files/subversion-1.1.1-perl-vendor.patch 713
 SHA256 d7c5994fa66d77ec956b2e1ca1020fadcf1200bdd2acce974033e9839bb8f7c3 files/subversion-1.1.1-perl-vendor.patch 713
+AUX subversion-1.3.1-neon-0.26.patch 1976 RMD160 ddf49e7128afebf9431d650c3a66259c42ce3613 SHA1 ca890a59c2477d4d7f97dc701245abd34e32ead4 SHA256 9e6a2f83d2cbb2b341d79aa1450b4a4fedbfc492abcd310014406c411f3ac836
+MD5 5be7c432a260dcf2fbb57af2dcd04f36 files/subversion-1.3.1-neon-0.26.patch 1976
+RMD160 ddf49e7128afebf9431d650c3a66259c42ce3613 files/subversion-1.3.1-neon-0.26.patch 1976
+SHA256 9e6a2f83d2cbb2b341d79aa1450b4a4fedbfc492abcd310014406c411f3ac836 files/subversion-1.3.1-neon-0.26.patch 1976
 AUX subversion-1.3.1-neon-config.patch 1237 RMD160 ccf7449e030afe6ef6388c12157831d5f2d59d6b SHA1 f05075b7c17be367cf83529e8558d8a1d14ace91 SHA256 6e0f152a8254b7e7c0b498ce011f1798d475b2acf18d779b4dfe0758de1f3049
 MD5 c357b009b610db967d0df27d61cd3704 files/subversion-1.3.1-neon-config.patch 1237
 RMD160 ccf7449e030afe6ef6388c12157831d5f2d59d6b files/subversion-1.3.1-neon-config.patch 1237
@@ -50,7 +54,7 @@ AUX vc-svn.el 16847 RMD160 8665b9a34c8fd9acae40e18aac33026aff3a39d7 SHA1 4d1a5a9
 MD5 dc8ba46b50a61d868eb76f524c212381 files/vc-svn.el 16847
 RMD160 8665b9a34c8fd9acae40e18aac33026aff3a39d7 files/vc-svn.el 16847
 SHA256 b4979d5df9fba02dbc8ad71d813229222e95ee1e8e89dec3060611d2d6be87aa files/vc-svn.el 16847
-DIST subversion-1.1.3.tar.bz2 6793419
+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.0.tar.bz2 6811793 RMD160 da1d5a61e49c9337fc5d2ed31cf361b07a2d5f5c SHA1 0c5c4acfbd576da39cd60450f3e16b81c3d7c209 SHA256 c5837d2e7ee6ccfbe526b7dd624c2e09407160887707ed2c5fbe82b87109366d
 DIST subversion-1.3.1.tar.bz2 6796453 RMD160 5a8ce81cdb76ad2a6faf9df22178f5458d3b5e6f SHA1 f8d670a0ae931fca17192d02862aa93a229e5dda SHA256 4f10334d72266815ff427eb25e0e574efcc684dcf01e0229b7d02f63b068d39d
@@ -79,21 +83,25 @@ EBUILD subversion-1.3.1.ebuild 11580 RMD160 7143265216987296cdd453132a45150c55a7
 MD5 db4466b30afd0339b866509ea24c9cad subversion-1.3.1.ebuild 11580
 RMD160 7143265216987296cdd453132a45150c55a78fa2 subversion-1.3.1.ebuild 11580
 SHA256 75fe0835aff1885b9349969816e5eb0dc9ccc3141c2813c5da2bc1b86c0d1ad0 subversion-1.3.1.ebuild 11580
+EBUILD subversion-1.3.2-r1.ebuild 11631 RMD160 10eb74d9fa5f3bbf8975f77ab746eee620882800 SHA1 cf1c66607ff5ba4af8f195843dd46436545e5fc9 SHA256 e583d1521778df6a2214536ceb413c2ac88c1b3bd612e8fd3f7fa7a2bec33189
+MD5 e93959d2860d1e1ca86dfeb90d7b009b subversion-1.3.2-r1.ebuild 11631
+RMD160 10eb74d9fa5f3bbf8975f77ab746eee620882800 subversion-1.3.2-r1.ebuild 11631
+SHA256 e583d1521778df6a2214536ceb413c2ac88c1b3bd612e8fd3f7fa7a2bec33189 subversion-1.3.2-r1.ebuild 11631
 EBUILD subversion-1.3.2.ebuild 11540 RMD160 ce34529e1ba79a4443e6fc2638fcecc59c2d3337 SHA1 9a45a16a2a26a2fa46614648f44bef194a57ae8a SHA256 c5be6073f36f5de203a9e741b1b84121bd806a61388d7144ae22f8c210a0c8e5
 MD5 7e61d548adad5f93c730fb2d49cf1cba subversion-1.3.2.ebuild 11540
 RMD160 ce34529e1ba79a4443e6fc2638fcecc59c2d3337 subversion-1.3.2.ebuild 11540
 SHA256 c5be6073f36f5de203a9e741b1b84121bd806a61388d7144ae22f8c210a0c8e5 subversion-1.3.2.ebuild 11540
-MISC ChangeLog 37522 RMD160 c3da5472adba59e577e85cfe4c76cd6c72c14b63 SHA1 6250869fc2cf194225fb22ac2dcb1e0e0b01a98c SHA256 8cba8be92653db8962c135ee7a6714ffb0cfce68a0aed0ca83c2f01e0e1e2c35
-MD5 cd22e7e0b26cac187cc95618e6362230 ChangeLog 37522
-RMD160 c3da5472adba59e577e85cfe4c76cd6c72c14b63 ChangeLog 37522
-SHA256 8cba8be92653db8962c135ee7a6714ffb0cfce68a0aed0ca83c2f01e0e1e2c35 ChangeLog 37522
+MISC ChangeLog 37878 RMD160 b223fd29ea3db2282cefed764c13da0364f368f1 SHA1 1034c212d4c90ac828086c34032b0d04de7e08ea SHA256 38681914af392400abd5ba46308bff557d8794126eff97c414b8221c2a349e88
+MD5 a088eba6e37ecd0455e34a172f76e9ee ChangeLog 37878
+RMD160 b223fd29ea3db2282cefed764c13da0364f368f1 ChangeLog 37878
+SHA256 38681914af392400abd5ba46308bff557d8794126eff97c414b8221c2a349e88 ChangeLog 37878
 MISC metadata.xml 222 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 SHA1 76e56ef0ec9c71b3032d1c501e358dd80fa1664b SHA256 4710a38e11b23d4355a7a0cba621d9680e2148aa173528491e88903487e93152
 MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 metadata.xml 222
 SHA256 4710a38e11b23d4355a7a0cba621d9680e2148aa173528491e88903487e93152 metadata.xml 222
-MD5 1c207179f5bf0b148528312cbc37632d files/digest-subversion-1.1.3 70
-RMD160 78ae90a444223e89a88d95e82c8532890700fef5 files/digest-subversion-1.1.3 70
-SHA256 a828f8333aac5b49e21f147a776eaac8e964e3a83f09e704769de0c4897590c8 files/digest-subversion-1.1.3 70
+MD5 6baee6f02e66ee1f11ce5292027c8d0e files/digest-subversion-1.1.3 256
+RMD160 531427ffa94056c60d37fa7e75fbdb035f20f2c3 files/digest-subversion-1.1.3 256
+SHA256 af1d1f87d2121b8e60720a83063780ac2ef4f12b0aee6e6daaa047513c7d85fc files/digest-subversion-1.1.3 256
 MD5 3ee952f56a925d56d70c72e85c27fb29 files/digest-subversion-1.2.3 256
 RMD160 8df566027bfecc11a638aaed481cc8bfa07b8073 files/digest-subversion-1.2.3 256
 SHA256 1bc32a0a7716e4158624d978e12872aeff5a87e77df8b552c8886178117dc709 files/digest-subversion-1.2.3 256
@@ -112,3 +120,6 @@ SHA256 18e41e86ec820c4c45ae1edc935e7a490b45efaf2fb0febef5df59516058a74b files/di
 MD5 f451fb992815e387265f7dd7afb3ddb6 files/digest-subversion-1.3.2 256
 RMD160 2f2fa8d1f158c558014773611365d6488f55ea09 files/digest-subversion-1.3.2 256
 SHA256 b77de6fcac8e868c91fb08f21a08d8e45e26d50f7efa510c9940722746b37cc5 files/digest-subversion-1.3.2 256
+MD5 f451fb992815e387265f7dd7afb3ddb6 files/digest-subversion-1.3.2-r1 256
+RMD160 2f2fa8d1f158c558014773611365d6488f55ea09 files/digest-subversion-1.3.2-r1 256
+SHA256 b77de6fcac8e868c91fb08f21a08d8e45e26d50f7efa510c9940722746b37cc5 files/digest-subversion-1.3.2-r1 256
diff --git a/dev-util/subversion/files/digest-subversion-1.1.3 b/dev-util/subversion/files/digest-subversion-1.1.3
index d3c44630ae56..15b5ce2293bd 100644
--- a/dev-util/subversion/files/digest-subversion-1.1.3
+++ b/dev-util/subversion/files/digest-subversion-1.1.3
@@ -1 +1,3 @@
 MD5 a09c2b2fa1a09566c024547954a48478 subversion-1.1.3.tar.bz2 6793419
+RMD160 08ff9d6736c842b829d3256bd48732a64755a81e subversion-1.1.3.tar.bz2 6793419
+SHA256 f14f19db2da379523c63a08991ac4ae997cb1fb14e472258f64291b529ec7a9e subversion-1.1.3.tar.bz2 6793419
diff --git a/dev-util/subversion/files/digest-subversion-1.3.2-r1 b/dev-util/subversion/files/digest-subversion-1.3.2-r1
new file mode 100644
index 000000000000..3cbcc285bd36
--- /dev/null
+++ b/dev-util/subversion/files/digest-subversion-1.3.2-r1
@@ -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/subversion-1.3.1-neon-0.26.patch b/dev-util/subversion/files/subversion-1.3.1-neon-0.26.patch
new file mode 100644
index 000000000000..79529b427586
--- /dev/null
+++ b/dev-util/subversion/files/subversion-1.3.1-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"
+ 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-r1.ebuild b/dev-util/subversion/subversion-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..4980aa8de3fd
--- /dev/null
+++ b/dev-util/subversion/subversion-1.3.2-r1.ebuild
@@ -0,0 +1,353 @@
+# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/07/05 03:37:46 nerdboy Exp $
+
+inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module
+
+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 ~ppc-macos ~ppc64 ~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-0.9.5
+	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 )
+	emacs? ( virtual/emacs )"
+RDEPEND="${COMMONDEPEND}
+	java? ( virtual/jre )"
+
+DEPEND="${COMMONDEPEND}
+	java? ( virtual/jdk )
+	>=sys-devel/autoconf-2.59"
+# Does not work because jikes is broken
+#	jikes? (dev-java/jikes)"
+
+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 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
+}
+
+src_unpack() {
+	unpack $A
+	cd ${S}
+
+	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.1-neon-0.26.patch
+
+	export WANT_AUTOCONF=2.5
+	autoconf
+	(cd apr; autoconf)
+	(cd apr-util; 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} $(use_with jikes)"
+	use java && myconf="${myconf} --without-jikes"
+
+	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 --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 JAVACFLAGS="-source 1.3 -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"
+	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
+	exeinto /etc/init.d ; newexe ${FILESDIR}/svnserve.initd svnserve
+	insinto /etc/conf.d ; newins ${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
+
+	einfo "Subversion Server Notes"
+	einfo "-----------------------"
+	einfo
+
+	einfo "If you intend to run a server, a repository needs to be created using"
+	einfo "svnadmin (see man svnadmin) or the following command to create it in"
+	einfo "/var/svn:"
+	einfo
+	einfo "    emerge --config =${CATEGORY}/${PF}"
+	einfo
+	einfo "If you upgraded from an older version of berkely db and experience"
+	einfo "problems with your repository then run the following commands as root:"
+	einfo "    db4_recover -h ${SVN_REPOS_LOC}/repos"
+	einfo "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
+	einfo
+	einfo "Subversion has multiple server types, take your pick:"
+	einfo
+	einfo " - svnserve daemon: "
+	einfo "   1. edit /etc/conf.d/svnserve"
+	einfo "   2. start daemon: /etc/init.d/svnserve start"
+	einfo "   3. make persistent: rc-update add svnserve default"
+	einfo
+	einfo " - svnserve via xinetd:"
+	einfo "   1. edit /etc/xinetd.d/svnserve (remove disable line)"
+	einfo "   2. restart xinetd.d: /etc/init.d/xinetd restart"
+	einfo
+	einfo " - svn over ssh:"
+	einfo "   1. Fix the repository permissions:"
+	einfo "        groupadd svnusers"
+	einfo "        chown -R root:svnusers /var/svn/repos/"
+	einfo "        chmod -R g-w /var/svn/repos"
+	einfo "        chmod -R g+rw /var/svn/repos/db"
+	einfo "        chmod -R g+rw /var/svn/repos/locks"
+	einfo "   2. create an svnserve wrapper in /usr/local/bin to set the umask you"
+	einfo "      want, for example:"
+	einfo "         #!/bin/bash"
+	einfo "         umask 002"
+	einfo "         exec /usr/bin/svnserve \"\$@\""
+	einfo
+
+	if use apache2 >/dev/null; then
+		einfo " - http-based server:"
+		einfo "   1. edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
+		einfo "   2. create an htpasswd file:"
+		einfo "      htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
+		einfo
+	fi
+
+	einfo "If you intend to use svn-hot-backup, you can specify the number of"
+	einfo "backups to keep per repository by specifying an environment variable."
+	einfo "If you want to keep e.g. 2 backups, do the following:"
+	einfo "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion"
+	einfo "echo 'SVN_HOTBACKUP_NUM_BACKUPS=2' >> /etc/env.d/80subversion"
+	einfo ""
+}
+
+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
+}