Add patch to fix build errors with GCC 4.3. Bug #227231.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc9 x86_64

4 files changed, 56 insertions, 4 deletions

diff --git a/sys-block/partimage/ChangeLog b/sys-block/partimage/ChangeLog
index 704cba9d125d..3e34fca12996 100644
--- a/sys-block/partimage/ChangeLog
+++ b/sys-block/partimage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-block/partimage
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.36 2008/06/15 09:45:21 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.37 2008/07/17 02:15:20 dirtyepic Exp $
+
+  17 Jul 2008; Ryan Hill <dirtyepic@gentoo.org>
+  +files/partimage-0.6.7-gcc43.patch, partimage-0.6.7.ebuild:
+  Add patch to fix build errors with GCC 4.3. Bug #227231.
 
   15 Jun 2008; Samuli Suominen <drac@gentoo.org> -partimage-0.6.4-r3.ebuild,
   -partimage-0.6.4-r4.ebuild:
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
index 94b25f5b422d..ede24d8de395 100644
--- a/sys-block/partimage/Manifest
+++ b/sys-block/partimage/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX partimage-0.6.4-1-lib64.patch 2483 RMD160 20b936037e223a02237bbc45b4c037fc1e571c51 SHA1 219a6d4524908360722b25a7eb7e619238a562ff SHA256 22686caa9919b9c0f8f248d033cce400bdf004a7cbaa1773d9e4c20dc212dfb9
 AUX partimage-0.6.4-LP64-fixes.patch 1773 RMD160 3a2e1d4d69794aaa4311b716c4a418350774707f SHA1 a76a3af0a0ca6b56e3ad58e8111cda88bf7757c3 SHA256 1f4ad532e1edc0c5772290fde3ed0285e5c09caecd786216c92f78fab2c4075b
 AUX partimage-0.6.4-chown.patch 1660 RMD160 3fc66b6aa0b045a3d184f12c6347be5ef192e602 SHA1 1f77af2bc459b539b767915f19c48b880326b1c0 SHA256 34b851e54dbf4f713b7ecb0d626668556911f8240010b1b86bd3e9c924c0e079
@@ -28,6 +31,7 @@ AUX partimage-0.6.6-not_install_info.patch 937 RMD160 2360cebf931845f6b5d08eb56e
 AUX partimage-0.6.6-thread-privilege-fix.patch 1301 RMD160 77ef2aa3202731205acebb8ea58faeccb930363a SHA1 2ae3782574f6dc57a7e7aa8e6b6cb55cf1c275fc SHA256 29c49a8ca43fcf3ad0f842d836cb353bf8e3f7420a7b9fbfd8a1b9885fd14daf
 AUX partimage-0.6.7-chown.patch 1888 RMD160 0db2de481cddd206eb47fa8ef4ee37c01c6fe777 SHA1 b66ab9d3a28400a0fe2329ec38c9b9ab4b814784 SHA256 4e07de0f3b8f182bd16d5f45f0f56be2158524492936cf47891db8714cdb0f4e
 AUX partimage-0.6.7-datadir-path.patch 673 RMD160 4ba52dcfc6857026864a5fc460dd978164d0b967 SHA1 03e485c794a9ca24fb85e41d8dba2af8a9cc0abb SHA256 84bbb66c69cbd183bb326e17da2a0b7540690c5f1435903d9e5e7ae4c4cbc820
+AUX partimage-0.6.7-gcc43.patch 1299 RMD160 1541906226f8000eb140bd76c553ab3257e80441 SHA1 e717c7ce64f4e3e06a0f03a26e39e2e0ddaee41a SHA256 91dd330641d28f1bcb5a22a57618249a4f4e5350b0837b2636ef48abfa64443f
 AUX partimage.1 4492 RMD160 6d35af437de84b7825d089aa7883593bd93124ef SHA1 1b9514e8e8b13a7e4a3dc1b497008e79fc295a48 SHA256 9c6f726dd4e873271765c402d6b1d971532d0c3540fb78a09ed4ddf8d06ba2e6
 AUX partimaged.8 1448 RMD160 8cd38ac1b519f805b43fea713f15067c1ae4eec9 SHA1 8d370d024934b416d2ad8ed4c297e78acabe3679 SHA256 f82674fb2956836afacc440b03703fb7a48339abad7d1e8573f208adf8fffa51
 AUX partimaged.conf 424 RMD160 e1dbe5dd5a3eec01b3061cce992f1fbee4bec167 SHA1 f571f19bf872f43df9c086162aed96992a073db3 SHA256 f794f539051e0f2e5f3ce357c4683c4a22a9e87b31f1ae113fcf58cd8bda43cf
