Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/, media-gfx/hugin/files/
Date: Sat, 23 May 2020 10:53:07
Message-Id: 1590231173.f4841815cb707b2aad2db97001a0a38eab577c34.asturm@gentoo
1 commit: f4841815cb707b2aad2db97001a0a38eab577c34
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 23 09:51:14 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat May 23 10:52:53 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4841815
7
8 media-gfx/hugin: Drop 2019.0.0
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-gfx/hugin/Manifest | 1 -
14 .../hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch | 29 ------
15 media-gfx/hugin/hugin-2019.0.0.ebuild | 100 ---------------------
16 3 files changed, 130 deletions(-)
17
18 diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
19 index ed9c292193e..424227ceba5 100644
20 --- a/media-gfx/hugin/Manifest
21 +++ b/media-gfx/hugin/Manifest
22 @@ -1,2 +1 @@
23 -DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B 59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5 SHA512 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
24 DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
25
26 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
27 deleted file mode 100644
28 index e22023f3998..00000000000
29 --- a/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
30 +++ /dev/null
31 @@ -1,29 +0,0 @@
32 -Fix build against exiv2-0.27.1 by using upstream recommended catchall header.
33 -
34 ---- a/src/hugin_base/panodata/SrcPanoImage.cpp 2019-02-16 09:18:55.000000000 +0100
35 -+++ b/src/hugin_base/panodata/SrcPanoImage.cpp 2019-05-21 14:26:23.470193305 +0200
36 -@@ -40,9 +40,7 @@
37 - #include <vigra/diff2d.hxx>
38 - #include <vigra/imageinfo.hxx>
39 - #include <hugin_utils/utils.h>
40 --#include <exiv2/exif.hpp>
41 --#include <exiv2/image.hpp>
42 --#include <exiv2/easyaccess.hpp>
43 -+#include <exiv2/exiv2.hpp>
44 - #include <lensdb/LensDB.h>
45 - #include "Exiv2Helper.h"
46 -
47 ---- a/src/hugin1/hugin/RawImport.cpp 2019-02-02 11:11:01.000000000 +0100
48 -+++ b/src/hugin1/hugin/RawImport.cpp 2019-05-21 14:33:00.522541182 +0200
49 -@@ -35,10 +35,7 @@
50 - // workaround for a conflict between exiv2 and wxWidgets/CMake built
51 - #define HAVE_PID_T 1
52 - #endif
53 --#include <exiv2/exif.hpp>
54 --#include <exiv2/image.hpp>
55 --#include <exiv2/easyaccess.hpp>
56 --#include <exiv2/xmpsidecar.hpp>
57 -+#include <exiv2/exiv2.hpp>
58 - #ifdef __WXMSW__
59 - #include <wx/msw/registry.h>
60 - #endif
61
62 diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild b/media-gfx/hugin/hugin-2019.0.0.ebuild
63 deleted file mode 100644
64 index 1217aa9474d..00000000000
65 --- a/media-gfx/hugin/hugin-2019.0.0.ebuild
66 +++ /dev/null
67 @@ -1,100 +0,0 @@
68 -# Copyright 1999-2020 Gentoo Authors
69 -# Distributed under the terms of the GNU General Public License v2
70 -
71 -EAPI=6
72 -
73 -WX_GTK_VER="3.0"
74 -PYTHON_COMPAT=( python{3_6,3_7,3_8} )
75 -
76 -inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
77 -
78 -DESCRIPTION="GUI for the creation & processing of panoramic images"
79 -HOMEPAGE="http://hugin.sf.net"
80 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
81 -
82 -LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
83 -SLOT="0"
84 -KEYWORDS="amd64 arm64 x86"
85 -
86 -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"
87 -IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
88 -
89 -CDEPEND="
90 - !!dev-util/cocom
91 - dev-db/sqlite:3
92 - dev-libs/boost:=
93 - dev-libs/zthread
94 - >=media-gfx/enblend-4.0
95 - media-gfx/exiv2:=
96 - media-libs/freeglut
97 - media-libs/glew:=
98 - >=media-libs/libpano13-2.9.19_beta1:0=
99 - media-libs/libpng:0=
100 - media-libs/openexr:=
101 - media-libs/tiff:0
102 - >=media-libs/vigra-1.11.0[openexr]
103 - sci-libs/fftw:3.0=
104 - sci-libs/flann
105 - sys-libs/zlib
106 - virtual/glu
107 - virtual/jpeg:0
108 - virtual/opengl
109 - x11-libs/wxGTK:3.0=[X,opengl]
110 - lapack? ( virtual/blas virtual/lapack )
111 - python? ( ${PYTHON_DEPS} )
112 - sift? ( media-gfx/autopano-sift-C )"
113 -RDEPEND="${CDEPEND}
114 - media-libs/exiftool
115 - raw? ( media-gfx/dcraw )"
116 -DEPEND="${CDEPEND}
117 - dev-cpp/tclap
118 - sys-devel/gettext
119 - virtual/pkgconfig
120 - python? ( >=dev-lang/swig-2.0.4 )"
121 -
122 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
123 -
124 -DOCS=( authors.txt README TODO )
125 -
126 -PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" ) # bug 686366
127 -
128 -S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
129 -
130 -pkg_setup() {
131 - use python && python-single-r1_pkg_setup
132 - setup-wxwidgets
133 -}
134 -
135 -src_prepare() {
136 - sed -i \
137 - -e "/COMMAND.*GZIP/d" \
138 - -e "s/\.gz//g" \
139 - "${S}"/doc/CMakeLists.txt || die
140 - cmake-utils_src_prepare
141 -}
142 -
143 -src_configure() {
144 - local mycmakeargs=(
145 - -DBUILD_HSI=$(usex python)
146 - -DENABLE_LAPACK=$(usex lapack)
147 - )
148 - cmake-utils_src_configure
149 -}
150 -
151 -src_install() {
152 - cmake-utils_src_install
153 - use python && python_optimize
154 -
155 - local lang
156 - for lang in ${LANGS} ; do
157 - case ${lang} in
158 - ca) dir=ca_ES;;
159 - ca-valencia) dir=ca_ES@valencia;;
160 - cs) dir=cs_CZ;;
161 - *) dir=${lang/-/_};;
162 - esac
163 - if ! use l10n_${lang} ; then
164 - rm -r "${ED%/}"/usr/share/locale/${dir} || die
165 - fi
166 - done
167 -}