6 files changed, 10 insertions, 252 deletions
diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index a5d2dddeb9a2..bdc254f2fb01 100644
--- a/media-gfx/hugin/ChangeLog
+++ b/media-gfx/hugin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/hugin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.147 2014/06/01 15:32:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.148 2014/06/09 08:19:09 maekke Exp $
+
+  09 Jun 2014; Markus Meier <maekke@gentoo.org> hugin-2013.0.0-r1.ebuild,
+  -hugin-2014.0.0_rc1.ebuild, -hugin-2014.0.0_rc2.ebuild,
+  -hugin-2014.0.0_rc3.ebuild, hugin-2014.0.0_rc4.ebuild:
+  add sys-devel/gettext to DEPEND by Nikoli in bug #512776, remove old
 
 *hugin-2014.0.0_rc4 (01 Jun 2014)
 
diff --git a/media-gfx/hugin/hugin-2013.0.0-r1.ebuild b/media-gfx/hugin/hugin-2013.0.0-r1.ebuild
index e009cacf60b9..a6287794bc2e 100644
--- a/media-gfx/hugin/hugin-2013.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2013.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2013.0.0-r1.ebuild,v 1.5 2014/02/05 11:25:22 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2013.0.0-r1.ebuild,v 1.6 2014/06/09 08:19:09 maekke Exp $
 
 EAPI=5
 
@@ -43,6 +43,7 @@ CDEPEND="
 RDEPEND="${CDEPEND}
 	media-libs/exiftool"
 DEPEND="${CDEPEND}
+	sys-devel/gettext
 	virtual/pkgconfig
 	python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
 
diff --git a/media-gfx/hugin/hugin-2014.0.0_rc1.ebuild b/media-gfx/hugin/hugin-2014.0.0_rc1.ebuild
deleted file mode 100644
index 57dba11fcf25..000000000000
--- a/media-gfx/hugin/hugin-2014.0.0_rc1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2014.0.0_rc1.ebuild,v 1.1 2014/02/20 17:54:04 maekke Exp $
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-
-inherit base python-single-r1 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.bz2"
-
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" cs da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW"
-IUSE="lapack python sift debug $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
-	!!dev-util/cocom
-	app-arch/zip
-	dev-cpp/tclap
-	>=dev-libs/boost-1.49.0-r1:=
-	dev-libs/zthread
-	>=media-gfx/enblend-4.0
-	media-gfx/exiv2
-	media-libs/freeglut
-	media-libs/glew:=
-	media-libs/lensfun
-	>=media-libs/libpano13-2.9.19_beta1:0=
-	media-libs/libpng:0=
-	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}
-	virtual/pkgconfig
-	python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
-	DOCS="authors.txt README TODO"
-	mycmakeargs=(
-		$(cmake-utils_use_enable lapack LAPACK)
-		$(cmake-utils_use_build python HSI)
-	)
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e 's:-O3::g' \
-		-i src/celeste/CMakeLists.txt || die
-	rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
-
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_optimize
-
-	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-2014.0.0_rc2.ebuild b/media-gfx/hugin/hugin-2014.0.0_rc2.ebuild
deleted file mode 100644
index dc6f0adeba0f..000000000000
--- a/media-gfx/hugin/hugin-2014.0.0_rc2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2014.0.0_rc2.ebuild,v 1.1 2014/04/27 11:54:29 maekke Exp $
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-
-inherit base python-single-r1 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.bz2"
-
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" cs da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW"
-IUSE="lapack python sift debug $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
-	!!dev-util/cocom
-	app-arch/zip
-	dev-cpp/tclap
-	>=dev-libs/boost-1.49.0-r1:=
-	dev-libs/zthread
-	>=media-gfx/enblend-4.0
-	media-gfx/exiv2
-	media-libs/freeglut
-	media-libs/glew:=
-	media-libs/lensfun
-	>=media-libs/libpano13-2.9.19_beta1:0=
-	media-libs/libpng:0=
-	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}
-	virtual/pkgconfig
-	python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
-	DOCS="authors.txt README TODO"
-	mycmakeargs=(
-		$(cmake-utils_use_enable lapack LAPACK)
-		$(cmake-utils_use_build python HSI)
-	)
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e 's:-O3::g' \
-		-i src/celeste/CMakeLists.txt || die
-	rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
-
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_optimize
-
-	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-2014.0.0_rc3.ebuild b/media-gfx/hugin/hugin-2014.0.0_rc3.ebuild
deleted file mode 100644
index 7dd49a0f307d..000000000000
--- a/media-gfx/hugin/hugin-2014.0.0_rc3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2014.0.0_rc3.ebuild,v 1.1 2014/05/20 17:13:58 maekke Exp $
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-
-inherit base python-single-r1 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.bz2"
-
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" cs da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW"
-IUSE="lapack python sift debug $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
-	!!dev-util/cocom
-	app-arch/zip
-	dev-cpp/tclap
-	>=dev-libs/boost-1.49.0-r1:=
-	dev-libs/zthread
-	>=media-gfx/enblend-4.0
-	media-gfx/exiv2
-	media-libs/freeglut
-	media-libs/glew:=
-	media-libs/lensfun
-	>=media-libs/libpano13-2.9.19_beta1:0=
-	media-libs/libpng:0=
-	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}
-	virtual/pkgconfig
-	python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
-	DOCS="authors.txt README TODO"
-	mycmakeargs=(
-		$(cmake-utils_use_enable lapack LAPACK)
-		$(cmake-utils_use_build python HSI)
-	)
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e 's:-O3::g' \
-		-i src/celeste/CMakeLists.txt || die
-	rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
-
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_optimize
-
-	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-2014.0.0_rc4.ebuild b/media-gfx/hugin/hugin-2014.0.0_rc4.ebuild
index a84c15d8c4a0..2069cd5738bf 100644
--- a/media-gfx/hugin/hugin-2014.0.0_rc4.ebuild
+++ b/media-gfx/hugin/hugin-2014.0.0_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2014.0.0_rc4.ebuild,v 1.1 2014/06/01 15:32:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2014.0.0_rc4.ebuild,v 1.2 2014/06/09 08:19:09 maekke Exp $
 
 EAPI=5
 
@@ -43,6 +43,7 @@ CDEPEND="
 RDEPEND="${CDEPEND}
 	media-libs/exiftool"
 DEPEND="${CDEPEND}
+	sys-devel/gettext
 	virtual/pkgconfig
 	python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"