Fix for gcc-4.3.0 Bug #217622

Package-Manager: portage-2.1.4.4

4 files changed, 41 insertions, 15 deletions

diff --git a/media-libs/atlas-c++/ChangeLog b/media-libs/atlas-c++/ChangeLog
index c8539f21e894..ea0b227247e0 100644
--- a/media-libs/atlas-c++/ChangeLog
+++ b/media-libs/atlas-c++/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/atlas-c++
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/atlas-c++/ChangeLog,v 1.23 2008/02/29 07:23:41 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/atlas-c++/ChangeLog,v 1.24 2008/04/14 22:11:49 tupone Exp $
+
+  14 Apr 2008; Tupone Alfredo <tupone@gentoo.org>
+  +files/atlas-c++-0.6.1-gcc-4.3.patch, atlas-c++-0.6.1.ebuild:
+  Fix for gcc-4.3.0 Bug #217622 by Peter Alfredsen
 
   29 Feb 2008; Tupone Alfredo <tupone@gentoo.org>
   +files/atlas-c++-0.6.1-strict-aliasing.patch, atlas-c++-0.4.5.ebuild,
diff --git a/media-libs/atlas-c++/Manifest b/media-libs/atlas-c++/Manifest
index 0ac088b45ed9..e4557986f491 100644
--- a/media-libs/atlas-c++/Manifest
+++ b/media-libs/atlas-c++/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX atlas-c++-0.6.1-gcc-4.3.patch 784 RMD160 d8c4ce7babb278965145916be98cc551a891e350 SHA1 46f9d629c0e508295703c3a829f28c9f6a2668e0 SHA256 1c40cd584c57d6bb4be082a1a8851efa02457afab90061d752a04d0a4b91fa49
 AUX atlas-c++-0.6.1-strict-aliasing.patch 560 RMD160 cf1fc14662b5a268f35df7d8f1ed7667f3b0d900 SHA1 c4cc25232b95d232cee072d2354d3c3f01159fde SHA256 74e4ccedd6610ebce1c0f14f4b67ee064a133fe7f48c0c0d34356dd9749b0016
 DIST Atlas-C++-0.4.5.tar.bz2 171101 RMD160 bc0fe1485b2fa2e237652e1cd901b036046f3d6f SHA1 8b3e6ec1db7ec1e6fce122ee004edf089e925ea2 SHA256 b628e35b8ecc2e9542c6a15e70b23e1297e3a2daf2f2628e54ebd4cfb0d25376
 DIST Atlas-C++-0.5.92.tar.bz2 296222 RMD160 75440053ccca093b2e6064d0f197558d3aa3e09a SHA1 2f8e2e0636f447ee815acaef7eddfa70be84db94 SHA256 ae1accd5a0731ff757d10ae9ba7cf8ff1843e274abd3a6a7fe84837dab0f52b1
@@ -9,13 +7,6 @@ DIST Atlas-C++-0.6.1.tar.bz2 352247 RMD160 e9a1c8c314dd7a7239a11f630d8e710f7d238
 EBUILD atlas-c++-0.4.5.ebuild 773 RMD160 329e98d32bbdaafda75746dbe31ab0ba082cf91b SHA1 b9467493097493eca7b60910fe9dcc5484a29c5c SHA256 09b96cbe8b0df63170db54018655ee8d90aef9e8764ec6a131b829586f772ec4
 EBUILD atlas-c++-0.5.92.ebuild 886 RMD160 d9fceeb8367eda2ee9bb24bf5928dc89e415c157 SHA1 e81cbe2c964c1ee0dbb7881b07a4f206136f558d SHA256 915fd56ba8c64de8b0f81b897a000b886992a28e3800e5b66600e849fe35c49a
 EBUILD atlas-c++-0.6.0.ebuild 1056 RMD160 4445e35c9b64feb498f25e79933ba8adf7845946 SHA1 ea475c3de9442fb15699350b232ad96aa48d12a0 SHA256 8e3451e2c7bb00b5734609b7dc80eb9199088377512107669dc575fc555b0924
