Fix compile with GCC 4.4 wrt #267466, thanks to John Keeping.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 44 insertions, 11 deletions

diff --git a/media-libs/exempi/ChangeLog b/media-libs/exempi/ChangeLog
index 74d73d50d10a..3e73386435ee 100644
--- a/media-libs/exempi/ChangeLog
+++ b/media-libs/exempi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/exempi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/exempi/ChangeLog,v 1.15 2009/04/27 14:07:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/exempi/ChangeLog,v 1.16 2009/05/11 16:02:08 ssuominen Exp $
+
+  11 May 2009; Samuli Suominen <ssuominen@gentoo.org> exempi-2.0.2.ebuild,
+  +files/exempi-2.0.2-gcc44.patch:
+  Fix compile with GCC 4.4 wrt #267466, thanks to John Keeping.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> exempi-2.0.2:
   Stable for HPPA (bug #260063).
diff --git a/media-libs/exempi/exempi-2.0.2.ebuild b/media-libs/exempi/exempi-2.0.2.ebuild
index e6fa9587c74a..e1deeefe5c5a 100644
--- a/media-libs/exempi/exempi-2.0.2.ebuild
+++ b/media-libs/exempi/exempi-2.0.2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/exempi/exempi-2.0.2.ebuild,v 1.15 2009/04/27 14:07:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/exempi/exempi-2.0.2.ebuild,v 1.16 2009/05/11 16:02:08 ssuominen Exp $
 
+EAPI=2
 inherit autotools eutils
 
 DESCRIPTION="Exempi is a port of the Adobe XMP SDK to work on UNIX"
@@ -16,11 +17,10 @@ IUSE="examples test"
 RDEPEND="dev-libs/expat
 	virtual/libiconv"
 DEPEND="${RDEPEND}
-	test? ( >=dev-libs/boost-1.33.0 )"
+	test? ( >=dev-libs/boost-1.33 )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 
 	# don't waste time on autoreconf for those who don't want to run unit tests
 	if use test; then
@@ -29,14 +29,13 @@ src_unpack() {
 	fi
 }
 
-src_compile() {
-	econf $(use_enable test unittest)
-	emake || die "emake failed"
+src_configure() {
+	econf \
+		$(use_enable test unittest)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README
 
 	if use examples ; then
diff --git a/media-libs/exempi/files/exempi-2.0.2-gcc44.patch b/media-libs/exempi/files/exempi-2.0.2-gcc44.patch
new file mode 100644
index 000000000000..fc38f21c348b
--- /dev/null
+++ b/media-libs/exempi/files/exempi-2.0.2-gcc44.patch
@@ -0,0 +1,30 @@
+--- source/XMPFiles/XMPFiles_Impl.cpp
++++ source/XMPFiles/XMPFiles_Impl.cpp
+@@ -17,6 +17,7 @@
+ 	#include <fcntl.h>
+ 	#include <sys/stat.h>
+ 	#include <unistd.h>
++	#include <stdio.h>
+ #endif
+ 
+ using namespace std;
+--- samples/source/XMPFilesCoverage.cpp
++++ samples/source/XMPFilesCoverage.cpp
+@@ -4,6 +4,7 @@
+ #include <errno.h>
+ #include <time.h>
+ #include <cstring>
++#include <cstdio>
+ 
+ #define TXMP_STRING_TYPE std::string
+ #define XMP_INCLUDE_XMPFILES 1
+--- exempi/tests/utils.cpp
++++ exempi/tests/utils.cpp
+@@ -38,6 +38,7 @@
+ #include <boost/test/unit_test.hpp>
+ 
+ #include "utils.h"
++#include <cstdio>
+ 
+ std::string g_testfile;
+ std::string g_src_testdir;