fix building with gcc-4.3 by Peter Alfredsen in bug #219779; remove old

(Portage version: 2.1.5_rc6)

5 files changed, 39 insertions, 42 deletions

diff --git a/media-gfx/enblend/ChangeLog b/media-gfx/enblend/ChangeLog
index 2e11c24438aa..056799dcabf4 100644
--- a/media-gfx/enblend/ChangeLog
+++ b/media-gfx/enblend/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/enblend
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.21 2007/12/22 15:47:27 dertobi123 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.22 2008/05/02 11:43:35 maekke Exp $
+
+  02 May 2008; Markus Meier <maekke@gentoo.org>
+  +files/enblend-3.0-gcc43.patch, -enblend-2.3.ebuild, -enblend-2.5.ebuild,
+  enblend-3.0.ebuild:
+  fix building with gcc-4.3 by Peter Alfredsen in bug #219779; remove old
 
   22 Dec 2007; Tobias Scherbaum <dertobi123@gentoo.org> enblend-3.0.ebuild:
   ppc stable, bug #202095
diff --git a/media-gfx/enblend/enblend-2.3.ebuild b/media-gfx/enblend/enblend-2.3.ebuild
deleted file mode 100644
index f9a092b09a71..000000000000
--- a/media-gfx/enblend/enblend-2.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-2.3.ebuild,v 1.3 2005/11/06 03:23:51 metalgod Exp $
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sf.net"
-SRC_URI="mirror://sourceforge/enblend/${P}.tar.gz"
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="media-libs/tiff
-		>=dev-libs/boost-1.31.0"
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO VIGRA_LICENSE
-}
diff --git a/media-gfx/enblend/enblend-2.5.ebuild b/media-gfx/enblend/enblend-2.5.ebuild
deleted file mode 100644
index c99872a886d4..000000000000
--- a/media-gfx/enblend/enblend-2.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-2.5.ebuild,v 1.4 2007/04/16 09:33:04 opfer Exp $
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sf.net"
-SRC_URI="mirror://sourceforge/enblend/${P}.tar.gz"
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="media-libs/tiff
-		>=dev-libs/boost-1.31.0"
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-gfx/enblend/enblend-3.0.ebuild b/media-gfx/enblend/enblend-3.0.ebuild
index e02dad595c40..a5ee7a3ffc62 100644
--- a/media-gfx/enblend/enblend-3.0.ebuild
+++ b/media-gfx/enblend/enblend-3.0.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/media-gfx/enblend/enblend-3.0.ebuild,v 1.7 2007/12/22 15:47:27 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-3.0.ebuild,v 1.8 2008/05/02 11:43:35 maekke Exp $
 
 inherit eutils
 
@@ -46,6 +46,7 @@ src_unpack() {
 	# Fixes compilation on AMD64
 	epatch "${FILESDIR}"/${P}-amd64_compilation.patch
 
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 	sed -i '/CXXFLAGS/s: -g -O3 : :' src/Makefile.in
 }
 
diff --git a/media-gfx/enblend/files/enblend-3.0-gcc43.patch b/media-gfx/enblend/files/enblend-3.0-gcc43.patch
new file mode 100644
index 000000000000..0d054173661e
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-3.0-gcc43.patch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gcc4.3-includes.dpatch by Sebastian Harl <sh@tokkee.org>
+##
+## DP: This patch adds missing includes required by gcc-4.3.
+
+@DPATCH@
+
+--- a/include/vigra/imageiteratoradapter.hxx	2007-01-27 05:54:46.000000000 +0100
++++ b/include/vigra/imageiteratoradapter.hxx	2007-12-27 18:15:52.000000000 +0100
+@@ -38,6 +38,8 @@
+ #ifndef VIGRA_IMAGEITERATORADAPTER_HXX
+ #define VIGRA_IMAGEITERATORADAPTER_HXX
+ 
++#include <cstdlib>
++
+ #include <iterator>   // iterator tags
+ 
+ namespace vigra {
+--- a/src/gpu.cc	2006-12-08 09:40:58.000000000 +0100
++++ b/src/gpu.cc	2007-12-28 04:04:49.000000000 +0100
+@@ -18,6 +18,8 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
++#include <cstdlib>
++
+ #include <iostream>
+ 
+ #include "gpu.h"