media-gfx/hugin: sync with main tree

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Manifest-Sign-Key: 0x846491FE4527815A
Signed-off-by: Markus Meier <maekke@gentoo.org>

6 files changed, 23 insertions, 152 deletions

diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 7242768..2942186 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,24 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX hugin-2019.0.0-exiv2-0.27.1.patch 998 BLAKE2B fd072b1bfb995f3e63ca78b0ad288c6012e6256d8c268fde7b9d3e1fb346544d34807394ac45b244329d96d6e75347c7e06b8cffa44258dd9b59378f56ead112 SHA512 9127921810b9a3cbc7aa216cb961cf5d8eef04ab5beb6baef94851d25e32314dd0565e507e3e57d2d560b6079afcf54e16330935334835fe664842d337732643
-DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B 59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5 SHA512 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
 DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
-EBUILD hugin-2019.0.0.ebuild 2217 BLAKE2B 3a6bf11afcb1d5a70d48facc30faf58e86e6383389fc6066060b82cf27aa9f16f972ea9ec84021ec9bb2163b9f1b3978b4d8df7c376e4c4214b18d8498544180 SHA512 b595aa2b5912850ad5a779ee83465d313c25cf86b9393e7f322bbd728efb89e31c62acf6626826b4a6e4f262864030fefd777f6c6a106fb7eb116b946448c07a
-EBUILD hugin-2019.2.0.ebuild 2190 BLAKE2B 8c73bd844cae7a57f8650f50767037675d1ceb668aaaffcdd6d5a9c268f1fa2699fe9f0c2953bc1687b97340cc2426ebf4f2605fa5ca2f5efb97c876d5f0a32b SHA512 9e1029242801ec53e51b6a41f6d63dea5c42392a9e6da62b184073b973fae68f5d39c8f83f84d9f3c06f71ba9bb3951e73dcf07a298cd2e6e405a9e99d1aa859
-EBUILD hugin-9999.ebuild 2066 BLAKE2B e4f553556bdc38e2b64851510634e565833ee6f2a1e23cfcaa64a2b980249e4caf0daa9834b788e008377fdd289238498c04ffaecdeb6ca473b14a4eb225597a SHA512 d3f9f892292f6596c690a7cbb804fdb30abd800da6c924ea28ae601e3b98dae1d942aa41612570dc3fc4f5e0b65b48bd2bf133e698b3f356c9c57faf3f6fc30a
-MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b
+EBUILD hugin-2019.2.0.ebuild 2185 BLAKE2B 25b087eccf301e5540e6e897161e7c1ccbe907a26b22feefd31a40357602c5f9c61f41e41b033958d0df171c2df04c4e49ee4061f9d0e5db002f2f8ed46c1edf SHA512 89c7d596a4fef47dc3d144ae30a4cce0745391b05760108d6755717413a76bc6bf5d790ec50b0af01a88ced13ce1467d4cc311a24c877c9584df14ad712545b0
+EBUILD hugin-9999.ebuild 2058 BLAKE2B d7f7ab9b065dcc31cc85033a044b3e8da912779069709e2c1c02c3958744896c9c84cfb2bbf9c802b444e92ce6f6cd86d402254d3b2e5eb5f2b2b766eef069e0 SHA512 65ead2eab2416af88e8529704ee0c936901d3512558e1433eaff5ec3b3db5ba8659b2f72fd4613cc305afb9461003841ce7e3c04b8bbd201c8842ab7ddb5c5c7
+MISC metadata.xml 546 BLAKE2B efad9c27562890b23594411333a0ef827b7e54acde132ffdec4f664eae37fb3ab270950ef650e6caaea4bd3b69a7bed469e794dce51d59850cd06ff844e08836 SHA512 0d096754e2f6ef1468e6bdf7464e6f5cc1de06f20136b68be7aaf199cd78a10e4213678d875ff61d829f692dbd5b0728d50bb35eefb1de6af4e5e0fd7d91d350
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGTBAEBCAB9FiEEO7vfxj/1NCgzMht7hGSR/kUngVoFAl4J96tfFIAAAAAALgAo
+iQGTBAEBCAB9FiEEO7vfxj/1NCgzMht7hGSR/kUngVoFAl+Vq/dfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNC
 QkJERkM2M0ZGNTM0MjgzMzMyMUI3Qjg0NjQ5MUZFNDUyNzgxNUEACgkQhGSR/kUn
