add missing media-gfx/exiv2 dependency for bug #248628; remove old

(Portage version: 2.1.6_rc2/cvs/Linux 2.6.28-rc6 i686)

6 files changed, 11 insertions, 126 deletions

diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index c3e242eda2fa..f934a1cfef36 100644
--- a/media-gfx/hugin/ChangeLog
+++ b/media-gfx/hugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/hugin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.50 2008/11/26 21:08:36 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.51 2008/11/28 18:28:07 maekke Exp $
+
+  28 Nov 2008; Markus Meier <maekke@gentoo.org>
+  -files/hugin-0.7_beta4-insec-file.patch,
+  -files/hugin-0.7_beta4-as-needed.patch, -hugin-0.7_beta4-r1.ebuild,
+  hugin-0.7.0.ebuild, hugin-0.7.0-r1.ebuild:
+  add missing media-gfx/exiv2 dependency for bug #248628; remove old
 
   26 Nov 2008; Ryan Hill <dirtyepic@gentoo.org> hugin-0.7.0.ebuild:
   Call wxwidgets_pkg_setup.
diff --git a/media-gfx/hugin/files/hugin-0.7_beta4-as-needed.patch b/media-gfx/hugin/files/hugin-0.7_beta4-as-needed.patch
deleted file mode 100644
index b07cd5b72557..000000000000
--- a/media-gfx/hugin/files/hugin-0.7_beta4-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur hugin-0.7_beta4.org/src/Panorama/Makefile.am hugin-0.7_beta4/src/Panorama/Makefile.am
---- hugin-0.7_beta4.org/src/Panorama/Makefile.am	2006-12-31 15:37:05.000000000 +0100
-+++ hugin-0.7_beta4/src/Panorama/Makefile.am	2007-06-01 21:36:08.000000000 +0200
-@@ -7,5 +7,7 @@
- noinst_LTLIBRARIES = libpanorama.la
- libpanorama_la_SOURCES = Panorama.cpp PanoramaMemento.cpp PanoImage.cpp PanoToolsInterface.cpp SpaceTransform.cpp PTOptimise.cpp ImageGraph.cpp Stitcher.cpp Stitcher1.cpp Stitcher2.cpp Stitcher3.cpp Stitcher4.cpp utils.cpp
- 
-+libpanorama_la_LIBADD = $(BOOST_THREAD_LIB)
-+
- EXTRA_DIST=Panorama.vcproj OptimizeOptions.cpp
- noinst_HEADERS =
diff --git a/media-gfx/hugin/files/hugin-0.7_beta4-insec-file.patch b/media-gfx/hugin/files/hugin-0.7_beta4-insec-file.patch
deleted file mode 100644
index 2bb330173cf8..000000000000
--- a/media-gfx/hugin/files/hugin-0.7_beta4-insec-file.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur hugin-0.7_beta4.orig/src/hugin/AutoCtrlPointCreator.cpp hugin-0.7_beta4/src/hugin/AutoCtrlPointCreator.cpp
---- hugin-0.7_beta4.orig/src/hugin/AutoCtrlPointCreator.cpp	2007-12-03 00:53:19.000000000 +0100
-+++ hugin-0.7_beta4/src/hugin/AutoCtrlPointCreator.cpp	2007-12-03 00:55:18.000000000 +0100
-@@ -219,7 +219,7 @@
- 	}
- #endif
- 
--    wxString ptofile(wxT("autopano_result_tempfile.pto"));
-+    wxString ptofile = wxFileName::CreateTempFileName(wxT("ap_res"));
-     autopanoArgs.Replace(wxT("%o"), ptofile);
-     wxString tmp;
-     tmp.Printf(wxT("%d"), nFeatures);
-@@ -373,7 +373,7 @@
-         imgNr++;
-     }
- 
--    wxString ptofile(wxT("autopano_result_tempfile"));
-+    wxString ptofile = wxFileName::CreateTempFileName(wxT("ap_res"));
-     autopanoArgs.Replace(wxT("%o"), ptofile);
-     wxString tmp;
-     tmp.Printf(wxT("%d"), nFeatures);
-diff -ur hugin-0.7_beta4.orig/src/Panorama/PTOptimise.cpp hugin-0.7_beta4/src/Panorama/PTOptimise.cpp
---- hugin-0.7_beta4.orig/src/Panorama/PTOptimise.cpp	2007-12-03 00:53:19.000000000 +0100
-+++ hugin-0.7_beta4/src/Panorama/PTOptimise.cpp	2007-12-03 00:56:05.000000000 +0100
-@@ -36,8 +36,8 @@
- #include <boost/property_map.hpp>
- #include <boost/graph/graph_utility.hpp>
- 
--#define DEBUG_WRITE_OPTIM_OUTPUT
--#define DEBUG_WRITE_OPTIM_OUTPUT_FILE "hugin_debug_optim_results.txt"
-+//#define DEBUG_WRITE_OPTIM_OUTPUT
-+//#define DEBUG_WRITE_OPTIM_OUTPUT_FILE "hugin_debug_optim_results.txt"
- 
- using namespace std;
- using namespace PT;
diff --git a/media-gfx/hugin/hugin-0.7.0-r1.ebuild b/media-gfx/hugin/hugin-0.7.0-r1.ebuild
index 63658f48757a..32567ecbecd1 100644
--- a/media-gfx/hugin/hugin-0.7.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-0.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.7.0-r1.ebuild,v 1.2 2008/10/06 19:10:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.7.0-r1.ebuild,v 1.3 2008/11/28 18:28:07 maekke Exp $
 
 EAPI="2"
 WX_GTK_VER="2.8"
