Added new version, updated use=doc generation (closes bug #265941).

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 152 insertions, 13 deletions

diff --git a/dev-util/rapidsvn/ChangeLog b/dev-util/rapidsvn/ChangeLog
index b3818f10df4f..8abe8fb09a24 100644
--- a/dev-util/rapidsvn/ChangeLog
+++ b/dev-util/rapidsvn/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/rapidsvn
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.64 2008/09/17 20:46:01 maekke Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.65 2009/06/06 15:54:15 nerdboy Exp $
+
+*rapidsvn-0.9.8 (06 Jun 2009)
+
+  06 Jun 2009; Steve Arnold <nerdboy@gentoo.org>
+  +files/rapidsvn-0.9.8-sar.patch, +rapidsvn-0.9.8.ebuild:
+  Added new version, updated use=doc generation (closes bug #265941).  The
+  underlying subversion neon support is dorked up (at least for me) so this
+  was tested with webdav-serf against a couple of different local repos.
 
   17 Sep 2008; Markus Meier <maekke@gentoo.org> rapidsvn-0.9.6-r1.ebuild:
   amd64/x86 stable, bug #237095
diff --git a/dev-util/rapidsvn/Manifest b/dev-util/rapidsvn/Manifest
index 7f40488fb3f4..06d76f42c260 100644
--- a/dev-util/rapidsvn/Manifest
+++ b/dev-util/rapidsvn/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX rapidsvn-0.9.8-sar.patch 955 RMD160 872c2307abee59bc2b2d63866b8d72ec81600e08 SHA1 0682da8f3dcd41019c780f749b1087ba22793311 SHA256 485eca96c9d393baffec28443eb7f32fe577d9a12533c0797ca61f67380c4b0e
 AUX rapidsvn-sar.patch 931 RMD160 ba28d6ccfd86553b4963d611593812db6005ae4c SHA1 175d1609f2e9cfb7f0f6e832ee168869760b442e SHA256 0690d1c3c516e32138225ca60c74a157632eab7358f5d8cbdd374f7b5d1c5782
 AUX rapidsvn-svncpp_link.patch 304 RMD160 3d2b6f48e46e3c5e39a499589043aa09de60d8c6 SHA1 9752592941c10d71f94680ff97e925fee66bc890 SHA256 99a4690987be6f39400a737ca12762495621fc2789fed18c5d9903a8d87ae968
 DIST rapidsvn-0.9.3.tar.gz 998268 RMD160 316904503ab1a067fb14b0567d6e28bc2a6ad6c5 SHA1 71a57ffb4f7944191df51c4a2a87f1c971567543 SHA256 90363935f9a1cb3177d045679db39c94ee44ffc3d67ed63570900ca64771f139
 DIST rapidsvn-0.9.4.tar.gz 1057482 RMD160 edbabab261b69acc78a2009f2da175b2b70c8987 SHA1 0f8eff53964f641253d6a4be82187ab9f30168c7 SHA256 20c6a17ed91171bae6c3af7b611b0f91395cb2962fc0cfe1d66dfd5178d60651
 DIST rapidsvn-0.9.6.tar.gz 1205771 RMD160 060a66d3f268f9a4018f01a9541df2a3394ed7b8 SHA1 266f846437e3bbce1707799ec0d95c2d1be43b4a SHA256 4e026b0e7a56b2a0ba4cd12b1ee224c8d0645e98eb5b682078220f912513b36d
+DIST rapidsvn-0.9.8.tar.gz 1212108 RMD160 a1614daff3631536c3eb0a14c279f0581b257fbf SHA1 22d145d2d686841da100d45789a663c70e325a3c SHA256 9af7462559d8a600a1b54ac19a79c111691818969e193a06080c9d9306b32b13
 EBUILD rapidsvn-0.9.3.ebuild 3091 RMD160 466e320834ce751fcfb7b8f94a629b63c1dbca09 SHA1 f207b23c2031d349aab9002440c4cbf10bb17435 SHA256 699bffef14e903b9f1774dc4701077c38abd9a9f2d82aea96e7670988e96ca0b
 EBUILD rapidsvn-0.9.4.ebuild 3072 RMD160 ec90d18c04914eda51f0170211c152c687acac70 SHA1 ac8e219a3680ee93e8db6b2db95a3ea994cc0af8 SHA256 82829bbb651c340d6b3d2eba80864798fbd9d824ab3473476b56753f23422805
 EBUILD rapidsvn-0.9.6-r1.ebuild 3373 RMD160 4d1382864a7b09cbc3a516a0a084be11826544bc SHA1 19b9a8cb6defc5b0a3c591783768bc401bcb8e5f SHA256 29b7bcef2d09ce5ca684ce36f3adf0ab0955b98a50d38681c1324cb5543c742d
-MISC ChangeLog 10249 RMD160 ae3386feadd6f0a316f7b8b80461616e2b670c6b SHA1 ef4930bf6182f965b240cd819d1a77986c9aeda6 SHA256 ce4e11d9597d301025011424973aad0a64da7c0f5b38feb11ec9ac761deccbd8
+EBUILD rapidsvn-0.9.8.ebuild 3048 RMD160 e1a5c5c749448a345e7bdb261385dee5bad2cdc4 SHA1 354a76c7b7c1403077a47144faa98c505b2e2fdf SHA256 844e91ed2c98680989d394c334d02363e2152eb96352e9e20cce3697ed84fdf9
+MISC ChangeLog 10614 RMD160 ec20fff051d3931c991b8e192dd01b29cffd54c5 SHA1 c59963feb9c62191b67b8d8e8fb2be6fc82745ed SHA256 3a1dc828f9d6ef4b1989020f4f194bbbd33685687081bea8cf3f9a6fefcd716d
 MISC metadata.xml 518 RMD160 b9c97307a72d2c0ae05deb166229ffc603d8855b SHA1 6b9c6a8c99c7dd184cf048b4e306f0a0e5f81788 SHA256 b7e173df02d2585da2771a95e6acd8ae824e61887087747d227b9ea07bf0b435
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjRbNoACgkQkKaRLQcq0GKz5QCgqyPpeez1gxnUj1q5q83KlK9f
-WdIAnjm1K4J/9MLc3nzJ6lmBD+cbSTIw
-=m//B
------END PGP SIGNATURE-----
diff --git a/dev-util/rapidsvn/files/rapidsvn-0.9.8-sar.patch b/dev-util/rapidsvn/files/rapidsvn-0.9.8-sar.patch
new file mode 100644
index 000000000000..6769382f8267
--- /dev/null
+++ b/dev-util/rapidsvn/files/rapidsvn-0.9.8-sar.patch
@@ -0,0 +1,28 @@
+--- src/svncpp/client_status.cpp.orig	2009-02-14 14:08:15.000000000 -0800
++++ src/svncpp/client_status.cpp	2009-05-26 18:12:04.137129866 -0700
+@@ -65,17 +65,21 @@
+            hi != NULL;
+            hi = apr_hash_next(hi))
+       {
+-        char *path;
++        typedef union {
++    	    char *cpath;
++    	    void *vpath;
++    	} upath;
++    	upath path;
+         void *val;
+-        apr_hash_this(hi, (const void **)&path, NULL, &val);
++        apr_hash_this(hi, (const void **)&path.vpath, NULL, &val);
+ 
+         svn_log_changed_path_t *log_item = reinterpret_cast<svn_log_changed_path_t *>(val);
+ 
+         entry.changedPaths.push_back(
+-          LogChangePathEntry(path,
++          LogChangePathEntry(path.cpath,
+                              log_item->action,
+                              log_item->copyfrom_path,
+-                             log_item->copyfrom_rev));
++                             log_item->copyfrom_rev) );
+       }
+     }
+ 
diff --git a/dev-util/rapidsvn/rapidsvn-0.9.8.ebuild b/dev-util/rapidsvn/rapidsvn-0.9.8.ebuild
new file mode 100644
index 000000000000..0cb8b4c51b09
--- /dev/null
+++ b/dev-util/rapidsvn/rapidsvn-0.9.8.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.8.ebuild,v 1.1 2009/06/06 15:54:15 nerdboy Exp $
+
+WANT_AUTOCONF="2.5"
+inherit versionator eutils libtool autotools wxwidgets flag-o-matic fdo-mime
+
+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"
+
+COMMON_DEP=">=dev-util/subversion-1.5.0
+	>=x11-libs/wxGTK-2.6
+	>=dev-libs/apr-1.2.10
+	>=dev-libs/apr-util-1.2.10"
+
+DEPEND="${COMMON_DEP}
+	doc? ( dev-libs/libxslt
+		app-text/docbook-sgml-utils
+		app-doc/doxygen
+		app-text/docbook-xsl-stylesheets )"
+
+RDEPEND="${COMMON_DEP}"
+
+RESTRICT=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Apparently we still need the --as-needed link patch...
+	#export EPATCH_OPTS="-F3 -l"
+	epatch "${FILESDIR}/${PN}-svncpp_link.patch"
+	epatch "${FILESDIR}/${P}-sar.patch"
+	eautoreconf
+}
+
+src_compile() {
+	einfo "Checking for subversion compiled with WebDAV support..."
+	if ! built_with_use --missing true -o dev-util/subversion webdav-serf || \
+	built_with_use --missing false dev-util/subversion nowebdav; then
+		ewarn "SVN (dev-util/subversion) must be compiled with WebDAV support."
+		ewarn "Please re-emerge subversion with the webdav-serf USE flag and"
+		ewarn "without the nowebdav USE flag."
+		die "SVN merged without WebDAV support"
+	else
+		einfo "Found WebDAV 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 apr_suffix=""
+
+	if has_version ">dev-libs/apr-util-1"; then
+		apr_suffix="-1"
+	fi
+
+	if use doc; then
+		myconf="--with-manpage=yes"
+	else
+		myconf="--without-xsltproc --with-manpage=no \
+		    --without-doxygen --without-dot"
+	fi
+
+	local INST_WX=$(best_version x11-libs/wxGTK)
+	export WX_GTK_VER=$(get_version_component_range 1-2 \
+		        ${INST_WX/x11-libs\/wxGTK})
+
+	need-wxwidgets ansi
+	myconf="${myconf} --with-wx-config=${WX_CONFIG}"
+
+	append-flags $( /usr/bin/apr${apr_suffix}-config --cppflags )
+
+	econf	--with-svn-lib=/usr/$(get_libdir) \
+		--with-svn-include=/usr/include \
+		--with-apr-config="/usr/bin/apr${apr_suffix}-config" \
+		--with-apu-config="/usr/bin/apu${apr_suffix}-config" \
+		${myconf} || die "econf failed"
+	emake  || die "emake failed"
+}
+
+src_install() {
+	einstall || die "einstall failed"
+
+	doicon src/res/rapidsvn.ico
+	make_desktop_entry rapidsvn "RapidSVN ${PV}" \
+		"/usr/share/pixmaps/rapidsvn.ico" \
+		"RevisionControl;Development"
+
+	dodoc HACKING.txt TRANSLATIONS
+
+	if use doc ; then
+		dodoc AUTHORS CHANGES NEWS README
+		dohtml "${S}"/doc/svncpp/html/*
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}