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