Fix build with GCC 4.3. Patch by Arttu Valo in bug #251705

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 47 insertions, 6 deletions

diff --git a/sci-electronics/gnucap/ChangeLog b/sci-electronics/gnucap/ChangeLog
index d7ff8a1696d2..7e16afd5ba54 100644
--- a/sci-electronics/gnucap/ChangeLog
+++ b/sci-electronics/gnucap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/gnucap
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnucap/ChangeLog,v 1.43 2008/12/27 19:05:26 calchan Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnucap/ChangeLog,v 1.44 2009/02/15 20:36:11 dirtyepic Exp $
+
+  15 Feb 2009; Ryan Hill <dirtyepic@gentoo.org>
+  +files/gnucap-0.35-gcc43.patch, gnucap-0.35.ebuild:
+  Fix build with GCC 4.3. Patch by Arttu Valo in bug #251705
 
 *gnucap-0.35.20081223 (27 Dec 2008)
 
diff --git a/sci-electronics/gnucap/Manifest b/sci-electronics/gnucap/Manifest
index f8c1704298d2..25239792c456 100644
--- a/sci-electronics/gnucap/Manifest
+++ b/sci-electronics/gnucap/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gnucap-0.35-gcc43.patch 686 RMD160 30755fb6b246ce8c71f5e7019a32287e33da746f SHA1 0d4c30961d474534bc8f35e7318f40997bf3061a SHA256 592f25cf8fca8c21d0e6f788607785e6557fa7f7b712a3c085011a6ce20b4570
 DIST gnucap-0.35.tar.gz 1008736 RMD160 96a3f62ef9e082bb5bf113af86f1372d2896791e SHA1 fa4da0ca4a36ca509d00b7c7286ffb8a008ceaaf SHA256 820bd9e32be5b1a4422744c19b371616ace70f48f00768b8afe373f9ded1516b
 DIST gnucap-2007-02-21-bsim-models.tar.gz 2997708 RMD160 9db7f0cb6b9c1c7418e0af4527a280eaca67be89 SHA1 47a78ad092ee9c0d056f2fa0537e07481a3ea5d7 SHA256 4a755be44384ece18516209767e98c9f2ccc3752cab497531e86367c7fc21451
 DIST gnucap-2007-02-21-ngspice17-models.tar.gz 2310474 RMD160 04380271580ed0dfc9bafd353f43d1cc0f7cc7e4 SHA1 bee0700e990829c31428198b1773e53907716c8e SHA256 cd4a24df7b23244f4d3c7124cffd965469a6a6dd12a3c94bcf21e22bb577e242
@@ -30,6 +34,13 @@ EBUILD gnucap-0.35.20071121.ebuild 2343 RMD160 e23fb2486ffc352e26e27893347e09495
 EBUILD gnucap-0.35.20080211.ebuild 2064 RMD160 d895b4d26231aa95a20fe41a2b29fd331cc11fd4 SHA1 e2d0121ba89e82ee6154bebb52b8118e7adf6524 SHA256 ba9106d97113099a70d9b722f5460327bb1ea21727a494740180cf6b0515b8c7
 EBUILD gnucap-0.35.20080324.ebuild 2177 RMD160 74963fd23868dbdfbd4ee86fb3007a92821dbda5 SHA1 4511e69a7010746a54ae30f446907f3d3e49d3c1 SHA256 ca7c724b8530521c7e0d64ee5d491afd0c81e07f07c603fed945627212a77f9a
 EBUILD gnucap-0.35.20081223.ebuild 2201 RMD160 ab750aa208b7f0fe356d85dcbad62707225234e4 SHA1 f69d11e2082c17e96996c0fce8a0abe411c94685 SHA256 5175db5d951fb6bd51091a9b748fa7ae548e888834daca387a81fa78d23edfea
