gentoo auto-resync : 20:12:2022 - 01:49:56

3 files changed, 101 insertions, 3 deletions

diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index f1513d8af3d2..80a726577212 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,4 +1,6 @@
 DIST hugin-2021.0.0.tar.bz2 10333565 BLAKE2B 4bde9bb491074a2f49a34c9af0e90246095c390abf2c49e924d4412e6c00148ae013e10a885799b7eeb1cd9977922a77dc5ebe032a38e2153138632ec818f038 SHA512 fb491af2543dda8c6d3c9d125936a32a04109eec39e3091347ef2856073d4e1f04017686acb8000e50e29a0ac8dcfe463b63613b277f8fb4aec0537f58a6c853
+DIST hugin-2022.0.0.tar.bz2 10374360 BLAKE2B ea77614a650f832f39583328767a55ebe888a003fed117e73b22fd29c641fc8494b190b864b7ccb05f996ceca5d95c5391597333efdc19bce0eba93af14543be SHA512 752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97
 EBUILD hugin-2021.0.0-r1.ebuild 2133 BLAKE2B 659fb635d57baa0e63c6d182d68ac56635bb920b6b6a15851878496442f9938baf125827436d4f818d0445ea452f292163aff8249de4c9cb0402462c40757583 SHA512 1d81e1ae941fc4c1f9a2f2bd963becb1f7972827276881b182f01f9cd420dfaf2da537becedac41e9cb9f24a1fb366b1b4cab0b169d072f9f0948ef41051155a
-EBUILD hugin-9999.ebuild 2076 BLAKE2B e7920e9474581bbdebaed92a9531b6ce4045a93d287a74990f640a95e0564111d7962f52a61b40d648e2963f38416b6f2dbbd209dedca609e07e21c6e4300ae8 SHA512 488a303661ac36853c19b2f1b870b5409d6611ebe58e59b9b6bcb36f230dee3d430cbd55e5fc67969e12c153f92a9d1347d619d81fdf8b681ad5424fef71d0df
+EBUILD hugin-2022.0.0.ebuild 2118 BLAKE2B e09e810724c4b00a34ebbb7f18694113f6d92f9403c1758fb1fe2b212af6d7c9f47ec2c52896a8d86f5e706bd28de5dba3454308b3503b9b437befd7518ba539 SHA512 0c8e74c38c8ba7d302e2a0c444328fd1c6f44da69224044d1668333a14202ae510fee18b3df90073133578ff9d7edbfffda3cc671fc558c0e79eb399a5827946
+EBUILD hugin-9999.ebuild 2058 BLAKE2B 56e0e82076d2c5f19463fe33f374692c1394d8361e11b9c7fd76a6a790efb7ba7011b675ec3ce63bcc47f35efb0b72e9e69aa86b2bc03e7390deaf5b37a5a073 SHA512 0f2ba5fdb8bd6d5879f6c4509c7c50b8af5984665b4d4598977fff26a8d6bc4afd827bdd099334c32ac4469b247f8061292b88c28d9574e1c63c13d2724f1040
 MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba
diff --git a/media-gfx/hugin/hugin-2022.0.0.ebuild b/media-gfx/hugin/hugin-2022.0.0.ebuild
new file mode 100644
index 000000000000..76bca342c75e
--- /dev/null
+++ b/media-gfx/hugin/hugin-2022.0.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit python-single-r1 wxwidgets cmake xdg
+
+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+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
+SLOT="0"
+KEYWORDS="amd64 arm64 x86"
+
+LANGS=" ca ca-valencia 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="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
+
+CDEPEND="
+	dev-db/sqlite:3
+	dev-libs/boost:=
+	dev-libs/zthread
+	>=media-gfx/enblend-4.0
+	media-gfx/exiv2:=
+	media-libs/freeglut
+	media-libs/glew:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libpano13-2.9.19_beta1:=
+	media-libs/libpng:=
+	media-libs/openexr:=
+	media-libs/tiff:=
+	>=media-libs/vigra-1.11.1-r5[openexr]
+	sci-libs/fftw:3.0=
+	sci-libs/flann
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
+	lapack? ( virtual/blas virtual/lapack )
+	python? ( ${PYTHON_DEPS} )
+	sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+	media-libs/exiftool
+	raw? ( media-gfx/dcraw )"
+DEPEND="${CDEPEND}
+	dev-cpp/tclap
+	sys-devel/gettext
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0.4 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( authors.txt README TODO )
+
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	setup-wxwidgets
+}
+
+src_prepare() {
+	sed -i \
+		-e "/COMMAND.*GZIP/d" \
+		-e "s/\.gz//g" \
+		"${S}"/doc/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_HSI=$(usex python)
+		-DENABLE_LAPACK=$(usex lapack)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use python && python_optimize
+
+	local lang
+	for lang in ${LANGS} ; do
+		case ${lang} in
+			ca) dir=ca_ES;;
+			ca-valencia) dir=ca_ES@valencia;;
+			cs) dir=cs_CZ;;
+			*) dir=${lang/-/_};;
+		esac
+		if ! use l10n_${lang} ; then
+			rm -r "${ED}"/usr/share/locale/${dir} || die
+		fi
+	done
+}
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 2d80dcb4c7c8..7d99806d9fa0 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -22,7 +22,6 @@ LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk
 IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
 
 CDEPEND="
-	!!dev-util/cocom
 	dev-db/sqlite:3
 	dev-libs/boost:=
 	dev-libs/zthread
@@ -30,8 +29,8 @@ CDEPEND="
 	media-gfx/exiv2:=
 	media-libs/freeglut
 	media-libs/glew:=
-	>=media-libs/libpano13-2.9.19_beta1:=
 	media-libs/libjpeg-turbo:=
+	>=media-libs/libpano13-2.9.19_beta1:=
 	media-libs/libpng:=
 	media-libs/openexr:=
 	media-libs/tiff:=