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

Package-Manager: portage-2.1_pre10

6 files changed, 61 insertions, 16 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/Manifest b/dev-embedded/picprog/Manifest
index 2f6e18a74bea..a3aaba5e0b9b 100644
--- a/dev-embedded/picprog/Manifest
+++ b/dev-embedded/picprog/Manifest
@@ -1,17 +1,41 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 58b711fc398c7dd777cf1a8685569732 ChangeLog 1565
-MD5 c5b5ceb7ecb0df0ecfd4508c06ee7f37 metadata.xml 289
-MD5 88882b9fc239d8a050baf69a8610ef41 picprog-1.7.ebuild 724
-MD5 1d6b43ae8dca8959678b38634ff03ab7 picprog-1.7-r1.ebuild 840
-MD5 646f6161041a00507756e0c3e261df62 files/digest-picprog-1.7 62
-MD5 646f6161041a00507756e0c3e261df62 files/digest-picprog-1.7-r1 62
+AUX picprog-1.7-gcc41.patch 293 RMD160 84e5cfa32db086bc79ca928a59d56fd8f003a9c2 SHA1 c77a6748e0cb4b4988997dd12aa0714fa3b3f0dc SHA256 e50318041ed36ae630b4a9bba9fff496433bce19ce0df12883502e77732d444e size 293
+MD5 ce8e84cf22ff4781c39389ec30b1d5a8 files/picprog-1.7-gcc41.patch 293
+RMD160 84e5cfa32db086bc79ca928a59d56fd8f003a9c2 files/picprog-1.7-gcc41.patch 293
+SHA256 e50318041ed36ae630b4a9bba9fff496433bce19ce0df12883502e77732d444e files/picprog-1.7-gcc41.patch 293
+AUX picprog-1.7-werner-almesberger.diff 3329 RMD160 ef4a24e2201cbcefb441b4a8c84ca7fc8b464269 SHA1 3b853af340bf2d8f4417117ab45c593dc2510a4a SHA256 89ed91ff511ba5971d645e4c98e5dd4425c69343dc0182ce689b85894d6e5530 size 3329
 MD5 72e83a1c722fa24f95702a8367c95a95 files/picprog-1.7-werner-almesberger.diff 3329
+RMD160 ef4a24e2201cbcefb441b4a8c84ca7fc8b464269 files/picprog-1.7-werner-almesberger.diff 3329
+SHA256 89ed91ff511ba5971d645e4c98e5dd4425c69343dc0182ce689b85894d6e5530 files/picprog-1.7-werner-almesberger.diff 3329
+DIST picprog-1.7.tar.gz 55118 RMD160 e8a1c74b2335783682f88aee92cf910f519b8206 SHA256 08c9abd24aada73f934775bec8e0573054800daa1cf72b9bddaab1fa7ad3f352 size 55118
+EBUILD picprog-1.7-r1.ebuild 879 RMD160 199eaa0afb4966dceda11b925977a80885cd1505 SHA1 c2957625afbbfca263751383fdfc16a03f7bc05f SHA256 4bbea89795cf0cd30665a84620718bc3aa2bb8bcabe2900112c2cbd449765b00 size 879
+MD5 bf3d958976d736f7b489c10bed9c85a0 picprog-1.7-r1.ebuild 879
+RMD160 199eaa0afb4966dceda11b925977a80885cd1505 picprog-1.7-r1.ebuild 879
+SHA256 4bbea89795cf0cd30665a84620718bc3aa2bb8bcabe2900112c2cbd449765b00 picprog-1.7-r1.ebuild 879
+EBUILD picprog-1.7.ebuild 724 RMD160 b7cd80c68862a958ce33db294c9286eab44176a4 SHA1 d3aba29d84329161688573a0ee4e047bc0a8d597 SHA256 921b1a1691a35db39b8250eec9dcf9995d3647ed0bfeddd4398e97fe1b02b604 size 724
+MD5 88882b9fc239d8a050baf69a8610ef41 picprog-1.7.ebuild 724
+RMD160 b7cd80c68862a958ce33db294c9286eab44176a4 picprog-1.7.ebuild 724
+SHA256 921b1a1691a35db39b8250eec9dcf9995d3647ed0bfeddd4398e97fe1b02b604 picprog-1.7.ebuild 724
+MISC ChangeLog 1772 RMD160 f9a06765a13fed69e907ed163c7935fe9a230ab4 SHA1 7169b063c0eb867e182a8bd2fdaec8c4ad1a041b SHA256 54ef82fe7b729c8b2ebf37b807d0f4de5d34ffcd1fcdbcf878503664701184ce size 1772
+MD5 3f0163dc810b8defb31d953bdac64fb3 ChangeLog 1772
+RMD160 f9a06765a13fed69e907ed163c7935fe9a230ab4 ChangeLog 1772
+SHA256 54ef82fe7b729c8b2ebf37b807d0f4de5d34ffcd1fcdbcf878503664701184ce ChangeLog 1772
+MISC metadata.xml 289 RMD160 bf9fb1258fcfd3fddf106bf96af9611f77925637 SHA1 52c7fbd10e489e879efb3e527eab5fc2f8e3f89c SHA256 b668d618f089ff8dd246ca3707d9d326a299669e330c550c75b834512255390d size 289
+MD5 c5b5ceb7ecb0df0ecfd4508c06ee7f37 metadata.xml 289
+RMD160 bf9fb1258fcfd3fddf106bf96af9611f77925637 metadata.xml 289
+SHA256 b668d618f089ff8dd246ca3707d9d326a299669e330c550c75b834512255390d metadata.xml 289
+MD5 ccee309168671d6ef36c7cbfb44755d1 files/digest-picprog-1.7 232
+RMD160 029ccc4952dcdc51fbe19b41df8fb4785e2a93ca files/digest-picprog-1.7 232
+SHA256 5e42f4c30f66e379f15f611ab7aa5c9f6b706d4c67420003bc11a0c6cb3adfff files/digest-picprog-1.7 232
+MD5 ccee309168671d6ef36c7cbfb44755d1 files/digest-picprog-1.7-r1 232
+RMD160 029ccc4952dcdc51fbe19b41df8fb4785e2a93ca files/digest-picprog-1.7-r1 232
+SHA256 5e42f4c30f66e379f15f611ab7aa5c9f6b706d4c67420003bc11a0c6cb3adfff files/digest-picprog-1.7-r1 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFCRJgJmdTrptrqvGERAmXKAJ9prbTNnXTfTyyOw4yZRcTTrnEL3ACgj/GT
-vgWH2ACA/WA5JTHbRayA4x8=
-=JFMu
+iD8DBQFEVpIKCRZPokWLroQRAjQ6AJ0U4x9LyTecTAh0eJwKilSPMTF/AACgpR/D
+7Ibj/SFU9uujt15cl8raT1E=
+=vxNB
 -----END PGP SIGNATURE-----
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() {