updates for bugs 134978 and 134976

Package-Manager: portage-2.1_rc3-r2

4 files changed, 44 insertions, 12 deletions

diff --git a/dev-util/rapidsvn/ChangeLog b/dev-util/rapidsvn/ChangeLog
index 9e39093a94d0..ef879db3bec6 100644
--- a/dev-util/rapidsvn/ChangeLog
+++ b/dev-util/rapidsvn/ChangeLog
@@ -1,6 +1,11 @@
 # 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.25 2006/05/28 19:52:25 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.26 2006/06/02 06:06:52 nerdboy Exp $
+
+  02 Jun 2006; Steve Arnold <nerdboy@gentoo.org>
+  +files/rapidsvn-0.9.2-gcc-4.patch, rapidsvn-0.9.2.ebuild:
+  Updates for bugs 134978 and 134976; thanks to Gergan Penkov 
+  <gpp666_999 at yahoo.de> for the patch.
 
 *rapidsvn-0.9.2 (28 May 2006)
 
diff --git a/dev-util/rapidsvn/Manifest b/dev-util/rapidsvn/Manifest
index a83828d71082..55e3952245c9 100644
--- a/dev-util/rapidsvn/Manifest
+++ b/dev-util/rapidsvn/Manifest
@@ -1,3 +1,7 @@
+AUX rapidsvn-0.9.2-gcc-4.patch 735 RMD160 135362107eb370495fa6a3aaff8d25bdea5732b1 SHA1 3b081fac641f66fc13de01fc5e56825198456f63 SHA256 3cc36d38688bc5c449603849ae8a355e911f36f9a4e9185bdfb239b92111e0da
+MD5 4987bd8cf2fe269a1ba8e19035b5937b files/rapidsvn-0.9.2-gcc-4.patch 735
+RMD160 135362107eb370495fa6a3aaff8d25bdea5732b1 files/rapidsvn-0.9.2-gcc-4.patch 735
+SHA256 3cc36d38688bc5c449603849ae8a355e911f36f9a4e9185bdfb239b92111e0da files/rapidsvn-0.9.2-gcc-4.patch 735
 AUX svncpp_0.6.1_link.patch 304 RMD160 3d2b6f48e46e3c5e39a499589043aa09de60d8c6 SHA1 9752592941c10d71f94680ff97e925fee66bc890 SHA256 99a4690987be6f39400a737ca12762495621fc2789fed18c5d9903a8d87ae968
 MD5 8fbb41ca751a2e4336d85f9d0bcae422 files/svncpp_0.6.1_link.patch 304
 RMD160 3d2b6f48e46e3c5e39a499589043aa09de60d8c6 files/svncpp_0.6.1_link.patch 304
@@ -19,14 +23,14 @@ EBUILD rapidsvn-0.9.0-r1.ebuild 2395 RMD160 16591af9e8d46d298efd93d2b5167135e597
 MD5 74ec813f9ae0323fea4b99217fbe51af rapidsvn-0.9.0-r1.ebuild 2395
 RMD160 16591af9e8d46d298efd93d2b5167135e5977561 rapidsvn-0.9.0-r1.ebuild 2395
 SHA256 865e529f1c3c6e90893bb002720b1bd15c95972ab2182ecce6043862a4abc59b rapidsvn-0.9.0-r1.ebuild 2395
