Fix build with gcc-4.4 Bug #275911

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

7 files changed, 41 insertions, 35 deletions

diff --git a/media-libs/atlas-c++/ChangeLog b/media-libs/atlas-c++/ChangeLog
index 03faed93177f..2001cd33a10f 100644
--- a/media-libs/atlas-c++/ChangeLog
+++ b/media-libs/atlas-c++/ChangeLog
@@ -1,6 +1,13 @@
 # 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.29 2008/11/20 11:04:24 tove Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/atlas-c++/ChangeLog,v 1.30 2009/07/06 08:13:03 tupone Exp $
+
+  06 Jul 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/atlas-c++-0.6.1-gcc-4.4.patch, atlas-c++-0.4.5.ebuild,
+  atlas-c++-0.5.92.ebuild, atlas-c++-0.6.0.ebuild,
+  atlas-c++-0.6.1-r1.ebuild:
+  Fix build with gcc-4.4 Bug #275911 by Joost Ruis
+  Some QA fixes
 
   20 Nov 2008; Tupone Alfredo <tupone@gentoo.org> files/atlas-c++-0.6.1-as-needed.patch:
   Adding all dependency within libraries. Tested with -Wl,-no-undefined
diff --git a/media-libs/atlas-c++/Manifest b/media-libs/atlas-c++/Manifest
index 0bd52e37a8f4..912ca24f77fb 100644
--- a/media-libs/atlas-c++/Manifest
+++ b/media-libs/atlas-c++/Manifest
@@ -1,24 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX atlas-c++-0.6.1-as-needed.patch 2214 RMD160 70f2342d5c3afe2d77dff4fa53e093192b01d249 SHA1 ba2d8774b0167cb25ce4cf1061146940dd4257fa SHA256 5e5c03a67caa424b3ec7a500388006d3b4454e1bbb5c46077245b497f5f80837
 AUX atlas-c++-0.6.1-gcc-4.3.patch 784 RMD160 d8c4ce7babb278965145916be98cc551a891e350 SHA1 46f9d629c0e508295703c3a829f28c9f6a2668e0 SHA256 1c40cd584c57d6bb4be082a1a8851efa02457afab90061d752a04d0a4b91fa49
+AUX atlas-c++-0.6.1-gcc-4.4.patch 226 RMD160 6ad8174f66078ab937f9cb7e5308b32be30395ee SHA1 6abe4390ec7bccce5d6e0a88e283bc738c15341a SHA256 53b965e8dd7c71b87ff7f523d80330024d6481ea9f262c301d73defb92b9e94a
 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
 DIST Atlas-C++-0.6.0.tar.bz2 316498 RMD160 04f2800951475c2bdae2bf12c71e4a0e19d537fc SHA1 889c46ee3a5bb0e83b9abeab31a01597c54c8528 SHA256 30865a568185260fa7d9d4a7bb8e8eb6a1edf5b326e98ac45178fc10d001822f
 DIST Atlas-C++-0.6.1.tar.bz2 352247 RMD160 e9a1c8c314dd7a7239a11f630d8e710f7d238c0a SHA1 c28559bd005962a59ccc0f703743ff16b83483c2 SHA256 a9c4de5de6559c69bdcad21751cad15e304025037f612150a08648a88d29844e
-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-r1.ebuild 1258 RMD160 3eb1bb9f3226dadb9f62c4808677784a6f6c2f4e SHA1 635422ed9cad5c9db5ee577a23a7f5fe4ec1b630 SHA256 e4ed434b4619156bc97275679e47372bf64e695438d0515dee6eaad5a22b3b03
+EBUILD atlas-c++-0.4.5.ebuild 791 RMD160 54f7ab9f7f634712ae9c81b1e35b2e6ce54901e0 SHA1 482e7db2d43d1195f2ac12dca06f2ce475caa418 SHA256 9d4805702cf17398609784b99d6945376ca35af52e9aaed2626c8a124350ab39
+EBUILD atlas-c++-0.5.92.ebuild 911 RMD160 5100686fbb41f9bfb7f5c6198c608f937836ce77 SHA1 4b2764e9efafa9182c54547de3f1522925d9c391 SHA256 1cc46993aea0592b4b79db875c13198a96819bcc5c609f29ca525847c69a457c
+EBUILD atlas-c++-0.6.0.ebuild 1065 RMD160 b2c2e3659fdca8606c3634f06e68fb1e199784d0 SHA1 3fa0cfe0802f9c56dba3e2bfb81c39603141b99c SHA256 68b740ba6153e86b83179bf6dc5844216cb0799a001c0322733e466402507b51
+EBUILD atlas-c++-0.6.1-r1.ebuild 1165 RMD160 335e2cd3bda8cacb4797bad008e124f68a480e53 SHA1 633328aef49bcf6b183b84a5f6603de472100775 SHA256 d2952db4f4bebb5b5d0014e412a9dfdc199f067c99fe879f70bcbf36cb2a7f4c
 EBUILD atlas-c++-0.6.1.ebuild 1214 RMD160 3708963bdffafd9c45fe9d70bd3b40f3e49c042a SHA1 5ca26804c2661608b6e2862f898d62a36cbde801 SHA256 d0b1eae3b76275d14e4430a8ac3cf531e5ef1373810ff61576c59facf04184af
