Add patch to build with GCC 4.1.

Package-Manager: portage-2.1_pre6-r7

4 files changed, 83 insertions, 13 deletions

diff --git a/dev-embedded/gpsim/ChangeLog b/dev-embedded/gpsim/ChangeLog
index 46b0aa4a2265..1be9257086ec 100644
--- a/dev-embedded/gpsim/ChangeLog
+++ b/dev-embedded/gpsim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-embedded/gpsim
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/ChangeLog,v 1.18 2006/03/25 06:12:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/ChangeLog,v 1.19 2006/03/25 21:21:52 flameeyes Exp $
+
+  25 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/gpsim-0.21.11-gcc41.patch, gpsim-0.21.11.ebuild:
+  Add patch to build with GCC 4.1.
 
 *gpsim-0.21.11 (25 Mar 2006)
 *gpsim-0.21.2-r1 (25 Mar 2006)
diff --git a/dev-embedded/gpsim/Manifest b/dev-embedded/gpsim/Manifest
index 572c41337621..703afbc3fa55 100644
--- a/dev-embedded/gpsim/Manifest
+++ b/dev-embedded/gpsim/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 594a1ce1e35e26bd3f1633d48e9bf345 ChangeLog 2785
-RMD160 3424806cb79a80f32cb187455fe058a0cfe95d97 ChangeLog 2785
-SHA256 9c765e33dab5079389c37b178410b9e8f3908409b7b83fe42603142ddc243d88 ChangeLog 2785
+MD5 72ae761d0d83377d717d9029514d8b9a ChangeLog 2934
+RMD160 2f009bd1197ef7885d9909aa4812233cece38761 ChangeLog 2934
+SHA256 7094803ac319148d86650ba8728a713b5b83f578a0ba60824c4c1db5d3c3de7a ChangeLog 2934
 MD5 de88a554b8897c4076fe1716a1299c08 files/digest-gpsim-0.20.14-r1 205
 RMD160 792d94a559feaadd51bb1d4900095ef9b43378dd files/digest-gpsim-0.20.14-r1 205
 SHA256 a64c0c2fd32e3618cdf5c088fb74e21402907cb74dd8395c0dfd7c83e0bdf7cf files/digest-gpsim-0.20.14-r1 205
@@ -19,12 +19,15 @@ SHA256 da1ae15daada5fae3a9f40f48afeed8ca1968c5abc1bf0ac0e0513eb0958658d files/di
 MD5 aad12da70389a0c7871624aadadeaa58 files/gpsim-0.20.14-gcc2_fix.patch 407
 RMD160 57b7083fc136d660d480a44f24c3cd81cc993f3c files/gpsim-0.20.14-gcc2_fix.patch 407
 SHA256 0628471d4a1f781e408ea53f5b763d58b098d50525a00ab3d2d61994046ebcd1 files/gpsim-0.20.14-gcc2_fix.patch 407
+MD5 2caf38f86f6b4155d37b3c70dc4edc22 files/gpsim-0.21.11-gcc41.patch 2573
+RMD160 eb5e9eb9786c76b2f61b03cf7509edb17fcf7124 files/gpsim-0.21.11-gcc41.patch 2573
+SHA256 e6cb8d8d1eeb4adcdcf00814188b20d7380fa96357d46b430454f0abb86e9355 files/gpsim-0.21.11-gcc41.patch 2573
 MD5 15e8057f7f12113a704b8d9fbfdad2bb gpsim-0.20.14-r1.ebuild 1106
 RMD160 6bf4de6bc13c33b3aacabde3b66e4f846335888c gpsim-0.20.14-r1.ebuild 1106
 SHA256 1db0703f58aaeed41436fa6535ca9a485831ce69aab4fbc1de32d816284ed185 gpsim-0.20.14-r1.ebuild 1106
-MD5 54a726f05b58368b70bdf3c77458cfd2 gpsim-0.21.11.ebuild 1606
-RMD160 4d789f27237c53b60e8ac2ce025a362753757979 gpsim-0.21.11.ebuild 1606
-SHA256 3099af93aa28b014002757558da859e8cd9166be007be0c5486b46f62bc7a87e gpsim-0.21.11.ebuild 1606
+MD5 d2b87444e3bc8e09bce6ed902bd60a93 gpsim-0.21.11.ebuild 1654
+RMD160 4f378610cf2b3f510a83f12a24031a3fa9e4c5e2 gpsim-0.21.11.ebuild 1654
+SHA256 586ddec26a08dbcd70ed1e3cce1765e6faf009049dfb172544e3247dbecf6857 gpsim-0.21.11.ebuild 1654
 MD5 0f3ec324a68710b4f9b1d952dec1f079 gpsim-0.21.2-r1.ebuild 1321
 RMD160 d71312d4ed475219ba5c5716ddf70734d6f8b448 gpsim-0.21.2-r1.ebuild 1321
 SHA256 ce013379d7084f0e5ae8601b0506448e903207e64927ce1fa72590e89009ef2d gpsim-0.21.2-r1.ebuild 1321
