gentoo christmass resync : 25.12.2020

3 files changed, 20 insertions, 19 deletions

diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 805405e2e5ca..20e995cbd026 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,6 +1,6 @@
 DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
 DIST hugin-2020.0.0.tar.bz2 10371301 BLAKE2B f5092dfe3c61344f8b03e14dd85903ae6f5170989b6824578bd3350408d7a11be2c2f9cd83d030a3967b81e4125cf97af075d79136a93e06de3fac8901859c6d SHA512 4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e
 EBUILD hugin-2019.2.0.ebuild 2337 BLAKE2B 9ca08518fef5bb7d3167cc01caa64da8bd076142174e000cd3881f855644e8e95021149104d86ef82973c6d073eddbaccaf7ea0e8621e3a8e458562d4b7f5b6f SHA512 a17162e5db9fad823f35f867f96e13bb443e2150da84b54d71577a4c33cdbf9497da3d1b3cc0ee051ee7ed607a877133dd6e4483e2a86f150f27f7558e8627cc
-EBUILD hugin-2020.0.0.ebuild 2144 BLAKE2B 3d5e2cd2a531552be99fce17f722f71fc24ff513293b6ee53faf7b2e673bce44c56257eb1903317396aabc47929c68ba9653053099240d934855d7f008175320 SHA512 9e4f95d87863101cd67a21aa5c78d58fbde97b63b8a255f8c23bac5f607e42a884e43a43037d07a81b26838c25b6f84bec4bfdba1e5da56965ab4f702e5835b1
-EBUILD hugin-9999.ebuild 2058 BLAKE2B d7f7ab9b065dcc31cc85033a044b3e8da912779069709e2c1c02c3958744896c9c84cfb2bbf9c802b444e92ce6f6cd86d402254d3b2e5eb5f2b2b766eef069e0 SHA512 65ead2eab2416af88e8529704ee0c936901d3512558e1433eaff5ec3b3db5ba8659b2f72fd4613cc305afb9461003841ce7e3c04b8bbd201c8842ab7ddb5c5c7
+EBUILD hugin-2020.0.0-r1.ebuild 2125 BLAKE2B 7fed3491685573cf5288d91c1bd8287372eb1b93fd729028a3fdca9d4cbbaf247ece8376eb91ebb4a7ac6bd3af66fcc69f710e714a90e5f42bc7415d838753fa SHA512 d013ac7b751f6d624db2744349fa100fe240b40d106b29c443bc37b2ce30738423da5096babe7d4e37abb17b377b1741a612a40cee58eea8b8aec017b534a4ac
+EBUILD hugin-9999.ebuild 2065 BLAKE2B f64cb2ca7c5eadade0e76545a7f3fe778e41e22509eb8a2149bd2e45efc0de33193dbbcb52820878b85e08b1b977c38ca99b62163196334fc5ca5d90d8eb8f77 SHA512 eeb41148cd7ca8cca9429fa2e231007ba99885790563a266c05730a62ee3be1a513927d632aede8e1e2f10c1965bfc03d66cb6326c0f1a1a239d5c61a194b90b
 MISC metadata.xml 546 BLAKE2B efad9c27562890b23594411333a0ef827b7e54acde132ffdec4f664eae37fb3ab270950ef650e6caaea4bd3b69a7bed469e794dce51d59850cd06ff844e08836 SHA512 0d096754e2f6ef1468e6bdf7464e6f5cc1de06f20136b68be7aaf199cd78a10e4213678d875ff61d829f692dbd5b0728d50bb35eefb1de6af4e5e0fd7d91d350
diff --git a/media-gfx/hugin/hugin-2020.0.0.ebuild b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index 7c7d2c57f260..60bec67bbd97 100644
--- a/media-gfx/hugin/hugin-2020.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
+inherit python-single-r1 wxwidgets cmake xdg
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -39,7 +39,7 @@ CDEPEND="
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
-	x11-libs/wxGTK:3.0=[X,opengl]
+	x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
 	lapack? ( virtual/blas virtual/lapack )
 	python? ( ${PYTHON_DEPS} )
 	sift? ( media-gfx/autopano-sift-C )"
@@ -68,7 +68,7 @@ src_prepare() {
 		-e "/COMMAND.*GZIP/d" \
 		-e "s/\.gz//g" \
 		"${S}"/doc/CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -76,11 +76,11 @@ src_configure() {
 		-DBUILD_HSI=$(usex python)
 		-DENABLE_LAPACK=$(usex lapack)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use python && python_optimize
 
 	local lang
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 3eb92a7c66c7..0c9e3ac20a0f 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
+inherit mercurial python-single-r1 wxwidgets cmake xdg
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS=""
 
 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 sift $(echo ${LANGS//\ /\ l10n_})"
+IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
 
 CDEPEND="
 	!!dev-util/cocom
@@ -41,12 +41,13 @@ CDEPEND="
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
-	x11-libs/wxGTK:3.0=[X,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"
+	media-libs/exiftool
+	raw? ( media-gfx/dcraw )"
 DEPEND="${CDEPEND}
 	dev-cpp/tclap
 	sys-devel/gettext
@@ -65,7 +66,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -73,11 +74,11 @@ src_configure() {
 		-DBUILD_HSI=$(usex python)
 		-DENABLE_LAPACK=$(usex lapack)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use python && python_optimize
 
 	local lang