Fix building with boost 1.37 wrt #261321, thanks to Christoph Gysin and bonsaikitten. Fix building with GCC 4.4.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 48 insertions, 15 deletions

diff --git a/media-gfx/sfftobmp/ChangeLog b/media-gfx/sfftobmp/ChangeLog
index 166c24033300..fc23a2c22f62 100644
--- a/media-gfx/sfftobmp/ChangeLog
+++ b/media-gfx/sfftobmp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/sfftobmp
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sfftobmp/ChangeLog,v 1.13 2008/11/09 13:40:35 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sfftobmp/ChangeLog,v 1.14 2009/05/08 21:36:38 ssuominen Exp $
+
+  08 May 2009; Samuli Suominen <ssuominen@gentoo.org> sfftobmp-3.1.1.ebuild,
+  +files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch:
+  Fix building with boost 1.37 wrt #261321, thanks to Christoph Gysin and
+  bonsaikitten. Fix building with GCC 4.4.
 
   09 Nov 2008; Markus Meier <maekke@gentoo.org> -sfftobmp-3.0.ebuild:
   old
@@ -13,7 +18,7 @@
 
 *sfftobmp-3.1.1 (14 Apr 2008)
 
-  14 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  14 Apr 2008; Samuli Suominen <ssuominen@gentoo.org>
   +files/sfftobmp-3.1.1-gcc43-and-cerrno.patch, +sfftobmp-3.1.1.ebuild:
   Version bump with GCC 4.3 patch by Peter Alfredsen.
 
diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch
new file mode 100644
index 000000000000..3ba832afaed6
--- /dev/null
+++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch
@@ -0,0 +1,33 @@
+Only in sfftobmp3_1_1: Makefile.am.orig
+Only in sfftobmp3_1_1: Makefile.am.rej
+diff -ur sfftobmp3_1_1.orig/src/cmdline.cpp sfftobmp3_1_1/src/cmdline.cpp
+--- sfftobmp3_1_1.orig/src/cmdline.cpp	2007-10-07 22:01:21.000000000 +0300
++++ sfftobmp3_1_1/src/cmdline.cpp	2009-05-09 00:33:06.000000000 +0300
+@@ -35,6 +35,7 @@
+ 
+ ---RCS-Info--------------------------------------------------*/
+ 
++#include <cstdio>
+ #include <vector>
+ #include <cassert>
+ #include <iostream>
+diff -ur sfftobmp3_1_1.orig/src/common.cpp sfftobmp3_1_1/src/common.cpp
+--- sfftobmp3_1_1.orig/src/common.cpp	2007-10-07 22:01:20.000000000 +0300
++++ sfftobmp3_1_1/src/common.cpp	2009-05-09 00:28:37.000000000 +0300
+@@ -49,6 +49,7 @@
+ #include <sys/utime.h>
+ #endif
+ 
++#include <cstdio>
+ #include <cassert>
+ #include <iostream>
+ 
+diff -ur sfftobmp3_1_1.orig/src/Makefile.am sfftobmp3_1_1/src/Makefile.am
+--- sfftobmp3_1_1.orig/src/Makefile.am	2006-10-24 23:14:19.000000000 +0300
++++ sfftobmp3_1_1/src/Makefile.am	2009-05-09 00:27:42.000000000 +0300
+@@ -3,4 +3,4 @@
+ INCLUDES            =  -I$(top_builddir) -I$(top_srcdir)
+ bin_PROGRAMS = sfftobmp
+ sfftobmp_SOURCES = my_getopt.c cmdline.cpp codes.cpp common.cpp decoder.cpp input.cpp main.cpp output.cpp
+-sfftobmp_LDADD = @TIFF_LIB@ @JPEG_LIB@ -lboost_filesystem
++sfftobmp_LDADD = @TIFF_LIB@ @JPEG_LIB@ -lboost_filesystem -lboost_system
diff --git a/media-gfx/sfftobmp/sfftobmp-3.1.1.ebuild b/media-gfx/sfftobmp/sfftobmp-3.1.1.ebuild
index 630385be6874..8aeaecec15ea 100644
--- a/media-gfx/sfftobmp/sfftobmp-3.1.1.ebuild
+++ b/media-gfx/sfftobmp/sfftobmp-3.1.1.ebuild
@@ -1,7 +1,8 @@
-# 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-gfx/sfftobmp/sfftobmp-3.1.1.ebuild,v 1.4 2008/11/09 13:31:07 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sfftobmp/sfftobmp-3.1.1.ebuild,v 1.5 2009/05/08 21:36:38 ssuominen Exp $
 
+EAPI=2
 inherit autotools eutils
 
 MY_P=${PN}${PV//./_}
@@ -23,19 +24,13 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc43-and-cerrno.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43-and-cerrno.patch \
+		"${FILESDIR}"/${P}-gcc44-and-boost-1_37.patch
 	eautoreconf
 }
 
-src_compile() {
-	econf --disable-dependency-tracking
-	emake || die "emake failed."
-}
-
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc doc/{changes,credits,readme}
 }