From 67f7dc19f19b27a98ab8523f35805ea76d7a4c30 Mon Sep 17 00:00:00 2001 From: Markus Meier Date: Wed, 5 May 2021 20:48:26 +0200 Subject: media-gfx/hugin: sync with main tree Package-Manager: Portage-3.0.18, Repoman-3.0.2 Manifest-Sign-Key: 0xEBA2FFB10026658D Signed-off-by: Markus Meier --- media-gfx/hugin/Manifest | 22 +++---- media-gfx/hugin/hugin-2019.2.0.ebuild | 105 ------------------------------- media-gfx/hugin/hugin-2020.0.0-r1.ebuild | 8 +-- media-gfx/hugin/hugin-9999.ebuild | 6 +- 4 files changed, 17 insertions(+), 124 deletions(-) delete mode 100644 media-gfx/hugin/hugin-2019.2.0.ebuild diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index 0a1c26d..02f3aff 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -1,23 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -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-r1.ebuild 2125 BLAKE2B 7fed3491685573cf5288d91c1bd8287372eb1b93fd729028a3fdca9d4cbbaf247ece8376eb91ebb4a7ac6bd3af66fcc69f710e714a90e5f42bc7415d838753fa SHA512 d013ac7b751f6d624db2744349fa100fe240b40d106b29c443bc37b2ce30738423da5096babe7d4e37abb17b377b1741a612a40cee58eea8b8aec017b534a4ac -EBUILD hugin-9999.ebuild 2065 BLAKE2B f64cb2ca7c5eadade0e76545a7f3fe778e41e22509eb8a2149bd2e45efc0de33193dbbcb52820878b85e08b1b977c38ca99b62163196334fc5ca5d90d8eb8f77 SHA512 eeb41148cd7ca8cca9429fa2e231007ba99885790563a266c05730a62ee3be1a513927d632aede8e1e2f10c1965bfc03d66cb6326c0f1a1a239d5c61a194b90b +EBUILD hugin-2020.0.0-r1.ebuild 2119 BLAKE2B e697eebaa7c6e6afba08e1edbb179dfc7db8fb60a7f8e07cfe749936f9f943d42b71b21fef88ce10f56050f905fe6c42e53fc989e4685274c6e38e4d476d7559 SHA512 051eb7eff33fb3eb73465d769de6a755c8c3c5136f7191969ec1ab1f84f641caa259dc049b901327121b6ac690492da43224e30a94e2a6373c8e9686fafa69b7 +EBUILD hugin-9999.ebuild 2062 BLAKE2B 4a24726bf47c3ff2911c29cf6c8fe8fd3632c82ca54a1fe60c562ea3e202260c93e38d76b5ea6a1d934b3ff036019110ee15d45067e91effc43a3aafd426b56a SHA512 359170dfbae430c9210dc75945cc883eea5b7928d22ea191f9179674032a06a3d84bccbf28cefaaafca1dc7b91c1c14040f4c26dad6d0c48506fae41b6f1817c MISC metadata.xml 546 BLAKE2B efad9c27562890b23594411333a0ef827b7e54acde132ffdec4f664eae37fb3ab270950ef650e6caaea4bd3b69a7bed469e794dce51d59850cd06ff844e08836 SHA512 0d096754e2f6ef1468e6bdf7464e6f5cc1de06f20136b68be7aaf199cd78a10e4213678d875ff61d829f692dbd5b0728d50bb35eefb1de6af4e5e0fd7d91d350 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQGTBAEBCAB9FiEEFpAmG9rbc11oli8L66L/sQAmZY0FAl/fCn9fFIAAAAAALgAo +iQGTBAEBCAB9FiEEFpAmG9rbc11oli8L66L/sQAmZY0FAmCS6HFfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE2 OTAyNjFCREFEQjczNUQ2ODk2MkYwQkVCQTJGRkIxMDAyNjY1OEQACgkQ66L/sQAm -ZY0VSwf8CNWtzTumTqqp385v2kz5paRhLMgsziUPU52eJIWf3NqGLk/vRuuSxsxd -Oh56x858s7FJjpwkPwh98zI008Rvvi+9XXpsp/V0z+R0AWuWg2dkN0oETaURUSNR -+XL4Gjh8PWOoHaS0QZ0P7nyXgfqjGvPyRHEnE+RuKLlOJN8X//X1SKV8n/LikTjF -QkwjKFKhdpZ3SBGAEWvWmff6xjv25YY1gKHa9MbCAquEvFpaNiGIrtHOF6KAIWy/ -HmrgxCKOBHkm2Q9BWJNvIjWcCiOCBFK8ciZfyWF/WhAyGLDRk6j9mvH8cf6TvAMF -qd0TO7WyoBe23X2+4vD00FpPAi0w6w== -=lkBY +ZY1QZggApVd/218HouXY5QCamZ0oKJJ+qJTQzOOqN1rB/k08glhnrQK45SZczNQX +hp/euP2uXSNCk0BF8U8ooh3Z1juG9TNkR7VkBWVRTCaZ+PpYafjFQENntfrfdX1c +Fo6+yc82SnPa+DdXY+GIeQ/z2oOO338/ot9aB8bDPURcr1GAaNq4KiY101ctPrAr +q6dgYsf2L16Qpu1nwBd26havouEwIoA1Q4Kfyv7FeF9iNS9g8sKzkp+H2NeW+stt +UOk0zyPgoDMoglxixWYRTcb+e+Oy0Sjg453Ahhgy05krJJQ0zhDkbqjHPB4zxPXW +wo4xazd9Ie2fSV7Tur+peIybt2TcBg== +=/GgP -----END PGP SIGNATURE----- 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 0981ba7..0000000 --- a/media-gfx/hugin/hugin-2019.2.0.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# 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_{6,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 60bec67..7c55081 100644 --- a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild +++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 WX_GTK_VER="3.0-gtk3" -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit python-single-r1 wxwidgets cmake xdg @@ -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_})" @@ -92,7 +92,7 @@ src_install() { *) dir=${lang/-/_};; esac if ! use l10n_${lang} ; then - rm -r "${ED%/}"/usr/share/locale/${dir} || die + 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 0c9e3ac..4ec32d7 100644 --- a/media-gfx/hugin/hugin-9999.ebuild +++ b/media-gfx/hugin/hugin-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 WX_GTK_VER="3.0-gtk3" -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit mercurial python-single-r1 wxwidgets cmake xdg @@ -90,7 +90,7 @@ src_install() { *) dir=${lang/-/_};; esac if ! use l10n_${lang} ; then - rm -r "${ED%/}"/usr/share/locale/${dir} || die + rm -r "${ED}"/usr/share/locale/${dir} || die fi done } -- cgit v1.2.3-65-gdbad