New upstream version

Package-Manager: portage-2.1.1_rc1-r2

6 files changed, 388 insertions, 33 deletions

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index d94ce6e212c9..8fc9af8fbc00 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fix-po.patch 4005 RMD160 1f34be3c97b5af335a46781be36bba6fb951b531 SHA1 d2c84e9db6971f8cd23787e0dda53f09c8f17e56 SHA256 6977f8fb96fbb1320e46beab7c9ddce0253b553de91c975f540a884bafd7f99b
 MD5 3ec863ae5648587f525dddd4cc614557 files/fix-po.patch 4005
 RMD160 1f34be3c97b5af335a46781be36bba6fb951b531 files/fix-po.patch 4005
 SHA256 6977f8fb96fbb1320e46beab7c9ddce0253b553de91c975f540a884bafd7f99b files/fix-po.patch 4005
-AUX fix-po.patch.orig 4032 RMD160 c9bffce3122a0ca642c176264e5b63fd6ac91e04 SHA1 dfc6bb99f0984723fe06fdd4bf1288923467399f SHA256 1e7a40bb1c4c2a48f7c71c20ed41816127edafa1bf75a7b43b4fb828251c3d0f
-MD5 589cb30285b4d8d830e6922ae9010f47 files/fix-po.patch.orig 4032
-RMD160 c9bffce3122a0ca642c176264e5b63fd6ac91e04 files/fix-po.patch.orig 4032
-SHA256 1e7a40bb1c4c2a48f7c71c20ed41816127edafa1bf75a7b43b4fb828251c3d0f files/fix-po.patch.orig 4032
 DIST meld-1.1.3.tar.bz2 597967 RMD160 43134e32b33aa2f5a405c4ad2ba90eb22b632fbc SHA1 e7f17e8426f29aa448cfed306dccb00ac0a3e43b SHA256 0494636661aadf07520e6d75c986a53af136b6d6c4e71bdcb9dde01554dcbdb9
 DIST meld-1.1.4.tar.bz2 599912 RMD160 ae327557458cae31660d3c30bcd6640f0406f1fa SHA1 52f51e5825b4e2bb56594a9f4e180908e714848f SHA256 040c7a633b8abfe646425be4835790d4515952ce0e2ffe8523c36751d93a472f
 EBUILD meld-1.1.3.ebuild 1550 RMD160 1b314cb259132acec47fab6bd1e6a2443c22e91b SHA1 3afed2e3e0f58512c2451bede85129b0e4b8dac3 SHA256 ce513af076674d02387abf8616f8397c9c88381f149a4159bdb2ba6959ee33a4
@@ -19,10 +12,10 @@ EBUILD meld-1.1.4.ebuild 1649 RMD160 9989e300dc4030a160f93e09a6cdcdb17784e816 SH
 MD5 0b974725062058393c35e95def5294ab meld-1.1.4.ebuild 1649
 RMD160 9989e300dc4030a160f93e09a6cdcdb17784e816 meld-1.1.4.ebuild 1649
 SHA256 ca4ea38189bef61c69e7512954422e5f477e3d98721b24c25573e1aa25fcbcb6 meld-1.1.4.ebuild 1649
-MISC ChangeLog 6442 RMD160 5136db647e5d412855cf9373873742bc59adcd76 SHA1 b7786acf587edd1e10c577159022e9a8318a7fee SHA256 6b10380535225a446d8feb7383d748dd0e336d7d85344a5902f57726fc97a713
-MD5 b10f2864948f0d51ea5789dc8e5358c2 ChangeLog 6442
-RMD160 5136db647e5d412855cf9373873742bc59adcd76 ChangeLog 6442
-SHA256 6b10380535225a446d8feb7383d748dd0e336d7d85344a5902f57726fc97a713 ChangeLog 6442
+MISC ChangeLog 6525 RMD160 b85f33a1fd3ec7072474839b71ddbec907964253 SHA1 2d0ed82213bd9100cff857cb2744beb89c83cb60 SHA256 75666188b4e9be89107a201828b072ff91ca485508e59cabc4d0558a44e92acd
+MD5 9c9f3575083d27ee7830ef520f4cc9d7 ChangeLog 6525
+RMD160 b85f33a1fd3ec7072474839b71ddbec907964253 ChangeLog 6525
+SHA256 75666188b4e9be89107a201828b072ff91ca485508e59cabc4d0558a44e92acd ChangeLog 6525
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -33,10 +26,3 @@ SHA256 59fc6d05cf97b39dca34fdfc4161642aa1bad60c3f811bb668064191c8e2ebdb files/di
 MD5 366840d5e7f0bca6e5e1d56724dd6757 files/digest-meld-1.1.4 235
 RMD160 b7f6be12a22bf89fc13e6896ef35887ab184b86a files/digest-meld-1.1.4 235
 SHA256 0dc9c9acd57e433dd314f227d209444c7cd750c56d9a77ced153cbcadec5671f files/digest-meld-1.1.4 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFFBZvrJrHF4yAQTrARAtQrAKDImxNhcptnu+c6DOvSv5CVozg6FQCeMxzV
