Fix for gcc-4.3 bug #225413, thanks to Marek Miller <mlm@shells.pl>.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

4 files changed, 55 insertions, 15 deletions

diff --git a/sys-fs/lufs/ChangeLog b/sys-fs/lufs/ChangeLog
index 25865946f54c..2b350022985b 100644
--- a/sys-fs/lufs/ChangeLog
+++ b/sys-fs/lufs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/lufs
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/ChangeLog,v 1.26 2007/01/04 18:25:13 flameeyes Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/ChangeLog,v 1.27 2008/06/29 12:20:55 loki_val Exp $
+
+  29 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/lufs-0.9.7-gcc43.patch, lufs-0.9.7-r3.ebuild:
+  Fix for gcc-4.3 bug #225413, thanks to Marek Miller <mlm@shells.pl>.
 
   04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> lufs-0.9.7-r3.ebuild:
   Fix broken autotools handling.
diff --git a/sys-fs/lufs/Manifest b/sys-fs/lufs/Manifest
index d311f4ae1d56..4a1ffef80a43 100644
--- a/sys-fs/lufs/Manifest
+++ b/sys-fs/lufs/Manifest
@@ -1,8 +1,9 @@
 AUX lufs-0.9.7-enable-gnome-2.patch 3079 RMD160 b17789d1ffe525f095bd652d48c60349410c9918 SHA1 8d218d854adc7ac14d47fb4f3fe5843b4f583e15 SHA256 d0d7fed96b8384a465178ce562cd8d8afad970b60a64e9b2b5f2ffc625f24e2f
 AUX lufs-0.9.7-fPIC.patch 714 RMD160 b9fc2548e9669c5ea7d3967ceb40e2d0eb40a792 SHA1 2ae19169f42d4fa51c10188bc25c94964c50010b SHA256 6f889e1f17eb265b73666a6eb9feca00402531fa9116a41bee498a228467f323
+AUX lufs-0.9.7-gcc43.patch 877 RMD160 022e4d227c785058888ff14bf06917ec3f68c29e SHA1 cdf54aaafb1d4391f79ed9725dea9e941277255a SHA256 dd03bf3ce89cfcbd22b90e6220fb65f8bb70fd025f62de711334a07447ccf461
 AUX lufs-automount-port.diff 754 RMD160 254ca6ac02e282df1796c3c594201fe2e3f68807 SHA1 d09e6e5d4208288f48129963c6005a7adc5027ed SHA256 87dba7403484e036fc63625c85a7da12efc538e6a5da12013795475dc918791e
 AUX lufs-no-kernel.patch 3347 RMD160 9709ffd5280bc04ee9beb70f4c0f0722adef2432 SHA1 943ed09a8e9a718af880549cfd6b903f57dedfc5 SHA256 4d537437b7af583cf6f3736264c96c53cd2f2b1be1387e058c7c9a7ed97b5d04
 DIST lufs-0.9.7.tar.gz 537772 RMD160 d453c2393cd67b04c13dad04870432bb60fa5749 SHA1 095710e8f8845b2655396ae40149a15ce8339b1a SHA256 2d91457906ee2ff1e26de82987019fe2efe22d9c3b6c7741b7ed8fffbae51411
-EBUILD lufs-0.9.7-r3.ebuild 1798 RMD160 4c68b7372000607193d2c2711b3964edf2545879 SHA1 7cca456428d857d9d662e00eb343a661cdf6d704 SHA256 3b88f800cdb336deb57b4390e5c46773b19626aaf4dad387b2a0ced038e2835f
-MISC ChangeLog 6001 RMD160 9d6f9f2036e31eb9892de4dda366d695f38849fd SHA1 233f28548515d840eb41db7484dbab7a7ef40d1c SHA256 13248d7bdebb6f7409a7ba9c8573d14c5b6ca3d4e2b18df7ca75151d3dab5694
+EBUILD lufs-0.9.7-r3.ebuild 1868 RMD160 cbca3f2e0534e87ddccc0fe5ca633638f7f3c6a6 SHA1 5b3044bc865379d91c86cecbca2e0641a94c1a1f SHA256 17682d7c0c6c00031d8c4337a4a5ef6dbf7ab997476c2b041cf015ffbd7ec5f2
+MISC ChangeLog 6180 RMD160 c9def6b23a7303e59e088daf3dfa38287cf77f05 SHA1 727b9c1e190861cf570796aba4b834f66ecb6720 SHA256 c2de6943a6605ff765be15f7db49b1f303addebcbf3796f034dec8577baf2222
 MISC metadata.xml 269 RMD160 e364e771306bf8a60d195209fbbbafd2c8faeb81 SHA1 aa019acdc76d14f8401d041871c93e5efe0097df SHA256 ba70c4af46ab7bc603b8de20989aa852162ca80dcde06dd27c3896d095adc428