@@ -38,6 +42,13 @@ AUX servercert.cnf 1096 RMD160 8786b07466c5330254eb96e1de6f754e8a68e77f SHA1 64f
 DIST partimage-0.6.6.tar.bz2 524695 RMD160 8bad0dd706d88dee27531766daf7611d95bb0a04 SHA1 691a5bfe1637fce3d1af3a48a37b63d603c09b7f SHA256 0bf5d720094777ae0aa258a00f30cee6988c026558eea20087aa20d46b81b2bd
 DIST partimage-0.6.7.tar.bz2 628214 RMD160 e01315fe6073653c89f2dea3c19483853960d59e SHA1 c02e0db728e72277a78a1fb4140171ba8a9336cf SHA256 0b3ed41ab71a73f83a41fc12e61cd874f5d2799cbfbd1db8e39730ba8a3d6d9e
 EBUILD partimage-0.6.6.ebuild 5128 RMD160 b5e7e41b8a6913b8b5fe245ee38f08d2bd87511f SHA1 9b2dbe3caf16719b18d673502daa6539742069c0 SHA256 9ab3fc0b5168fb6d9a510b2cf86a58e76107fe430659972317722c429763e693
-EBUILD partimage-0.6.7.ebuild 4561 RMD160 e2e460e5868d98597539dc1fb32b22d4b6848626 SHA1 1b6b46f3365dc9de552953a082d9c1950ff48b01 SHA256 a0db05b0ca139581920c1e55fcf568b9e779a15dd8f979181b683343cfb34b76
-MISC ChangeLog 10988 RMD160 7fd91bdd698f1ae21b4168fcc686bf0e2edcfc4a SHA1 83a8d5cd73e448443ee7899f9ab90cd28cf8b834 SHA256 e0f5972e90456ba8d23e1d68ec33dcb6aac4ba31e7fe31c5c8e49b7bee5b385a
+EBUILD partimage-0.6.7.ebuild 4603 RMD160 71f1df8576f11728f32e61f0f0fee49be99668f9 SHA1 c50d34edd307d8bfb05bb7b7399010f87925d9e3 SHA256 724d97a1a8020455875e3ea270be48f7c932e05d3d5a39bba22686a6bef80c6c
+MISC ChangeLog 11163 RMD160 324dfd0815ae0b1a87698b24e69f7b64f08e1598 SHA1 a4117ba77b746301eed50e57b33f1a60802834df SHA256 3d0cc58efd0c6615cd31d35d0018ea8603a1c9a0cd77ca53300a958d0e484ac7
 MISC metadata.xml 300 RMD160 1b8d549b3e7475c26f605a1a36fcab59722f51ab SHA1 7a58ba664a8a3385b8c3a16d7f0168ed656aed67 SHA256 a7042ab513648c05514689f1c2b7c1e6cbf1d339ca3aaa1a45de08ea5cfb152c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkh+q1EACgkQiqiDRvmkBmKPhACfbzlja+TlPP9yl4sMr4oaCfE4
+Bz0An3Kie3MM3RQ4g+yeWOHxgIkMLDgf
+=8VPA
+-----END PGP SIGNATURE-----
diff --git a/sys-block/partimage/files/partimage-0.6.7-gcc43.patch b/sys-block/partimage/files/partimage-0.6.7-gcc43.patch
new file mode 100644
index 000000000000..af37ee1c063e
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.7-gcc43.patch
@@ -0,0 +1,36 @@
+diff -Naurp partimage-0.6.7-orig/src/shared/net.h partimage-0.6.7/src/shared/net.h
+--- partimage-0.6.7-orig/src/shared/net.h	2008-02-03 15:57:55.000000000 -0600
++++ partimage-0.6.7/src/shared/net.h	2008-07-16 20:04:02.000000000 -0600
+@@ -28,7 +28,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <pthread.h>
+ 
+ #include "pathnames.h"
+diff -Naurp partimage-0.6.7-orig/src/server/partimaged.cpp partimage-0.6.7/src/server/partimaged.cpp
+--- partimage-0.6.7-orig/src/server/partimaged.cpp	2008-02-03 15:57:53.000000000 -0600
++++ partimage-0.6.7/src/server/partimaged.cpp	2008-07-16 20:10:04.000000000 -0600
+@@ -22,7 +22,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "net.h"
+ #include "netserver.h"
+diff -Naurp partimage-0.6.7-orig/src/server/partimaged-main.cpp partimage-0.6.7/src/server/partimaged-main.cpp
+--- partimage-0.6.7-orig/src/server/partimaged-main.cpp	2008-02-03 15:57:53.000000000 -0600
++++ partimage-0.6.7/src/server/partimaged-main.cpp	2008-07-16 20:10:45.000000000 -0600
+@@ -27,7 +27,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <signal.h>
diff --git a/sys-block/partimage/partimage-0.6.7.ebuild b/sys-block/partimage/partimage-0.6.7.ebuild
index 7d5beefe005d..6d6cf7f42647 100644
--- a/sys-block/partimage/partimage-0.6.7.ebuild
+++ b/sys-block/partimage/partimage-0.6.7.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/sys-block/partimage/partimage-0.6.7.ebuild,v 1.3 2008/04/07 20:57:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.7.ebuild,v 1.4 2008/07/17 02:15:20 dirtyepic Exp $
 
 WANT_AUTOMAKE="1.10"
 
@@ -55,6 +55,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-chown.patch || die
 	epatch "${FILESDIR}"/${PN}-0.6.6-disable_header_check.patch || die
 	epatch "${FILESDIR}"/${P}-datadir-path.patch || die
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_compile() {