minor QA fix and version bump

(Portage version: 2.1.2_rc4-r2)

4 files changed, 103 insertions, 4 deletions

diff --git a/dev-util/rapidsvn/ChangeLog b/dev-util/rapidsvn/ChangeLog
index 9db499e51298..9c617b00008c 100644
--- a/dev-util/rapidsvn/ChangeLog
+++ b/dev-util/rapidsvn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/rapidsvn
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.38 2006/09/08 04:52:55 nerdboy Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.39 2007/01/10 08:44:15 nerdboy Exp $
+
+*rapidsvn-0.9.4 (10 Jan 2007)
+
+  10 Jan 2007; Steve Arnold <nerdboy@gentoo.org> rapidsvn-0.9.3.ebuild,
+  +rapidsvn-0.9.4.ebuild:
+  Minor QA fix and version bump to current stable upstream release.
 
   08 Sep 2006; Steve Arnold <nerdboy@gentoo.org>
   +files/rapidsvn-svncpp_link.patch, rapidsvn-0.9.3.ebuild:
diff --git a/dev-util/rapidsvn/files/digest-rapidsvn-0.9.4 b/dev-util/rapidsvn/files/digest-rapidsvn-0.9.4
new file mode 100644
index 000000000000..75fa1dfb0d0f
--- /dev/null
+++ b/dev-util/rapidsvn/files/digest-rapidsvn-0.9.4
@@ -0,0 +1,3 @@
+MD5 29ef579131f97a8b2bdad77e14a619be rapidsvn-0.9.4.tar.gz 1057482
+RMD160 edbabab261b69acc78a2009f2da175b2b70c8987 rapidsvn-0.9.4.tar.gz 1057482
+SHA256 20c6a17ed91171bae6c3af7b611b0f91395cb2962fc0cfe1d66dfd5178d60651 rapidsvn-0.9.4.tar.gz 1057482
diff --git a/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild b/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild
index f8c96d8b7f3e..5c4a13ee981d 100644
--- a/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild,v 1.8 2006/09/08 04:52:55 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild,v 1.9 2007/01/10 08:44:15 nerdboy Exp $
 
 inherit eutils libtool autotools
 
@@ -20,6 +20,9 @@ DEPEND=">=dev-util/subversion-1.3.2-r1
 	    app-doc/doxygen
 	    app-text/docbook-xsl-stylesheets )"
 
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild b/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild
new file mode 100644
index 000000000000..7e74b3fb25f8
--- /dev/null
+++ b/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild,v 1.1 2007/01/10 08:44:15 nerdboy Exp $
+
+inherit eutils libtool autotools
+
+DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system."
+HOMEPAGE="http://rapidsvn.tigris.org/"
+SRC_URI="http://www.rapidsvn.org/download/release/${PV}/${P}.tar.gz"
+LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static"
+
+DEPEND=">=dev-util/subversion-1.3.2-r1
+	>=net-misc/neon-0.26
+	>=x11-libs/wxGTK-2.6.2
+	doc? ( dev-libs/libxslt
+	    app-text/docbook-sgml-utils
+	    app-doc/doxygen
+	    app-text/docbook-xsl-stylesheets )"
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# Apparently we still the --as-needed link patch...
+	epatch ${FILESDIR}/${PN}-svncpp_link.patch || die "epatch failed"
+	elibtoolize
+	eautoreconf
+}
+
+src_compile() {
+	einfo "Checking for subversion compiled with neon support..."
+	if built_with_use dev-util/subversion nowebdav; then
+	    ewarn "SVN (dev-util/subversion) must be compiled with neon support."
+	    einfo "Please re-emerge subversion without the nowebdav USE flag."
+	    die "SVN merged with nowebdav USE flag"
+	else
+	    einfo "Found neon support; continuing..."
+	fi
+
+	# if you compiled subversion without (the) apache2 (flag) and with the 
+	# berkdb flag, you will get an error that it can't find the lib db4
+	# Note: this should be fixed in rapidsvn 0.9.3 and later
+	local myconf
+	local xslss_dir
+
+	if use doc; then
+		xslss_dir=$(ls -1d /usr/share/sgml/docbook/xsl-stylesheets*|head -n1)
+		myconf="--with-docbook-xsl=$xslss_dir"
+	else
+		myconf="--without-xsltproc --without-docbook-xsl \
+			--without-doxygen --without-dot"
+	fi
+	if use static; then
+		myconf="${myconf} --enable-static"
+	else
+		myconf="${myconf} --disable-static --enable-shared"
+	fi
+	# 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 "wx-config-2.6 not found. Compiling with default wxGTK."
+	fi
+
+	econf	--with-svn-lib=/usr/$(get_libdir) \
+		--with-svn-include=/usr/include \
+		--with-neon-config=/usr/bin/neon-config \
+		${myconf} || die "econf failed"
+	emake  || die "emake failed"
+}
+
+src_install() {
+	einstall || die "einstall failed"
+	doman doc/manpage/rapidsvn.1 || die "doman failed"
+	doicon src/res/bitmaps/svn.xpm
+	make_desktop_entry rapidsvn RapidSVN svn.xpm Programming
+	dodoc HACKING.txt TRANSLATIONS
+	if use doc ; then
+	    dodoc AUTHORS CHANGES NEWS README
+	    dohtml ${S}/doc/svncpp/html/*
+	fi
+}