Fix for gcc-4.3, bug #227125.

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.25.8 i686

4 files changed, 322 insertions, 4 deletions

diff --git a/app-misc/graphlcd-base/ChangeLog b/app-misc/graphlcd-base/ChangeLog
index bfa5318205f3..61e2aaae57ec 100644
--- a/app-misc/graphlcd-base/ChangeLog
+++ b/app-misc/graphlcd-base/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/graphlcd-base
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/graphlcd-base/ChangeLog,v 1.18 2008/02/22 05:53:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/graphlcd-base/ChangeLog,v 1.19 2008/07/27 11:16:14 loki_val Exp $
+
+  27 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/graphlcd-base-0.1.5-gcc43.patch, graphlcd-base-0.1.5-r1.ebuild:
+  Fix for gcc-4.3, bug #227125.
 
   22 Feb 2008; Robin H. Johnson <robbat2@gentoo.org>
   graphlcd-base-0.1.5.ebuild:
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index 0a65d98e979b..c84100a5de59 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,7 +1,8 @@
+AUX graphlcd-base-0.1.5-gcc43.patch 10066 RMD160 a5f63b7b91c8ea371e1d7a5f0918cc6f4b94d14d SHA1 a57ce3ed3fe8f83ecb83204b9de88e214ac71f29 SHA256 6753e9a1804ae49ef367a97138e04d2e1fb69fa1a7517e4c0d5a9c462b4777d7
 AUX graphlcd-base-0.1.5-nostrip.patch 3062 RMD160 36e1c9330eedcf76d7378c9f44932db8053e2a39 SHA1 37105756ab6c85f5d059feae4d0e0b96258b4c18 SHA256 5a59bc4ad1567d9898cf69e0152a350e980dcf027230fc442813a44a8c358d99
 DIST graphlcd-base-0.1.5.tgz 99863 RMD160 17fd2a0a0ef2362013843929df8944902f71c104 SHA1 b9ea611a37cb4fe4c47e1fc3b3bc5c8ae48c243c SHA256 7b11d1e68aa3f9b65ae437e9d6b5bd8bdaba86f7abf93e4ae5ee6b2427b5a47f
 DIST graphlcd-base-0.1.5_utf8.diff.tgz 5040 RMD160 6d9bd62e6d0fe253095599eb1ef10e8d6dfcf925 SHA1 6ec2373ad9c262da43f38c0d3c9322f5bf4a853d SHA256 02aeee8f7fcfacf927c86cb9bcb7a67fa5574ad43871938f1e99e618852fbfcb
-EBUILD graphlcd-base-0.1.5-r1.ebuild 1201 RMD160 03508fa0c3c58fc315b59d5c82cff2010172207c SHA1 bbd26be0b805f886b82712c13202d26288cab5a3 SHA256 481125379500224d4838ac462221530bbcd6c3cb472c60ab457451d29ca2d23c
+EBUILD graphlcd-base-0.1.5-r1.ebuild 1241 RMD160 ec39c37c537606b51e675fdf114e6c019e8750f4 SHA1 701e9f6f82221f75a3bfa30ed85c83abf9db9d95 SHA256 8cd380e0d9ecc0f7b91421c6568bdb291e10647b2fdb627f0d51ff794d6f6019
 EBUILD graphlcd-base-0.1.5.ebuild 970 RMD160 796bae0db146d1335dc3df6838209e50291a712f SHA1 3a66a887de0679da30ab95d8ca6e792eb8c96f3c SHA256 3f37353dd25e2ec8d90b413d895d114741ba5cf9c290d345053a74b613901973
-MISC ChangeLog 3191 RMD160 ed148636e0fbda1ccc2a2b14e0a02886356270be SHA1 75c25f1f90486714a06a8ccd4fdb73d16969ada9 SHA256 287327380003bebfdbb4d8f9226a4533da926206bfca3439566e659cf5928dd9
+MISC ChangeLog 3351 RMD160 7ee012db52502641b9e3bde67d8e7b5942ea8915 SHA1 4527e3abeeee1b9e54c5a5204819ae00fe1aa315 SHA256 a6f8c205b59c2c197339f15bfb0833e196c1693f920659c928975c2d1cfd9137
 MISC metadata.xml 476 RMD160 bc802365081ad4215071e88ef3bd57c8f3f1f18f SHA1 2042fb225f9d7d964b2afc4dc25f42b95a5bea9b SHA256 036e2615a5f28627b0f6826a455322faae1155756d41369b220de77e6d0f29be
