--- /usr/portage/dev-util/subversion/subversion-1.6.0.ebuild	2009-03-23 07:05:40.000000000 +0100
+++ subversion-1.6.0.ebuild	2009-03-25 04:27:12.000000000 +0100
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.4 2009/03/23 05:37:31 jer Exp $
+# $Header: $
 
-EAPI="1"
+EAPI="2"
 
 WANT_AUTOMAKE="none"
 
@@ -13,30 +13,40 @@
 SRC_URI="http://subversion.tigris.org/downloads/${P/_/-}.tar.bz2"
 
 LICENSE="Subversion"
-SLOT="0"
 KEYWORDS="~amd64 ~hppa"
+SLOT="0"
 IUSE="apache2 berkdb ctypes-python debug doc +dso emacs extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
+
 RESTRICT="test"
 
-CDEPEND=">=dev-db/sqlite-3.4
+CDEPEND="
+	>=dev-db/sqlite-3.4
 	>=dev-libs/apr-1.3:1
 	>=dev-libs/apr-util-1.3:1
 	dev-libs/expat
 	sys-libs/zlib
 	berkdb? ( =sys-libs/db-4* )
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring )
-	kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui =kde-base/kdelibs-4* )
+	gnome-keyring? (
+		dev-libs/glib:2
+		gnome-base/gnome-keyring
+		sys-apps/dbus
+	)
+	kde? (
+		>=kde-base/kdelibs-4.2.1
+		x11-libs/qt-gui:4[dbus]
+	)
 	ruby? ( >=dev-lang/ruby-1.8.2 )
 	sasl? ( dev-libs/cyrus-sasl )
 	webdav-neon? ( >=net-misc/neon-0.28 )
-	webdav-serf? ( >=net-libs/serf-0.3.0 )"
-
+	webdav-serf? ( >=net-libs/serf-0.3.0 )
+"
 RDEPEND="${CDEPEND}
 	java? ( >=virtual/jre-1.5 )
+	kde? ( >=kde-base/kwalletd-4.2.1 )
 	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )"
-
+	perl? ( dev-perl/URI )
+"
 DEPEND="${CDEPEND}
 	ctypes-python? ( dev-python/ctypesgen )
 	doc? ( app-doc/doxygen )
@@ -44,7 +54,8 @@
 	java? ( >=virtual/jdk-1.5 )
 	kde? ( dev-util/pkgconfig )
 	nls? ( sys-devel/gettext )
-	webdav-neon? ( dev-util/pkgconfig )"
+	webdav-neon? ( dev-util/pkgconfig )
+"
 
 want_apache
 
@@ -83,10 +94,7 @@
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}/${P}-disable_linking_against_unneeded_libraries.patch"
 
 	# Various fixes which will be included in 1.6.1.
@@ -110,7 +118,7 @@
 	elibtoolize
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 
 	if use python || use perl || use ruby; then
@@ -159,7 +167,9 @@
 		--disable-mod-activation \
 		--disable-neon-version-check \
 		--with-sqlite=/usr
+}
 
+src_compile() {
 	einfo
 	einfo "Building of core of Subversion"
 	einfo
@@ -479,7 +489,7 @@
 	elog "You should install \"net-misc/memcached\", start memcached"
 	elog "and configure your FSFS repositories, if you want to use this feature."
 	elog "See the documentation for details."
-	elog
+	echo
 	epause 6
 
 	if [[ -n "${CHANGED_BDB_VERSION}" ]]; then