Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Markus Meier (maekke)" <maekke@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/hugin: ChangeLog hugin-2015.0.0_rc3-r1.ebuild hugin-2015.0.0_rc3.ebuild hugin-9999.ebuild
Date: Tue, 28 Jul 2015 16:31:58
Message-Id: 20150728163152.D9590BF@oystercatcher.gentoo.org
1 maekke 15/07/28 16:31:52
2
3 Modified: ChangeLog hugin-9999.ebuild
4 Added: hugin-2015.0.0_rc3-r1.ebuild
5 hugin-2015.0.0_rc3.ebuild
6 Log:
7 version bump: fix dependencies by Nikoli in bug #551800, should also fix problems with newer boost from bug #549986
8
9 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 072AD062)
10
11 Revision Changes Path
12 1.160 media-gfx/hugin/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/ChangeLog?rev=1.160&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/ChangeLog?rev=1.160&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/ChangeLog?r1=1.159&r2=1.160
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v
21 retrieving revision 1.159
22 retrieving revision 1.160
23 diff -u -r1.159 -r1.160
24 --- ChangeLog 18 Jul 2015 10:04:45 -0000 1.159
25 +++ ChangeLog 28 Jul 2015 16:31:52 -0000 1.160
26 @@ -1,6 +1,14 @@
27 # ChangeLog for media-gfx/hugin
28 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.159 2015/07/18 10:04:45 maekke Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.160 2015/07/28 16:31:52 maekke Exp $
31 +
32 +*hugin-2015.0.0_rc3-r1 (28 Jul 2015)
33 +*hugin-2015.0.0_rc3 (28 Jul 2015)
34 +
35 + 28 Jul 2015; Markus Meier <maekke@g.o> +hugin-2015.0.0_rc3.ebuild,
36 + +hugin-2015.0.0_rc3-r1.ebuild, hugin-9999.ebuild:
37 + version bump: fix dependencies by Nikoli in bug #551800, should also fix
38 + problems with newer boost from bug #549986
39
40 18 Jul 2015; Markus Meier <maekke@g.o> -hugin-2013.0.0-r1.ebuild,
41 -files/hugin-2013.0.0-boost.patch:
42
43
44
45 1.7 media-gfx/hugin/hugin-9999.ebuild
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild?rev=1.7&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild?rev=1.7&content-type=text/plain
49 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild?r1=1.6&r2=1.7
50
51 Index: hugin-9999.ebuild
52 ===================================================================
53 RCS file: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild,v
54 retrieving revision 1.6
55 retrieving revision 1.7
56 diff -u -r1.6 -r1.7
57 --- hugin-9999.ebuild 20 Dec 2014 16:36:16 -0000 1.6
58 +++ hugin-9999.ebuild 28 Jul 2015 16:31:52 -0000 1.7
59 @@ -1,6 +1,6 @@
60 -# Copyright 1999-2014 Gentoo Foundation
61 +# Copyright 1999-2015 Gentoo Foundation
62 # Distributed under the terms of the GNU General Public License v2
63 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild,v 1.6 2014/12/20 16:36:16 maekke Exp $
64 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild,v 1.7 2015/07/28 16:31:52 maekke Exp $
65
66 EAPI=5
67
68 @@ -19,32 +19,35 @@
69 SLOT="0"
70 KEYWORDS=""
71
72 -LANGS=" cs da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW"
73 +LANGS=" ca@valencia ca_ES cs_CZ da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW"
74 IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
75
76 CDEPEND="
77 !!dev-util/cocom
78 - app-arch/zip
79 - dev-cpp/tclap
80 + dev-db/sqlite:3
81 >=dev-libs/boost-1.49.0-r1:=
82 dev-libs/zthread
83 >=media-gfx/enblend-4.0
84 media-gfx/exiv2:=
85 media-libs/freeglut
86 media-libs/glew:=
87 - media-libs/lensfun
88 >=media-libs/libpano13-2.9.19_beta1:0=
89 media-libs/libpng:0=
90 media-libs/openexr:=
91 - media-libs/tiff
92 + media-libs/tiff:0
93 + >=media-libs/vigra-1.9.0[openexr]
94 + sci-libs/fftw:=
95 sys-libs/zlib
96 - virtual/jpeg
97 + virtual/opengl
98 + virtual/jpeg:0
99 + virtual/opengl
100 x11-libs/wxGTK:3.0=[X,opengl]
101 - lapack? ( virtual/lapack )
102 + lapack? ( virtual/blas virtual/lapack )
103 sift? ( media-gfx/autopano-sift-C )"
104 RDEPEND="${CDEPEND}
105 media-libs/exiftool"
106 DEPEND="${CDEPEND}
107 + dev-cpp/tclap
108 sys-devel/gettext
109 virtual/pkgconfig
110 python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
111 @@ -77,8 +80,7 @@
112
113 for lang in ${LANGS} ; do
114 case ${lang} in
115 - ca) dir=ca_ES;;
116 - cs) dir=cs_CZ;;
117 + ca@valencia) dir=ca_ES@valencia;;
118 *) dir=${lang};;
119 esac
120 use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
121
122
123
124 1.1 media-gfx/hugin/hugin-2015.0.0_rc3-r1.ebuild
125
126 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2015.0.0_rc3-r1.ebuild?rev=1.1&view=markup
127 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2015.0.0_rc3-r1.ebuild?rev=1.1&content-type=text/plain
128
129 Index: hugin-2015.0.0_rc3-r1.ebuild
130 ===================================================================
131 # Copyright 1999-2015 Gentoo Foundation
132 # Distributed under the terms of the GNU General Public License v2
133 # $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2015.0.0_rc3-r1.ebuild,v 1.1 2015/07/28 16:31:52 maekke Exp $
134
135 EAPI=5
136
137 WX_GTK_VER="3.0"
138 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
139
140 inherit base python-single-r1 wxwidgets versionator cmake-utils
141
142 DESCRIPTION="GUI for the creation & processing of panoramic images"
143 HOMEPAGE="http://hugin.sf.net"
144 SRC_URI="https://launchpad.net/${PN}/2015.0/2015.0rc3/+download/${P}.tar.bz2"
145
146 LICENSE="GPL-2 SIFT"
147 SLOT="0"
148 KEYWORDS="~amd64 ~ppc ~x86"
149
150 LANGS=" ca@valencia ca_ES cs_CZ da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW"
151 IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
152
153 CDEPEND="
154 !!dev-util/cocom
155 dev-db/sqlite:3
156 >=dev-libs/boost-1.49.0-r1:=
157 dev-libs/zthread
158 >=media-gfx/enblend-4.0
159 media-gfx/exiv2:=
160 media-libs/freeglut
161 media-libs/glew:=
162 >=media-libs/libpano13-2.9.19_beta1:0=
163 media-libs/libpng:0=
164 media-libs/openexr:=
165 media-libs/tiff:0
166 >=media-libs/vigra-1.9.0[openexr]
167 sci-libs/fftw:=
168 sys-libs/zlib
169 virtual/glu
170 virtual/jpeg:0
171 virtual/opengl
172 x11-libs/wxGTK:3.0=[X,opengl]
173 lapack? ( virtual/blas virtual/lapack )
174 sift? ( media-gfx/autopano-sift-C )"
175 RDEPEND="${CDEPEND}
176 media-libs/exiftool"
177 DEPEND="${CDEPEND}
178 dev-cpp/tclap
179 sys-devel/gettext
180 virtual/pkgconfig
181 python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
182
183 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
184
185 S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
186
187 pkg_setup() {
188 DOCS="authors.txt README TODO"
189 mycmakeargs=(
190 $(cmake-utils_use_enable lapack LAPACK)
191 $(cmake-utils_use_build python HSI)
192 )
193 use python && python-single-r1_pkg_setup
194 }
195
196 src_prepare() {
197 sed \
198 -e 's:-O3::g' \
199 -i src/celeste/CMakeLists.txt || die
200 rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
201
202 cmake-utils_src_prepare
203 }
204
205 src_install() {
206 cmake-utils_src_install
207 use python && python_optimize
208
209 for lang in ${LANGS} ; do
210 case ${lang} in
211 ca@valencia) dir=ca_ES@valencia;;
212 *) dir=${lang};;
213 esac
214 use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
215 done
216 }
217
218
219
220 1.1 media-gfx/hugin/hugin-2015.0.0_rc3.ebuild
221
222 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2015.0.0_rc3.ebuild?rev=1.1&view=markup
223 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2015.0.0_rc3.ebuild?rev=1.1&content-type=text/plain
224
225 Index: hugin-2015.0.0_rc3.ebuild
226 ===================================================================
227 # Copyright 1999-2015 Gentoo Foundation
228 # Distributed under the terms of the GNU General Public License v2
229 # $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2015.0.0_rc3.ebuild,v 1.1 2015/07/28 16:31:52 maekke Exp $
230
231 EAPI=5
232
233 WX_GTK_VER="2.8"
234 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
235
236 inherit base python-single-r1 wxwidgets versionator cmake-utils
237
238 DESCRIPTION="GUI for the creation & processing of panoramic images"
239 HOMEPAGE="http://hugin.sf.net"
240 SRC_URI="https://launchpad.net/${PN}/2015.0/2015.0rc3/+download/${P}.tar.bz2"
241
242 LICENSE="GPL-2 SIFT"
243 SLOT="0"
244 KEYWORDS="~amd64 ~ppc ~x86"
245
246 LANGS=" ca@valencia ca_ES cs_CZ da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW"
247 IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
248
249 CDEPEND="
250 !!dev-util/cocom
251 dev-db/sqlite:3
252 >=dev-libs/boost-1.49.0-r1:=
253 dev-libs/zthread
254 >=media-gfx/enblend-4.0
255 media-gfx/exiv2:=
256 media-libs/freeglut
257 media-libs/glew:=
258 >=media-libs/libpano13-2.9.19_beta1:0=
259 media-libs/libpng:0=
260 media-libs/openexr:=
261 media-libs/tiff:0
262 >=media-libs/vigra-1.9.0[openexr]
263 sci-libs/fftw:=
264 sys-libs/zlib
265 virtual/glu
266 virtual/jpeg:0
267 virtual/opengl
268 x11-libs/wxGTK:2.8=[X,opengl,-odbc]
269 lapack? ( virtual/blas virtual/lapack )
270 sift? ( media-gfx/autopano-sift-C )"
271 RDEPEND="${CDEPEND}
272 media-libs/exiftool"
273 DEPEND="${CDEPEND}
274 dev-cpp/tclap
275 sys-devel/gettext
276 virtual/pkgconfig
277 python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
278
279 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
280
281 S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
282
283 pkg_setup() {
284 DOCS="authors.txt README TODO"
285 mycmakeargs=(
286 $(cmake-utils_use_enable lapack LAPACK)
287 $(cmake-utils_use_build python HSI)
288 )
289 use python && python-single-r1_pkg_setup
290 }
291
292 src_prepare() {
293 sed \
294 -e 's:-O3::g' \
295 -i src/celeste/CMakeLists.txt || die
296 rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
297
298 cmake-utils_src_prepare
299 }
300
301 src_install() {
302 cmake-utils_src_install
303 use python && python_optimize
304
305 for lang in ${LANGS} ; do
306 case ${lang} in
307 ca@valencia) dir=ca_ES@valencia;;
308 *) dir=${lang};;
309 esac
310 use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
311 done
312 }
Report Message
Find on MARC Find on Google Groups