1 |
commit: ead86d1911f9c478a6b332abc111cdbdc7cc393b |
2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 27 17:45:39 2013 +0000 |
4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 27 17:45:39 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=ead86d19 |
7 |
|
8 |
bumped to EAPI5 and added slot operators on lib deps per bug 467734 |
9 |
|
10 |
Please use this as the basis for any revbumps. Adding slot operators really |
11 |
needs a revbump in the tree, but i didn't want to force a rebuild for all users |
12 |
just so that the slot operators are in place. |
13 |
|
14 |
--- |
15 |
eclass/mozlinguas.eclass | 2 +- |
16 |
...d-24.0-r1.ebuild => thunderbird-24.0-r2.ebuild} | 36 +++++++-------- |
17 |
...refox-24.0-r1.ebuild => firefox-24.0-r2.ebuild} | 42 +++++++++--------- |
18 |
...monkey-2.21.ebuild => seamonkey-2.21-r1.ebuild} | 51 +++++++++++----------- |
19 |
4 files changed, 65 insertions(+), 66 deletions(-) |
20 |
|
21 |
diff --git a/eclass/mozlinguas.eclass b/eclass/mozlinguas.eclass |
22 |
index 02984d2..fb2e24d 100644 |
23 |
--- a/eclass/mozlinguas.eclass |
24 |
+++ b/eclass/mozlinguas.eclass |
25 |
@@ -17,7 +17,7 @@ inherit mozextension |
26 |
case "${EAPI:-0}" in |
27 |
0|1) |
28 |
die "EAPI ${EAPI:-0} does not support the '->' SRC_URI operator";; |
29 |
- 2|3|4) |
30 |
+ 2|3|4|5) |
31 |
EXPORT_FUNCTIONS src_unpack src_install;; |
32 |
*) |
33 |
die "EAPI ${EAPI} is not supported, contact eclass maintainers";; |
34 |
|
35 |
diff --git a/mail-client/thunderbird/thunderbird-24.0-r1.ebuild b/mail-client/thunderbird/thunderbird-24.0-r2.ebuild |
36 |
similarity index 93% |
37 |
rename from mail-client/thunderbird/thunderbird-24.0-r1.ebuild |
38 |
rename to mail-client/thunderbird/thunderbird-24.0-r2.ebuild |
39 |
index a46f767..b350b18 100644 |
40 |
--- a/mail-client/thunderbird/thunderbird-24.0-r1.ebuild |
41 |
+++ b/mail-client/thunderbird/thunderbird-24.0-r2.ebuild |
42 |
@@ -2,7 +2,7 @@ |
43 |
# Distributed under the terms of the GNU General Public License v2 |
44 |
# $Header: $ |
45 |
|
46 |
-EAPI="3" |
47 |
+EAPI=5 |
48 |
WANT_AUTOCONF="2.1" |
49 |
MOZ_ESR="" |
50 |
|
51 |
@@ -53,20 +53,20 @@ ASM_DEPEND=">=dev-lang/yasm-1.1" |
52 |
|
53 |
RDEPEND=" |
54 |
>=sys-devel/binutils-2.16.1 |
55 |
- >=dev-libs/nss-3.15.1 |
56 |
- >=dev-libs/nspr-4.10 |
57 |
+ >=dev-libs/nss-3.15.1:= |
58 |
+ >=dev-libs/nspr-4.10:= |
59 |
>=dev-libs/glib-2.26:2 |
60 |
- >=media-libs/mesa-7.10 |
61 |
- >=media-libs/libpng-1.5.13[apng] |
62 |
- virtual/libffi |
63 |
- gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] ) |
64 |
- pulseaudio? ( media-sound/pulseaudio ) |
65 |
- system-cairo? ( >=x11-libs/cairo-1.12[X] ) |
66 |
- system-icu? ( dev-libs/icu ) |
67 |
- system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) |
68 |
- system-sqlite? ( >=dev-db/sqlite-3.7.16.1:3[secure-delete,debug=] ) |
69 |
- >=media-libs/libvpx-1.0.0 |
70 |
- kernel_linux? ( media-libs/alsa-lib ) |
71 |
+ >=media-libs/mesa-7.10:= |
72 |
+ >=media-libs/libpng-1.5.13:0=[apng] |
73 |
+ virtual/libffi:= |
74 |
+ gstreamer? ( media-plugins/gst-plugins-meta:0.10=[ffmpeg] ) |
75 |
+ pulseaudio? ( media-sound/pulseaudio:= ) |
76 |
+ system-cairo? ( >=x11-libs/cairo-1.12:=[X] ) |
77 |
+ system-icu? ( dev-libs/icu:= ) |
78 |
+ system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= ) |
79 |
+ system-sqlite? ( >=dev-db/sqlite-3.7.16.1:3=[secure-delete,debug=] ) |
80 |
+ >=media-libs/libvpx-1.0.0:= |
81 |
+ kernel_linux? ( media-libs/alsa-lib:= ) |
82 |
selinux? ( sec-policy/selinux-thunderbird ) |
83 |
!x11-plugins/enigmail |
84 |
crypt? ( || ( |
85 |
@@ -257,8 +257,8 @@ src_compile() { |
86 |
cd "${S}"/mailnews/extensions/enigmail || die |
87 |
./makemake -r 2&> /dev/null |
88 |
cd "${S}"/tbird/mailnews/extensions/enigmail |
89 |
- emake -j1 || die "make enigmail failed" |
90 |
- emake -j1 xpi || die "make enigmail xpi failed" |
91 |
+ emake -j1 |
92 |
+ emake -j1 xpi |
93 |
fi |
94 |
} |
95 |
|
96 |
@@ -282,7 +282,7 @@ src_install() { |
97 |
pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell |
98 |
|
99 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" \ |
100 |
- emake DESTDIR="${D}" install || die "emake install failed" |
101 |
+ emake DESTDIR="${D}" install |
102 |
|
103 |
# Install language packs |
104 |
mozlinguas_src_install |
105 |
@@ -304,7 +304,7 @@ src_install() { |
106 |
unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi install.rdf || die |
107 |
emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf) |
108 |
|
109 |
- dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die |
110 |
+ dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} |
111 |
cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die |
112 |
unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die |
113 |
fi |
114 |
|
115 |
diff --git a/www-client/firefox/firefox-24.0-r1.ebuild b/www-client/firefox/firefox-24.0-r2.ebuild |
116 |
similarity index 92% |
117 |
rename from www-client/firefox/firefox-24.0-r1.ebuild |
118 |
rename to www-client/firefox/firefox-24.0-r2.ebuild |
119 |
index 23eaae4..5dbb9e7 100644 |
120 |
--- a/www-client/firefox/firefox-24.0-r1.ebuild |
121 |
+++ b/www-client/firefox/firefox-24.0-r2.ebuild |
122 |
@@ -2,7 +2,7 @@ |
123 |
# Distributed under the terms of the GNU General Public License v2 |
124 |
# $Header: $ |
125 |
|
126 |
-EAPI="3" |
127 |
+EAPI=5 |
128 |
VIRTUALX_REQUIRED="pgo" |
129 |
WANT_AUTOCONF="2.1" |
130 |
MOZ_ESR="" |
131 |
@@ -51,20 +51,20 @@ ASM_DEPEND=">=dev-lang/yasm-1.1" |
132 |
# Mesa 7.10 needed for WebGL + bugfixes |
133 |
RDEPEND=" |
134 |
>=sys-devel/binutils-2.16.1 |
135 |
- >=dev-libs/nss-3.15.1 |
136 |
- >=dev-libs/nspr-4.10 |
137 |
- >=dev-libs/glib-2.26:2 |
138 |
- >=media-libs/mesa-7.10 |
139 |
- >=media-libs/libpng-1.5.13[apng] |
140 |
- virtual/libffi |
141 |
- gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] ) |
142 |
+ >=dev-libs/nss-3.15.1:= |
143 |
+ >=dev-libs/nspr-4.10:= |
144 |
+ >=dev-libs/glib-2.26:2= |
145 |
+ >=media-libs/mesa-7.10:= |
146 |
+ >=media-libs/libpng-1.5.13:0=[apng] |
147 |
+ virtual/libffi:= |
148 |
+ gstreamer? ( media-plugins/gst-plugins-meta:0.10=[ffmpeg] ) |
149 |
pulseaudio? ( media-sound/pulseaudio ) |
150 |
- system-cairo? ( >=x11-libs/cairo-1.12[X] ) |
151 |
- system-icu? ( dev-libs/icu ) |
152 |
- system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) |
153 |
- system-sqlite? ( >=dev-db/sqlite-3.7.16.1:3[secure-delete,debug=] ) |
154 |
- >=media-libs/libvpx-1.0.0 |
155 |
- kernel_linux? ( media-libs/alsa-lib ) |
156 |
+ system-cairo? ( >=x11-libs/cairo-1.12:=[X] ) |
157 |
+ system-icu? ( dev-libs/icu:= ) |
158 |
+ system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= ) |
159 |
+ system-sqlite? ( >=dev-db/sqlite-3.7.16.1:3=[secure-delete,debug=] ) |
160 |
+ >=media-libs/libvpx-1.0.0:= |
161 |
+ kernel_linux? ( media-libs/alsa-lib:= ) |
162 |
selinux? ( sec-policy/selinux-mozilla )" |
163 |
|
164 |
DEPEND="${RDEPEND} |
165 |
@@ -277,7 +277,7 @@ src_compile() { |
166 |
else |
167 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ |
168 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \ |
169 |
- emake -f client.mk || die "emake failed" |
170 |
+ emake -f client.mk |
171 |
fi |
172 |
|
173 |
} |
174 |
@@ -311,7 +311,7 @@ src_install() { |
175 |
"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die |
176 |
|
177 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" \ |
178 |
- emake DESTDIR="${D}" install || die "emake install failed" |
179 |
+ emake DESTDIR="${D}" install |
180 |
|
181 |
# Install language packs |
182 |
mozlinguas_src_install |
183 |
@@ -334,16 +334,16 @@ src_install() { |
184 |
# Install icons and .desktop for menu entry |
185 |
for size in ${sizes}; do |
186 |
insinto "/usr/share/icons/hicolor/${size}x${size}/apps" |
187 |
- newins "${icon_path}/default${size}.png" "${icon}.png" || die |
188 |
+ newins "${icon_path}/default${size}.png" "${icon}.png" |
189 |
done |
190 |
# The 128x128 icon has a different name |
191 |
insinto "/usr/share/icons/hicolor/128x128/apps" |
192 |
- newins "${icon_path}/mozicon128.png" "${icon}.png" || die |
193 |
+ newins "${icon_path}/mozicon128.png" "${icon}.png" |
194 |
# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs |
195 |
- newicon "${icon_path}/content/icon48.png" "${icon}.png" || die |
196 |
- newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" || die |
197 |
+ newicon "${icon_path}/content/icon48.png" "${icon}.png" |
198 |
+ newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" |
199 |
sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \ |
200 |
- "${ED}/usr/share/applications/${PN}.desktop" || die |
201 |
+ "${ED}/usr/share/applications/${PN}.desktop" |
202 |
|
203 |
# Add StartupNotify=true bug 237317 |
204 |
if use startup-notification ; then |
205 |
|
206 |
diff --git a/www-client/seamonkey/seamonkey-2.21.ebuild b/www-client/seamonkey/seamonkey-2.21-r1.ebuild |
207 |
similarity index 91% |
208 |
rename from www-client/seamonkey/seamonkey-2.21.ebuild |
209 |
rename to www-client/seamonkey/seamonkey-2.21-r1.ebuild |
210 |
index ff65a4f..02f16a4 100644 |
211 |
--- a/www-client/seamonkey/seamonkey-2.21.ebuild |
212 |
+++ b/www-client/seamonkey/seamonkey-2.21-r1.ebuild |
213 |
@@ -2,7 +2,7 @@ |
214 |
# Distributed under the terms of the GNU General Public License v2 |
215 |
# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.21.ebuild,v 1.4 2013/09/25 14:15:10 polynomial-c Exp $ |
216 |
|
217 |
-EAPI="3" |
218 |
+EAPI=5 |
219 |
WANT_AUTOCONF="2.1" |
220 |
|
221 |
# This list can be updated with scripts/get_langs.sh from the mozilla overlay |
222 |
@@ -59,27 +59,27 @@ ASM_DEPEND=">=dev-lang/yasm-1.1" |
223 |
|
224 |
# Mesa 7.10 needed for WebGL + bugfixes |
225 |
RDEPEND=">=sys-devel/binutils-2.16.1 |
226 |
- >=dev-libs/nss-3.15.1 |
227 |
- >=dev-libs/nspr-4.10 |
228 |
- >=dev-libs/glib-2.26:2 |
229 |
- >=media-libs/mesa-7.10 |
230 |
- >=media-libs/libpng-1.5.13[apng] |
231 |
- >=x11-libs/pango-1.14.0 |
232 |
- >=x11-libs/gtk+-2.14:2 |
233 |
- virtual/libffi |
234 |
- gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] ) |
235 |
- system-cairo? ( >=x11-libs/cairo-1.12[X] ) |
236 |
- system-icu? ( dev-libs/icu ) |
237 |
- system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) |
238 |
- system-sqlite? ( >=dev-db/sqlite-3.7.16.1:3[secure-delete,debug=] ) |
239 |
- >=media-libs/libvpx-1.0.0 |
240 |
+ >=dev-libs/nss-3.15.1:= |
241 |
+ >=dev-libs/nspr-4.10:= |
242 |
+ >=dev-libs/glib-2.26:2= |
243 |
+ >=media-libs/mesa-7.10:= |
244 |
+ >=media-libs/libpng-1.5.13:0=[apng] |
245 |
+ >=x11-libs/pango-1.14.0:= |
246 |
+ >=x11-libs/gtk+-2.14:2= |
247 |
+ virtual/libffi:= |
248 |
+ gstreamer? ( media-plugins/gst-plugins-meta:0.10=[ffmpeg] ) |
249 |
+ system-cairo? ( >=x11-libs/cairo-1.12:=[X] ) |
250 |
+ system-icu? ( dev-libs/icu:= ) |
251 |
+ system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= ) |
252 |
+ system-sqlite? ( >=dev-db/sqlite-3.7.16.1:3=[secure-delete,debug=] ) |
253 |
+ >=media-libs/libvpx-1.0.0:= |
254 |
crypt? ( >=app-crypt/gnupg-1.4 ) |
255 |
- kernel_linux? ( media-libs/alsa-lib ) |
256 |
+ kernel_linux? ( media-libs/alsa-lib:= ) |
257 |
pulseaudio? ( media-sound/pulseaudio ) |
258 |
selinux? ( sec-policy/selinux-mozilla )" |
259 |
|
260 |
DEPEND="${RDEPEND} |
261 |
- !elibc_glibc? ( dev-libs/libexecinfo ) |
262 |
+ !elibc_glibc? ( dev-libs/libexecinfo:= ) |
263 |
virtual/pkgconfig |
264 |
amd64? ( ${ASM_DEPEND} |
265 |
virtual/opengl ) |
266 |
@@ -257,15 +257,15 @@ src_configure() { |
267 |
src_compile() { |
268 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ |
269 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \ |
270 |
- emake -f client.mk || die |
271 |
+ emake -f client.mk |
272 |
|
273 |
# Only build enigmail extension if conditions are met. |
274 |
if use crypt ; then |
275 |
cd "${S}"/mailnews/extensions/enigmail || die |
276 |
./makemake -r 2&> /dev/null |
277 |
cd "${S}"/seamonk/mailnews/extensions/enigmail |
278 |
- emake || die "make enigmail failed" |
279 |
- emake xpi || die "make enigmail xpi failed" |
280 |
+ emake |
281 |
+ emake xpi |
282 |
fi |
283 |
} |
284 |
|
285 |
@@ -300,7 +300,7 @@ src_install() { |
286 |
|| die |
287 |
|
288 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" \ |
289 |
- emake DESTDIR="${D}" install || die "emake install failed" |
290 |
+ emake DESTDIR="${D}" install |
291 |
cp -f "${FILESDIR}"/icon/${PN}.desktop "${T}" || die |
292 |
|
293 |
if use crypt ; then |
294 |
@@ -308,7 +308,7 @@ src_install() { |
295 |
unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi install.rdf || die |
296 |
emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf) |
297 |
|
298 |
- dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die |
299 |
+ dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} |
300 |
cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die |
301 |
unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die |
302 |
|
303 |
@@ -329,9 +329,8 @@ src_install() { |
304 |
fi |
305 |
|
306 |
# Install icon and .desktop for menu entry |
307 |
- newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png \ |
308 |
- || die |
309 |
- domenu "${T}"/${PN}.desktop || die |
310 |
+ newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png |
311 |
+ domenu "${T}"/${PN}.desktop |
312 |
|
313 |
# Required in order to use plugins and even run seamonkey on hardened. |
314 |
pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container} |
315 |
@@ -343,7 +342,7 @@ src_install() { |
316 |
# Handle plugins dir through nsplugins.eclass |
317 |
share_plugins_dir |
318 |
|
319 |
- doman "${S}"/${obj_dir}/suite/app/${PN}.1 || die |
320 |
+ doman "${S}"/${obj_dir}/suite/app/${PN}.1 |
321 |
} |
322 |
|
323 |
pkg_preinst() { |