version bump, remove old

(Portage version: 2.1.10.20/cvs/Linux i686)

4 files changed, 24 insertions, 91 deletions

diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index 0a322ea505b8..a375f5745e29 100644
--- a/media-gfx/hugin/ChangeLog
+++ b/media-gfx/hugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/hugin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.116 2011/09/14 18:54:43 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.117 2011/10/02 21:33:47 maekke Exp $
+
+*hugin-2011.2.0 (02 Oct 2011)
+
+  02 Oct 2011; Markus Meier <maekke@gentoo.org> -hugin-2010.0.0.ebuild,
+  -files/hugin-2010.0.0_rc1-libpng14.patch, -hugin-2010.4.0.ebuild,
+  +hugin-2011.2.0.ebuild:
+  version bump, remove old
 
   15 Sep 2011; Andreas Schuerch <nativemad@gentoo.org> hugin-2011.0.0.ebuild:
   x86 stable, Thanks JD, bug 379089
diff --git a/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch b/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch
deleted file mode 100644
index fdc026368c4d..000000000000
--- a/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://repos.archlinux.org/wsvn/packages/hugin/trunk/libpng14.patch
-
---- src/foreign/vigra/vigra_impex/png.cxx
-+++ src/foreign/vigra/vigra_impex/png.cxx
-@@ -271,8 +271,8 @@
-         // expand gray values to at least one byte size
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
-             if (setjmp(png->jmpbuf))
--                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
--            png_set_gray_1_2_4_to_8(png);
-+                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+            png_set_expand_gray_1_2_4_to_8(png);
-             bit_depth = 8;
-         }
- 
diff --git a/media-gfx/hugin/hugin-2010.0.0.ebuild b/media-gfx/hugin/hugin-2010.0.0.ebuild
deleted file mode 100644
index 904aee6f7519..000000000000
--- a/media-gfx/hugin/hugin-2010.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2010.0.0.ebuild,v 1.9 2011/07/05 19:41:43 maekke Exp $
-
-EAPI=2
-WX_GTK_VER="2.8"
-
-inherit wxwidgets versionator cmake-utils
-
-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"
-
-LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack +sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
-	!!dev-util/cocom
-	app-arch/zip
-	>=dev-libs/boost-1.35.0-r5
-	>=media-gfx/enblend-3.0_p20080807
-	media-gfx/exiv2
-	media-libs/freeglut
-	>=media-libs/libpano13-2.9.14
-	media-libs/libpng
-	media-libs/openexr
-	media-libs/tiff
-	sys-libs/zlib
-	virtual/jpeg
-	x11-libs/wxGTK:2.8[X,opengl,-odbc]
-	lapack? ( virtual/lapack )
-	sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
-	media-libs/exiftool"
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-PATCHES=( "${FILESDIR}/${P}_rc1-libpng14.patch" )
-
-pkg_setup() {
-	DOCS="AUTHORS README TODO"
-	mycmakeargs="$(cmake-utils_use_enable lapack)"
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	for lang in ${LANGS} ; do
-		case ${lang} in
-			ca) dir=ca_ES;;
-			cs) dir=cs_CZ;;
-			*) dir=${lang};;
-		esac
-		use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
-	done
-}
diff --git a/media-gfx/hugin/hugin-2010.4.0.ebuild b/media-gfx/hugin/hugin-2011.2.0.ebuild
index b7d2c951e49a..b20134d76074 100644
--- a/media-gfx/hugin/hugin-2010.4.0.ebuild
+++ b/media-gfx/hugin/hugin-2011.2.0.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2010.4.0.ebuild,v 1.3 2011/07/05 19:41:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.2.0.ebuild,v 1.1 2011/10/02 21:33:47 maekke Exp $
 
-EAPI=2
+EAPI=3
 WX_GTK_VER="2.8"
+PYTHON_DEPEND="python? 2:2.6 3"
 
-inherit wxwidgets versionator cmake-utils
+inherit python wxwidgets versionator cmake-utils
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -14,17 +15,19 @@ LICENSE="GPL-2 SIFT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack sift $(echo ${LANGS//\ /\ linguas_})"
+LANGS=" bg ca cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
+IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
 
 CDEPEND="
 	!!dev-util/cocom
 	app-arch/zip
+	dev-cpp/tclap
 	>=dev-libs/boost-1.35.0-r5
-	>=media-gfx/enblend-3.0_p20080807
+	dev-libs/zthread
+	>=media-gfx/enblend-4.0
 	media-gfx/exiv2
 	media-libs/freeglut
-	>=media-libs/libpano13-2.9.17
+	>=media-libs/libpano13-2.9.18
 	media-libs/libpng
 	media-libs/openexr
 	media-libs/tiff
@@ -36,13 +39,17 @@ CDEPEND="
 RDEPEND="${CDEPEND}
 	media-libs/exiftool"
 DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	python? ( >=dev-lang/swig-2.0.4 )"
 
 S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
 
 pkg_setup() {
 	DOCS="authors.txt README TODO"
-	mycmakeargs=( $(cmake-utils_use_enable lapack LAPACK) )
+	mycmakeargs=(
+		$(cmake-utils_use_enable lapack LAPACK)
+		$(cmake-utils_use_build python HSI)
+	)
 }
 
 src_install() {
@@ -57,8 +64,3 @@ src_install() {
 		use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
 	done
 }
-
-pkg_postinst() {
-	elog "Please note that the sift USE-flag has been disabled by default"
-	elog "as hugin ships its own control point generator with 2010.4"
-}