[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/

["Markus Meier" <maekke@gentoo.org>]

commit:     61e180811234fa166ad42a356c7f266291e28a7f
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 19:23:08 2022 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 19:23:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61e18081

media-gfx/hugin: version bump

Signed-off-by: Markus Meier <maekke <AT> gentoo.org>

 media-gfx/hugin/Manifest                                |  1 +
 .../hugin/{hugin-9999.ebuild => hugin-2022.0.0.ebuild}  | 17 +++++++++--------
 media-gfx/hugin/hugin-9999.ebuild                       |  3 +--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 15ba9e83bbf6..e30767d33cc1 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1 +1,2 @@
 DIST hugin-2021.0.0.tar.bz2 10333565 BLAKE2B 4bde9bb491074a2f49a34c9af0e90246095c390abf2c49e924d4412e6c00148ae013e10a885799b7eeb1cd9977922a77dc5ebe032a38e2153138632ec818f038 SHA512 fb491af2543dda8c6d3c9d125936a32a04109eec39e3091347ef2856073d4e1f04017686acb8000e50e29a0ac8dcfe463b63613b277f8fb4aec0537f58a6c853
+DIST hugin-2022.0.0.tar.bz2 10374360 BLAKE2B ea77614a650f832f39583328767a55ebe888a003fed117e73b22fd29c641fc8494b190b864b7ccb05f996ceca5d95c5391597333efdc19bce0eba93af14543be SHA512 752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97

diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-2022.0.0.ebuild
similarity index 88%
copy from media-gfx/hugin/hugin-9999.ebuild
copy to media-gfx/hugin/hugin-2022.0.0.ebuild
index 2d80dcb4c7c8..76bca342c75e 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-2022.0.0.ebuild
@@ -4,25 +4,22 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
-inherit mercurial python-single-r1 wxwidgets cmake xdg
+inherit python-single-r1 wxwidgets cmake xdg
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
-SRC_URI=""
-EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin"
-EHG_PROJECT="${PN}-${PN}"
+SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
 
 LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
 SLOT="0"
-KEYWORDS=""
+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-util/cocom
 	dev-db/sqlite:3
 	dev-libs/boost:=
 	dev-libs/zthread
@@ -30,8 +27,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:=
@@ -66,6 +63,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	sed -i \
+		-e "/COMMAND.*GZIP/d" \
+		-e "s/\.gz//g" \
+		"${S}"/doc/CMakeLists.txt || die
 	cmake_src_prepare
 }
 

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:=