1 |
polynomial-c 10/10/28 15:40:01 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: thunderbird-3.1.6.ebuild |
5 |
Removed: thunderbird-3.1.4.ebuild |
6 |
Log: |
7 |
Security bump (bug #342847). |
8 |
|
9 |
(Portage version: 2.2.0_alpha2/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.46 mail-client/thunderbird/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?rev=1.46&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?rev=1.46&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?r1=1.45&r2=1.46 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v |
21 |
retrieving revision 1.45 |
22 |
retrieving revision 1.46 |
23 |
diff -u -r1.45 -r1.46 |
24 |
--- ChangeLog 25 Oct 2010 00:29:53 -0000 1.45 |
25 |
+++ ChangeLog 28 Oct 2010 15:40:01 -0000 1.46 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for mail-client/thunderbird |
28 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.45 2010/10/25 00:29:53 fauli Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.46 2010/10/28 15:40:01 polynomial-c Exp $ |
31 |
+ |
32 |
+*thunderbird-3.1.6 (28 Oct 2010) |
33 |
+ |
34 |
+ 28 Oct 2010; Lars Wendler <polynomial-c@g.o> |
35 |
+ +files/xulrunner-1.9.2-gtk+-2.21.patch, -thunderbird-3.1.4.ebuild, |
36 |
+ +thunderbird-3.1.6.ebuild: |
37 |
+ Security bump (bug #342847). |
38 |
|
39 |
25 Oct 2010; Christian Faulhammer <fauli@g.o> |
40 |
thunderbird-3.1.5.ebuild: |
41 |
|
42 |
|
43 |
|
44 |
1.1 mail-client/thunderbird/thunderbird-3.1.6.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.6.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.6.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: thunderbird-3.1.6.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2010 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.6.ebuild,v 1.1 2010/10/28 15:40:01 polynomial-c Exp $ |
54 |
|
55 |
EAPI="3" |
56 |
WANT_AUTOCONF="2.1" |
57 |
|
58 |
inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools |
59 |
|
60 |
# This list can be updated using get_langs.sh from the mozilla overlay |
61 |
LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr \ |
62 |
fy-NL ga-IE he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru si \ |
63 |
sk sl sq sv-SE tr uk zh-CN zh-TW" |
64 |
NOSHORTLANGS="en-GB es-AR pt-BR zh-TW" |
65 |
|
66 |
MY_PV="${PV/_rc/rc}" |
67 |
MY_P="${P/_rc/rc}" |
68 |
|
69 |
DESCRIPTION="Thunderbird Mail Client" |
70 |
HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/" |
71 |
|
72 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
73 |
SLOT="0" |
74 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
75 |
IUSE="+alsa ldap +crypt bindist libnotify +lightning mozdom system-sqlite wifi" |
76 |
PATCH="${PN}-3.1-patches-1.1" |
77 |
|
78 |
REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases" |
79 |
SRC_URI="${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2 |
80 |
http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" |
81 |
|
82 |
for X in ${LANGS} ; do |
83 |
if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then |
84 |
SRC_URI="${SRC_URI} |
85 |
linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )" |
86 |
fi |
87 |
IUSE="${IUSE} linguas_${X/-/_}" |
88 |
# english is handled internally |
89 |
if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then |
90 |
if [ "${X}" != "en-US" ]; then |
91 |
SRC_URI="${SRC_URI} |
92 |
linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )" |
93 |
fi |
94 |
IUSE="${IUSE} linguas_${X%%-*}" |
95 |
fi |
96 |
done |
97 |
|
98 |
RDEPEND=">=sys-devel/binutils-2.16.1 |
99 |
>=dev-libs/nss-3.12.8 |
100 |
>=dev-libs/nspr-4.8.6 |
101 |
>=app-text/hunspell-1.2 |
102 |
x11-libs/cairo[X] |
103 |
x11-libs/pango[X] |
104 |
alsa? ( media-libs/alsa-lib ) |
105 |
libnotify? ( >=x11-libs/libnotify-0.4 ) |
106 |
system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete] ) |
107 |
wifi? ( net-wireless/wireless-tools ) |
108 |
!x11-plugins/lightning" |
109 |
|
110 |
PDEPEND="crypt? ( >=x11-plugins/enigmail-1.1 )" |
111 |
|
112 |
S="${WORKDIR}"/comm-1.9.2 |
113 |
|
114 |
linguas() { |
115 |
local LANG SLANG |
116 |
for LANG in ${LINGUAS}; do |
117 |
if has ${LANG} en en_US; then |
118 |
has en ${linguas} || linguas="${linguas:+"${linguas} "}en" |
119 |
continue |
120 |
elif has ${LANG} ${LANGS//-/_}; then |
121 |
has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}" |
122 |
continue |
123 |
elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then |
124 |
for X in ${LANGS}; do |
125 |
if [[ "${X}" == "${LANG}-"* ]] && \ |
126 |
[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then |
127 |
has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}" |
128 |
continue 2 |
129 |
fi |
130 |
done |
131 |
fi |
132 |
ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" |
133 |
done |
134 |
} |
135 |
|
136 |
pkg_setup() { |
137 |
export BUILD_OFFICIAL=1 |
138 |
export MOZILLA_OFFICIAL=1 |
139 |
|
140 |
if ! use bindist; then |
141 |
elog "You are enabling official branding. You may not redistribute this build" |
142 |
elog "to any users on your network or the internet. Doing so puts yourself into" |
143 |
elog "a legal problem with Mozilla Foundation" |
144 |
elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" |
145 |
fi |
146 |
} |
147 |
|
148 |
src_unpack() { |
149 |
unpack ${A} |
150 |
|
151 |
linguas |
152 |
for X in ${linguas}; do |
153 |
# FIXME: Add support for unpacking xpis to portage |
154 |
[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi" |
155 |
done |
156 |
if [[ ${linguas} != "" && ${linguas} != "en" ]]; then |
157 |
einfo "Selected language packs (first will be default): ${linguas}" |
158 |
fi |
159 |
} |
160 |
|
161 |
src_prepare() { |
162 |
# Apply our patches |
163 |
EPATCH_SUFFIX="patch" \ |
164 |
EPATCH_FORCE="yes" \ |
165 |
epatch "${WORKDIR}" |
166 |
|
167 |
epatch "${FILESDIR}/bug-606109.patch" |
168 |
epatch "${FILESDIR}/xulrunner-1.9.2-gtk+-2.21.patch" |
169 |
|
170 |
# Allow user to apply any additional patches without modifing ebuild |
171 |
epatch_user |
172 |
|
173 |
eautoreconf |
174 |
|
175 |
cd mozilla |
176 |
eautoreconf |
177 |
cd js/src |
178 |
eautoreconf |
179 |
} |
180 |
|
181 |
src_configure() { |
182 |
declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
183 |
MEXTENSIONS="default" |
184 |
|
185 |
#################################### |
186 |
# |
187 |
# mozconfig, CFLAGS and CXXFLAGS setup |
188 |
# |
189 |
#################################### |
190 |
|
191 |
touch mail/config/mozconfig |
192 |
mozconfig_init |
193 |
mozconfig_config |
194 |
|
195 |
# It doesn't compile on alpha without this LDFLAGS |
196 |
use alpha && append-ldflags "-Wl,--no-relax" |
197 |
|
198 |
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" |
199 |
mozconfig_annotate '' --enable-application=mail |
200 |
mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}" |
201 |
mozconfig_annotate '' --with-user-appdir=.thunderbird |
202 |
mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr |
203 |
mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr |
204 |
mozconfig_annotate '' --with-sqlite-prefix="${EPREFIX}"/usr |
205 |
mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir) |
206 |
mozconfig_annotate 'broken' --disable-crashreporter |
207 |
mozconfig_annotate '' --enable-system-hunspell |
208 |
|
209 |
# Use enable features |
210 |
mozconfig_use_enable ldap |
211 |
mozconfig_use_enable ldap ldap-experimental |
212 |
mozconfig_use_enable libnotify |
213 |
mozconfig_use_enable lightning calendar |
214 |
mozconfig_use_enable wifi necko-wifi |
215 |
mozconfig_use_enable system-sqlite |
216 |
mozconfig_use_enable !bindist official-branding |
217 |
mozconfig_use_enable alsa ogg |
218 |
mozconfig_use_enable alsa wave |
219 |
|
220 |
# Bug #72667 |
221 |
if use mozdom; then |
222 |
MEXTENSIONS="${MEXTENSIONS},inspector" |
223 |
fi |
224 |
|
225 |
# Finalize and report settings |
226 |
mozconfig_final |
227 |
|
228 |
#################################### |
229 |
# |
230 |
# Configure and build |
231 |
# |
232 |
#################################### |
233 |
|
234 |
# Disable no-print-directory |
235 |
MAKEOPTS=${MAKEOPTS/--no-print-directory/} |
236 |
|
237 |
if [[ $(gcc-major-version) -lt 4 ]]; then |
238 |
append-cxxflags -fno-stack-protector |
239 |
fi |
240 |
|
241 |
CPPFLAGS="${CPPFLAGS}" \ |
242 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ |
243 |
econf || die |
244 |
} |
245 |
|
246 |
src_compile() { |
247 |
# Should the build use multiprocessing? Not enabled by default, as it tends to break |
248 |
[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1" |
249 |
emake ${jobs} || die |
250 |
} |
251 |
|
252 |
src_install() { |
253 |
declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
254 |
|
255 |
emake DESTDIR="${D}" install || die "emake install failed" |
256 |
|
257 |
if use lightning ; then |
258 |
declare emid emd1 emid2 |
259 |
|
260 |
emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}" |
261 |
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} |
262 |
cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} |
263 |
unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi |
264 |
|
265 |
emid1="calendar-timezones@×××××××.org" |
266 |
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid1} |
267 |
cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid1} |
268 |
unzip "${S}"/mozilla/dist/xpi-stage/calendar-timezones.xpi |
269 |
|
270 |
emid2="{e2fda1a4-762b-4020-b5ad-a41df1933103}" |
271 |
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid2} |
272 |
cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid2} |
273 |
unzip "${S}"/mozilla/dist/xpi-stage/lightning.xpi |
274 |
fi |
275 |
|
276 |
linguas |
277 |
for X in ${linguas}; do |
278 |
[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" |
279 |
done |
280 |
|
281 |
if ! use bindist; then |
282 |
newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png |
283 |
domenu "${FILESDIR}"/icon/${PN}.desktop |
284 |
else |
285 |
newicon "${S}"/mail/branding/unofficial/content/icon48.png thunderbird-icon-unbranded.png |
286 |
newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \ |
287 |
${PN}.desktop |
288 |
|
289 |
sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \ |
290 |
"${D}"/usr/share/applications/${PN}.desktop |
291 |
|
292 |
fi |
293 |
|
294 |
# Warn user that remerging enigmail is neccessary on USE=crypt |
295 |
use crypt && ewarn "Please remerge x11-plugins/enigmail after updating ${PN}." |
296 |
|
297 |
# Enable very specific settings for thunderbird-3 |
298 |
cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js \ |
299 |
"${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \ |
300 |
die "failed to cp thunderbird-gentoo-default-prefs.js" |
301 |
} |