Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/seamonkey: metadata.xml ChangeLog seamonkey-2.3.1.ebuild seamonkey-2.3.2.ebuild
Date: Wed, 31 Aug 2011 21:05:08
Message-Id: 20110831210458.8F6932004C@flycatcher.gentoo.org
1 polynomial-c 11/08/31 21:04:58
2
3 Modified: metadata.xml ChangeLog seamonkey-2.3.1.ebuild
4 Added: seamonkey-2.3.2.ebuild
5 Log:
6 Security bump. Added ipc USE flag as requested in bug #381191
7
8 (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.13 www-client/seamonkey/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/metadata.xml?rev=1.13&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/metadata.xml?rev=1.13&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/metadata.xml?r1=1.12&r2=1.13
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/seamonkey/metadata.xml,v
20 retrieving revision 1.12
21 retrieving revision 1.13
22 diff -u -r1.12 -r1.13
23 --- metadata.xml 17 Aug 2011 16:51:46 -0000 1.12
24 +++ metadata.xml 31 Aug 2011 21:04:57 -0000 1.13
25 @@ -11,6 +11,8 @@
26 <flag name='custom-optimization'>Fine-tune custom compiler
27 optimizations</flag>
28 <flag name='composer'>Build Mozilla's HTML editor component (default on)</flag>
29 + <flag name="ipc">Use inter-process communication between tabs and plugins.
30 + Allows for greater stability in case of plugin crashes</flag>
31 <flag name='mailclient'>Build Mozilla's Mail client (default on)</flag>
32 <flag name="methodjit">Enable JIT for JavaScript using MethodJIT for faster
33 JS performance. Hardened users can disable this USE-flag to use MPROTECT
34
35
36
37 1.331 www-client/seamonkey/ChangeLog
38
39 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/ChangeLog?rev=1.331&view=markup
40 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/ChangeLog?rev=1.331&content-type=text/plain
41 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/ChangeLog?r1=1.330&r2=1.331
42
43 Index: ChangeLog
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v
46 retrieving revision 1.330
47 retrieving revision 1.331
48 diff -u -r1.330 -r1.331
49 --- ChangeLog 29 Aug 2011 21:38:16 -0000 1.330
50 +++ ChangeLog 31 Aug 2011 21:04:57 -0000 1.331
51 @@ -1,6 +1,12 @@
52 # ChangeLog for www-client/seamonkey
53 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
54 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.330 2011/08/29 21:38:16 hwoarang Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.331 2011/08/31 21:04:57 polynomial-c Exp $
56 +
57 +*seamonkey-2.3.2 (31 Aug 2011)
58 +
59 + 31 Aug 2011; Lars Wendler <polynomial-c@g.o> seamonkey-2.3.1.ebuild,
60 + +seamonkey-2.3.2.ebuild, metadata.xml:
61 + Security bump. Added ipc USE flag as requested in bug #381191.
62
63 29 Aug 2011; Markos Chandras <hwoarang@g.o> seamonkey-2.3.1.ebuild:
64 Stable on amd64 wrt bug #380913
65
66
67
68 1.3 www-client/seamonkey/seamonkey-2.3.1.ebuild
69
70 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/seamonkey-2.3.1.ebuild?rev=1.3&view=markup
71 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/seamonkey-2.3.1.ebuild?rev=1.3&content-type=text/plain
72 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/seamonkey-2.3.1.ebuild?r1=1.2&r2=1.3
73
74 Index: seamonkey-2.3.1.ebuild
75 ===================================================================
76 RCS file: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.3.1.ebuild,v
77 retrieving revision 1.2
78 retrieving revision 1.3
79 diff -u -r1.2 -r1.3
80 --- seamonkey-2.3.1.ebuild 29 Aug 2011 21:38:16 -0000 1.2
81 +++ seamonkey-2.3.1.ebuild 31 Aug 2011 21:04:58 -0000 1.3
82 @@ -1,6 +1,6 @@
83 # Copyright 1999-2011 Gentoo Foundation
84 # Distributed under the terms of the GNU General Public License v2
85 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.3.1.ebuild,v 1.2 2011/08/29 21:38:16 hwoarang Exp $
86 +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.3.1.ebuild,v 1.3 2011/08/31 21:04:58 polynomial-c Exp $
87
88 EAPI="3"
89 WANT_AUTOCONF="2.1"
90 @@ -32,7 +32,7 @@
91 LANGPACK_PREFIX=""
92 LANGPACK_SUFFIX=""
93 #KEYWORDS=""
94 - KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
95 + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
96 #HAS_LANGS="false"
97 else
98 # This is where arch teams should change the KEYWORDS.
99
100
101
102 1.1 www-client/seamonkey/seamonkey-2.3.2.ebuild
103
104 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/seamonkey-2.3.2.ebuild?rev=1.1&view=markup
105 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/seamonkey-2.3.2.ebuild?rev=1.1&content-type=text/plain
106
107 Index: seamonkey-2.3.2.ebuild
108 ===================================================================
109 # Copyright 1999-2011 Gentoo Foundation
110 # Distributed under the terms of the GNU General Public License v2
111 # $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.3.2.ebuild,v 1.1 2011/08/31 21:04:58 polynomial-c Exp $
112
113 EAPI="3"
114 WANT_AUTOCONF="2.1"
115
116 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python
117
118 PATCH="${PN}-2.3-patches-01"
119 EMVER="1.3"
120
121 LANGS="be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN"
122 NOSHORTLANGS="en-GB en-US es-AR"
123
124 MY_PV="${PV/_pre*}"
125 MY_PV="${MY_PV/_alpha/a}"
126 MY_PV="${MY_PV/_beta/b}"
127 MY_PV="${MY_PV/_rc/rc}"
128 MY_P="${PN}-${MY_PV}"
129
130 # release versions usually have language packs. So be careful with changing this.
131 HAS_LANGS="true"
132 LANGPACK_PREFIX="${MY_P}."
133 LANGPACK_SUFFIX=".langpack"
134 if [[ ${PV} == *_pre* ]] ; then
135 # pre-releases. No need for arch teams to change KEYWORDS here.
136
137 REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MY_PV}-candidates/build${PV##*_pre}"
138 #LANG_URI="${REL_URI}/langpack"
139 LANG_URI="${REL_URI}/linux-i686/xpi"
140 LANGPACK_PREFIX=""
141 LANGPACK_SUFFIX=""
142 #KEYWORDS=""
143 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
144 #HAS_LANGS="false"
145 else
146 # This is where arch teams should change the KEYWORDS.
147
148 #REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}"
149 REL_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MY_PV}"
150 LANG_URI="${REL_URI}/langpack"
151 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
152 [[ ${PV} == *alpha* ]] && HAS_LANGS="false"
153 fi
154
155 DESCRIPTION="Seamonkey Web Browser"
156 HOMEPAGE="http://www.seamonkey-project.org"
157
158 SLOT="0"
159 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
160 IUSE="+alsa +chatzilla +crypt +ipc +methodjit +roaming system-sqlite +webm"
161
162 SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2 -> ${P}.source.tar.bz2
163 http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
164 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )"
165
166 if ${HAS_LANGS} ; then
167 for X in ${LANGS} ; do
168 if [ "${X}" != "en" ] ; then
169 SRC_URI="${SRC_URI}
170 linguas_${X/-/_}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )"
171 fi
172 IUSE="${IUSE} linguas_${X/-/_}"
173 # english is handled internally
174 if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
175 #if [ "${X}" != "en-US" ]; then
176 SRC_URI="${SRC_URI}
177 linguas_${X%%-*}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )"
178 #fi
179 IUSE="${IUSE} linguas_${X%%-*}"
180 fi
181 done
182 fi
183
184 ASM_DEPEND=">=dev-lang/yasm-1.1"
185
186 # Mesa 7.10 needed for WebGL + bugfixes
187 RDEPEND=">=sys-devel/binutils-2.16.1
188 >=dev-libs/nss-3.12.10
189 >=dev-libs/nspr-4.8.8
190 >=dev-libs/glib-2.26
191 >=media-libs/mesa-7.10
192 >=media-libs/libpng-1.4.1[apng]
193 >=x11-libs/cairo-1.10
194 dev-libs/libffi
195 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
196 crypt? ( >=app-crypt/gnupg-1.4 )
197 webm? ( media-libs/libvpx
198 media-libs/alsa-lib )"
199
200 DEPEND="${RDEPEND}
201 dev-util/pkgconfig
202 webm? ( amd64? ( ${ASM_DEPEND} )
203 x86? ( ${ASM_DEPEND} ) )"
204
205 if [[ ${PV} == *beta* ]] ; then
206 S="${WORKDIR}/comm-beta"
207 else
208 S="${WORKDIR}/comm-release"
209 fi
210
211 linguas() {
212 local LANG SLANG
213 for LANG in ${LINGUAS}; do
214 if has ${LANG} en en_US; then
215 has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
216 continue
217 elif has ${LANG} ${LANGS//-/_}; then
218 has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
219 continue
220 elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
221 for X in ${LANGS}; do
222 if [[ "${X}" == "${LANG}-"* ]] && \
223 [[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
224 has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
225 continue 2
226 fi
227 done
228 fi
229 ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
230 done
231 }
232
233 src_unpack() {
234 unpack ${A}
235
236 if ${HAS_LANGS} ; then
237 linguas
238 for X in ${linguas}; do
239 # FIXME: Add support for unpacking xpis to portage
240 [[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
241 done
242 if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
243 einfo "Selected language packs (first will be default): ${linguas}"
244 fi
245 fi
246 }
247
248 pkg_setup() {
249 if [[ ${PV} == *_pre* ]] ; then
250 ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
251 ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
252 ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
253 fi
254
255 moz_pkgsetup
256
257 if ! use methodjit ; then
258 einfo
259 ewarn "You are disabling the method-based JIT in J├ĄgerMonkey."
260 ewarn "This will greatly slowdown JavaScript in ${PN}!"
261 fi
262 }
263
264 src_prepare() {
265 # Apply our patches
266 EPATCH_SUFFIX="patch" \
267 EPATCH_FORCE="yes" \
268 epatch "${WORKDIR}/patch"
269
270 epatch "${FILESDIR}"/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff \
271 "${FILESDIR}"/${PN}-2.2-curl7217-includes-fix.patch
272
273 # mailnews patches go here
274 #pushd "${S}"/mailnews &>/dev/null || die
275 #popd &>/dev/null || die
276
277 # Allow user to apply any additional patches without modifing ebuild
278 epatch_user
279
280 if use crypt ; then
281 mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
282 cd "${S}"/mailnews/extensions/enigmail || die
283 ./makemake -r 2&>/dev/null
284 sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \
285 -i Makefile.in || die
286 cd "${S}"
287 fi
288
289 #Ensure we disable javaxpcom by default to prevent configure breakage
290 sed -i -e s:MOZ_JAVAXPCOM\=1::g "${S}"/mozilla/xulrunner/confvars.sh \
291 || die "sed javaxpcom"
292
293 # Disable gnomevfs extension
294 sed -i -e "s:gnomevfs::" "${S}/"suite/confvars.sh \
295 || die "Failed to remove gnomevfs extension"
296
297 eautoreconf
298 cd "${S}"/mozilla || die
299 eautoreconf
300 cd "${S}"/mozilla/js/src || die
301 eautoreconf
302 }
303
304 src_configure() {
305 declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
306 MEXTENSIONS=""
307
308 ####################################
309 #
310 # mozconfig, CFLAGS and CXXFLAGS setup
311 #
312 ####################################
313
314 mozconfig_init
315 mozconfig_config
316
317 # It doesn't compile on alpha without this LDFLAGS
318 use alpha && append-ldflags "-Wl,--no-relax"
319
320 if ! use chatzilla ; then
321 MEXTENSIONS="${MEXTENSIONS},-irc"
322 fi
323 if ! use roaming ; then
324 MEXTENSIONS="${MEXTENSIONS},-sroaming"
325 fi
326
327 mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
328 mozconfig_annotate '' --disable-gconf
329 mozconfig_annotate '' --enable-jsd
330 mozconfig_annotate '' --enable-canvas
331 mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
332
333 mozconfig_use_enable system-sqlite
334 mozconfig_use_enable methodjit
335
336 if use crypt ; then
337 mozconfig_annotate "mail crypt" --enable-chrome-format=jar
338 fi
339
340 mozconfig_annotate '' --with-system-png
341
342 # Finalize and report settings
343 mozconfig_final
344
345 if [[ $(gcc-major-version) -lt 4 ]]; then
346 append-cxxflags -fno-stack-protector
347 elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
348 if use amd64 || use x86; then
349 append-flags -mno-avx
350 fi
351 fi
352
353 ####################################
354 #
355 # Configure and build
356 #
357 ####################################
358
359 # Work around breakage in makeopts with --no-print-directory
360 MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
361
362 CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
363 }
364
365 src_compile() {
366 emake || die
367
368 # Only build enigmail extension if conditions are met.
369 if use crypt ; then
370 emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
371 emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed"
372 fi
373 }
374
375 src_install() {
376 declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
377 declare emid
378
379 emake DESTDIR="${D}" install || die "emake install failed"
380 cp -f "${FILESDIR}"/icon/${PN}.desktop "${T}" || die
381
382 if use crypt ; then
383 cd "${T}" || die
384 unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die
385 emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
386
387 dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
388 cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
389 unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die
390 fi
391
392 sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
393 -i "${T}"/${PN}.desktop || die
394 sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
395 || die
396
397 if ${HAS_LANGS} ; then
398 linguas
399 for X in ${linguas}; do
400 [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
401 done
402 fi
403
404 # Add StartupNotify=true bug 290401
405 if use startup-notification ; then
406 echo "StartupNotify=true" >> "${T}"/${PN}.desktop
407 fi
408
409 # Install icon and .desktop for menu entry
410 newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png \
411 || die
412 domenu "${T}"/${PN}.desktop || die
413
414 # Add our default prefs
415 sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo.js \
416 > "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \
417 || die
418
419 # Plugins dir
420 rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins || die "failed to remove existing plugins dir"
421 dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die
422
423 doman "${S}"/suite/app/${PN}.1 || die
424 }
425
426 pkg_preinst() {
427 declare MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
428
429 if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
430 rm ${MOZILLA_FIVE_HOME}/plugins -rf
431 fi
432 }
433
434 pkg_postinst() {
435 declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
436
437 # Update mimedb for the new .desktop file
438 fdo-mime_desktop_database_update
439
440 if use chatzilla ; then
441 elog "chatzilla is now an extension which can be en-/disabled and configured via"
442 elog "the Add-on manager."
443 fi
444 }