diff --git a/app-misc/graphlcd-base/files/graphlcd-base-0.1.5-gcc43.patch b/app-misc/graphlcd-base/files/graphlcd-base-0.1.5-gcc43.patch
new file mode 100644
index 000000000000..5ec1fa276fae
--- /dev/null
+++ b/app-misc/graphlcd-base/files/graphlcd-base-0.1.5-gcc43.patch
@@ -0,0 +1,312 @@
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/avrctl.c graphlcd-base-0.1.5/glcddrivers/avrctl.c
+--- graphlcd-base-0.1.5.orig/glcddrivers/avrctl.c	2008-06-15 14:01:50.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/avrctl.c	2008-06-15 14:02:15.000000000 +0200
+@@ -9,10 +9,11 @@
+  * (c) 2005 Andreas Regel <andreas.regel AT powarman.de>
+  */
+ 
+ #include <stdint.h>
+ #include <syslog.h>
++#include <cstring>
+ 
+ #include "common.h"
+ #include "config.h"
+ #include "port.h"
+ #include "avrctl.h"
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/config.c graphlcd-base-0.1.5/glcddrivers/config.c
+--- graphlcd-base-0.1.5.orig/glcddrivers/config.c	2008-06-15 14:01:52.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/config.c	2008-06-15 14:02:15.000000000 +0200
+@@ -9,10 +9,12 @@
+  * (c) 2004 Andreas Regel <andreas.regel AT powarman.de>
+  */
+ 
+ #include <syslog.h>
+ #include <fstream>
++#include <cstring>
++#include <cstdlib>
+ 
+ #include "common.h"
+ #include "config.h"
+ #include "drivers.h"
+ 
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/framebuffer.c graphlcd-base-0.1.5/glcddrivers/framebuffer.c
+--- graphlcd-base-0.1.5.orig/glcddrivers/framebuffer.c	2008-06-15 14:01:53.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/framebuffer.c	2008-06-15 14:02:15.000000000 +0200
+@@ -14,10 +14,12 @@
+ #include <stdio.h>
+ #include <syslog.h>
+ #include <unistd.h>
+ #include <sys/mman.h>
+ #include <sys/ioctl.h>
++#include <cstdlib>
++#include <cstring>
+ 
+ #include "common.h"
+ #include "config.h"
+ #include "framebuffer.h"
+ 
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/g15daemon.c graphlcd-base-0.1.5/glcddrivers/g15daemon.c
+--- graphlcd-base-0.1.5.orig/glcddrivers/g15daemon.c	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/g15daemon.c	2008-06-15 14:07:32.000000000 +0200
+@@ -17,10 +17,11 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <poll.h>
+ #include <arpa/inet.h>
+ #include <unistd.h>
++#include <cstring>
+ 
+ #include "common.h"
+ #include "config.h"
+ 
+ #include "g15daemon.h"
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/gu126x64D-K610A4.c graphlcd-base-0.1.5/glcddrivers/gu126x64D-K610A4.c
+--- graphlcd-base-0.1.5.orig/glcddrivers/gu126x64D-K610A4.c	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/gu126x64D-K610A4.c	2008-06-15 14:08:52.000000000 +0200
+@@ -23,10 +23,12 @@
+ 
+ #include <errno.h>
+ #include <syslog.h>
+ #include <unistd.h>
+ #include <sys/time.h>
++#include <cstring>
++#include <cstdlib>
+ 
+ #include "common.h"
+ #include "config.h"
+ #include "gu126x64D-K610A4.h"
+ #include "port.h"
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/gu140x32f.c graphlcd-base-0.1.5/glcddrivers/gu140x32f.c
+--- graphlcd-base-0.1.5.orig/glcddrivers/gu140x32f.c	2008-06-15 14:01:53.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/gu140x32f.c	2008-06-15 14:02:15.000000000 +0200
+@@ -19,10 +19,11 @@
+ 
+ #include <errno.h>
+ #include <syslog.h>
+ #include <unistd.h>
+ #include <sys/time.h>
++#include <cstring>
+ 
+ #include "common.h"
+ #include "config.h"
+ #include "gu140x32f.h"
+ #include "port.h"
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/gu256x64-372.c graphlcd-base-0.1.5/glcddrivers/gu256x64-372.c
+--- graphlcd-base-0.1.5.orig/glcddrivers/gu256x64-372.c	2008-06-15 14:01:54.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/gu256x64-372.c	2008-06-15 14:02:15.000000000 +0200
+@@ -21,10 +21,11 @@
+ 
+ #include <errno.h>
+ #include <syslog.h>
+ #include <unistd.h>
+ #include <sys/time.h>
++#include <cstring>
+ 
+ #include "common.h"
+ #include "config.h"
+ #include "gu256x64-372.h"
+ #include "port.h"
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/gu256x64-3900.c graphlcd-base-0.1.5/glcddrivers/gu256x64-3900.c
+--- graphlcd-base-0.1.5.orig/glcddrivers/gu256x64-3900.c	2008-06-15 14:01:54.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/gu256x64-3900.c	2008-06-15 14:02:15.000000000 +0200
+@@ -27,10 +27,11 @@
+ #include <fcntl.h>
+ #include <syslog.h>
+ #include <unistd.h>
+ #include <termios.h>
+ #include <sys/time.h>
++#include <cstring>
+ 
+ #include "common.h"
+ #include "config.h"
+ #include "gu256x64-3900.h"
+ #include "port.h"
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/hd61830.c graphlcd-base-0.1.5/glcddrivers/hd61830.c
+--- graphlcd-base-0.1.5.orig/glcddrivers/hd61830.c	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/hd61830.c	2008-06-15 14:03:34.000000000 +0200
+@@ -9,10 +9,11 @@
+  * (c) 2001-2004 Carsten Siebholz <c.siebholz AT t-online.de>
+  */
+ 
+ #include <syslog.h>
+ #include <sys/time.h>
++#include <cstring>
+ 
+ #include "common.h"
+ #include "config.h"
+ #include "hd61830.h"
+ #include "port.h"
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/image.c graphlcd-base-0.1.5/glcddrivers/image.c
+--- graphlcd-base-0.1.5.orig/glcddrivers/image.c	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/image.c	2008-06-15 14:04:11.000000000 +0200
+@@ -10,10 +10,11 @@
+  * (c) 2004 Andreas Regel <andreas.regel AT powarman.de>
+  */
+ 
+ #include <stdio.h>
+ #include <syslog.h>
++#include <cstring>
+ 
+ #include "common.h"
+ #include "config.h"
+ #include "image.h"
+ 
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/ks0108.c graphlcd-base-0.1.5/glcddrivers/ks0108.c
+--- graphlcd-base-0.1.5.orig/glcddrivers/ks0108.c	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/ks0108.c	2008-06-15 14:03:45.000000000 +0200
+@@ -9,10 +9,11 @@
+  * (c) 2003 Andreas 'randy' Weinberger <vdr AT smue.org>
+  */
+ 
+ #include <syslog.h>
+ #include <sys/time.h>
++#include <cstring>
+ 
+ #include "common.h"
+ #include "config.h"
+ #include "ks0108.h"
+ #include "port.h"
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/network.c graphlcd-base-0.1.5/glcddrivers/network.c
+--- graphlcd-base-0.1.5.orig/glcddrivers/network.c	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/network.c	2008-06-15 14:08:05.000000000 +0200
+@@ -16,10 +16,11 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <errno.h>
++#include <cstring>
+ 
+ #include "common.h"
+ #include "config.h"
+ #include "network.h"
+ 
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/noritake800.c graphlcd-base-0.1.5/glcddrivers/noritake800.c
+--- graphlcd-base-0.1.5.orig/glcddrivers/noritake800.c	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/noritake800.c	2008-06-15 14:07:04.000000000 +0200
+@@ -32,10 +32,11 @@
+ 
+ #include <errno.h>
+ #include <syslog.h>
+ #include <unistd.h>
+ #include <sys/time.h>
++#include <cstring>
+ 
+ #include "common.h"
+ #include "config.h"
+ #include "noritake800.h"
+ #include "port.h"
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/sed1330.c graphlcd-base-0.1.5/glcddrivers/sed1330.c
+--- graphlcd-base-0.1.5.orig/glcddrivers/sed1330.c	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/sed1330.c	2008-06-15 14:05:55.000000000 +0200
+@@ -17,10 +17,12 @@
+  * (c) 2003 Roland Praml <praml.roland AT t-online.de>
+  */
+ 
+ #include <syslog.h>
+ #include <sys/time.h>
++#include <cstring>
++#include <cstdlib>
+ 
+ #include "common.h"
+ #include "config.h"
+ #include "port.h"
+ #include "sed1330.h"
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/sed1520.c graphlcd-base-0.1.5/glcddrivers/sed1520.c
+--- graphlcd-base-0.1.5.orig/glcddrivers/sed1520.c	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/sed1520.c	2008-06-15 14:05:31.000000000 +0200
+@@ -9,10 +9,11 @@
+  * (c) 2003 Andreas 'randy' Weinberger <vdr AT smue.org>
+  */
+ 
+ #include <syslog.h>
+ #include <sys/time.h>
++#include <cstring>
+ 
+ #include "common.h"
+ #include "config.h"
+ #include "port.h"
+ #include "sed1520.h"
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/simlcd.c graphlcd-base-0.1.5/glcddrivers/simlcd.c
+--- graphlcd-base-0.1.5.orig/glcddrivers/simlcd.c	2008-06-15 14:01:55.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/simlcd.c	2008-06-15 14:02:15.000000000 +0200
+@@ -11,10 +11,11 @@
+  * (c) 2001-2004 Carsten Siebholz <c.siebholz AT t-online.de>
+  */
+ 
+ #include <stdio.h>
+ #include <syslog.h>
++#include <cstring>
+ 
+ #include "common.h"
+ #include "config.h"
+ #include "simlcd.h"
+ 
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/t6963c.c graphlcd-base-0.1.5/glcddrivers/t6963c.c
+--- graphlcd-base-0.1.5.orig/glcddrivers/t6963c.c	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/t6963c.c	2008-06-15 14:06:33.000000000 +0200
+@@ -10,10 +10,12 @@
+  *
+  * (c) 2003, 2004 Andreas Regel <andreas.regel AT powarman.de>
+  */
+ 
+ #include <syslog.h>
++#include <cstring>
++#include <cstdlib>
+ 
+ #include "common.h"
+ #include "config.h"
+ #include "port.h"
+ #include "t6963c.h"
+diff -NrU5 graphlcd-base-0.1.5.orig/glcdgraphics/glcd.c graphlcd-base-0.1.5/glcdgraphics/glcd.c
+--- graphlcd-base-0.1.5.orig/glcdgraphics/glcd.c	2008-06-15 14:01:55.000000000 +0200
++++ graphlcd-base-0.1.5/glcdgraphics/glcd.c	2008-06-15 14:02:15.000000000 +0200
+@@ -14,11 +14,11 @@
+ 
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <syslog.h>
+ 
+-#include <string>
++#include <cstring>
+ 
+ #include "bitmap.h"
+ #include "glcd.h"
+ #include "image.h"
+ 
+diff -NrU5 graphlcd-base-0.1.5.orig/glcdgraphics/pbm.c graphlcd-base-0.1.5/glcdgraphics/pbm.c
+--- graphlcd-base-0.1.5.orig/glcdgraphics/pbm.c	2008-06-15 14:01:55.000000000 +0200
++++ graphlcd-base-0.1.5/glcdgraphics/pbm.c	2008-06-15 14:02:15.000000000 +0200
+@@ -10,12 +10,13 @@
+  */
+ 
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <syslog.h>
++#include <cstdlib>
+ 
+-#include <string>
++#include <cstring>
+ 
+ #include "bitmap.h"
+ #include "pbm.h"
+ #include "image.h"
+ 
+diff -NrU5 graphlcd-base-0.1.5.orig/tools/convpic/bmp.c graphlcd-base-0.1.5/tools/convpic/bmp.c
+--- graphlcd-base-0.1.5.orig/tools/convpic/bmp.c	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/tools/convpic/bmp.c	2008-06-15 14:09:57.000000000 +0200
+@@ -27,12 +27,12 @@
+  ***************************************************************************/
+ 
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <string.h>
+-
+-#include <string>
++#include <cstring>
++#include <cstdlib>
+ 
+ #include <glcdgraphics/bitmap.h>
+ #include <glcdgraphics/image.h>
+ 
+ #include "bmp.h"
diff --git a/app-misc/graphlcd-base/graphlcd-base-0.1.5-r1.ebuild b/app-misc/graphlcd-base/graphlcd-base-0.1.5-r1.ebuild
index 9795215b92f2..8b462c4111d3 100644
--- a/app-misc/graphlcd-base/graphlcd-base-0.1.5-r1.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-0.1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/graphlcd-base/graphlcd-base-0.1.5-r1.ebuild,v 1.5 2008/02/21 23:54:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/graphlcd-base/graphlcd-base-0.1.5-r1.ebuild,v 1.6 2008/07/27 11:16:14 loki_val Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -27,6 +27,7 @@ src_unpack() {
 
 	sed -i Make.config -e "s:usr\/local:usr:" -e "s:FLAGS *=:FLAGS ?=:"
 	epatch "${FILESDIR}/${P}-nostrip.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
 
 	use !truetype && sed -i "s:HAVE_FREETYPE2:#HAVE_FREETYPE2:" Make.config