--- subversion-1.5.0_rc9-r1.ebuild
+++ subversion-1.5.0.ebuild
@@ -3,6 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.5.0_rc9-r1.ebuild,v 1.1 2008/06/16 08:34:45 hollow Exp $
 
 EAPI="1"
+WANT_AUTOMAKE="none"
 
 inherit autotools bash-completion confutils depend.apache elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module python
 
@@ -13,7 +14,7 @@
 LICENSE="Subversion"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="apache2 berkdb debug +dso doc emacs extras java nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
+IUSE="apache2 berkdb debug doc +dso emacs extras java nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
 RESTRICT="test"
 
 CDEPEND=">=dev-libs/apr-1.2.8
@@ -71,12 +72,18 @@
 
 	epatch "${FILESDIR}"/1.5.0/http-library.patch
 	epatch "${FILESDIR}"/1.5.0/disable-unneeded-linking.patch
+	epatch "${FILESDIR}"/1.5.0/merge-improvements.patch
+
+	sed -i \
+		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
+		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
 
 	sed -e 's:@bindir@/svn-contrib:@libdir@/subversion/bin:' \
 		-e 's:@bindir@/svn-tools:@libdir@/subversion/bin:' \
 		-i Makefile.in
 
 	eautoconf
+	elibtoolize
 }
 
 src_compile() {
@@ -281,7 +288,7 @@
 		ecompressdir /usr/share/doc/${PF}/notes
 
 		if use java; then
-			doins -r doc/javadoc
+			java-pkg_dojavadoc doc/javadoc
 		fi
 	fi
 }
@@ -289,8 +296,8 @@
 pkg_preinst() {
 	# Compare versions of Berkeley DB, bug 122877.
 	if use berkdb && [[ -f "${ROOT}usr/bin/svn" ]] ; then
-		OLD_BDB_VERSION="$(scanelf -nq "${ROOT}usr/lib/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${D}usr/lib/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		OLD_BDB_VERSION="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		NEW_BDB_VERSION="$(scanelf -nq "${D}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
 		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
 			CHANGED_BDB_VERSION=1
 		fi