diff --git a/sys-fs/lufs/files/lufs-0.9.7-gcc43.patch b/sys-fs/lufs/files/lufs-0.9.7-gcc43.patch
new file mode 100644
index 000000000000..3736ba62b017
--- /dev/null
+++ b/sys-fs/lufs/files/lufs-0.9.7-gcc43.patch
@@ -0,0 +1,33 @@
+--- filesystems/ftpfs/ftplib.cpp.orig	2008-06-08 20:01:35.000000000 +0200
++++ filesystems/ftpfs/ftplib.cpp	2008-06-08 20:01:53.000000000 +0200
+@@ -20,6 +20,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
++#include <cstring>
+ #include <unistd.h>
+ #include <netdb.h>
+ #include <stdio.h>
+--- filesystems/ftpfs/ftpfs.h.orig	2008-06-08 20:04:33.000000000 +0200
++++ filesystems/ftpfs/ftpfs.h	2008-06-08 20:05:07.000000000 +0200
+@@ -23,6 +23,8 @@
+ #ifndef _FTPFS_H_
+ #define _FTPFS_H_
+ 
++#include <cstdlib>
++#include <cstring>
+ using namespace std;
+ 
+ struct directory;
+--- filesystems/sshfs/sftplib.h.orig	2008-06-08 20:08:55.000000000 +0200
++++ filesystems/sshfs/sftplib.h	2008-06-08 20:09:43.000000000 +0200
+@@ -28,6 +28,9 @@
+ 
+ #include <string>
+ 
++#include <cstring>
++#include <cstdlib>
++
+ using namespace std;
+ 
+ #define MAXDATA		32768
diff --git a/sys-fs/lufs/lufs-0.9.7-r3.ebuild b/sys-fs/lufs/lufs-0.9.7-r3.ebuild
index 799318a77334..2fee4141c9fa 100644
--- a/sys-fs/lufs/lufs-0.9.7-r3.ebuild
+++ b/sys-fs/lufs/lufs-0.9.7-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.7-r3.ebuild,v 1.9 2007/01/04 18:25:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.7-r3.ebuild,v 1.10 2008/06/29 12:20:55 loki_val Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -15,18 +15,20 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc ~amd64"
 IUSE="debug"
-DEPEND="sys-fs/lufis
-		sys-devel/automake
-		sys-devel/autoconf"
+RDEPEND="sys-fs/lufis"
+DEPEND="${RDEPEND}
+	sys-devel/automake
+	sys-devel/autoconf"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-fPIC.patch
-	epatch ${FILESDIR}/lufs-automount-port.diff
-	epatch ${FILESDIR}/${P}-enable-gnome-2.patch
-	epatch ${FILESDIR}/lufs-no-kernel.patch
+	epatch "${FILESDIR}"/${P}-fPIC.patch
+	epatch "${FILESDIR}"/lufs-automount-port.diff
+	epatch "${FILESDIR}"/${P}-enable-gnome-2.patch
+	epatch "${FILESDIR}"/lufs-no-kernel.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 
 	filesystems="ftpfs localfs sshfs"
 	useq amd64 && filesystems="ftpfs localfs"
@@ -53,7 +55,7 @@ src_install() {
 	for i in ${filesystems}
 	do
 		cd ${i}
-		make DESTDIR=${D} install || die "make install failed"
+		make DESTDIR="${D}" install || die "make install failed"
 		cd ..
 	done
 }