fixes for bug 180236 as well as desktop and icon fixes

Package-Manager: portage-2.1.3_rc3

4 files changed, 60 insertions, 35 deletions

diff --git a/dev-util/rapidsvn/ChangeLog b/dev-util/rapidsvn/ChangeLog
index bd2f2e1e58fa..7aa1f8a17a2e 100644
--- a/dev-util/rapidsvn/ChangeLog
+++ b/dev-util/rapidsvn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/rapidsvn
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.43 2007/04/08 03:56:40 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.44 2007/06/26 05:40:11 nerdboy Exp $
+
+  26 Jun 2007; Steve Arnold <nerdboy@gentoo.org> rapidsvn-0.9.3.ebuild,
+  rapidsvn-0.9.4.ebuild:
+  Fixes for bug 180236 as well as desktop and icon fixes.  Set apr deps
+  based on subversion and upstream (handle apr-1 correctly).
 
   08 Apr 2007; Ryan Hill <dirtyepic@gentoo.org> rapidsvn-0.9.3.ebuild,
   rapidsvn-0.9.4.ebuild:
diff --git a/dev-util/rapidsvn/Manifest b/dev-util/rapidsvn/Manifest
index f291fe54b797..4b2c1409f246 100644
--- a/dev-util/rapidsvn/Manifest
+++ b/dev-util/rapidsvn/Manifest
@@ -4,18 +4,18 @@ RMD160 3d2b6f48e46e3c5e39a499589043aa09de60d8c6 files/rapidsvn-svncpp_link.patch
 SHA256 99a4690987be6f39400a737ca12762495621fc2789fed18c5d9903a8d87ae968 files/rapidsvn-svncpp_link.patch 304
 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
-EBUILD rapidsvn-0.9.3.ebuild 2626 RMD160 730af4419de01e8920e9a8ec81b68e282e6e2edb SHA1 4e0b8e23e3ed445a78585e70eafc0024f790fede SHA256 219c62e74d8b5f24720630f1f387e970cc84975f21138b65c54a08e3fb5d14aa
-MD5 8263e880c3ca11406f420af5f8a72dd2 rapidsvn-0.9.3.ebuild 2626
-RMD160 730af4419de01e8920e9a8ec81b68e282e6e2edb rapidsvn-0.9.3.ebuild 2626
-SHA256 219c62e74d8b5f24720630f1f387e970cc84975f21138b65c54a08e3fb5d14aa rapidsvn-0.9.3.ebuild 2626
-EBUILD rapidsvn-0.9.4.ebuild 2638 RMD160 fe071029ecc979c9617072e410fb6c1faafdbed6 SHA1 7436c1d71480f4e3752240adf93d301b1608dbc2 SHA256 cab5eb821ce1b94a2a59cd93140528d579947eb5568d1c548b99c2cfc61ea930
-MD5 9e14b5e29af70b86073d9baee964d2fa rapidsvn-0.9.4.ebuild 2638
-RMD160 fe071029ecc979c9617072e410fb6c1faafdbed6 rapidsvn-0.9.4.ebuild 2638
-SHA256 cab5eb821ce1b94a2a59cd93140528d579947eb5568d1c548b99c2cfc61ea930 rapidsvn-0.9.4.ebuild 2638
-MISC ChangeLog 7148 RMD160 6ae3f703d013d76b32d88e8cbc908fce02131650 SHA1 33b5e7586c38b7aaa84e5f497c8cf3f8951c689a SHA256 c96c229b53967796545715b7fa8ce699155435be1ddcfd8a0b835bc6a7c9a697
-MD5 9f28353f7a11788a389b94818076cd6d ChangeLog 7148
-RMD160 6ae3f703d013d76b32d88e8cbc908fce02131650 ChangeLog 7148
-SHA256 c96c229b53967796545715b7fa8ce699155435be1ddcfd8a0b835bc6a7c9a697 ChangeLog 7148
+EBUILD rapidsvn-0.9.3.ebuild 2890 RMD160 a7360981540f282923f0582c2dce772ea07dd5f5 SHA1 79fbad24808040e11fa0a8d226d4a1d7dad27cff SHA256 cd09307eb981d140856e8857dd4e0f3c6b47e0cee6ceddf583c3dc37e3cfc62d
+MD5 49bd58aaffae9970276631b5aabbdf47 rapidsvn-0.9.3.ebuild 2890
+RMD160 a7360981540f282923f0582c2dce772ea07dd5f5 rapidsvn-0.9.3.ebuild 2890
+SHA256 cd09307eb981d140856e8857dd4e0f3c6b47e0cee6ceddf583c3dc37e3cfc62d rapidsvn-0.9.3.ebuild 2890
+EBUILD rapidsvn-0.9.4.ebuild 2912 RMD160 83d4c9c2d875cd0d506f4a5ceae46a9758489930 SHA1 ff0c2a5e32f60616d841449b24a13eb12edc71c3 SHA256 32010541574741632dd55757c82f3978896f2daf85f8aaf00f9804d9627ffd0f
+MD5 dbb526d98a53780cc43f47a72cd884cf rapidsvn-0.9.4.ebuild 2912
+RMD160 83d4c9c2d875cd0d506f4a5ceae46a9758489930 rapidsvn-0.9.4.ebuild 2912
+SHA256 32010541574741632dd55757c82f3978896f2daf85f8aaf00f9804d9627ffd0f rapidsvn-0.9.4.ebuild 2912
+MISC ChangeLog 7377 RMD160 73d7cb9b738d2f0f3b67a69a2bca841c4191d2ce SHA1 ab38571dd05c2b32c5981ef80e2dc8d55957d4ff SHA256 f355f8e5d1c7ab6104b1af71839ea2a33b3aeca6face2e7d38fb1c52a770df35
+MD5 097863903dae8aa5ddc0d5de0c3bcd42 ChangeLog 7377
+RMD160 73d7cb9b738d2f0f3b67a69a2bca841c4191d2ce ChangeLog 7377
+SHA256 f355f8e5d1c7ab6104b1af71839ea2a33b3aeca6face2e7d38fb1c52a770df35 ChangeLog 7377
 MISC metadata.xml 518 RMD160 b9c97307a72d2c0ae05deb166229ffc603d8855b SHA1 6b9c6a8c99c7dd184cf048b4e306f0a0e5f81788 SHA256 b7e173df02d2585da2771a95e6acd8ae824e61887087747d227b9ea07bf0b435
 MD5 35d9a0711821962697d1e9a351f7ea58 metadata.xml 518
 RMD160 b9c97307a72d2c0ae05deb166229ffc603d8855b metadata.xml 518