@@ -35,9 +38,9 @@ MD5 420df847a3db1c4969aff20243f656dd metadata.xml 165
 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 metadata.xml 165
 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a metadata.xml 165
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEJbHFI1lqEGTUzyQRAhavAKCbc9M7q8BrYr5qUAgvrRMPMwFF0QCeIDQa
-0epa++FHOfNWeuFoidD6vl0=
-=FoCG
+iD8DBQFEJbRfAiZjviIA2XgRAhAnAKDCrlz/zsxPbJa5ifEYfgPNUwlhTQCfX1oV
+93FtxbEhXr9g9Pp7+VAkZA8=
+=8vVj
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/gpsim/files/gpsim-0.21.11-gcc41.patch b/dev-embedded/gpsim/files/gpsim-0.21.11-gcc41.patch
new file mode 100644
index 000000000000..e49ae99d6f9c
--- /dev/null
+++ b/dev-embedded/gpsim/files/gpsim-0.21.11-gcc41.patch
@@ -0,0 +1,61 @@
+Index: gpsim-0.21.11/cli/ui_gpsim.cc
+===================================================================
+--- gpsim-0.21.11.orig/cli/ui_gpsim.cc
++++ gpsim-0.21.11/cli/ui_gpsim.cc
+@@ -34,7 +34,7 @@ public:
+   CGpsimUserInterface(const char *paStrings[]);
+   virtual ~CGpsimUserInterface() {}
+ 
+-  void CGpsimUserInterface::SetStreams(FILE *in, FILE *out);
++  void SetStreams(FILE *in, FILE *out);
+   virtual ISimConsole &GetConsole();
+   virtual void DisplayMessage(unsigned int uStringID, ...);
+   virtual void DisplayMessage(FILE * pOut, unsigned int uStringID, ...);
+Index: gpsim-0.21.11/src/p12x.h
+===================================================================
+--- gpsim-0.21.11.orig/src/p12x.h
++++ gpsim-0.21.11/src/p12x.h
+@@ -108,7 +108,7 @@ class P12CE518 : public P12C508
+ 
+   virtual PROCESSOR_TYPE isa(void){return _P12CE518_;};
+   virtual void tris_instruction(unsigned int tris_register);
+-  virtual void P12CE518::set_eeprom(I2C_EE *e);
++  virtual void set_eeprom(I2C_EE *e);
+ 
+   P12CE518(void);
+   static Processor *construct(void);
+Index: gpsim-0.21.11/src/value.h
+===================================================================
+--- gpsim-0.21.11.orig/src/value.h
++++ gpsim-0.21.11/src/value.h
+@@ -290,7 +290,7 @@ public:
+ 
+   bool getVal() { return value; }
+ 
+-  static Boolean* Boolean::typeCheck(Value* val, string valDesc);
++  static Boolean* typeCheck(Value* val, string valDesc);
+   virtual bool compare(ComparisonOperator *compOp, Value *rvalue);
+ 
+   virtual Value *copy() { return new Boolean(value); }
+@@ -353,9 +353,9 @@ public:
+   virtual char *toString(char *, int len);
+   virtual char *toBitStr(char *, int len);
+ 
+-  static Integer* Integer::typeCheck(Value* val, string valDesc);
+-  static Integer* Integer::assertValid(Value* val, string valDesc, gint64 valMin);
+-  static Integer* Integer::assertValid(Value* val, string valDesc, gint64 valMin, gint64 valMax);
++  static Integer* typeCheck(Value* val, string valDesc);
++  static Integer* assertValid(Value* val, string valDesc, gint64 valMin);
++  static Integer* assertValid(Value* val, string valDesc, gint64 valMin, gint64 valMax);
+   virtual bool compare(ComparisonOperator *compOp, Value *rvalue);
+ 
+   inline operator gint64() {
+@@ -498,7 +498,7 @@ public:
+   /// copy the object value to a user char array
+   virtual char *toString(char *, int len);
+ 
+-  static AbstractRange* AbstractRange::typeCheck(Value* val, string valDesc);
++  static AbstractRange* typeCheck(Value* val, string valDesc);
+   virtual bool compare(ComparisonOperator *compOp, Value *rvalue);
+ 
+ private:
diff --git a/dev-embedded/gpsim/gpsim-0.21.11.ebuild b/dev-embedded/gpsim/gpsim-0.21.11.ebuild
index 100d35e003ca..ae8f9c7e95bd 100644
--- a/dev-embedded/gpsim/gpsim-0.21.11.ebuild
+++ b/dev-embedded/gpsim/gpsim-0.21.11.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-embedded/gpsim/gpsim-0.21.11.ebuild,v 1.2 2006/03/25 21:10:19 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/gpsim-0.21.11.ebuild,v 1.3 2006/03/25 21:21:54 flameeyes Exp $
 
-inherit gnuconfig
+inherit gnuconfig eutils
 
 DESCRIPTION="A simulator for the Microchip PIC microcontrollers"
 HOMEPAGE="http://www.dattalo.com/gnupic/gpsim.html"
@@ -38,6 +38,8 @@ src_unpack() {
 	for i in ${S}/src/Makefile.{in,am} ; do
 		sed -i.orig -e '/^libgpsim_la_LDFLAGS/s,$, -lpthread,g' $i
 	done
+
+	epatch "${FILESDIR}/${P}-gcc41.patch"
 }
 
 src_compile() {