Bug #218469, fix compilation with GCC4.3.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64

4 files changed, 27 insertions, 4 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index ca42b3a92ff8..10d9fbbb3f4f 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.261 2008/08/16 22:46:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.262 2008/08/16 23:27:22 robbat2 Exp $
+
+  16 Aug 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/db-3.2.9-gcc43.patch, db-3.2.9_p2.ebuild:
+  Bug #218469, fix compilation with GCC4.3.
 
   16 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> db-4.3.29_p1-r1.ebuild,
   db-4.4.20_p4-r1.ebuild, db-4.5.20_p2-r1.ebuild, db-4.6.21_p3-r1.ebuild,
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 4d639c739bd9..d5e827349914 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,5 +1,6 @@
 AUX db-1.85-gentoo-paths.patch 684 RMD160 cbfb484127600e180eb432d3f5aa31deba43e8bf SHA1 42a105f2503315a28b1e7f7aad71ee3bd4a56a13 SHA256 049052c74c544ac1c1f3b1b91c3e43df76b135c610148212679dfd324470cf2f
 AUX db-3.2.9-fix-dep-link.patch 1005 RMD160 71f4c2255cc6afffc494341ecd6352a6c754c006 SHA1 437f0eb7c82c0a2b8e7c2cdadddbd889d2735a97 SHA256 57e6f13170db99ba7f2f43aa0c7606085d25094127c63a48b76333c1289f6382
+AUX db-3.2.9-gcc43.patch 441 RMD160 90de42fc7b06e1f92f389b17d1af88da44b36b4d SHA1 7c42a4cba6cbd3ae75c306a5ed9090162f719c49 SHA256 102ac694f32719deabbefdcfbecd96a255b8a6cdc312095fb537cf99ca6b9d77
 AUX db-3.2.9-jarlocation.patch 492 RMD160 36d489cc9d3db876623302458583061f65b5ff8d SHA1 d3fd8f200766c38598742b7c5621c2cc1f2f1cf3 SHA256 20e807cd72f79918359e7438f8f12a7bacbeb97577b0caa2e4a254b3a8183513
 AUX db-3.2.9-java15.patch 598 RMD160 0ae20150102a06eace007c26876abc9f9c6516e6 SHA1 e8e207a7eec954cc3a6e4a0335206d9dd249dcc7 SHA256 6795ee3a07d3c10eb96831b500a081301cda5652a85708760d22fde7befed5af
 AUX db-4.0.14-fix-dep-link.patch 1119 RMD160 ed25b3a8045da183b43f2dcba64080bc8e5a6393 SHA1 dfb99b8dd84d4a576ef72a14bdfb7dd23d095b96 SHA256 ea2324490dcc36199e0b441f183e05768965c358ba2e5e963753e0aaf29525c1
@@ -52,7 +53,7 @@ DIST patch.4.6.21.3 1517 RMD160 63743d910f8c3832409bdc6e7d74db0fcdd686a5 SHA1 a8
 DIST patch.4.7.25.1 2072 RMD160 89c58f5235f95e82e65bab447d1b9019bf26ed25 SHA1 3ae3c02fb541dc8f8dee903a75450d2dbc0736a7 SHA256 e91590af872705efc34414afb702abc630a75c55ba61570dca2216c783e0a83a
 EBUILD db-1.85-r3.ebuild 1380 RMD160 5f83a60a3e196d9988af40a0e1a5c1b4781f81ca SHA1 07998d65f70d2ff4703f7f87cb73f6b35f545b19 SHA256 2547f9e976def8144f3ce8ab21c396b6555bc98193bef3ab54656e2b829ab994
 EBUILD db-3.2.9-r11.ebuild 4425 RMD160 3da3794a23f356fcf6fbbccae274afb4001d16fc SHA1 d5fecadf49d8ad9ee8f9bff0f3cc9df6e37ffa0b SHA256 04cbaa35c5e27d25a483432b8c3b709c7a68f7a9c98d11b95efb70c5cdcdcc4a
-EBUILD db-3.2.9_p2.ebuild 4896 RMD160 21783a7f5ec04e0357bf4a33f48a9694c0a43048 SHA1 b1bb1f99ced5fe399bbb56f0afe96023b0dda5d3 SHA256 1baf48f35a49ae66588719725220640651afc77230f64e5e90b26d054e4c5e62
+EBUILD db-3.2.9_p2.ebuild 4939 RMD160 3321c012e427e73eed26cd2bdde5d6b37478f475 SHA1 95911d96c91a0fd9ec037af4c74bb9e1e881af01 SHA256 4c721f4dea8b5056fb54d2f757b91711d42a7c2b369cf661101c61edcfe7b617
 EBUILD db-4.2.52_p4-r2.ebuild 3486 RMD160 de46f7d210692588bbbed1acccb6e8aa5047bb5f SHA1 509c581644371e4735df1bfae0b57f056cb6fb6e SHA256 c29ae939d9740e0d43a57b178e2423a5bf72749a1bd1adc55c9ec901b43077c3
 EBUILD db-4.2.52_p5-r1.ebuild 5101 RMD160 66237ad74414a126cd6a5a0402613da8130d575d SHA1 4ad2718ac64c09e1a18c3f065d5a364c2f7f466d SHA256 b6fd948b3af04b43391899c4d4dffb385ee74c95724a3b498cfc5044f6fcae8e
 EBUILD db-4.2.52_p5.ebuild 3601 RMD160 1ae0ed4f4aefef8787cdfad43ba2b9538e3db3cc SHA1 a0f18167ecb42beb306b611a5d8c313fbfbc067b SHA256 2eec1df5abc79855a961e9d866a25791ae0c05bcf8c08c0e8967fd90ac597751
