gentoo resync : 03.03.2021

3 files changed, 2 insertions, 109 deletions

diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 3a8cd19cdef8..fe338f100a4b 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,6 +1,4 @@
-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 2335 BLAKE2B 34378c7149aa8b9f35956e4f068c50a0ca08803c834beaface0a4ad3ab2b75e744f81ddbd604603a6c890056e0c56abe6d5453feb6d8675120ada61a8307750d SHA512 193b61f6102aa4c6f47370db64255294cd9cf63ecfd4a7f8d0ffa98daeb071ca131ac2550229ff332bf25bec1298651943b91b1b21d41cd5ebf8a2c7eea08824
-EBUILD hugin-2020.0.0-r1.ebuild 2120 BLAKE2B f50e2d96fa5efac4a39e6f2a86dc1ddb4ffeddf3b79fa21ba096db4893053d14f074c03d46e4c5044c16e7be2db8811fbda2f24ecf86d16d49f6c1568d4ecd1d SHA512 53e5a9a7f45b0158fcfdf55e54fba08c99f4d058016349ba6abcbc1e47c1fab352f652e799fe5031a87308eaebe601f8b0d9807d91b86fa08f23ae0fe1c16b6c
+EBUILD hugin-2020.0.0-r1.ebuild 2118 BLAKE2B 85617fbf8640f4bef73589f6c93d5f20de441bf4016c0db1358d4616669e453bffbb16ff433b8922f56eb282890e677acf489f47816324aea810fb0cdebfae04 SHA512 179466d5fd0784d1156e23bcc2d8f54fd11b37de5e036301747159101baca9f6108598f5a9e319eb818ab012089615c6c3c416d9425f93d3bb792c307d3c3f21
 EBUILD hugin-9999.ebuild 2061 BLAKE2B 02d3b47b6a75b0cb1618a04f6267535bdf2e085eb01f24b50e943f1b2d1fe524224fb9d30a971ad901db6c4e2d4856c102b13aae6cc094b52265dd2dcbabe6ca SHA512 d15b5933ceb4e15a16a4cb437a0f09cb0655311daab2f21645a8700ec4d808174975e70b6966a796bb30f0255f1a0e2e7492d6e88ec813a9007b2a3e1eb029c3
 MISC metadata.xml 546 BLAKE2B efad9c27562890b23594411333a0ef827b7e54acde132ffdec4f664eae37fb3ab270950ef650e6caaea4bd3b69a7bed469e794dce51d59850cd06ff844e08836 SHA512 0d096754e2f6ef1468e6bdf7464e6f5cc1de06f20136b68be7aaf199cd78a10e4213678d875ff61d829f692dbd5b0728d50bb35eefb1de6af4e5e0fd7d91d350
diff --git a/media-gfx/hugin/hugin-2019.2.0.ebuild b/media-gfx/hugin/hugin-2019.2.0.ebuild
deleted file mode 100644
index af53b07ac8a8..000000000000
--- a/media-gfx/hugin/hugin-2019.2.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-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"
-
-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 )
-
-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
-
-	mkdir -p "${ED}"/usr/share/metainfo || die
-	mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
-	rmdir "${ED}"/usr/share/appdata || die
-
-	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-2020.0.0-r1.ebuild b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index e90610cc03a1..8a8381d740e3 100644
--- a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+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_})"