old

(Portage version: 2.1.4_rc14)

11 files changed, 7 insertions, 327 deletions

diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index d13574f10b2b..18c696a851bf 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.34 2008/01/11 17:07:57 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.35 2008/01/12 09:42:39 maekke Exp $
+
+  12 Jan 2008; Markus Meier <maekke@gentoo.org>
+  -files/hugin-0.5-gcc41.patch, -files/hugin-0.5_rc2-gcc4.patch,
+  -hugin-0.5_rc1-r2.ebuild, -hugin-0.5.ebuild, -hugin-0.6.1.ebuild,
+  -hugin-0.6.1-r1.ebuild:
+  old
 
   11 Jan 2008; nixnut <nixnut@gentoo.org> hugin-0.6.1-r2.ebuild:
   Stable on ppc wrt bug 205154
diff --git a/media-gfx/hugin/files/digest-hugin-0.5 b/media-gfx/hugin/files/digest-hugin-0.5
deleted file mode 100644
index c501ebdd3b3d..000000000000
--- a/media-gfx/hugin/files/digest-hugin-0.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 18b38f5d6744831567b7fabfedb643fd hugin-0.5.tar.gz 2264996
-RMD160 f9504ed501db3ca02830eb0e3d3329d27bb98f93 hugin-0.5.tar.gz 2264996
-SHA256 28b49663ea52ff73b61453a6b397c99b704844d6147f316f961327532f9ca1fc hugin-0.5.tar.gz 2264996
diff --git a/media-gfx/hugin/files/digest-hugin-0.5_rc1-r2 b/media-gfx/hugin/files/digest-hugin-0.5_rc1-r2
deleted file mode 100644
index 7d5af944f468..000000000000
--- a/media-gfx/hugin/files/digest-hugin-0.5_rc1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 82fcd91f437b375438bee6f51352c777 hugin-0.5_rc1.tar.bz2 1499912
-RMD160 58cdf41d3494fefa6d33692bda2cf90f3389ab0e hugin-0.5_rc1.tar.bz2 1499912
-SHA256 56c72ae9bcb09f191d64b33e8b0137530f0053edd811a652a0277e9aa872184f hugin-0.5_rc1.tar.bz2 1499912
diff --git a/media-gfx/hugin/files/digest-hugin-0.6.1 b/media-gfx/hugin/files/digest-hugin-0.6.1
deleted file mode 100644
index f1c1d678e694..000000000000
--- a/media-gfx/hugin/files/digest-hugin-0.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 46bc3136d42acbabab837128ff471507 hugin-0.6.1.tar.bz2 2151921
-RMD160 4d5c1fa47f0bbe0ce452cab90443d7bd4b6e602a hugin-0.6.1.tar.bz2 2151921
-SHA256 18546d42ef15154246d5b84ebde847aa2cf003c6305cc64a17cc5396db346ae7 hugin-0.6.1.tar.bz2 2151921
diff --git a/media-gfx/hugin/files/digest-hugin-0.6.1-r1 b/media-gfx/hugin/files/digest-hugin-0.6.1-r1
deleted file mode 100644
index f1c1d678e694..000000000000
--- a/media-gfx/hugin/files/digest-hugin-0.6.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 46bc3136d42acbabab837128ff471507 hugin-0.6.1.tar.bz2 2151921
-RMD160 4d5c1fa47f0bbe0ce452cab90443d7bd4b6e602a hugin-0.6.1.tar.bz2 2151921
-SHA256 18546d42ef15154246d5b84ebde847aa2cf003c6305cc64a17cc5396db346ae7 hugin-0.6.1.tar.bz2 2151921
diff --git a/media-gfx/hugin/files/hugin-0.5-gcc41.patch b/media-gfx/hugin/files/hugin-0.5-gcc41.patch
deleted file mode 100644
index b176bd28c5ba..000000000000
--- a/media-gfx/hugin/files/hugin-0.5-gcc41.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ur hugin-0.5-orig/src/include/PT/Panorama.h hugin-0.5/src/include/PT/Panorama.h
---- hugin-0.5-orig/src/include/PT/Panorama.h	2005-12-26 21:35:42.000000000 -0500
-+++ hugin-0.5/src/include/PT/Panorama.h	2005-12-26 21:36:14.000000000 -0500
-@@ -542,7 +542,7 @@
-      *
-      *  only copies inherited variables
-      */
--    void Panorama::updateLensToImages(unsigned int lensNr);
-+    void updateLensToImages(unsigned int lensNr);
- 
-     /** copy lens variables to image variables.
-      *  update all images that use lensNr
-diff -ur hugin-0.5-orig/src/include/PT/PanoramaMemento.h hugin-0.5/src/include/PT/PanoramaMemento.h
---- hugin-0.5-orig/src/include/PT/PanoramaMemento.h	2005-12-26 21:35:57.000000000 -0500
-+++ hugin-0.5/src/include/PT/PanoramaMemento.h	2005-12-26 21:34:00.000000000 -0500
-@@ -154,7 +154,7 @@
-     double getHFOV() const;
- 
-     /** set HFOV in degrees */
--    void Lens::setHFOV(double d);
-+    void setHFOV(double d);
- 
-     /** get focal length of lens, it is calculated from the HFOV */
-     double getFocalLength() const;
-@@ -389,13 +389,13 @@
-     void printScriptLine(std::ostream & o) const;
- 
-     /// return string name of output file format
--    static const std::string & PanoramaOptions::getFormatName(FileFormat f);
-+    static const std::string & getFormatName(FileFormat f);
- 
-     /** returns the FileFormat corrosponding to name.
-      *
-      *  if name is not recognized, FileFormat::TIFF is returned
-      */
--    static FileFormat PanoramaOptions::getFormatFromName(const std::string & name);
-+    static FileFormat getFormatFromName(const std::string & name);
- 
-     /** calculate height of the output panorama
-      *
diff --git a/media-gfx/hugin/files/hugin-0.5_rc2-gcc4.patch b/media-gfx/hugin/files/hugin-0.5_rc2-gcc4.patch
deleted file mode 100644
index 61c9ba434739..000000000000
--- a/media-gfx/hugin/files/hugin-0.5_rc2-gcc4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-===================================================================
-RCS file: /cvsroot/hugin/hugin/src/include/PT/RemappedPanoImage.h,v
-retrieving revision 1.8
-retrieving revision 1.9
-diff -u -r1.8 -r1.9
---- hugin/hugin/src/include/PT/RemappedPanoImage.h	2005/05/11 18:13:12	1.8
-+++ hugin/hugin/src/include/PT/RemappedPanoImage.h	2005/11/16 18:50:05	1.9
-@@ -436,8 +436,7 @@
- 
-         if (imgOpts.docrop) {
-             vigra::BImage alpha(srcImgSize,255);
--
--            if (pano.getLens(pano.getImage(imgNr)).getProjection() == Lens::CIRCULAR_FISHEYE) {
-+            if (pano.getLens(img.getLensNr()).getProjection() == Lens::CIRCULAR_FISHEYE) {
-                 FDiff2D m( (imgOpts.cropRect.left() + imgOpts.cropRect.width()/2.0) * scale,
-                            (imgOpts.cropRect.top() + imgOpts.cropRect.height()/2.0) * scale);
- 
-@@ -494,7 +493,6 @@
-             vigra::BImage alpha(srcImgSize);
-             vigra::copyImage(vigra::make_triple(alphaImg.first, alphaImg.first + srcImgSize, alphaImg.second),
-                              vigra::destImage(alpha));
--
-             if (pano.getLens(img.getLensNr()).getProjection() == Lens::CIRCULAR_FISHEYE) {
-                 FDiff2D m( (imgOpts.cropRect.left() + imgOpts.cropRect.width()/2.0) * scale,
-                            (imgOpts.cropRect.top() + imgOpts.cropRect.height()/2.0) * scale);
diff --git a/media-gfx/hugin/hugin-0.5.ebuild b/media-gfx/hugin/hugin-0.5.ebuild
deleted file mode 100644
index 7f3f22a9d3f8..000000000000
--- a/media-gfx/hugin/hugin-0.5.ebuild
+++ /dev/null
@@ -1,52 +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/hugin/hugin-0.5.ebuild,v 1.6 2007/10/13 00:06:49 dirtyepic Exp $
-
-inherit wxwidgets eutils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="unicode debug"
-
-DEPEND=">=media-libs/libpano12-2.7.0.8
-		>=dev-libs/boost-1.30.0
-		=x11-libs/wxGTK-2.6*
-		sys-libs/zlib
-		media-libs/libpng
-		media-libs/jpeg
-		media-libs/tiff
-		media-gfx/enblend
-		media-gfx/autopano-sift"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}"/${P}-gcc41.patch
-
-	sed -i -e 's/autopanog\.exe/autopanog/' "${S}"/src/include/hugin/config_defaults.h
-}
-
-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
-}
diff --git a/media-gfx/hugin/hugin-0.5_rc1-r2.ebuild b/media-gfx/hugin/hugin-0.5_rc1-r2.ebuild
deleted file mode 100644
index ff85f9237188..000000000000
--- a/media-gfx/hugin/hugin-0.5_rc1-r2.ebuild
+++ /dev/null
@@ -1,57 +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/hugin/hugin-0.5_rc1-r2.ebuild,v 1.3 2007/10/13 00:06:49 dirtyepic Exp $
-
-inherit wxwidgets
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-MY_P=${P/_rc*//}
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="unicode debug"
-
-DEPEND=">=media-libs/libpano12-2.7.0.8
-		>=dev-libs/boost-1.30.0
-		=x11-libs/wxGTK-2.6*
-		sys-libs/zlib
-		media-libs/libpng
-		media-libs/jpeg
-		media-libs/tiff"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i -e 's/autopanog\.exe/autopanog/' "${S}"/src/include/hugin/config_defaults.h
-}
-
-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 INSTALL LICENCE LICENCE_SIFT README TODO
-}
-
-pkg_postinst() {
-	elog "Please consider the helper apps autopano-sift and enblend."
-	elog "autopano-sift is used to automagically generate control"
-	elog "points and enblend is used to merge images smoothly."
-}
diff --git a/media-gfx/hugin/hugin-0.6.1-r1.ebuild b/media-gfx/hugin/hugin-0.6.1-r1.ebuild
deleted file mode 100644
index 8ba83c616194..000000000000
--- a/media-gfx/hugin/hugin-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,71 +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/hugin/hugin-0.6.1-r1.ebuild,v 1.4 2007/11/14 07:03:20 welp Exp $
-
-inherit wxwidgets eutils
-
-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=">=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}-1_0.6.1-1.1.patch"
-}
-
-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
-}
diff --git a/media-gfx/hugin/hugin-0.6.1.ebuild b/media-gfx/hugin/hugin-0.6.1.ebuild
deleted file mode 100644
index 4ecdbb5ac6f2..000000000000
--- a/media-gfx/hugin/hugin-0.6.1.ebuild
+++ /dev/null
@@ -1,69 +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/hugin/hugin-0.6.1.ebuild,v 1.10 2007/10/13 00:06:49 dirtyepic Exp $
-
-inherit wxwidgets eutils
-
-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=">=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
-}
-
-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
-}