Add patch to fix compilation with gcc-4.1 by Gabriel Devenyi <ace AT staticwave DOT ca>; bug #129996

(Portage version: 2.1_pre10)

5 files changed, 27 insertions, 6 deletions

diff --git a/dev-embedded/picprog/ChangeLog b/dev-embedded/picprog/ChangeLog
index 8e9c550a4967..6d538600df18 100644
--- a/dev-embedded/picprog/ChangeLog
+++ b/dev-embedded/picprog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-embedded/picprog
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/ChangeLog,v 1.10 2005/03/25 23:00:17 dragonheart Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/ChangeLog,v 1.11 2006/05/01 22:55:58 halcy0n Exp $
+
+  01 May 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/picprog-1.7-gcc41.patch, picprog-1.7-r1.ebuild:
+  Add patch to fix compilation with gcc-4.1 by Gabriel Devenyi <ace AT
+  staticwave DOT ca>; bug #129996
 
 *picprog-1.7-r1 (26 Mar 2005)
 
diff --git a/dev-embedded/picprog/files/digest-picprog-1.7 b/dev-embedded/picprog/files/digest-picprog-1.7
index efe3b6c88b09..43141b4712e6 100644
--- a/dev-embedded/picprog/files/digest-picprog-1.7
+++ b/dev-embedded/picprog/files/digest-picprog-1.7
@@ -1 +1,3 @@
 MD5 342f65a9cc71a0507fe8083181e2681c picprog-1.7.tar.gz 55118
+RMD160 e8a1c74b2335783682f88aee92cf910f519b8206 picprog-1.7.tar.gz 55118
+SHA256 08c9abd24aada73f934775bec8e0573054800daa1cf72b9bddaab1fa7ad3f352 picprog-1.7.tar.gz 55118
diff --git a/dev-embedded/picprog/files/digest-picprog-1.7-r1 b/dev-embedded/picprog/files/digest-picprog-1.7-r1
index efe3b6c88b09..43141b4712e6 100644
--- a/dev-embedded/picprog/files/digest-picprog-1.7-r1
+++ b/dev-embedded/picprog/files/digest-picprog-1.7-r1
@@ -1 +1,3 @@
 MD5 342f65a9cc71a0507fe8083181e2681c picprog-1.7.tar.gz 55118
+RMD160 e8a1c74b2335783682f88aee92cf910f519b8206 picprog-1.7.tar.gz 55118
+SHA256 08c9abd24aada73f934775bec8e0573054800daa1cf72b9bddaab1fa7ad3f352 picprog-1.7.tar.gz 55118
diff --git a/dev-embedded/picprog/files/picprog-1.7-gcc41.patch b/dev-embedded/picprog/files/picprog-1.7-gcc41.patch
new file mode 100644
index 000000000000..d6f79cc75870
--- /dev/null
+++ b/dev-embedded/picprog/files/picprog-1.7-gcc41.patch
@@ -0,0 +1,11 @@
+--- picport.h	2004-07-14 01:24:34.000000000 -0400
++++ picport.h.orig	2006-04-14 19:16:53.000000000 -0400
+@@ -45,7 +45,7 @@
+   int W[16];
+ 
+   int modembits;
+-  void picport::set_clock_data (int rts, int dtr);
++  void set_clock_data (int rts, int dtr);
+ 
+   void p_out (int b);
+   int p_in ();
diff --git a/dev-embedded/picprog/picprog-1.7-r1.ebuild b/dev-embedded/picprog/picprog-1.7-r1.ebuild
index e13507fb5404..1f99eed50c5d 100644
--- a/dev-embedded/picprog/picprog-1.7-r1.ebuild
+++ b/dev-embedded/picprog/picprog-1.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/picprog-1.7-r1.ebuild,v 1.1 2005/03/25 23:00:17 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/picprog-1.7-r1.ebuild,v 1.2 2006/05/01 22:55:58 halcy0n Exp $
 
 inherit eutils
 
@@ -20,8 +20,9 @@ RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/picprog-1.7-werner-almesberger.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/picprog-1.7-werner-almesberger.diff
+	epatch "${FILESDIR}"/${P}-gcc41.patch
 }
 
 src_compile() {