From: | "Jory Pratt (anarchy)" <anarchy@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in x11-plugins/enigmail: ChangeLog enigmail-1.1.1.ebuild |
Date: | Sat, 26 Jun 2010 14:44:07 |
Message-Id: | 20100626144405.3AC122CF7A@corvid.gentoo.org |
1 | anarchy 10/06/26 14:44:05 |
2 | |
3 | Modified: ChangeLog |
4 | Added: enigmail-1.1.1.ebuild |
5 | Log: |
6 | Upstream bump to fix regressions in 3.1 thunderbird mimetypes |
7 | (Portage version: 2.1.8.3/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.188 x11-plugins/enigmail/ChangeLog |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/enigmail/ChangeLog?rev=1.188&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/enigmail/ChangeLog?rev=1.188&content-type=text/plain |
14 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/enigmail/ChangeLog?r1=1.187&r2=1.188 |
15 | |
16 | Index: ChangeLog |
17 | =================================================================== |
18 | RCS file: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v |
19 | retrieving revision 1.187 |
20 | retrieving revision 1.188 |
21 | diff -u -r1.187 -r1.188 |
22 | --- ChangeLog 21 Jun 2010 15:16:54 -0000 1.187 |
23 | +++ ChangeLog 26 Jun 2010 14:44:05 -0000 1.188 |
24 | @@ -1,6 +1,11 @@ |
25 | # ChangeLog for x11-plugins/enigmail |
26 | # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 | -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.187 2010/06/21 15:16:54 anarchy Exp $ |
28 | +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.188 2010/06/26 14:44:05 anarchy Exp $ |
29 | + |
30 | +*enigmail-1.1.1 (26 Jun 2010) |
31 | + |
32 | + 26 Jun 2010; <anarchy@g.o> +enigmail-1.1.1.ebuild: |
33 | + Fix for decrypting messages |
34 | |
35 | 21 Jun 2010; <anarchy@g.o> enigmail-1.1.ebuild: |
36 | Update to build with rc2 source |
37 | |
38 | |
39 | |
40 | 1.1 x11-plugins/enigmail/enigmail-1.1.1.ebuild |
41 | |
42 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/enigmail/enigmail-1.1.1.ebuild?rev=1.1&view=markup |
43 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/enigmail/enigmail-1.1.1.ebuild?rev=1.1&content-type=text/plain |
44 | |
45 | Index: enigmail-1.1.1.ebuild |
46 | =================================================================== |
47 | # Copyright 1999-2010 Gentoo Foundation |
48 | # Distributed under the terms of the GNU General Public License v2 |
49 | # $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-1.1.1.ebuild,v 1.1 2010/06/26 14:44:05 anarchy Exp $ |
50 | |
51 | WANT_AUTOCONF="2.1" |
52 | EAPI="2" |
53 | |
54 | inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools |
55 | MY_P="${P/_beta/b}" |
56 | EMVER="${PV}" |
57 | TBVER="3.1" |
58 | PATCH="mozilla-thunderbird-3.1-patches-0.1" |
59 | |
60 | DESCRIPTION="GnuPG encryption plugin for thunderbird." |
61 | HOMEPAGE="http://enigmail.mozdev.org" |
62 | REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/" |
63 | SRC_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${TBVER}/source/thunderbird-${TBVER}.source.tar.bz2 |
64 | http://www.mozilla-enigmail.org/download/source/${PN}-${EMVER}.tar.gz |
65 | http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2" |
66 | |
67 | KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
68 | SLOT="0" |
69 | LICENSE="MPL-1.1 GPL-2" |
70 | IUSE="system-sqlite" |
71 | |
72 | DEPEND=">=mail-client/thunderbird-3.1_beta1[system-sqlite=]" |
73 | RDEPEND="${DEPEND} |
74 | system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] ) |
75 | || ( |
76 | ( |
77 | >=app-crypt/gnupg-2.0 |
78 | || ( |
79 | app-crypt/pinentry[gtk] |
80 | app-crypt/pinentry[qt4] |
81 | ) |
82 | ) |
83 | =app-crypt/gnupg-1.4* |
84 | )" |
85 | |
86 | S="${WORKDIR}"/comm-1.9.2 |
87 | |
88 | pkg_setup() { |
89 | # EAPI=2 ensures they are set properly. |
90 | export BUILD_OFFICIAL=1 |
91 | export MOZILLA_OFFICIAL=1 |
92 | export MOZ_CO_PROJECT=mail |
93 | } |
94 | |
95 | src_unpack() { |
96 | unpack thunderbird-${TBVER}.source.tar.bz2 ${PATCH}.tar.bz2 || die "unpack failed" |
97 | } |
98 | |
99 | src_prepare(){ |
100 | # Apply our patches |
101 | EPATCH_SUFFIX="patch" \ |
102 | EPATCH_FORCE="yes" \ |
103 | epatch "${WORKDIR}" |
104 | |
105 | cd mozilla |
106 | eautoreconf |
107 | cd js/src |
108 | eautoreconf |
109 | |
110 | # Unpack the enigmail plugin |
111 | cd "${S}"/mailnews/extensions || die |
112 | unpack enigmail-${EMVER}.tar.gz |
113 | cd "${S}"/mailnews/extensions/enigmail || die "cd failed" |
114 | makemake2 |
115 | |
116 | cd "${S}" |
117 | |
118 | # Fix installation of enigmail.js |
119 | epatch "${FILESDIR}"/70_enigmail-fix.patch |
120 | |
121 | eautoreconf |
122 | } |
123 | |
124 | src_configure() { |
125 | declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird" |
126 | |
127 | #################################### |
128 | # |
129 | # mozconfig, CFLAGS and CXXFLAGS setup |
130 | # |
131 | #################################### |
132 | |
133 | touch mail/config/mozconfig |
134 | mozconfig_init |
135 | mozconfig_config |
136 | |
137 | # tb-specific settings |
138 | mozconfig_annotate '' \ |
139 | --with-system-nspr \ |
140 | --with-system-nss \ |
141 | --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \ |
142 | --with-user-appdir=.thunderbird \ |
143 | --enable-application=mail \ |
144 | --disable-necko-wifi \ |
145 | --disable-libnotify |
146 | |
147 | mozconfig_use_enable system-sqlite |
148 | |
149 | # Finalize and report settings |
150 | mozconfig_final |
151 | |
152 | # Disable no-print-directory |
153 | MAKEOPTS=${MAKEOPTS/--no-print-directory/} |
154 | |
155 | if [[ $(gcc-major-version) -lt 4 ]]; then |
156 | append-cxxflags -fno-stack-protector |
157 | fi |
158 | |
159 | #################################### |
160 | # |
161 | # Configure and build Thunderbird |
162 | # |
163 | #################################### |
164 | CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ |
165 | econf || die |
166 | |
167 | # This removes extraneous CFLAGS from the Makefiles to reduce RAM |
168 | # requirements while compiling |
169 | edit_makefiles |
170 | } |
171 | |
172 | src_compile() { |
173 | # Only build the parts necessary to support building enigmail |
174 | emake -j1 export || die "make export failed" |
175 | emake -C mozilla/modules/libreg || die "make modules/libreg failed" |
176 | emake -C mozilla/xpcom/string || die "make xpcom/string failed" |
177 | emake -C mozilla/xpcom || die "make xpcom failed" |
178 | emake -C mozilla/xpcom/obsolete || die "make xpcom/obsolete failed" |
179 | |
180 | # Build the enigmail plugin |
181 | einfo "Building Enigmail plugin..." |
182 | emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed" |
183 | |
184 | # Package the enigmail plugin; this may be the easiest way to collect the |
185 | # necessary files |
186 | emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make xpi failed" |
187 | } |
188 | |
189 | src_install() { |
190 | declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird" |
191 | declare emid |
192 | |
193 | cd "${T}" |
194 | unzip "${S}"/mozilla/dist/bin/*.xpi install.rdf |
195 | emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf) |
196 | |
197 | dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} |
198 | cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} |
199 | unzip "${S}"/mozilla/dist/bin/*.xpi |
200 | } |