Fix bug #218888

Package-Manager: portage-2.1.5.5

4 files changed, 23 insertions, 4 deletions

diff --git a/app-emulation/bochs/ChangeLog b/app-emulation/bochs/ChangeLog
index 8392c4c4747e..07acdefec4c2 100644
--- a/app-emulation/bochs/ChangeLog
+++ b/app-emulation/bochs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/bochs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.77 2008/06/14 22:30:05 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.78 2008/06/17 10:11:42 lu_zero Exp $
+
+  17 Jun 2008; Luca Barbato <lu_zero@gentoo.org>
+  +files/bochs-2.3.7-gcc43.patch, bochs-2.3.7.ebuild:
+  Address gcc-4.3 issues, thanks to Vladimir Lushnikov <vl210@bath.ac.uk>,
+  fix bug #218888
 
   14 Jun 2008; Luca Barbato <lu_zero@gentoo.org> -bochs-2.2.6.ebuild,
   bochs-2.3.ebuild, -bochs-2.3.5.ebuild:
diff --git a/app-emulation/bochs/Manifest b/app-emulation/bochs/Manifest
index 1d75a719f5a2..9acc4afb7062 100644
--- a/app-emulation/bochs/Manifest
+++ b/app-emulation/bochs/Manifest
@@ -1,13 +1,14 @@
 AUX bochs-2.3-floppy.patch 1356 RMD160 753655013f512d8e47245913727c996a3a2314a9 SHA1 7a7d5246a179d88e096d2eda5981036a32fc26b1 SHA256 01323056edbbfa4d142d7a81ee3725404bd5464372aa4e3507af58890a22b7fe
 AUX bochs-2.3-ne2k.patch 557 RMD160 9094800e0d427ae9b13b69d39da5f569816c50ca SHA1 39df13629909535104a7febc52b8749d4414000a SHA256 c68d8bfc3759e031474e3f144d2780c62ada633b97721bee78f3c996255e9527
 AUX bochs-2.3-redog.patch 507 RMD160 7840dee3b03a040882655ea7f5e63fb44e9cd4fe SHA1 1658fa72d8d1e8e6ea687e22ade722cba15bbfa9 SHA256 d7013f39972bc989ad3663a6849b72169b4d1d41d36a9ffc25b83c62033ba002
+AUX bochs-2.3.7-gcc43.patch 211 RMD160 881624926e09147a22256b95906c7f9662c114f0 SHA1 5bcdec596ed52c6c0a9d07afcee7493c43429d18 SHA256 eb3730763d7bce565f3240f81b21e77b0762b650d474cadb1cdc552c5eb2e457
 AUX bochs-2.3.7-typos.patch 1375 RMD160 d966955c9313d2ef6e961b48b24f65af10d2f29e SHA1 c55f317484117dfa59c71e95f95aed4d700d1bb4 SHA256 8ace7f1238702e9e973cabcb847673b5d2c63155c3efd572bf75a094819cdd49
 DIST bochs-2.3.6.tar.gz 3951132 RMD160 b81c8093c147d0d75cb18a954407ed3f7451aa3f SHA1 3675b1c5a324854b998bb7518c7279db2fecd8c3 SHA256 11b4026f0717266d01c59a3f95046077bc046949aa752d0f0773b2b20dfb16aa
 DIST bochs-2.3.7.tar.gz 3989982 RMD160 b4c9cb8e777c4e484f653085783bce9645804fe0 SHA1 e687c697a8be8396ae75106d0cd6149bd52ca67d SHA256 77f27fedadc6431df0a06ee226259a80443524ae9d221c97c5986e3f7927bb04
 DIST bochs-2.3.tar.gz 3812273 RMD160 545e0bf3edd0fdd073a107e835f90c65451c100e SHA1 2fe0dbdebd7fe9fe07d697bcbe1736bdaeb64aaf SHA256 fd926f3915d0619ddde8dedd02dac661f3233d77f3fc2ec7f94e1e028398497a
 DIST dlxlinux4.tar.gz 1504868 RMD160 29fd31dd0f77edacecabd9f053206a486635e7f1 SHA1 b3f441cd71c54c71a8c21aa405e949bde02c1783 SHA256 68b35f850ce69f4050ed85064e15d756245d57e84ddc1d52678b0e2a97dbf73e
 EBUILD bochs-2.3.6.ebuild 2788 RMD160 46e494d7ed36d389852d4c48eef75cebe9c7d2be SHA1 2f9cd828e8993035b7ae00e542e4d188cdf7adbc SHA256 380b52ccbfb7ea2d43ac7ff662c3d52755483aad41959da2c7bd3299bd805bb4
