Fix from Ryan Hill for building with gcc-4.3 #207338.

Package-Manager: portage-2.1.4

4 files changed, 40 insertions, 13 deletions

diff --git a/app-arch/lzma-utils/ChangeLog b/app-arch/lzma-utils/ChangeLog
index 85bdf2ba826f..4c80cfcd16be 100644
--- a/app-arch/lzma-utils/ChangeLog
+++ b/app-arch/lzma-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/lzma-utils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/ChangeLog,v 1.18 2008/01/22 23:15:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/ChangeLog,v 1.19 2008/01/26 06:29:56 vapier Exp $
+
+  26 Jan 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/lzma-utils-4.32.4-gcc-4.3.patch, lzma-utils-4.32.4.ebuild:
+  Fix from Ryan Hill for building with gcc-4.3 #207338.
 
   22 Jan 2008; Mike Frysinger <vapier@gentoo.org> lzma-utils-4.32.4.ebuild:
   Add ~mips love.
diff --git a/app-arch/lzma-utils/Manifest b/app-arch/lzma-utils/Manifest
index 814bac02ea3c..98a9bc435d74 100644
--- a/app-arch/lzma-utils/Manifest
+++ b/app-arch/lzma-utils/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX lzma-utils-4.32.4-gcc-4.3.patch 310 RMD160 e528dc7aba8b10566b6d8d11b0c3379270ddbc26 SHA1 444f7b495d535c7b16cf8fb7e4d891f82279c6cd SHA256 886f1cde4a721e0f336e413029e186c1db5e3b31574aa5d745246906f2e356b5
+MD5 b35bf92ace512291787f07018fa52d64 files/lzma-utils-4.32.4-gcc-4.3.patch 310
+RMD160 e528dc7aba8b10566b6d8d11b0c3379270ddbc26 files/lzma-utils-4.32.4-gcc-4.3.patch 310
+SHA256 886f1cde4a721e0f336e413029e186c1db5e3b31574aa5d745246906f2e356b5 files/lzma-utils-4.32.4-gcc-4.3.patch 310
 DIST lzma-4.32.0beta5.tar.gz 435099 RMD160 5ff391e344eefe1f15f684a7def18522e9d34540 SHA1 b8a8c26b226f90a9707aedf961fa40c617872355 SHA256 6f99e8d67964a834bde31989b163606f12ffdece5d096162bd0fb032d962f7f1
 DIST lzma-4.32.2.tar.gz 454148 RMD160 a2a49286ca933dac96bf8a4d130e2adc54ec677e SHA1 48f8fea28eb93c326cb512dcb1384030f21a7b84 SHA256 0639c4c177c10f95f39ca28e2489e6f352778f42a42bf998a44aa428ad29e14a
 DIST lzma-4.32.3.tar.gz 471373 RMD160 627945225dce75730c716d0086c99c715b1bd856 SHA1 6d1be75ee482b1086fa231aac82d62ea7a160608 SHA256 8c93a03fab74532e19f502a003428d5afd649020c8bc436a7475efdc6223058f
@@ -17,14 +21,14 @@ EBUILD lzma-utils-4.32.3.ebuild 630 RMD160 a1d74ca0c4766845f97594265be16b57d307d
 MD5 391cec61bde56cbe571c80c4f5aa44f0 lzma-utils-4.32.3.ebuild 630
 RMD160 a1d74ca0c4766845f97594265be16b57d307d50e lzma-utils-4.32.3.ebuild 630
 SHA256 9f81149c39b41d7ad56767464ec602d33d0063788811a9107f0cf83c80c949dc lzma-utils-4.32.3.ebuild 630
