--- rapidsvn-0.9.0-r1.ebuild	2006-03-04 22:28:09.000000000 +0100
+++ rapidsvn-0.9.1.ebuild	2006-03-05 00:49:56.000000000 +0100
@@ -6,16 +6,15 @@
 
 DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system."
 HOMEPAGE="http://rapidsvn.tigris.org/"
-SRC_URI="http://www.rapidsvn.org/download/${P}.tar.gz
-		mirror://gentoo/nodoc-configure.patch.gz"
+SRC_URI="http://www.rapidsvn.org/download/${P}.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 IUSE="doc static"
 
-DEPEND="~net-misc/neon-0.24.7
+DEPEND=">=net-misc/neon-0.24.7
 	>=dev-util/subversion-1.2.0
-	~x11-libs/wxGTK-2.4.2
+	>=x11-libs/wxGTK-2.4.2
 	doc? ( dev-libs/libxslt app-text/docbook-sgml-utils app-doc/doxygen app-text/docbook-xsl-stylesheets )"
 
 src_unpack() {
@@ -23,7 +22,6 @@
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/svncpp_0.6.1_link.patch
-	epatch ${WORKDIR}/nodoc-configure.patch
 }
 
 src_compile() {
@@ -44,18 +42,23 @@
 	else
 		myconf="${myconf} --disable-static --enable-shared"
 	fi
-	# look for wxgtk config file
-	if test -x /usr/bin/wxgtk2-2.4-config; then
-		myconf="${myconf} --with-wx-config=/usr/bin/wxgtk2-2.4-config"
+	# look for wx-config-2.6
+	if (test -x /usr/bin/wx-config-2.6 && `/usr/bin/wx-config-2.6 --toolkit=gtk2 2>/dev/null` ); then
+		myconf="${myconf} --with-wx-config=/usr/bin/wx-config-2.6"
 	else
-		ewarn "wxgtk2-2.4-config not found. Trying wxgtk-2.4-config..."
+		ewarn "wx-config-2.6 not found. Trying wxgtk2-2.4-config..."
+		# look for wxgtk config file
+		if test -x /usr/bin/wxgtk2-2.4-config; then
+			myconf="${myconf} --with-wx-config=/usr/bin/wxgtk2-2.4-config"
+		else
+			ewarn "wxgtk2-2.4-config not found. Trying wxgtk-2.4-config..."
+			if test -x /usr/bin/wxgtk-2.4-config; then
+				myconf="${myconf} --with-wx-config=/usr/bin/wxgtk-2.4-config"
+			else
+				ewarn "wxgtk-2.4-config not found. Compiling with default wxGTK."
+			fi
+	 	fi
 	fi
-	if test -x /usr/bin/wxgtk-2.4-config; then
-		myconf="${myconf} --with-wx-config=/usr/bin/wxgtk-2.4-config"
-	else
-		ewarn "wxgtk-2.4-config not found. Compiling with default wxGTK."
-	fi
-
 	libtoolize --copy --force
 	elibtoolize --portage
 	econf	--with-svn-lib=/usr/$(get_libdir) \