@@ -69,5 +70,5 @@ EBUILD db-4.6.21_p3.ebuild 3948 RMD160 16bc15d03ec7dfbc6ec74afcdd4fd33863d93a78
 EBUILD db-4.7.25.ebuild 3933 RMD160 98c4ddf234c7a274d7ae655008f2f010fda3bedc SHA1 1b0438c3811c64b66ac9a9711523fbe925e66027 SHA256 32ee208e2ab19cc48c04d732d2a7694803e9a15f84faa90374329600698e5669
 EBUILD db-4.7.25_p1-r1.ebuild 4941 RMD160 115a99bfe76c1c2e1f6be597751aa091f3d5fe8e SHA1 5295a7a949463a64bf56c9fa88cd1c1bc75432a5 SHA256 4a5fd922abccafcd9ea78465dde8b3df206fec1113efc878d4a4012f546788ff
 EBUILD db-4.7.25_p1.ebuild 3936 RMD160 a61846bc739c71452b7e72489c639ffbe7aa9591 SHA1 a1723f9759a2d6030f4c2e0fad5bf97677db1aaf SHA256 2ee7ea6bce661792a46b92c2943688101a3b5c9c3c3f8b348eeede1c08d3228c
-MISC ChangeLog 40409 RMD160 805ba54293dfa82a0bccf36aae760cf7b4ca6d5a SHA1 8ec46f32b692605efb37a45bb81ac542a31cdca0 SHA256 2952a4914b0ec6e7e9cf3c29df36ba7cb7eef8186c3484e5f9b1cc27ed70f5c1
+MISC ChangeLog 40558 RMD160 e4b9616d1979ffb0fd4e51793d0328f9c0e1a2f1 SHA1 f932300aa0b2ac938e8e101a421b74f6822b34c1 SHA256 f8c1914a12dc49b5e3e91a7a7a9c12577c74a155761e98a0545d93e868a4d883
 MISC metadata.xml 1657 RMD160 f474f2ae4512bb017c5f6d344d5d2d1b03dc6b47 SHA1 f24d5b8ab267859ddc9c1ddb0c10992d31809ec9 SHA256 cb82ec7afe1d3df3b38835aa74a6d467f5b31f98a783df9a01396a546acdf044
diff --git a/sys-libs/db/db-3.2.9_p2.ebuild b/sys-libs/db/db-3.2.9_p2.ebuild
index cb1ee993ac3b..2db18892134a 100644
--- a/sys-libs/db/db-3.2.9_p2.ebuild
+++ b/sys-libs/db/db-3.2.9_p2.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-libs/db/db-3.2.9_p2.ebuild,v 1.3 2008/08/16 05:23:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9_p2.ebuild,v 1.4 2008/08/16 23:27:22 robbat2 Exp $
 
 inherit eutils db
 
@@ -62,6 +62,8 @@ src_unpack() {
 		-e 's:DB185LIB=:DB185LIB= -ldb1:' \
 		"${S}"/dist/Makefile.in.orig > "${S}"/dist/Makefile.in || die "Failed to sed"
 
+	epatch "${FILESDIR}"/${MY_P}-gcc43.patch
+
 	# Fix invalid .la files
 	cd "${WORKDIR}"/${MY_P}/dist
 	rm -f ltversion.sh
diff --git a/sys-libs/db/files/db-3.2.9-gcc43.patch b/sys-libs/db/files/db-3.2.9-gcc43.patch
new file mode 100644
index 000000000000..f032da85296a
--- /dev/null
+++ b/sys-libs/db/files/db-3.2.9-gcc43.patch
@@ -0,0 +1,16 @@
+diff -Nuar db-3.2.9.orig/include/db_cxx.h db-3.2.9/include/db_cxx.h
+--- db-3.2.9.orig/include/db_cxx.h	2001-01-11 10:28:55.000000000 -0800
++++ db-3.2.9/include/db_cxx.h	2008-08-16 16:10:48.474699646 -0700
+@@ -49,7 +49,12 @@
+ // Forward declarations
+ //
+ 
++#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)
++using namespace std;
++#include <iostream>
++#else
+ #include <iostream.h>
++#endif
+ #include <stdarg.h>
+ #include "db.h"
+