--- dev-util/subversion/subversion-1.5.0_rc4.ebuild
+++ dev-util/subversion/subversion-1.5.0_rc5.ebuild
@@ -29,12 +29,12 @@
 	webdav-serf? ( net-libs/serf )"
 
 RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.4 )
+	java? ( >=virtual/jre-1.5 )
 	nls? ( virtual/libintl )
 	perl? ( dev-perl/URI )"
 
 DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.4 )
+	java? ( >=virtual/jdk-1.5 )
 	nls? ( sys-devel/gettext )"
 
 want_apache
@@ -81,7 +81,7 @@
 }
 
 src_compile() {
-	local myconf=
+	local myconf
 
 	if use python || use perl || use ruby; then
 		myconf="${myconf} --with-swig"
@@ -236,7 +236,8 @@
 	newins "${FILESDIR}"/svnserve.xinetd svnserve
 
 	# Install documentation.
-	dodoc BUGS CHANGES COMMITTERS HACKING INSTALL README TRANSLATING
+	dodoc CHANGES COMMITTERS README
+	dohtml www/hacking.html
 	dodoc tools/xslt/svnindex.{css,xsl}
 	rm -fr tools/xslt
 
@@ -289,8 +290,8 @@
 pkg_preinst() {
 	# Compare versions of Berkeley DB, bug 122877.
 	if use berkdb && [[ -f "${ROOT}usr/bin/svn" ]] ; then
-		OLD_BDB_VERSION="$(scanelf -qn "${ROOT}usr/lib/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -qn "${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/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/")"
 		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
 			CHANGED_BDB_VERSION=1
 		fi