-EBUILD rapidsvn-0.9.2.ebuild 2167 RMD160 a224a2d4a359f83714f361650891ce606dd15ed3 SHA1 b5d2faa34836edd16b9d5737b27b465d8fc2f735 SHA256 5fa28140d01ebbdc60142df1b3d8c14cb911916d32a641bed17e386282b13c75
-MD5 b6719432ed711307f70b3652275b66d3 rapidsvn-0.9.2.ebuild 2167
-RMD160 a224a2d4a359f83714f361650891ce606dd15ed3 rapidsvn-0.9.2.ebuild 2167
-SHA256 5fa28140d01ebbdc60142df1b3d8c14cb911916d32a641bed17e386282b13c75 rapidsvn-0.9.2.ebuild 2167
-MISC ChangeLog 4603 RMD160 5ad4bcae93c84f606f463b79c95558c53a1a1b73 SHA1 561166f8be548fd9926ae3d967f3bc8ef1369d85 SHA256 f651f1b4eb74126f5d5a636d34b5042e70bfad46f8f26e38988e6cfbedf7a40e
-MD5 e2abe895d00192b03278be2b68fcddd5 ChangeLog 4603
-RMD160 5ad4bcae93c84f606f463b79c95558c53a1a1b73 ChangeLog 4603
-SHA256 f651f1b4eb74126f5d5a636d34b5042e70bfad46f8f26e38988e6cfbedf7a40e ChangeLog 4603
+EBUILD rapidsvn-0.9.2.ebuild 2183 RMD160 b9bab5d9b8a8d3cd065b659393a18627dde0649d SHA1 a066216cb95e92835fccd9e42dbae20e2d8fda52 SHA256 07175233ecc876a13eaa77a3afc4a29d1dafca352a07ef9981d234144786659c
+MD5 e6097a5a91ff80c684ce40a14ed30c07 rapidsvn-0.9.2.ebuild 2183
+RMD160 b9bab5d9b8a8d3cd065b659393a18627dde0649d rapidsvn-0.9.2.ebuild 2183
+SHA256 07175233ecc876a13eaa77a3afc4a29d1dafca352a07ef9981d234144786659c rapidsvn-0.9.2.ebuild 2183
+MISC ChangeLog 4818 RMD160 f2620aefc26bea8f205e1de0070893f732379f3f SHA1 d97a5931574ad4ac0ae9365851105c0b859c7504 SHA256 dd4c04634047f45fcff9edfeee573c7e438972a6c623763a43847d4f8e88b0c5
+MD5 6c4a2201aafcc52c6d3400ef374c1f06 ChangeLog 4818
+RMD160 f2620aefc26bea8f205e1de0070893f732379f3f ChangeLog 4818
+SHA256 dd4c04634047f45fcff9edfeee573c7e438972a6c623763a43847d4f8e88b0c5 ChangeLog 4818
 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/files/rapidsvn-0.9.2-gcc-4.patch b/dev-util/rapidsvn/files/rapidsvn-0.9.2-gcc-4.patch
new file mode 100644
index 000000000000..a96b8d8c1176
--- /dev/null
+++ b/dev-util/rapidsvn/files/rapidsvn-0.9.2-gcc-4.patch
@@ -0,0 +1,22 @@
+--- src/action.hpp.orig	2006-04-04 11:53:17.000000000 +0200
++++ src/action.hpp	2006-05-31 02:01:19.000000000 +0200
+@@ -299,7 +299,7 @@
+     * @return temporary filename
+     */
+   svn::Path
+-  Action::GetPathAsTempFile (
++  GetPathAsTempFile (
+     const svn::Path & path,
+     const svn::Revision & revision = svn::Revision::HEAD);
+ 
+--- src/preferences_dlg.cpp.orig	2006-05-10 15:52:36.000000000 +0200
++++ src/preferences_dlg.cpp	2006-05-31 02:11:31.000000000 +0200
+@@ -94,7 +94,7 @@
+ class ProgramsPanel : public wxPanel
+ {
+ public:
+-  ProgramsPanel::ProgramsPanel (wxWindow* parent, Preferences * prefs)
++  ProgramsPanel (wxWindow* parent, Preferences * prefs)
+     : wxPanel (parent), m_prefs (prefs)
+   {
+     InitializeData ();
diff --git a/dev-util/rapidsvn/rapidsvn-0.9.2.ebuild b/dev-util/rapidsvn/rapidsvn-0.9.2.ebuild
index 3d57ace8c500..e713dc5e9212 100644
--- a/dev-util/rapidsvn/rapidsvn-0.9.2.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.9.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.2.ebuild,v 1.1 2006/05/28 19:52:26 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.2.ebuild,v 1.2 2006/06/02 06:06:52 nerdboy Exp $
 
-inherit eutils libtool
+inherit eutils libtool autotools
 
 DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system."
 HOMEPAGE="http://rapidsvn.tigris.org/"
@@ -23,7 +23,8 @@ src_unpack() {
 	cd ${WORKDIR}
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/svncpp_0.6.1_link.patch
+	epatch ${FILESDIR}/${P}-gcc-4.patch
+	eautoreconf
 }
 
 src_compile() {