version bump, EAPI=2 for stable ebuild, remove old

(Portage version: 2.2_rc40/cvs/Linux i686)

5 files changed, 81 insertions, 59 deletions

diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index 596692475edb..cf8f7572fdc0 100644
--- a/media-gfx/hugin/ChangeLog
+++ b/media-gfx/hugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/hugin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.70 2009/08/01 09:49:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.71 2009/09/13 14:11:54 maekke Exp $
+
+*hugin-2009.2.0_beta3 (13 Sep 2009)
+
+  13 Sep 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
+  -hugin-0.7.0-r1.ebuild, +hugin-2009.2.0_beta3.ebuild,
+  +files/hugin-2009.2.0_beta3-asneeded.patch:
+  version bump, EAPI=2 for stable ebuild, remove old
 
   01 Aug 2009; Markus Meier <maekke@gentoo.org> hugin-0.8.0.ebuild:
   tweak x11-libs/wxGTK dep for bug #279653 and bug #269689
diff --git a/media-gfx/hugin/files/hugin-2009.2.0_beta3-asneeded.patch b/media-gfx/hugin/files/hugin-2009.2.0_beta3-asneeded.patch
new file mode 100644
index 000000000000..4009c91eccbf
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2009.2.0_beta3-asneeded.patch
@@ -0,0 +1,9 @@
+diff -ru hugin-2009.2.0.orig/src/hugin_base/CMakeLists.txt hugin-2009.2.0/src/hugin_base/CMakeLists.txt
+--- hugin-2009.2.0.orig/src/hugin_base/CMakeLists.txt	2009-09-12 17:08:56.000000000 +0200
++++ hugin-2009.2.0/src/hugin_base/CMakeLists.txt	2009-09-12 17:10:22.000000000 +0200
+@@ -69,4 +69,4 @@
+ 
+ add_subdirectory(test)
+ 
+-TARGET_LINK_LIBRARIES(huginbase huginlevmar huginvigraimpex ${Boost_LIBRARIES} ${EXIV2_LIBRARIES} ${PANO_LIBRARIES} ${TIFF_LIBRARIES} ${LAPACK_LIBRARIES})
++TARGET_LINK_LIBRARIES(huginbase huginlevmar huginvigraimpex ${Boost_LIBRARIES} ${EXIV2_LIBRARIES} ${PANO_LIBRARIES} ${TIFF_LIBRARIES} ${LAPACK_LIBRARIES} ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES})
diff --git a/media-gfx/hugin/hugin-0.7.0-r1.ebuild b/media-gfx/hugin/hugin-0.7.0-r1.ebuild
deleted file mode 100644
index 45f8317d713d..000000000000
--- a/media-gfx/hugin/hugin-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 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.6 2009/05/24 10:07:59 maekke Exp $
-
-EAPI="2"
-WX_GTK_VER="2.8"
-
-inherit cmake-utils wxwidgets
-
-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 ~x86 ~ppc"
-IUSE="+sift"
-
-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
-	media-libs/openexr
-	media-libs/tiff
-	sys-libs/zlib
-	x11-libs/wxGTK:2.8
-	sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS README TODO"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.0_rc2-as-needed.patch
-	"${FILESDIR}"/${P}-gcc44.patch
-)
diff --git a/media-gfx/hugin/hugin-0.7.0.ebuild b/media-gfx/hugin/hugin-0.7.0.ebuild
index 10720d6e9810..54435d99056c 100644
--- a/media-gfx/hugin/hugin-0.7.0.ebuild
+++ b/media-gfx/hugin/hugin-0.7.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2009 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.8 2009/05/24 10:07:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.7.0.ebuild,v 1.9 2009/09/13 14:11:54 maekke Exp $
 
-EAPI="1"
+EAPI="2"
 WX_GTK_VER="2.8"
 
-inherit cmake-utils eutils wxwidgets
+inherit cmake-utils wxwidgets
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -17,7 +17,7 @@ IUSE="+sift"
 
 DEPEND="
 	app-arch/zip
-	>=dev-libs/boost-1.30.0
+	|| ( >=dev-libs/boost-1.34 =dev-libs/boost-1.33*[threads] )
 	>=media-gfx/enblend-3.0_p20080807
 	media-gfx/exiv2
 	media-libs/jpeg
@@ -30,21 +30,8 @@ DEPEND="
 	sift? ( media-gfx/autopano-sift-C )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-0.7.0"
 DOCS="AUTHORS README TODO"
-
-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
-	wxwidgets_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.7.0_rc2-as-needed.patch
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.0_rc2-as-needed.patch
+	"${FILESDIR}"/${P}-gcc44.patch
+)
diff --git a/media-gfx/hugin/hugin-2009.2.0_beta3.ebuild b/media-gfx/hugin/hugin-2009.2.0_beta3.ebuild
new file mode 100644
index 000000000000..1f2c881044da
--- /dev/null
+++ b/media-gfx/hugin/hugin-2009.2.0_beta3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2009.2.0_beta3.ebuild,v 1.1 2009/09/13 14:11:54 maekke Exp $
+
+EAPI="2"
+WX_GTK_VER="2.8"
+
+inherit base cmake-utils wxwidgets versionator
+
+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 fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
+IUSE="lapack +sift $(echo ${LANGS//\ /\ linguas_})"
+
+DEPEND="app-arch/zip
+	>=dev-libs/boost-1.35.0-r5
+	>=media-gfx/enblend-3.0_p20080807
+	media-gfx/exiv2
+	media-libs/jpeg
+	>=media-libs/libpano13-2.9.14
+	media-libs/libpng
+	media-libs/openexr
+	media-libs/tiff
+	sys-libs/zlib
+	x11-libs/wxGTK:2.8[opengl,-odbc]
+	lapack? ( virtual/lapack )
+	sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${DEPEND}
+	media-libs/exiftool"
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+PATCHES=( "${FILESDIR}"/${P}-asneeded.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
+}