-1nyMcYkwgz1AGo255aLSB60=
-=0KNX
------END PGP SIGNATURE-----
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 9c88a1360832..4972209c4b02 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.230 2006/09/03 23:13:38 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.231 2006/09/11 20:35:24 pauldv Exp $
+
+*subversion-1.4.0 (08 Sep 2006)
+
+  08 Sep 2006; Paul de Vrieze <pauldv@gentoo.org>
+  +files/subversion-1.4-db4.patch, +subversion-1.4.0.ebuild:
+  A new upstream major version. This version introduces a number of big changes. 
+  The most significant is that there is a new working copy format that is 
+  transparently updated. It can however not transparently downgrade!
 
   03 Sep 2006; Joshua Kinard <kumba@gentoo.org> subversion-1.3.2-r3.ebuild:
   Marked stable on mips.
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 64691614f39f..3ec24ad97e9a 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 136 RMD160 d130792953a0b14b78b9a54a982f0812428f0d5e SHA1 65dfcabc7cbfe89b2feeabf388422ff865f52dab SHA256 85dc5461709d3cd28be3fbdaf0f02778f98bc9c970b50bcb00ca7658e88f3274
 MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
 RMD160 d130792953a0b14b78b9a54a982f0812428f0d5e files/70svn-gentoo.el 136
@@ -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.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
+SHA256 73f2915a8334c0ebd95abb3bc1239237c683f71662281b1a183b7885f075e236 files/subversion-1.4-db4.patch 570
 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
@@ -62,6 +63,7 @@ DIST subversion-1.2.3.tar.bz2 7238176 RMD160 46de1455fb61a5814b9d67bada10216e70e
 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
 DIST subversion-1.3.2.tar.bz2 6834364 RMD160 dc9fbe683379ce25a62b91810eb5652ead19abcf SHA1 688ab178db1f6acb2ad3bd99f030402621f837b6 SHA256 805cb0ee894d2c219fe979dde98ccd56c06de6c3ca3986d87c80a2a2bcc08185
+DIST subversion-1.4.0.tar.bz2 4709293 RMD160 18ba1f5678fe121ce6f685fc7edf546f113c46d2 SHA1 92671bba140e9b9e300b5ffb526c4a7c59aeb5b1 SHA256 6960ed42174be9c54853e8708cc91a7c8355b23c4c3921a6d7fe7947d50843e4
 EBUILD subversion-1.1.3.ebuild 11427 RMD160 958f605daa5e1a9b9fa9e8ff70812ab0e61d24d5 SHA1 4cbd9d92f45547412f75960d202672e31a5d26b4 SHA256 392e782e138556145f4b96dd6765ffbe6d5703439acd56310f06656931a0642c
 MD5 5492b14cd976c4b74652b69899f4b66b subversion-1.1.3.ebuild 11427
 RMD160 958f605daa5e1a9b9fa9e8ff70812ab0e61d24d5 subversion-1.1.3.ebuild 11427
@@ -98,10 +100,14 @@ EBUILD subversion-1.3.2.ebuild 11540 RMD160 ce34529e1ba79a4443e6fc2638fcecc59c2d
 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 39136 RMD160 c79a0728cb911d7ad368723f19e6ee4a88850522 SHA1 a692e1632cc2c75a39371d29e6af74ae6f253acc SHA256 c8111866e6f2ab2bbdfa88231760e7b44ccbd10d55f030fe206667f3f75519a4
