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

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: scribus-1.3.9-r1.ebuild metadata.xml ChangeLog scribus-1.4.0_rc5.ebuild scribus-1.4.0_rc3.ebuild
Date: Tue, 12 Jul 2011 09:59:43
Message-Id: 20110712095934.0C20620034@flycatcher.gentoo.org
1 jlec 11/07/12 09:59:33
2
3 Modified: metadata.xml ChangeLog scribus-1.4.0_rc5.ebuild
4 Added: scribus-1.3.9-r1.ebuild
5 Removed: scribus-1.4.0_rc3.ebuild
6 Log:
7 Add myself as maintainer, added USE=example templates to slim the installation, sane doc installation fix for 1.4 (Help brwoser was not working)
8
9 (Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.6 app-office/scribus/metadata.xml
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/metadata.xml?rev=1.6&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/metadata.xml?rev=1.6&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/metadata.xml?r1=1.5&r2=1.6
17
18 Index: metadata.xml
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/metadata.xml,v
21 retrieving revision 1.5
22 retrieving revision 1.6
23 diff -u -r1.5 -r1.6
24 --- metadata.xml 11 Jul 2011 18:51:40 -0000 1.5
25 +++ metadata.xml 12 Jul 2011 09:59:33 -0000 1.6
26 @@ -6,7 +6,12 @@
27 <email>hanno@g.o</email>
28 <name>Hanno Boeck</name>
29 </maintainer>
30 + <maintainer>
31 + <email>jlec@g.o</email>
32 + <name>Justin Lecher</name>
33 + </maintainer>
34 <use>
35 <flag name="minimal">Don't install headers (only required for e.g. plug-in developers)</flag>
36 + <flag name="templates">Document tamplates</flag>
37 </use>
38 </pkgmetadata>
39
40
41
42 1.144 app-office/scribus/ChangeLog
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.144&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.144&content-type=text/plain
46 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?r1=1.143&r2=1.144
47
48 Index: ChangeLog
49 ===================================================================
50 RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v
51 retrieving revision 1.143
52 retrieving revision 1.144
53 diff -u -r1.143 -r1.144
54 --- ChangeLog 11 Jul 2011 18:51:40 -0000 1.143
55 +++ ChangeLog 12 Jul 2011 09:59:33 -0000 1.144
56 @@ -1,6 +1,15 @@
57 # ChangeLog for app-office/scribus
58 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
59 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.143 2011/07/11 18:51:40 jlec Exp $
60 +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.144 2011/07/12 09:59:33 jlec Exp $
61 +
62 +*scribus-1.3.9-r1 (12 Jul 2011)
63 +
64 + 12 Jul 2011; Justin Lecher <jlec@g.o> +scribus-1.3.9-r1.ebuild,
65 + -scribus-1.4.0_rc3.ebuild, scribus-1.4.0_rc5.ebuild,
66 + +files/scribus-1.4.0_rc5-docs.patch, metadata.xml:
67 + Add myself as maintainer, added USE=example templates to slim the
68 + installation, sane doc installation fix for 1.4 (Help brwoser was not
69 + working)
70
71 11 Jul 2011; Justin Lecher <jlec@g.o> scribus-1.3.6.ebuild,
72 scribus-1.3.8.ebuild, scribus-1.3.9.ebuild, scribus-1.4.0_rc3.ebuild,
73
74
75
76 1.3 app-office/scribus/scribus-1.4.0_rc5.ebuild
77
78 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.0_rc5.ebuild?rev=1.3&view=markup
79 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.0_rc5.ebuild?rev=1.3&content-type=text/plain
80 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.0_rc5.ebuild?r1=1.2&r2=1.3
81
82 Index: scribus-1.4.0_rc5.ebuild
83 ===================================================================
84 RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0_rc5.ebuild,v
85 retrieving revision 1.2
86 retrieving revision 1.3
87 diff -u -r1.2 -r1.3
88 --- scribus-1.4.0_rc5.ebuild 11 Jul 2011 18:51:40 -0000 1.2
89 +++ scribus-1.4.0_rc5.ebuild 12 Jul 2011 09:59:33 -0000 1.3
90 @@ -1,8 +1,8 @@
91 # Copyright 1999-2011 Gentoo Foundation
92 # Distributed under the terms of the GNU General Public License v2
93 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0_rc5.ebuild,v 1.2 2011/07/11 18:51:40 jlec Exp $
94 +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0_rc5.ebuild,v 1.3 2011/07/12 09:59:33 jlec Exp $
95
96 -EAPI=2
97 +EAPI=3
98
99 PYTHON_DEPEND="2:2.6"
100
101 @@ -17,14 +17,14 @@
102 LICENSE="GPL-2"
103 SLOT="0"
104 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
105 -IUSE="cairo debug +minimal +pdf spell"
106 +IUSE="cairo debug examples +minimal +pdf spell templates"
107
108 COMMON_DEPEND="
109 dev-libs/hyphen
110 dev-libs/libxml2
111 media-libs/fontconfig
112 media-libs/freetype:2
113 - media-libs/lcms:0
114 + media-libs/lcms:2
115 media-libs/libpng
116 media-libs/tiff
117 net-print/cups
118 @@ -40,7 +40,9 @@
119 DEPEND="${COMMON_DEPEND}
120 dev-libs/boost"
121
122 -DOCS="AUTHORS ChangeLog* LINKS NEWS README TODO TRANSLATION"
123 +PATCHES=(
124 + "${FILESDIR}"/${P}-docs.patch
125 + )
126
127 S=${WORKDIR}/${MY_P}
128
129 @@ -48,6 +50,14 @@
130 python_set_active_version 2
131 }
132
133 +src_prepare() {
134 + use templates || \
135 + sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt
136 + use examples || \
137 + sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt
138 + base_src_prepare
139 +}
140 +
141 src_configure() {
142 mycmakeargs=(
143 "-DHAVE_PYTHON=ON"
144 @@ -56,6 +66,7 @@
145 "-DWANT_NORPATH=ON"
146 "-DWANT_QTARTHUR=ON"
147 "-DWANT_QT3SUPPORT=OFF"
148 + "-DGENTOOVERSION=${PVR}"
149 $(cmake-utils_use_has spell ASPELL)
150 $(cmake-utils_use_has pdf PODOFO)
151 $(cmake-utils_use_want cairo)
152 @@ -68,9 +79,8 @@
153 src_install() {
154 cmake-utils_src_install
155
156 - # Use one directory for documentation
157 - mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF}/
158 - rmdir "${D}"/usr/share/doc/${PN}
159 + mv "${ED}"/usr/share/doc/${PF}/{en,html}
160 + ln -sf html "${ED}"/usr/share/doc/${PF}/en
161
162 doicon resources/icons/scribus.png
163 domenu scribus.desktop
164
165
166
167 1.1 app-office/scribus/scribus-1.3.9-r1.ebuild
168
169 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.3.9-r1.ebuild?rev=1.1&view=markup
170 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.3.9-r1.ebuild?rev=1.1&content-type=text/plain
171
172 Index: scribus-1.3.9-r1.ebuild
173 ===================================================================
174 # Copyright 1999-2011 Gentoo Foundation
175 # Distributed under the terms of the GNU General Public License v2
176 # $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.9-r1.ebuild,v 1.1 2011/07/12 09:59:33 jlec Exp $
177
178 EAPI=2
179
180 PYTHON_DEPEND="2:2.6"
181
182 inherit cmake-utils fdo-mime multilib python
183
184 DESCRIPTION="Desktop publishing (DTP) and layout program"
185 HOMEPAGE="http://www.scribus.net/"
186 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
187
188 LICENSE="GPL-2"
189 SLOT="0"
190 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
191 IUSE="cairo debug examples +minimal +pdf spell templates"
192
193 COMMON_DEPEND="
194 dev-libs/hyphen
195 dev-libs/libxml2
196 media-libs/fontconfig
197 media-libs/freetype:2
198 media-libs/lcms:0
199 media-libs/libpng
200 media-libs/tiff
201 net-print/cups
202 sys-libs/zlib
203 x11-libs/qt-core:4
204 x11-libs/qt-gui:4
205 virtual/jpeg
206 spell? ( app-text/aspell )
207 pdf? ( app-text/podofo )
208 cairo? ( x11-libs/cairo[X,svg] )"
209 RDEPEND="${COMMON_DEPEND}
210 app-text/ghostscript-gpl"
211 DEPEND="${COMMON_DEPEND}
212 dev-libs/boost"
213
214 PATCHES=(
215 "${FILESDIR}/${PN}-1.3.5.1-system-hyphen.patch"
216 )
217
218 DOCS="AUTHORS ChangeLog* LINKS NEWS README TODO TRANSLATION"
219
220 pkg_setup() {
221 python_set_active_version 2
222 }
223
224 src_prepare() {
225 use templates || \
226 sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt
227 use examples || \
228 sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt
229 base_src_prepare
230 }
231
232 src_configure() {
233 mycmakeargs=(
234 "-DHAVE_PYTHON=ON"
235 "-DPYTHON_INCLUDE_PATH=$(python_get_includedir)"
236 "-DPYTHON_LIBRARY=$(python_get_library)"
237 "-DWANT_NORPATH=ON"
238 "-DWANT_QTARTHUR=ON"
239 "-DWANT_QT3SUPPORT=OFF"
240 $(cmake-utils_use_has spell ASPELL)
241 $(cmake-utils_use_has pdf PODOFO)
242 $(cmake-utils_use_want cairo)
243 $(cmake-utils_use_want minimal NOHEADERINSTALL)
244 )
245
246 cmake-utils_src_configure
247 }
248
249 src_install() {
250 cmake-utils_src_install
251
252 doicon resources/icons/scribus.png
253 domenu scribus.desktop
254 }
255
256 pkg_postinst() {
257 fdo-mime_mime_database_update
258 }
259
260 pkg_postrm() {
261 fdo-mime_mime_database_update
262 }
Report Message
Find on MARC Find on Google Groups