-EBUILD atlas-c++-0.6.1.ebuild 1179 RMD160 e5e292ecbe0705001ff8ad4e3f09ce17cdc77751 SHA1 095907707c1c86b8da9d584f6a22f99a3d0d53b0 SHA256 4417ec449b231903114470d4bc30c1105e51fce41ecb48a2ba41892f56c08bd7
-MISC ChangeLog 3077 RMD160 ebffd78777e0399d2528d72c792df412386d9b1b SHA1 78b6f0e0b811a56aecebdada99a2d442c52d0291 SHA256 070d37d1bb714e7c589303ae4db78e0814a1d59c294bbf728c38b0e870bacbbc
+EBUILD atlas-c++-0.6.1.ebuild 1216 RMD160 02193fc41c1ec79316a206cd4597a0fa0b8856d8 SHA1 5f0a76498c37b4d3012ea99596bfd56d28f51fd0 SHA256 8fb94983905b1127d85d26166a69ba5989ca74e7ceec4477aa07341a03458490
+MISC ChangeLog 3243 RMD160 6ef45f5541328019a02b8a6b3847da29d1e7d957 SHA1 59c4d45aebb52241c5e2886ca8383f68159e3f67 SHA256 32b1deabc043d9996e898b1743def72ab7b5ea27cc7a4589cd8bab9fea15b433
 MISC metadata.xml 417 RMD160 b4d2b04ed705dd45fa2aae097b7c6a0bc2c0b9c7 SHA1 4d36d40488409667cab95b09b06db66f191cdbba SHA256 1f5bbb3d7ca1f6a96631e6f57d6c7069f8f45f8c3725d0acde7b8181b8d22483
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHx7MH8qKy9+b2Hl0RAqlsAJ9u6j5YZ6V/cjZkcomaUs3+Oj7KhgCfUsPt
-upKOa7y+glBJkz6qlct7pZ4=
-=Q8RH
------END PGP SIGNATURE-----
diff --git a/media-libs/atlas-c++/atlas-c++-0.6.1.ebuild b/media-libs/atlas-c++/atlas-c++-0.6.1.ebuild
index 3883883d1376..a295a9f3a07a 100644
--- a/media-libs/atlas-c++/atlas-c++-0.6.1.ebuild
+++ b/media-libs/atlas-c++/atlas-c++-0.6.1.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/media-libs/atlas-c++/atlas-c++-0.6.1.ebuild,v 1.3 2008/02/29 07:23:41 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/atlas-c++/atlas-c++-0.6.1.ebuild,v 1.4 2008/04/14 22:11:49 tupone Exp $
 
 inherit eutils autotools
 
@@ -24,7 +24,8 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-strict-aliasing.patch
+	epatch "${FILESDIR}"/${P}-strict-aliasing.patch \
+		"${FILESDIR}"/${P}-gcc-4.3.patch
 	eautoreconf
 }
 
diff --git a/media-libs/atlas-c++/files/atlas-c++-0.6.1-gcc-4.3.patch b/media-libs/atlas-c++/files/atlas-c++-0.6.1-gcc-4.3.patch
new file mode 100644
index 000000000000..6ac1bc6e6194
--- /dev/null
+++ b/media-libs/atlas-c++/files/atlas-c++-0.6.1-gcc-4.3.patch
@@ -0,0 +1,30 @@
+--- Atlas/Filter.cpp.old	2008-04-14 23:55:23.000000000 +0200
++++ Atlas/Filter.cpp	2008-04-14 23:57:04.000000000 +0200
+@@ -4,6 +4,8 @@
+ 
+ #include <Atlas/Filter.h>
+ 
++#include <string.h>
++
+ namespace Atlas {
+ 
+ Filter::Filter(Filter* next)
+@@ -41,7 +43,7 @@
+ 
+     if (numPutback > m_inPutback) numPutback = m_inPutback;
+ 
+-    std::memcpy(m_outBuffer + (m_inPutback - numPutback),
++    ::memcpy(m_outBuffer + (m_inPutback - numPutback),
+                 gptr() - numPutback,
+                 (unsigned long) numPutback);
+ 
+--- tools/atlas_convert.cpp.old	2008-04-14 23:58:53.000000000 +0200
++++ tools/atlas_convert.cpp	2008-04-14 23:59:15.000000000 +0200
+@@ -14,6 +14,7 @@
+ #include <fstream>
+ #include <iostream>
+ 
++#include <stdlib.h>
+ #include <unistd.h>
+ 
+ int option_format = 0;