-EBUILD lzma-utils-4.32.4.ebuild 650 RMD160 18233310b34238355ee81c0c0740e90c50fed41e SHA1 b6b748ec7dd9d6ffce1905a27572f852b7d3cdf8 SHA256 747a75f0b6564ffd5bd5c23cdc426ba30979bb91bd9bda3c3272e07c94f90f9c
-MD5 4d25ec858128f1a4daebbc3def1f5b7c lzma-utils-4.32.4.ebuild 650
-RMD160 18233310b34238355ee81c0c0740e90c50fed41e lzma-utils-4.32.4.ebuild 650
-SHA256 747a75f0b6564ffd5bd5c23cdc426ba30979bb91bd9bda3c3272e07c94f90f9c lzma-utils-4.32.4.ebuild 650
-MISC ChangeLog 2337 RMD160 6083578e7530f79bd95208e85ca92e7ad4ec36b3 SHA1 283dbdf37d5c219a3dd21965d9b217c363c0185f SHA256 74a00115e2fc2f8f318fcea9bafef0b4398b9c67f3b0103b659dc5b63fa45d92
-MD5 3f1f262575fdc126c73223e96be7b22e ChangeLog 2337
-RMD160 6083578e7530f79bd95208e85ca92e7ad4ec36b3 ChangeLog 2337
-SHA256 74a00115e2fc2f8f318fcea9bafef0b4398b9c67f3b0103b659dc5b63fa45d92 ChangeLog 2337
+EBUILD lzma-utils-4.32.4.ebuild 741 RMD160 4a33f95e376a88fd2112e7354b57b97e71bb8852 SHA1 ff6e4651c2fdb093e0ad1bbf87714dd165575366 SHA256 7d1ec6c723a172b527bc624cb21e2448797dee702a49e398356780f1f3cd9428
+MD5 854e1925cf3267bd6e2b83cbcd1c3d2c lzma-utils-4.32.4.ebuild 741
+RMD160 4a33f95e376a88fd2112e7354b57b97e71bb8852 lzma-utils-4.32.4.ebuild 741
+SHA256 7d1ec6c723a172b527bc624cb21e2448797dee702a49e398356780f1f3cd9428 lzma-utils-4.32.4.ebuild 741
+MISC ChangeLog 2512 RMD160 7994a419dd500a770e26984d57c01e8cafc80055 SHA1 250061a8eaa7f381d0cf4782a952614674b7d084 SHA256 3526f60fbe47a9b6a7fffa2790c6efaa36435d413a33ff72ffa1c93417b83cb6
+MD5 94df443253e46ae86d0618c53fb4f837 ChangeLog 2512
+RMD160 7994a419dd500a770e26984d57c01e8cafc80055 ChangeLog 2512
+SHA256 3526f60fbe47a9b6a7fffa2790c6efaa36435d413a33ff72ffa1c93417b83cb6 ChangeLog 2512
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -44,7 +48,7 @@ SHA256 cc01c13fa4176e81cbc847035a7caa1ecdd5c8c5504d73b549a73244d6e951d8 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHlnkYj9hvisErhMIRAshQAKC0MfV5QFH8BdSQGP81dU2KHPiHSgCfUewV
-L3qQRhBJKDOerX028VZgk00=
-=aX19
+iD8DBQFHmtNqj9hvisErhMIRAvXLAJ99BugWthuQ7ZTq+FDOOkQYfQGsYwCglg0j
+Dq6PsUS0hYf+unqLwQ2xiiA=
+=ruGR
 -----END PGP SIGNATURE-----
diff --git a/app-arch/lzma-utils/files/lzma-utils-4.32.4-gcc-4.3.patch b/app-arch/lzma-utils/files/lzma-utils-4.32.4-gcc-4.3.patch
new file mode 100644
index 000000000000..417a81141cb8
--- /dev/null
+++ b/app-arch/lzma-utils/files/lzma-utils-4.32.4-gcc-4.3.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/207338
+http://sourceforge.net/forum/forum.php?thread_id=1922427&forum_id=708858
+
+--- lzma-4.32.4/src/lzma/lzmp.cpp
++++ lzma-4.32.4/src/lzma/lzmp.cpp
+@@ -30,6 +30,7 @@
+ #include <cstdio>
+ #include <cstring>
+ #include <climits>
++#include <cstdlib>
+ 
+ #include <string>
+ using std::string;
diff --git a/app-arch/lzma-utils/lzma-utils-4.32.4.ebuild b/app-arch/lzma-utils/lzma-utils-4.32.4.ebuild
index 66e381083d02..6168bff9fe71 100644
--- a/app-arch/lzma-utils/lzma-utils-4.32.4.ebuild
+++ b/app-arch/lzma-utils/lzma-utils-4.32.4.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-arch/lzma-utils/lzma-utils-4.32.4.ebuild,v 1.2 2008/01/22 23:15:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/lzma-utils-4.32.4.ebuild,v 1.3 2008/01/26 06:29:56 vapier Exp $
 
 inherit eutils
 
@@ -17,6 +17,12 @@ RDEPEND="!app-arch/lzma"
 
 S=${WORKDIR}/lzma-${PV/_}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc-4.3.patch #207338
+}
+
 src_install() {
 	emake install DESTDIR="${D}" || die
 	dodoc AUTHORS ChangeLog NEWS README THANKS