-MISC ChangeLog 3753 RMD160 64ee33a3bd15a788119e377b7df992d45a3c3591 SHA1 73bbeb6af154649ae98d0b4405464f8aa0e26980 SHA256 cecf6a1e991865cab96e574111977924c6484a2a73baa38e0c3a788fe809ac27
+MISC ChangeLog 4017 RMD160 c1be1a4058163f8be1e02a8a074d3c3e3fc2273f SHA1 f834afa06261531b8b663caf0b71d15d3fd98aa7 SHA256 07b5725a9409b3bea1d4ddc9f93ced36a55aa9d510451dfb8273d5603bcc85e8
 MISC metadata.xml 417 RMD160 b4d2b04ed705dd45fa2aae097b7c6a0bc2c0b9c7 SHA1 4d36d40488409667cab95b09b06db66f191cdbba SHA256 1f5bbb3d7ca1f6a96631e6f57d6c7069f8f45f8c3725d0acde7b8181b8d22483
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkklRCgACgkQV3J2n04EauzKSACZAYSAbomaiGVrQL3tcA4daSU3
-sNoAn03S3ftMzGk3eaRE6F4LNmWpKp90
-=9JWM
------END PGP SIGNATURE-----
diff --git a/media-libs/atlas-c++/atlas-c++-0.4.5.ebuild b/media-libs/atlas-c++/atlas-c++-0.4.5.ebuild
index 1ba75d5dbfe1..16541ed7e37a 100644
--- a/media-libs/atlas-c++/atlas-c++-0.4.5.ebuild
+++ b/media-libs/atlas-c++/atlas-c++-0.4.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.4.5.ebuild,v 1.13 2008/02/29 07:23:41 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/atlas-c++/atlas-c++-0.4.5.ebuild,v 1.14 2009/07/06 08:13:03 tupone Exp $
 
 MY_PN="Atlas-C++"
 MY_P=${MY_PN}-${PV}
@@ -16,6 +16,7 @@ IUSE=""
 
 DEPEND="virtual/libc
 	=dev-libs/libsigc++-1.0*"
+RDEPEND=${DEPEND}
 
 src_compile() {
 
diff --git a/media-libs/atlas-c++/atlas-c++-0.5.92.ebuild b/media-libs/atlas-c++/atlas-c++-0.5.92.ebuild
index cc8bf556f5d3..a0f82cd2bcdd 100644
--- a/media-libs/atlas-c++/atlas-c++-0.5.92.ebuild
+++ b/media-libs/atlas-c++/atlas-c++-0.5.92.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.5.92.ebuild,v 1.5 2008/02/29 07:23:41 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/atlas-c++/atlas-c++-0.5.92.ebuild,v 1.6 2009/07/06 08:13:03 tupone Exp $
 
 inherit eutils
 
@@ -13,11 +13,12 @@ SRC_URI="mirror://sourceforge/worldforge/${MY_P}.tar.bz2"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="virtual/libc
 	>=dev-libs/libsigc++-1.2"
+RDEPEND=${DEPEND}
 
 src_install() {
 	make DESTDIR="${D}" install || die
diff --git a/media-libs/atlas-c++/atlas-c++-0.6.0.ebuild b/media-libs/atlas-c++/atlas-c++-0.6.0.ebuild
index 1b52fd590a4b..e9f837da8fa9 100644
--- a/media-libs/atlas-c++/atlas-c++-0.6.0.ebuild
+++ b/media-libs/atlas-c++/atlas-c++-0.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 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.0.ebuild,v 1.5 2007/07/21 23:24:35 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/atlas-c++/atlas-c++-0.6.0.ebuild,v 1.6 2009/07/06 08:13:03 tupone Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/worldforge/${MY_P}.tar.bz2"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="bzip2 doc zlib"
 
 RDEPEND=""
diff --git a/media-libs/atlas-c++/atlas-c++-0.6.1-r1.ebuild b/media-libs/atlas-c++/atlas-c++-0.6.1-r1.ebuild
index 2bf8140638e5..3c6930fe27c0 100644
--- a/media-libs/atlas-c++/atlas-c++-0.6.1-r1.ebuild
+++ b/media-libs/atlas-c++/atlas-c++-0.6.1-r1.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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-r1.ebuild,v 1.1 2008/11/19 14:47:42 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/atlas-c++/atlas-c++-0.6.1-r1.ebuild,v 1.2 2009/07/06 08:13:03 tupone Exp $
+EAPI=2
 
 inherit eutils autotools
 
@@ -13,7 +14,7 @@ SRC_URI="mirror://sourceforge/worldforge/${MY_P}.tar.bz2"
 SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="bzip2 doc zlib"
+IUSE="doc"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
@@ -21,20 +22,15 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-strict-aliasing.patch \
 		"${FILESDIR}"/${P}-gcc-4.3.patch \
+		"${FILESDIR}"/${P}-gcc-4.4.patch \
 		"${FILESDIR}"/${P}-as-needed.patch
 	eautoreconf
 }
 
 src_compile() {
-	econf \
-	    $(use_enable zlib) \
-	    $(use_enable bzip2 bzlib) \
-	    || die "Error: econf failed!"
 	emake || die "Error: emake failed!"
 	if use doc; then
 		emake docs ||  die "Error: emake failed!"
diff --git a/media-libs/atlas-c++/files/atlas-c++-0.6.1-gcc-4.4.patch b/media-libs/atlas-c++/files/atlas-c++-0.6.1-gcc-4.4.patch
new file mode 100644
index 000000000000..ed792935349a
--- /dev/null
+++ b/media-libs/atlas-c++/files/atlas-c++-0.6.1-gcc-4.4.patch
@@ -0,0 +1,10 @@
+--- Atlas/Filter.cpp.old	2009-07-06 09:58:04.000000000 +0200
++++ Atlas/Filter.cpp	2009-07-06 09:58:44.000000000 +0200
+@@ -5,6 +5,7 @@
+ #include <Atlas/Filter.h>
+ 
+ #include <string.h>
++#include <cstdio>
+ 
+ namespace Atlas {
+