-MD5 da179f7fd43da405d8108d0585370e7c ChangeLog 39136
-RMD160 c79a0728cb911d7ad368723f19e6ee4a88850522 ChangeLog 39136
-SHA256 c8111866e6f2ab2bbdfa88231760e7b44ccbd10d55f030fe206667f3f75519a4 ChangeLog 39136
+EBUILD subversion-1.4.0.ebuild 11374 RMD160 d422952f70e61a58480acab06f40d12124de2be8 SHA1 7220dc5a898f0f3fbf203265e7fdf3022ab0f2f6 SHA256 32a2b826dd168a1dae4bed730b000520aaea7bd3f543e8ddae61c25d85b2efcb
+MD5 ae030d4a1a3d49a65262182d6f9eddc6 subversion-1.4.0.ebuild 11374
+RMD160 d422952f70e61a58480acab06f40d12124de2be8 subversion-1.4.0.ebuild 11374
+SHA256 32a2b826dd168a1dae4bed730b000520aaea7bd3f543e8ddae61c25d85b2efcb subversion-1.4.0.ebuild 11374
+MISC ChangeLog 39508 RMD160 da0291ff22092587c94658fc0691e7076c3d9938 SHA1 905e3fe42be6aa064afb3872a8c25ec18af7b65e SHA256 acf91d1df176cb516ef6bf20952bd4d768c10898a6eaba2e93cbdf35183244a4
+MD5 2d76a394add246b5fb0f16c8a2cf295a ChangeLog 39508
+RMD160 da0291ff22092587c94658fc0691e7076c3d9938 ChangeLog 39508
+SHA256 acf91d1df176cb516ef6bf20952bd4d768c10898a6eaba2e93cbdf35183244a4 ChangeLog 39508
 MISC metadata.xml 222 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 SHA1 76e56ef0ec9c71b3032d1c501e358dd80fa1664b SHA256 4710a38e11b23d4355a7a0cba621d9680e2148aa173528491e88903487e93152
 MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 metadata.xml 222
@@ -133,10 +139,6 @@ SHA256 b77de6fcac8e868c91fb08f21a08d8e45e26d50f7efa510c9940722746b37cc5 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFA7+/amhnQswr0vIRAkFmAKC5wmP+GjbaivMMeUepnbcqUxEcoACdEJ+l
-g5E9yfekRZxNi0HTdrb1RC8=
-=uMGY
------END PGP SIGNATURE-----
+MD5 7025f60815e7fd5e8c8648a9fa66b7b8 files/digest-subversion-1.4.0 256
+RMD160 722d37a621303768280ad75e7aa4bbbbc2a897f4 files/digest-subversion-1.4.0 256
+SHA256 bd7fb04b6ddb693ea64dbcaca64d1518705722da5a2a7bfb9bc22ccace19cd12 files/digest-subversion-1.4.0 256
diff --git a/dev-util/subversion/files/digest-subversion-1.4.0 b/dev-util/subversion/files/digest-subversion-1.4.0
new file mode 100644
index 000000000000..df7773268c68
--- /dev/null
+++ b/dev-util/subversion/files/digest-subversion-1.4.0
@@ -0,0 +1,3 @@
+MD5 f0c5fef69fccfb12ef6c8598f484ed0e subversion-1.4.0.tar.bz2 4709293
+RMD160 18ba1f5678fe121ce6f685fc7edf546f113c46d2 subversion-1.4.0.tar.bz2 4709293
+SHA256 6960ed42174be9c54853e8708cc91a7c8355b23c4c3921a6d7fe7947d50843e4 subversion-1.4.0.tar.bz2 4709293
diff --git a/dev-util/subversion/files/subversion-1.4-db4.patch b/dev-util/subversion/files/subversion-1.4-db4.patch
new file mode 100644
index 000000000000..369cabb225f7
--- /dev/null
+++ b/dev-util/subversion/files/subversion-1.4-db4.patch
@@ -0,0 +1,12 @@
+diff -rNu subversion-0.27.0.orig/configure.in subversion-0.27.0/configure.in
+--- subversion-0.27.0.orig/configure.in	2003-08-14 14:22:08.000000000 +0200
++++ subversion-0.27.0/configure.in	2003-08-26 12:43:23.000000000 +0200
+@@ -261,7 +261,7 @@
+ esac
+ # Look for libdb4.so first:
+ SVN_LIB_BERKELEY_DB($SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MINOR,
+-                    $SVN_FS_WANT_DB_PATCH, [db4 db])
++                    $SVN_FS_WANT_DB_PATCH, [db-4.3 db-4.2 db-4.0 db-4 db-4.1 db4 db])
+ 
+ 
+ # Only add *_APACHE_RULE if we also have db, since mod_dav_svn depends on it.
diff --git a/dev-util/subversion/subversion-1.4.0.ebuild b/dev-util/subversion/subversion-1.4.0.ebuild
new file mode 100644
index 000000000000..14a841690f35
--- /dev/null
+++ b/dev-util/subversion/subversion-1.4.0.ebuild
@@ -0,0 +1,344 @@
+# 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.4.0.ebuild,v 1.1 2006/09/11 20:35:24 pauldv 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 ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="apache2 berkdb python emacs perl java nls nowebdav ruby"
+RESTRICT="test"
+
+COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} )
+	>=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 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
+	# rapidsvn developers work with 1.3.2
+	epatch ${FILESDIR}/subversion-1.3.1-neon-0.26.patch
+
+	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
+	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-config --cppflags`
+
+	econf ${myconf} \
+		$(use_with berkdb berkeley-db) \
+		$(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
+}
+
+
+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
+	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
+}