| 1 |
commit: e6f57da52580ddc7cc63010c0eef1f958a7e3515 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 2 02:01:09 2017 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 3 14:19:37 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6f57da5 |
| 7 |
|
| 8 |
www-client/firefox-bin: rework pulseausio deps to ensure apulse-0.1.9 is installed |
| 9 |
|
| 10 |
Also bumped firefox-bin-53 to EAPI6, restored eutils.eclass inherit to firefox-bin-52 |
| 11 |
(since newicon, etc is used), dropped multilib.eclass inherit as its NOT used, and misc |
| 12 |
other synchronizations between the two ebuilds. |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 15 |
|
| 16 |
...firefox-bin-53.0.ebuild => firefox-bin-52.1.0-r1.ebuild} | 13 +++++++++---- |
| 17 |
...firefox-bin-52.1.0.ebuild => firefox-bin-53.0-r1.ebuild} | 7 +++---- |
| 18 |
2 files changed, 12 insertions(+), 8 deletions(-) |
| 19 |
|
| 20 |
diff --git a/www-client/firefox-bin/firefox-bin-53.0.ebuild b/www-client/firefox-bin/firefox-bin-52.1.0-r1.ebuild |
| 21 |
similarity index 94% |
| 22 |
rename from www-client/firefox-bin/firefox-bin-53.0.ebuild |
| 23 |
rename to www-client/firefox-bin/firefox-bin-52.1.0-r1.ebuild |
| 24 |
index 138b3285c87..ed5784e0f7b 100644 |
| 25 |
--- a/www-client/firefox-bin/firefox-bin-53.0.ebuild |
| 26 |
+++ b/www-client/firefox-bin/firefox-bin-52.1.0-r1.ebuild |
| 27 |
@@ -1,7 +1,8 @@ |
| 28 |
# Copyright 1999-2017 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
-EAPI="5" |
| 32 |
+EAPI=6 |
| 33 |
+MOZ_ESR=1 |
| 34 |
|
| 35 |
# Can be updated using scripts/get_langs.sh from mozilla overlay |
| 36 |
# Missing when bumped : be |
| 37 |
@@ -15,11 +16,15 @@ son sq sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW ) |
| 38 |
MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI |
| 39 |
MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI |
| 40 |
MOZ_PN="${PN/-bin}" |
| 41 |
+if [[ ${MOZ_ESR} == 1 ]]; then |
| 42 |
+ # ESR releases have slightly version numbers |
| 43 |
+ MOZ_PV="${MOZ_PV}esr" |
| 44 |
+fi |
| 45 |
MOZ_P="${MOZ_PN}-${MOZ_PV}" |
| 46 |
|
| 47 |
MOZ_HTTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/" |
| 48 |
|
| 49 |
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas-v2 nsplugins |
| 50 |
+inherit eutils pax-utils fdo-mime gnome2-utils mozlinguas-v2 nsplugins |
| 51 |
|
| 52 |
DESCRIPTION="Firefox Web Browser" |
| 53 |
SRC_URI="${SRC_URI} |
| 54 |
@@ -53,8 +58,8 @@ RDEPEND="dev-libs/atk |
| 55 |
x11-libs/libXt |
| 56 |
>=x11-libs/pango-1.22.0 |
| 57 |
virtual/freedesktop-icon-theme |
| 58 |
- pulseaudio? ( || ( media-sound/pulseaudio |
| 59 |
- >=media-sound/apulse-0.1.9 ) ) |
| 60 |
+ pulseaudio? ( !<media-sound/apulse-0.1.9 |
| 61 |
+ || ( media-sound/pulseaudio media-sound/apulse ) ) |
| 62 |
ffmpeg? ( media-video/ffmpeg ) |
| 63 |
selinux? ( sec-policy/selinux-mozilla ) |
| 64 |
" |
| 65 |
|
| 66 |
diff --git a/www-client/firefox-bin/firefox-bin-52.1.0.ebuild b/www-client/firefox-bin/firefox-bin-53.0-r1.ebuild |
| 67 |
similarity index 97% |
| 68 |
rename from www-client/firefox-bin/firefox-bin-52.1.0.ebuild |
| 69 |
rename to www-client/firefox-bin/firefox-bin-53.0-r1.ebuild |
| 70 |
index c3555bbcab0..69ec314d827 100644 |
| 71 |
--- a/www-client/firefox-bin/firefox-bin-52.1.0.ebuild |
| 72 |
+++ b/www-client/firefox-bin/firefox-bin-53.0-r1.ebuild |
| 73 |
@@ -2,7 +2,6 @@ |
| 74 |
# Distributed under the terms of the GNU General Public License v2 |
| 75 |
|
| 76 |
EAPI=6 |
| 77 |
-MOZ_ESR=1 |
| 78 |
|
| 79 |
# Can be updated using scripts/get_langs.sh from mozilla overlay |
| 80 |
# Missing when bumped : be |
| 81 |
@@ -24,7 +23,7 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}" |
| 82 |
|
| 83 |
MOZ_HTTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/" |
| 84 |
|
| 85 |
-inherit multilib pax-utils fdo-mime gnome2-utils mozlinguas-v2 nsplugins |
| 86 |
+inherit eutils pax-utils fdo-mime gnome2-utils mozlinguas-v2 |
| 87 |
|
| 88 |
DESCRIPTION="Firefox Web Browser" |
| 89 |
SRC_URI="${SRC_URI} |
| 90 |
@@ -58,8 +57,8 @@ RDEPEND="dev-libs/atk |
| 91 |
x11-libs/libXt |
| 92 |
>=x11-libs/pango-1.22.0 |
| 93 |
virtual/freedesktop-icon-theme |
| 94 |
- pulseaudio? ( || ( media-sound/pulseaudio |
| 95 |
- >=media-sound/apulse-0.1.9 ) ) |
| 96 |
+ pulseaudio? ( !<media-sound/apulse-0.1.9 |
| 97 |
+ || ( media-sound/pulseaudio media-sound/apulse ) ) |
| 98 |
ffmpeg? ( media-video/ffmpeg ) |
| 99 |
selinux? ( sec-policy/selinux-mozilla ) |
| 100 |
" |
Archives