diff --git a/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild b/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild
index a7d0027032b6..7352350fc5bf 100644
--- a/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild
@@ -1,8 +1,8 @@
 # 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.14 2007/06/26 02:04:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild,v 1.15 2007/06/26 05:40:11 nerdboy Exp $
 
-inherit eutils libtool autotools wxwidgets
+inherit eutils libtool autotools wxwidgets flag-o-matic
 
 DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system."
 HOMEPAGE="http://rapidsvn.tigris.org/"
@@ -15,22 +15,23 @@ IUSE="doc static"
 DEPEND=">=dev-util/subversion-1.3.2-r1
 	>=net-misc/neon-0.26
 	>=x11-libs/wxGTK-2.6.2
-	<dev-libs/apr-0.9.13
+	>=dev-libs/apr-0.9.7
+	>=dev-libs/apr-util-0.9.7
 	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"
+
+	export WANT_AUTOCONF=2.5
+	autoconf
 	elibtoolize
-	eautoreconf
 }
 
 src_compile() {
@@ -43,12 +44,16 @@ src_compile() {
 	    einfo "Found neon support; continuing..."
 	fi
 
-	# if you compiled subversion without (the) apache2 (flag) and with the
+	# 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
+	local apr_suffix=""
 
+	if has_version ">dev-libs/apr-util-1"; then
+	    apr_suffix="-1"
+	fi
 	if use doc; then
 		xslss_dir=$(ls -1d /usr/share/sgml/docbook/xsl-stylesheets*|head -n1)
 		myconf="--with-docbook-xsl=$xslss_dir"
@@ -66,10 +71,13 @@ src_compile() {
 	need-wxwidgets gtk2
 	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-neon-config=/usr/bin/neon-config \
-		--with-apr-config=/usr/bin/apr-config \
+		--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"
 }
@@ -78,7 +86,8 @@ 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 RevisionControl
+	make_desktop_entry rapidsvn "RapidSVN ${PV}" \
+	    "/usr/share/pixmaps/svn.xpm"
 	dodoc HACKING.txt TRANSLATIONS
 	if use doc ; then
 	    dodoc AUTHORS CHANGES NEWS README
diff --git a/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild b/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild
index 2fca864638d3..1b9c25b9a58c 100644
--- a/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild
@@ -1,8 +1,8 @@
 # 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.6 2007/06/26 02:04:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild,v 1.7 2007/06/26 05:40:11 nerdboy Exp $
 
-inherit eutils libtool autotools wxwidgets
+inherit eutils libtool autotools wxwidgets flag-o-matic
 
 DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system."
 HOMEPAGE="http://rapidsvn.tigris.org/"
@@ -14,23 +14,24 @@ IUSE="doc static"
 
 DEPEND=">=dev-util/subversion-1.3.2-r1
 	>=net-misc/neon-0.26
-	=x11-libs/wxGTK-2.6*
-	<dev-libs/apr-0.9.13
+	>=x11-libs/wxGTK-2.6.2
+	>=dev-libs/apr-0.9.7
+	>=dev-libs/apr-util-0.9.7
 	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"
+
+	export WANT_AUTOCONF=2.5
+	autoconf
 	elibtoolize
-	eautoreconf
 }
 
 src_compile() {
@@ -43,11 +44,16 @@ src_compile() {
 	    einfo "Found neon support; continuing..."
 	fi
 
-	# if you compiled subversion without (the) apache2 (flag) and with the
+	# 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
+	local apr_suffix=""
+
+	if has_version ">dev-libs/apr-util-1"; then
+	    apr_suffix="-1"
+	fi
 
 	if use doc; then
 		xslss_dir=$(ls -1d /usr/share/sgml/docbook/xsl-stylesheets*|head -n1)
@@ -56,6 +62,7 @@ src_compile() {
 		myconf="--without-xsltproc --without-docbook-xsl \
 			--without-doxygen --without-dot"
 	fi
+
 	if use static; then
 		myconf="${myconf} --enable-static"
 	else
@@ -66,10 +73,13 @@ src_compile() {
 	need-wxwidgets gtk2
 	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-neon-config=/usr/bin/neon-config \
-		--with-apr-config=/usr/bin/apr-config \
+		--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"
 }
@@ -77,8 +87,9 @@ src_compile() {
 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
+	doicon src/res/rapidsvn.ico
+	make_desktop_entry rapidsvn "RapidSVN ${PV}" \
+	    "/usr/share/pixmaps/rapidsvn.ico"
 	dodoc HACKING.txt TRANSLATIONS
 	if use doc ; then
 	    dodoc AUTHORS CHANGES NEWS README