Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/scribus: metadata.xml ChangeLog scribus-1.4.9999.ebuild scribus-9999.ebuild scribus-1.4.2-r3.ebuild
Date: Wed, 29 May 2013 09:32:52
Message-Id: 20130529093240.E5E2B2171D@flycatcher.gentoo.org
1 jlec 13/05/29 09:32:40
2
3 Modified: metadata.xml ChangeLog scribus-1.4.9999.ebuild
4 scribus-9999.ebuild scribus-1.4.2-r3.ebuild
5 Log:
6 app-office/scribus: Update live ebuilds
7
8 (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
9
10 Revision Changes Path
11 1.10 app-office/scribus/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/metadata.xml?rev=1.10&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/metadata.xml?rev=1.10&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/metadata.xml?r1=1.9&r2=1.10
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/metadata.xml,v
20 retrieving revision 1.9
21 retrieving revision 1.10
22 diff -u -r1.9 -r1.10
23 --- metadata.xml 22 Jan 2013 08:40:02 -0000 1.9
24 +++ metadata.xml 29 May 2013 09:32:40 -0000 1.10
25 @@ -12,6 +12,8 @@
26 </maintainer>
27 <use>
28 <flag name="minimal">Don't install headers (only required for e.g. plug-in developers)</flag>
29 + <flag name="graphicsmagick">Add support for <pkg>media-gfx/graphicsmagick</pkg></flag>
30 + <flag name="osg">3D redering via <pkg>dev-games/openscenegraph</pkg></flag>
31 <flag name="templates">Document tamplates</flag>
32 <flag name="aspell">Enable support for spell checking with <pkg>app-text/aspell</pkg></flag>
33 <flag name="hunspell">Enable support for spell checking with <pkg>app-text/hunspell</pkg></flag>
34
35
36
37 1.176 app-office/scribus/ChangeLog
38
39 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.176&view=markup
40 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.176&content-type=text/plain
41 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?r1=1.175&r2=1.176
42
43 Index: ChangeLog
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v
46 retrieving revision 1.175
47 retrieving revision 1.176
48 diff -u -r1.175 -r1.176
49 --- ChangeLog 29 May 2013 08:18:10 -0000 1.175
50 +++ ChangeLog 29 May 2013 09:32:40 -0000 1.176
51 @@ -1,6 +1,10 @@
52 # ChangeLog for app-office/scribus
53 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
54 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.175 2013/05/29 08:18:10 jlec Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.176 2013/05/29 09:32:40 jlec Exp $
56 +
57 + 29 May 2013; Justin Lecher <jlec@g.o> scribus-1.4.2-r3.ebuild,
58 + scribus-1.4.9999.ebuild, scribus-9999.ebuild, metadata.xml:
59 + Update live ebuilds
60
61 *scribus-1.4.2-r3 (29 May 2013)
62
63
64
65
66 1.5 app-office/scribus/scribus-1.4.9999.ebuild
67
68 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild?rev=1.5&view=markup
69 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild?rev=1.5&content-type=text/plain
70 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild?r1=1.4&r2=1.5
71
72 Index: scribus-1.4.9999.ebuild
73 ===================================================================
74 RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v
75 retrieving revision 1.4
76 retrieving revision 1.5
77 diff -u -r1.4 -r1.5
78 --- scribus-1.4.9999.ebuild 2 Mar 2013 19:37:11 -0000 1.4
79 +++ scribus-1.4.9999.ebuild 29 May 2013 09:32:40 -0000 1.5
80 @@ -1,29 +1,34 @@
81 # Copyright 1999-2013 Gentoo Foundation
82 # Distributed under the terms of the GNU General Public License v2
83 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.4 2013/03/02 19:37:11 hwoarang Exp $
84 +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.5 2013/05/29 09:32:40 jlec Exp $
85
86 EAPI=5
87
88 PYTHON_COMPAT=( python{2_6,2_7} )
89 +PYTHON_REQ_USE=tk
90
91 inherit cmake-utils fdo-mime multilib python-single-r1 subversion
92
93 DESCRIPTION="Desktop publishing (DTP) and layout program"
94 HOMEPAGE="http://www.scribus.net/"
95 -#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
96 SRC_URI=""
97 ESVN_REPO_URI="svn://scribus.net/branches/Version14x/Scribus"
98 +ESVN_PROJECT=Scribus-1.4
99
100 LICENSE="GPL-2"
101 SLOT="0"
102 KEYWORDS=""
103 -IUSE="cairo debug examples hunspell +minimal +pdf spell templates"
104 +IUSE="aspell cairo debug examples hunspell +minimal +pdf templates"
105
106 # a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
107 IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
108 IUSE+=" ${IUSE_LINGUAS// / linguas_}"
109
110 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
111 +
112 COMMON_DEPEND="
113 + ${PYTHON_DEPS}
114 + dev-python/imaging[tk,${PYTHON_USEDEP}]
115 dev-libs/boost
116 dev-libs/hyphen
117 dev-libs/libxml2
118 @@ -37,12 +42,14 @@
119 dev-qt/qtcore:4
120 dev-qt/qtgui:4
121 virtual/jpeg
122 - spell? ( app-text/aspell )
123 + cairo? ( x11-libs/cairo[X,svg] )
124 pdf? ( app-text/podofo )
125 - cairo? ( x11-libs/cairo[X,svg] )"
126 + aspell? ( app-text/aspell )
127 + hunspell? ( app-text/hunspell )"
128 RDEPEND="${COMMON_DEPEND}
129 app-text/ghostscript-gpl"
130 -DEPEND="${COMMON_DEPEND}"
131 +DEPEND="${COMMON_DEPEND}
132 + virtual/pkgconfig"
133
134 PATCHES=(
135 "${FILESDIR}"/${PN}-1.4.2-docs.patch
136 @@ -87,11 +94,12 @@
137 -DWANT_QT3SUPPORT=OFF
138 -DGENTOOVERSION=${PVR}
139 -DWANT_GUI_LANG=${langs#,}
140 - $(cmake-utils_use_has spell ASPELL)
141 - $(cmake-utils_use_has pdf PODOFO)
142 + $(cmake-utils_use_with aspell ASPELL)
143 + $(cmake-utils_use_with pdf PODOFO)
144 $(cmake-utils_use_want cairo)
145 - $(cmake-utils_use_want minimal NOHEADERINSTALL)
146 $(cmake-utils_use_want debug DEBUG)
147 + $(cmake-utils_use_want minimal NOHEADERINSTALL)
148 + $(cmake-utils_use_want hunspell HUNSPELL)
149 )
150 use examples || mycmakeargs+=( -DWANT_NOEXAMPLES=ON)
151 use templates || mycmakeargs+=( -DWANT_NOTEMPLATES=ON)
152 @@ -117,9 +125,11 @@
153 }
154
155 pkg_postinst() {
156 + fdo-mime_desktop_database_update
157 fdo-mime_mime_database_update
158 }
159
160 pkg_postrm() {
161 + fdo-mime_desktop_database_update
162 fdo-mime_mime_database_update
163 }
164
165
166
167 1.5 app-office/scribus/scribus-9999.ebuild
168
169 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?rev=1.5&view=markup
170 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?rev=1.5&content-type=text/plain
171 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?r1=1.4&r2=1.5
172
173 Index: scribus-9999.ebuild
174 ===================================================================
175 RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v
176 retrieving revision 1.4
177 retrieving revision 1.5
178 diff -u -r1.4 -r1.5
179 --- scribus-9999.ebuild 2 Mar 2013 19:37:11 -0000 1.4
180 +++ scribus-9999.ebuild 29 May 2013 09:32:40 -0000 1.5
181 @@ -1,29 +1,35 @@
182 # Copyright 1999-2013 Gentoo Foundation
183 # Distributed under the terms of the GNU General Public License v2
184 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.4 2013/03/02 19:37:11 hwoarang Exp $
185 +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.5 2013/05/29 09:32:40 jlec Exp $
186
187 -EAPI=4
188 +EAPI=5
189
190 -PYTHON_DEPEND="2"
191 +PYTHON_COMPAT=( python{2_6,2_7} )
192 +PYTHON_REQ_USE=tk
193
194 -inherit cmake-utils fdo-mime multilib python subversion
195 +inherit cmake-utils fdo-mime multilib python-single-r1 subversion
196
197 DESCRIPTION="Desktop publishing (DTP) and layout program"
198 HOMEPAGE="http://www.scribus.net/"
199 -#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
200 SRC_URI=""
201 ESVN_REPO_URI="svn://scribus.net/trunk/Scribus"
202 +ESVN_PROJECT=Scribus-1.5
203
204 LICENSE="GPL-2"
205 SLOT="0"
206 KEYWORDS=""
207 -IUSE="cairo debug examples +minimal +pdf spell templates"
208 +IUSE="aspell cairo debug examples graphicsmagick hunspell +minimal osg +pdf templates"
209
210 # a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
211 -IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de_1901 de_CH de el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt_BR pt ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
212 +IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
213 IUSE+=" ${IUSE_LINGUAS// / linguas_}"
214
215 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
216 +
217 COMMON_DEPEND="
218 + ${PYTHON_DEPS}
219 + dev-python/imaging[tk,${PYTHON_USEDEP}]
220 + dev-libs/boost
221 dev-libs/hyphen
222 dev-libs/libxml2
223 media-libs/fontconfig
224 @@ -32,39 +38,40 @@
225 media-libs/libpng:0
226 media-libs/tiff:0
227 net-print/cups
228 - sys-libs/zlib
229 + sys-libs/zlib[minizip]
230 dev-qt/qtcore:4
231 dev-qt/qtgui:4
232 dev-qt/qtwebkit:4
233 virtual/jpeg
234 - spell? ( app-text/aspell )
235 + cairo? ( x11-libs/cairo[X,svg] )
236 + graphicsmagick? ( media-gfx/graphicsmagick )
237 + osg? ( dev-games/openscenegraph )
238 pdf? ( app-text/podofo )
239 - cairo? ( x11-libs/cairo[X,svg] )"
240 + aspell? ( app-text/aspell )
241 + hunspell? ( app-text/hunspell )"
242 RDEPEND="${COMMON_DEPEND}
243 app-text/ghostscript-gpl"
244 DEPEND="${COMMON_DEPEND}
245 - dev-libs/boost"
246 + virtual/pkgconfig"
247
248 PATCHES=(
249 "${FILESDIR}"/${PN}-1.5.0-docs.patch
250 )
251
252 -pkg_setup() {
253 - python_set_active_version 2
254 - python_pkg_setup
255 -}
256 -
257 src_prepare() {
258 - if use templates; then
259 - sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt || die
260 - fi
261 - if use examples; then
262 - sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt || die
263 - fi
264 + cat > cmake/modules/FindZLIB.cmake <<- EOF
265 + find_package(PkgConfig)
266 + pkg_check_modules(ZLIB minizip zlib)
267 + SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
268 + SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
269 + MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
270 + EOF
271 +
272 + rm scribus/{ioapi,unzip}.[ch] || die
273
274 sed \
275 - -e '1i#define OF(x) x' \
276 - -i scribus/fileunzip.cpp scribus/unzip.h scribus/ioapi.h || die
277 + -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
278 + -i resources/templates/CMakeLists.txt || die
279
280 base_src_prepare
281 subversion_src_prepare
282 @@ -73,30 +80,47 @@
283 src_configure() {
284 local lang langs
285 for lang in ${IUSE_LINGUAS}; do
286 - use linguas_${lang} && langs+=",${lang}"
287 + if use linguas_${lang}; then
288 + langs+=",${lang}"
289 + else
290 + sed -e "/${lang}/d" -i doc/CMakeLists.txt || die
291 + fi
292 done
293
294 local mycmakeargs=(
295 -DHAVE_PYTHON=ON
296 -DPYTHON_INCLUDE_PATH=$(python_get_includedir)
297 - -DPYTHON_LIBRARY=$(python_get_library)
298 + -DPYTHON_LIBRARY="${EPREFIX}/usr/$(get_libdir)/lib${EPYTHON}.so"
299 -DWANT_NORPATH=ON
300 -DWANT_QTARTHUR=ON
301 -DWANT_QT3SUPPORT=OFF
302 -DGENTOOVERSION=${PVR}
303 -DWANT_GUI_LANG=${langs#,}
304 - $(cmake-utils_use_has spell ASPELL)
305 - $(cmake-utils_use_has pdf PODOFO)
306 + $(cmake-utils_use_with aspell ASPELL)
307 + $(cmake-utils_use_with pdf PODOFO)
308 $(cmake-utils_use_want cairo)
309 - $(cmake-utils_use_want minimal NOHEADERINSTALL)
310 + $(cmake-utils_use_want graphicsmagick)
311 + $(cmake-utils_use_want osg)
312 $(cmake-utils_use_want debug DEBUG)
313 + $(cmake-utils_use_want minimal NOHEADERINSTALL)
314 + $(cmake-utils_use_want hunspell HUNSPELL)
315 )
316 + use examples || mycmakeargs+=( -DWANT_NOEXAMPLES=ON)
317 + use templates || mycmakeargs+=( -DWANT_NOTEMPLATES=ON)
318 cmake-utils_src_configure
319 }
320
321 src_install() {
322 cmake-utils_src_install
323
324 + local lang file
325 + for lang in ${IUSE_LINGUAS}; do
326 + file="${ED}"/usr/share/scribus/translations/scribus.${lang}.qm
327 + if ! use linguas_${lang} && [[ -f "${file}" ]]; then
328 + rm "${file}" || die
329 + fi
330 + done
331 +
332 mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
333 ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
334 docompress -x /usr/share/doc/${PF}/en
335 @@ -104,17 +128,12 @@
336 domenu scribus.desktop
337 }
338
339 -pkg_preinst() {
340 - # 399595
341 - rm -vf "${ED}"/usr/share/doc/${PF}/en* || die
342 - ln -sf html "${ED}"/usr/share/doc/${PF}/en
343 - subversion_pkg_preinst
344 -}
345 -
346 pkg_postinst() {
347 + fdo-mime_desktop_database_update
348 fdo-mime_mime_database_update
349 }
350
351 pkg_postrm() {
352 + fdo-mime_desktop_database_update
353 fdo-mime_mime_database_update
354 }
355
356
357
358 1.2 app-office/scribus/scribus-1.4.2-r3.ebuild
359
360 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.2-r3.ebuild?rev=1.2&view=markup
361 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.2-r3.ebuild?rev=1.2&content-type=text/plain
362 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.2-r3.ebuild?r1=1.1&r2=1.2
363
364 Index: scribus-1.4.2-r3.ebuild
365 ===================================================================
366 RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.2-r3.ebuild,v
367 retrieving revision 1.1
368 retrieving revision 1.2
369 diff -u -r1.1 -r1.2
370 --- scribus-1.4.2-r3.ebuild 29 May 2013 08:18:10 -0000 1.1
371 +++ scribus-1.4.2-r3.ebuild 29 May 2013 09:32:40 -0000 1.2
372 @@ -1,6 +1,6 @@
373 # Copyright 1999-2013 Gentoo Foundation
374 # Distributed under the terms of the GNU General Public License v2
375 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.2-r3.ebuild,v 1.1 2013/05/29 08:18:10 jlec Exp $
376 +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.2-r3.ebuild,v 1.2 2013/05/29 09:32:40 jlec Exp $
377
378 EAPI=5
379
380 @@ -22,7 +22,10 @@
381 IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
382 IUSE+=" ${IUSE_LINGUAS// / linguas_}"
383
384 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
385 +
386 COMMON_DEPEND="
387 + ${PYTHON_DEPS}
388 dev-python/imaging[tk,${PYTHON_USEDEP}]
389 dev-libs/boost
390 dev-libs/hyphen