-EBUILD gnucap-0.35.ebuild 1054 RMD160 dd66ad2b3b591815af69e574c18df87ae0e6c954 SHA1 e5931c6e9310a1ffc0aa3e58f59d3f895aeb6a37 SHA256 572d9724fb6347b229f3d21da9597d28f2ad659e889763d90f169c8b8d0d0d94
-MISC ChangeLog 7117 RMD160 85e728ba8da74bd7538a0284be1f73f6d7949a30 SHA1 459f64bbaec5b71c823c19bd52db68d97605e78e SHA256 9734a87c7410c5cc7ad17f566d2641b0bb41d2202843350623424bf4cd2b5ba7
+EBUILD gnucap-0.35.ebuild 1112 RMD160 ea980161cca0eba3be3e9c4770bb6ef2f667330c SHA1 0a9a7f962c52bade3637cd80b67881c9739e0be4 SHA256 9e72d1dc9376b94553f7210dc8c6786b09b3f12803fd712d970c7d246906ef6c
+MISC ChangeLog 7283 RMD160 84ab2dc1675d0e4dd8e97c3b1d4b9cc08c293779 SHA1 c78074dbb7a3997f744dbd4bfdeabf4dd21522ba SHA256 7885e25466329fd0a0d1da45134608b5a711e314db435e3c4da04b0ee028efb2
 MISC metadata.xml 639 RMD160 ddee6180e0025cae9e4ea9af68209788a0fc282e SHA1 7c60875a5cf344f4c4ac272f1d49ecba5d813ae2 SHA256 ff13dbf0ea2bc18a97e2b456c50c0b57082e14e5bde50ebb04395d955e3d9076
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmYfRIACgkQiqiDRvmkBmIKHQCgoIQQgnp3QrQkNbTRoiG7+GDU
+XT4An3nIVNIU35IhUrKS/5yMEX2sO2cN
+=Ttnh
+-----END PGP SIGNATURE-----
diff --git a/sci-electronics/gnucap/files/gnucap-0.35-gcc43.patch b/sci-electronics/gnucap/files/gnucap-0.35-gcc43.patch
new file mode 100644
index 000000000000..3bd648916102
--- /dev/null
+++ b/sci-electronics/gnucap/files/gnucap-0.35-gcc43.patch
@@ -0,0 +1,22 @@
+diff -Naur gnucap-0.35-orig/modelgen/md.h gnucap-0.35/modelgen/md.h
+--- gnucap-0.35-orig/modelgen/md.h	2006-08-28 00:15:43.000000000 -0600
++++ gnucap-0.35/modelgen/md.h	2009-02-15 14:31:22.000000000 -0600
+@@ -44,6 +44,7 @@
+ #include <csetjmp>
+ #include <csignal>
+ #include <iostream>
++#include <cstring>
+ // types
+ #include <complex>
+ #include <string>
+diff -Naur gnucap-0.35-orig/src/md.h gnucap-0.35/src/md.h
+--- gnucap-0.35-orig/src/md.h	2006-08-28 00:15:43.000000000 -0600
++++ gnucap-0.35/src/md.h	2009-02-15 14:31:22.000000000 -0600
+@@ -44,6 +44,7 @@
+ #include <csetjmp>
+ #include <csignal>
+ #include <iostream>
++#include <cstring>
+ // types
+ #include <complex>
+ #include <string>
diff --git a/sci-electronics/gnucap/gnucap-0.35.ebuild b/sci-electronics/gnucap/gnucap-0.35.ebuild
index 1e08dfa9baae..13f7b5e5ccff 100644
--- a/sci-electronics/gnucap/gnucap-0.35.ebuild
+++ b/sci-electronics/gnucap/gnucap-0.35.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnucap/gnucap-0.35.ebuild,v 1.7 2008/05/13 07:17:17 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnucap/gnucap-0.35.ebuild,v 1.8 2009/02/15 20:36:11 dirtyepic Exp $
+
+inherit eutils
 
 DESCRIPTION="GNUCap is the GNU Circuit Analysis Package"
 SRC_URI="http://www.gnucap.org/dist/${P}.tar.gz"
@@ -17,6 +19,8 @@ src_unpack() {
 	unpack ${A} || die "Failed to unpack!"
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+
 	# No need to install COPYING and INSTALL
 	sed -i \
 		-e 's: COPYING INSTALL::' \