-EBUILD bochs-2.3.7.ebuild 3477 RMD160 f128ae9737bf404b53b67795d4493d406f751e43 SHA1 b770e2d49b7fcae79e64f82ffa6540a2de24d2b1 SHA256 524e52f4e186cdca3629a03ffa8da60f2d9b5cdf16188623ef7691a1c310364c
+EBUILD bochs-2.3.7.ebuild 3523 RMD160 58b00d1c533c9fcf0f4a09230e5280f05d6fe657 SHA1 57bfdd9c5b7acce761111412605fa9dc8025ce21 SHA256 14d997d4decd9200881abadbf0737aea3b2b073f184a70368fe60d98e437f623
 EBUILD bochs-2.3.ebuild 3068 RMD160 8795b86ff397340582b95ab0fa247d032d92c728 SHA1 bf47cec0b18613c6a6ca45fb3aead0d33f488826 SHA256 f99daec5e2138693b289124e64af535c45c0df953a5642f68d2020898b534714
-MISC ChangeLog 9795 RMD160 a85d3d6aeb18dfcd0d14e97ef51568751eeced2c SHA1 cec4d532de30a3b90cabdb397aa74df1138615ee SHA256 260b9b0c06e5ce08f0ef31238cef58df904c99a733de2f6de602c1f045e39f80
+MISC ChangeLog 9992 RMD160 783229547290494360098f1ccad85076a5cbed0a SHA1 d2026b17ae816d33a16f4fc303f008c9623558e7 SHA256 d8e06f801f568483d8cd358fe096b88f2ca7d7fe441e2cc1850b537ce2ff8683
 MISC metadata.xml 223 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 SHA1 fcf66d2b271369d296150dde06603d850623ed27 SHA256 64a96c3c9929aec46b50a63ae1fd8c46cef4a8423f448d6f6fff09e20510c98b
diff --git a/app-emulation/bochs/bochs-2.3.7.ebuild b/app-emulation/bochs/bochs-2.3.7.ebuild
index 59db59de42c7..3e882bff1a7f 100644
--- a/app-emulation/bochs/bochs-2.3.7.ebuild
+++ b/app-emulation/bochs/bochs-2.3.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/app-emulation/bochs/bochs-2.3.7.ebuild,v 1.1 2008/06/05 02:22:51 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.7.ebuild,v 1.2 2008/06/17 10:11:42 lu_zero Exp $
 
 inherit eutils wxwidgets autotools
 
@@ -35,6 +35,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/bochs-2.3.7-typos.patch"
+	epatch "${FILESDIR}/bochs-2.3.7-gcc43.patch"
 
 	# we already downloaded dlxlinux4.tar.gz so let the Makefile cp it instead
 	# of downloading it again
diff --git a/app-emulation/bochs/files/bochs-2.3.7-gcc43.patch b/app-emulation/bochs/files/bochs-2.3.7-gcc43.patch
new file mode 100644
index 000000000000..c4b15617914d
--- /dev/null
+++ b/app-emulation/bochs/files/bochs-2.3.7-gcc43.patch
@@ -0,0 +1,12 @@
+--- symbols.cc	2008/03/30 14:32:14	1.11
++++ symbols.cc	2008/06/16 17:09:52	1.12
+@@ -95,6 +95,9 @@
+ #endif
+ 
+ using namespace std;
++#ifdef __GNUC__
++using namespace __gnu_cxx;
++#endif
+ 
+ struct symbol_entry_t
+ {