@@ -19,6 +19,7 @@ DEPEND="
 	app-arch/zip
 	|| ( >=dev-libs/boost-1.34 =dev-libs/boost-1.33*[threads] )
 	>=media-gfx/enblend-3.0_p20080807
+	media-gfx/exiv2
 	media-libs/jpeg
 	media-libs/libpano13
 	media-libs/libpng
diff --git a/media-gfx/hugin/hugin-0.7.0.ebuild b/media-gfx/hugin/hugin-0.7.0.ebuild
index 90819cba644f..a3419d35cb10 100644
--- a/media-gfx/hugin/hugin-0.7.0.ebuild
+++ b/media-gfx/hugin/hugin-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.7.0.ebuild,v 1.3 2008/11/26 21:08:36 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.7.0.ebuild,v 1.4 2008/11/28 18:28:07 maekke Exp $
 
 EAPI="1"
 WX_GTK_VER="2.8"
@@ -19,6 +19,7 @@ DEPEND="
 	app-arch/zip
 	>=dev-libs/boost-1.30.0
 	>=media-gfx/enblend-3.0_p20080807
+	media-gfx/exiv2
 	media-libs/jpeg
 	media-libs/libpano13
 	media-libs/libpng
diff --git a/media-gfx/hugin/hugin-0.7_beta4-r1.ebuild b/media-gfx/hugin/hugin-0.7_beta4-r1.ebuild
deleted file mode 100644
index d857dc7cadc0..000000000000
--- a/media-gfx/hugin/hugin-0.7_beta4-r1.ebuild
+++ /dev/null
@@ -1,77 +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/hugin/hugin-0.7_beta4-r1.ebuild,v 1.4 2008/05/10 11:41:32 vapier Exp $
-
-inherit wxwidgets eutils autotools libtool
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="unicode debug enblend sift"
-
-DEPEND="app-arch/zip
-		>=media-libs/libpano12-2.8.4
-		>=dev-libs/boost-1.30.0
-		=x11-libs/wxGTK-2.6*
-		sys-libs/zlib
-		media-libs/libpng
-		media-libs/jpeg
-		media-libs/tiff
-		enblend? ( >=media-gfx/enblend-2.4 )
-		sift? ( media-gfx/autopano-sift )"
-
-pkg_setup() {
-	if ! built_with_use --missing true dev-libs/boost threads ; then
-		local msg="Build dev-libs/boost with USE=threads"
-		eerror "$msg"
-		die "$msg"
-	fi
-	if ! use enblend; then
-		elog "It is recommended to emerge this package with the"
-		elog "enblend use flag to install media-gfx/enblend"
-		elog "that blends the seams between images in a panorama."
-	fi
-	if ! use sift; then
-		elog "It is recommended to emerge this package with the"
-		elog "sift use flag to install media-gfx/autopano-sift"
-		elog "that produces control points between images in a"
-		elog "panorama."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i -e 's/autopanog\.exe/autopanog/' "${S}"/src/include/hugin/config_defaults.h
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-insec-file.patch"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-0.6.1-gcc43.patch"
-
-	AT_M4DIR="${S}/m4" eautoreconf
-}
-
-src_compile() {
-	export WX_GTK_VER="2.6"
-
-	if use unicode; then
-		need-wxwidgets unicode || die "Emerge wxGTK with unicode in USE"
-	else
-		need-wxwidgets gtk2 || die "Emerge wxGTK with gtk2 in USE"
-	fi
-
-	myconf="`use_with unicode`
-			`use_enable debug`"
-
-	econf --with-wx-config="${WX_CONFIG}" ${myconf} || die "configure failed"
-	emake || die "compiling failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS BUGS README TODO
-}