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

Package-Manager: portage-2.1.5_rc6

7 files changed, 59 insertions, 54 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/Manifest b/media-gfx/enblend/Manifest
index 1376d8d0dff3..7b9f5d906d2e 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,10 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX enblend-3.0-amd64_compilation.patch 374 RMD160 767dcbbe4767610e42b4d53ee7687f8fb957c14a SHA1 9add406f5fff084cfe6aa67c3197efc41ec0a123 SHA256 4d06fa29f832bef421bf567fea3f8ed3748d9bb88d860564ce8c07ca5dbe8608
 AUX enblend-3.0-endless_loop_anneal.patch 1375 RMD160 455da248993d9ee5faab3b7b6f4fcb80caec44c0 SHA1 fe23b8246875469fa5aea2c9bfe953c7aa2cfe4c SHA256 dfdf427517ae25751ccbfc2b662871c1347e8e50b3f60328de9b15bc86206490
-DIST enblend-2.3.tar.gz 433083 RMD160 a60430e2bf9ec96d1ee65a0d2afd382581312d3b SHA1 ed339412b85f39bd982939b8981cf0cc91bfdc99 SHA256 1b82e8f220b954f64a0119295e6a7700c9f61a04e561b2d1cc8f2c3a0f3913f3
-DIST enblend-2.5.tar.gz 445337 RMD160 8003be4d4c8b5835e111f55245ada863331a6f7f SHA1 c622cde8614f7e2b3bdfcf7f34a5c75f4e7fee04 SHA256 0cbce341709d77bf966e79d470a2f66312586cbcc2af5276c23b3b69bfd22c36
+AUX enblend-3.0-gcc43.patch 792 RMD160 3773a45458572bda6488b490413da7049b839548 SHA1 7f8878ce65b0263ad0d4499ab8c9d168dd11635c SHA256 542d8275c08c4e1f5fa5c85306a96c16c7d09485f1c5ad132d3db65e4b0f7e5d
 DIST enblend-3.0.tar.gz 661778 RMD160 fceaece3b39b1b8f93f34efa5273a18fc2da356d SHA1 98f001a4eddb3fd1f9ab7def00d8655d4fb726ea SHA256 ab45109ff1cdf9318f7835a80df383c4c2a125db1af8d86a096a02d211254268
-EBUILD enblend-2.3.ebuild 605 RMD160 2aba16f6d7cf5f3f26a588d7ee05c036c4b26ef5 SHA1 d50d0e0e9e4ae361be6d165fb577454c5c3af99a SHA256 1411022b83e4cd268a081a6288a8fd3332682550a5a4954117f09258ccfc9013
-EBUILD enblend-2.5.ebuild 573 RMD160 9827615cabd2397d49a9eb899cd29a792c5c261c SHA1 3e967298176ecbca734adf107dd6a10673d1d9d9 SHA256 a41c0c683b4e6e08cf59843fe630fb3ac5a9c369dbf343654362ad3b35eac570
-EBUILD enblend-3.0.ebuild 1402 RMD160 62021f410e1ef2a6dbf32296d91b36d445dd65c6 SHA1 53e7f18c30a8a171060a154cfe7e32fc9aae5d76 SHA256 c9e353f4fa65233fa59d2ed87eb8db79926c20327ed8ba373531e72c8309b92c
-MISC ChangeLog 2979 RMD160 7874e07d06fd2bde1828b1d45b8f4cb35d2d6f8d SHA1 f772a45de243fc238393ce9147859ce9246d9473 SHA256 0a329e8a3bcf7c7a879ac668f30e092c04e167b26d852768338efd93f8d7ad7b
+EBUILD enblend-3.0.ebuild 1437 RMD160 1270435ceaef81b77dc7d74c6a6f862ce1f08ed3 SHA1 85e06eba313a5c4a6bc6c95ecfcd0e9aa6857f29 SHA256 45b471cf74ec2502d116be2f00a54b7d7ce514cab88a0e79ef285314e6709870
+MISC ChangeLog 3196 RMD160 121d192b7964591ccec78a7df5e9d87fa650ce88 SHA1 796dc6d7d066d0169605f0e863a8318c12927983 SHA256 acb5072d2b050f236acc23fa08360360feff1afe32190fff30e3752b0200cd55
 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkga/o4ACgkQkKaRLQcq0GIk6ACdGnWtH2kUmueuU92BdHAFk0i6
