old

(Portage version: 2.1.6_rc2/cvs/Linux 2.6.26.8 x86_64)

5 files changed, 7 insertions, 141 deletions

diff --git a/media-gfx/enblend/ChangeLog b/media-gfx/enblend/ChangeLog
index ab7776a24340..e6eea5b95c58 100644
--- a/media-gfx/enblend/ChangeLog
+++ b/media-gfx/enblend/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/enblend
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.30 2008/12/06 18:49:05 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.31 2008/12/08 18:57:31 maekke Exp $
+
+  08 Dec 2008; Markus Meier <maekke@gentoo.org>
+  -files/enblend-3.0-amd64_compilation.patch,
+  -files/enblend-3.0-endless_loop_anneal.patch,
+  -files/enblend-3.0-gcc43.patch, -enblend-3.0.ebuild:
+  old
 
   06 Dec 2008; nixnut <nixnut@gentoo.org> enblend-3.2.ebuild:
   Stable on ppc wrt bug 249380
diff --git a/media-gfx/enblend/enblend-3.0.ebuild b/media-gfx/enblend/enblend-3.0.ebuild
deleted file mode 100644
index a5ee7a3ffc62..000000000000
--- a/media-gfx/enblend/enblend-3.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.8 2008/05/02 11:43:35 maekke Exp $
-
-inherit eutils
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${P}.tar.gz"
-
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="media-libs/tiff
-	media-libs/lcms
-	virtual/glut
-	media-libs/glew
-	media-libs/plotutils
-	>=dev-libs/boost-1.31.0"
-
-pkg_setup() {
-	# bug 202476
-	if ! built_with_use media-libs/plotutils X ; then
-		eerror
-		eerror "media-gfx/plotutils has to be built with USE=\"X\""
-		eerror
-		die "emerge plotutils with USE=\"X\""
-	fi
-
-	ewarn
-	ewarn "The compilation of enblend needs a lot of RAM. If you have less"
-	ewarn "than 1GB RAM (and swap) you probably won't be able to compile it."
-	ewarn
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Both of the following patches can be found in the sf.net tracker
-	# Fixes endless loop with seam optimizer and 360 deg images
-	epatch "${FILESDIR}"/${P}-endless_loop_anneal.patch
-
-	# Fixes compilation on AMD64
-	epatch "${FILESDIR}"/${P}-amd64_compilation.patch
-
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	sed -i '/CXXFLAGS/s: -g -O3 : :' src/Makefile.in
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-gfx/enblend/files/enblend-3.0-amd64_compilation.patch b/media-gfx/enblend/files/enblend-3.0-amd64_compilation.patch
deleted file mode 100644
index 418f2adf4cd0..000000000000
--- a/media-gfx/enblend/files/enblend-3.0-amd64_compilation.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/anneal.h	27 Jan 2007 05:00:39 -0000	1.2
-+++ src/anneal.h	3 Feb 2007 09:27:30 -0000
-@@ -678,7 +695,7 @@
- 
-             localK = stateSpace->size();
-             if (localK < 2) convergedPoints[index] = true;
--            kMax = std::max(kMax, stateProbabilities->size());
-+            kMax = std::max((size_t)kMax, stateProbabilities->size());
- 
-         }
- 
-
- 	  	 
diff --git a/media-gfx/enblend/files/enblend-3.0-endless_loop_anneal.patch b/media-gfx/enblend/files/enblend-3.0-endless_loop_anneal.patch
deleted file mode 100644
index b333b4476e13..000000000000
--- a/media-gfx/enblend/files/enblend-3.0-endless_loop_anneal.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/anneal.h	27 Jan 2007 05:00:39 -0000	1.2
-+++ src/anneal.h	3 Feb 2007 09:27:30 -0000
-@@ -235,13 +235,25 @@
-             Pi = new double[kMax];
-         }
- 
-+        // dangelo: HACK to work around NaN numbers
-+        // force kMax to be > 2 (temporarily)
-+        // I'm not sure what the real cause for this is.
-+        int kMaxOrig = kMax;
-+        if (kMax <= 2) kMax = 15;
-         tau = 0.75;
-         deltaEMax = 7000.0;
-         deltaEMin = 5.0;
-         double epsilon = 1.0 / (kMax * kMax);
-         tInitial = ceil(deltaEMax / log((kMax - 1 + (kMax * kMax * epsilon)) / (kMax - 1 - (kMax * kMax * epsilon))));
-+
-         tFinal = deltaEMin / log((kMax - (kMax * epsilon) - 1) / (kMax * epsilon));
- 
-+        kMax = kMaxOrig;
-+
-+        if (Verbose > VERBOSE_GDA_MESSAGES) {
-+            cout << endl << "tInitial=" << tInitial << " tFinal=" << tFinal << " epsilon=" << epsilon << " kMax=" << kMax;
-+            cout.flush();
-+        }
-     }
- 
-     ~GDAConfiguration() {
-@@ -264,6 +276,11 @@
- 
-         tCurrent = tInitial;
- 
-+        if (Verbose > VERBOSE_GDA_MESSAGES) {
-+            cout << endl << "tInitial=" << tCurrent << " numIterations=" << numIterations;
-+            cout.flush();
-+        }
-+
-         while (tCurrent > tFinal) {
-             double epsilon = 1.0 / kMax;
-             unsigned int eta = (unsigned int)ceil(log(epsilon)
-
- 	  	 
diff --git a/media-gfx/enblend/files/enblend-3.0-gcc43.patch b/media-gfx/enblend/files/enblend-3.0-gcc43.patch
deleted file mode 100644
index 0d054173661e..000000000000
--- a/media-gfx/enblend/files/enblend-3.0-gcc43.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /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"