-gVpLoAf8CuqhTmFH5L7lv+pIeRE0DVlVXvtRTq89ntzWPtXGHUgCKCNS08gChiQq
-dySe2rgNXWNTp8BENGi9151OJWe1nKrGmzsumf9o5vgqo2vewBlbftmZHPwVU9Rx
-vinzgEZ9dZmfDfgM3Av+dyYBV2ADNF1eQvgky2DRUFW5AHG/4GB2yUwf+XPberFV
-q6T5NcIeBELIlUKretDR930G4ogsVsaWnCP/E3Uz/wiRpRewjrwTigfSKHDgd1i5
-h6V9StTYLlOultEACkptelN6SNJ9RJKKXKcySylceL4farQEYp2pJnBFHqwyXLRn
-BQMsW29536P9H7oqOoqe2uyl7QePmg==
-=fRyB
+gVpBZwgAlkUiSpg78YuUkbMZO0HBtGT9QJ3/6DqO4272jnXly5GYXNe+eUbkrdI6
+TwEUo+3TcBtuDWa6TbBaU1NmyTUMi/knikeheFJso+jk3O93pk8OHewoVylXKs+e
+wirtCClaVX0lqOf7chjz27etZKHiHJpnKdzPGVNfLTo7VNxsFwr7o7tNlRiBTk8d
+ECazZFBNT/ILF7JRNkwnr8i8rWP83OJrDfX6NJAgSQv4j9AB6Xv8x4LTn2Wk5q29
+BZT6bIe0iynNnXT4P73GDFDByCDb3nHNk1jYSwtCwStXt5fsmn0GicmAK3op/5Du
+TyurVcdI0Ki/pbzNmIz2O8TPgq0KwA==
+=Q0xB
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch b/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
deleted file mode 100644
index e22023f..0000000
--- a/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix build against exiv2-0.27.1 by using upstream recommended catchall header.
-
---- a/src/hugin_base/panodata/SrcPanoImage.cpp	2019-02-16 09:18:55.000000000 +0100
-+++ b/src/hugin_base/panodata/SrcPanoImage.cpp	2019-05-21 14:26:23.470193305 +0200
-@@ -40,9 +40,7 @@
- #include <vigra/diff2d.hxx>
- #include <vigra/imageinfo.hxx>
- #include <hugin_utils/utils.h>
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/easyaccess.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <lensdb/LensDB.h>
- #include "Exiv2Helper.h"
- 
---- a/src/hugin1/hugin/RawImport.cpp	2019-02-02 11:11:01.000000000 +0100
-+++ b/src/hugin1/hugin/RawImport.cpp	2019-05-21 14:33:00.522541182 +0200
-@@ -35,10 +35,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/easyaccess.hpp>
--#include <exiv2/xmpsidecar.hpp>
-+#include <exiv2/exiv2.hpp>
- #ifdef __WXMSW__
- #include <wx/msw/registry.h>
- #endif
diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild b/media-gfx/hugin/hugin-2019.0.0.ebuild
deleted file mode 100644
index a07dfba..0000000
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
-
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver 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-util/cocom
-	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/libpano13-2.9.19_beta1:0=
-	media-libs/libpng:0=
-	media-libs/openexr:=
-	media-libs/tiff:0
-	>=media-libs/vigra-1.11.0[openexr]
-	sci-libs/fftw:3.0=
-	sci-libs/flann
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/wxGTK:3.0=[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 )
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" ) # bug 686366
-
-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-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HSI=$(usex python)
-		-DENABLE_LAPACK=$(usex lapack)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_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-2019.2.0.ebuild b/media-gfx/hugin/hugin-2019.2.0.ebuild
index 41ad9fa..7cc3209 100644
--- a/media-gfx/hugin/hugin-2019.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+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_})"
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 50b288d..3eb92a7 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
index df762b4..4b6e449 100644
--- a/media-gfx/hugin/metadata.xml
+++ b/media-gfx/hugin/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
+		<name>Andreas K. Huettel</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>maekke@gentoo.org</email>
+		<name>Markus Meier</name>
 	</maintainer>
-	<longdescription>hugin is a panorama stitching program</longdescription>
 	<use>
 		<flag name="sift">automatically align images with <pkg>media-gfx/autopano-sift-C</pkg></flag>
 	</use>