+r60Aniy4zbbbUA26bwgfdPRY8bX5YJHZ
+=C9QB
+-----END PGP SIGNATURE-----
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"
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index eb0d97609e39..a722400b07f2 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -3,18 +3,19 @@ Hash: SHA1
 
 AUX hugin-0.6.1-1_0.6.1-1.1.patch 1165 RMD160 bc94d52e292329626d340fa3a88cfe3e9145faa5 SHA1 7d1adad2026d159f0d9d451338d1b08e306f9c9b SHA256 aee92c6eb7c36683719994b82758a6cfcae4470f92d3aa837a523b3e7e01e044
 AUX hugin-0.6.1-as-needed.patch 629 RMD160 af7d64eca6ffd7247111932a5793e83e873862c7 SHA1 e6140c09f6f61a5b0d16939a6826775e11408570 SHA256 ea63636b957ee2daa5ac0a59c6c9bf82adee6d328c50e9bf40e7fc8941461eaf
+AUX hugin-0.6.1-gcc43.patch 2158 RMD160 10d222fc8803ea11fbf73be36d158952d2c89c27 SHA1 0cf422177426d5d3069650a5f58c01e4907df0de SHA256 a67c455cb327969ad1ac0c3de08da97883877c50eaebc501677ba546e825f4c6
 AUX hugin-0.7_beta4-as-needed.patch 655 RMD160 02d58b47793ee64b3b8a418d88525cca312e3217 SHA1 d5ef18571ee0bace5bbe3756783159d8753cd691 SHA256 c432ca52a7052215631983d2cbfc8922a7430f1d6a719ba657d20792e6bd821d
 AUX hugin-0.7_beta4-insec-file.patch 1483 RMD160 910a462b06ffe5c21fb3eddbba813908c9a6da65 SHA1 8d5f9a112cd66b87c94741abb81e1b8814f7209a SHA256 e0e9fc3c252b80d413586e8c73c97b50ef9eeda2ae1e8c6269777b67c16c159a
 DIST hugin-0.6.1.tar.bz2 2151921 RMD160 4d5c1fa47f0bbe0ce452cab90443d7bd4b6e602a SHA1 b3581e316a6be182be13524b4e9c3758c7ed4b2e SHA256 18546d42ef15154246d5b84ebde847aa2cf003c6305cc64a17cc5396db346ae7
 DIST hugin-0.7_beta4.tar.bz2 2319243 RMD160 a46390111a0b47a05f3091549ca0523c7e867ae2 SHA1 66cbc8ef3db986c4b877a52b6291dafaa6d37ef0 SHA256 4527d40ae56a6ef67583a350ab67505e86054c0b297b2d18cf892c2751cabcfd
-EBUILD hugin-0.6.1-r2.ebuild 2043 RMD160 f9306eae9ad92ae07658542cc08c53f0b5d2ae85 SHA1 93d9d946b1760a2092856be2290319639d5b8b60 SHA256 38240d0d94fbdb6e297cf22184650a2d77e232b7c474a66d975040e10b569f93
+EBUILD hugin-0.6.1-r2.ebuild 2082 RMD160 b58543c38a0c2b0c2667177f3cf6a8b56e7ed69b SHA1 b28d8694a1b8c6ca59e8c291b164705d2fdf56bd SHA256 d3156460ab929c4129e40a136829deebe8b5e8a326c37c6c831f1e17c505bb56
 EBUILD hugin-0.7_beta4-r1.ebuild 2050 RMD160 8a0512c2e4e2796294bd44e6f6683118b98ae4ec SHA1 dbf0cb02cced5925baa909818b1a6c518e0ec9c5 SHA256 a243af4823a974cd3690f2a9150e2fc751b1478011e0a8eb67f7a2a95c18e427
-MISC ChangeLog 6383 RMD160 81b18f1edf3d39086c9fc9d3ad6a8fb2d2d07ceb SHA1 7fd295db7ad4635ecbf0e2328d4bd09c5d802426 SHA256 8c81f16eba7e2cf45bf8eec03d8b6fc678702a985159770706d4827e9ab918fb
+MISC ChangeLog 6549 RMD160 3c2d67391511ca9698259450b50b062fe0119658 SHA1 c684692164d3f7fd362b8bcfe76174da24e26c23 SHA256 22feeb980e7cbb252a22ab6da9a42f273b34d701da9612c9c38e7c6e70f14647
 MISC metadata.xml 236 RMD160 f8f179a11afc01f8e313241a5ff129266e0d8d15 SHA1 5543141f83e3d81465f35765ded5f03793238b59 SHA256 4d5e945742c9cf9cf794711f013e75fc4c1ce10e70d4ff34045c507f8b5bb1d9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH3GyYkKaRLQcq0GIRAhaPAJ9eM2PQR4AzEE9v3RH4e/T1ZbNIMACfadzU
-kl5la4teRgpH73rFT9GmtPM=
-=PdRw
+iEYEARECAAYFAkga/zsACgkQkKaRLQcq0GIYTwCglqG1A3dTnzv4n0Bm524Tmw8n
+M4cAoKeiJ1MpWb3G95znrcZWpr+u3S6L
+=vVDf
 -----END PGP SIGNATURE-----