www-client/firefox-bin: rework pulseausio deps to ensure apulse-0.1.9 is installed

Also bumped firefox-bin-53 to EAPI6, restored eutils.eclass inherit to firefox-bin-52
(since newicon, etc is used), dropped multilib.eclass inherit as its NOT used, and misc
other synchronizations between the two ebuilds.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/www-client/firefox-bin/firefox-bin-53.0.ebuild b/www-client/firefox-bin/firefox-bin-52.1.0-r1.ebuild
similarity index 94%
rename from www-client/firefox-bin/firefox-bin-53.0.ebuild
rename to www-client/firefox-bin/firefox-bin-52.1.0-r1.ebuild
index 138b3285c87c1faf09a314c34875f00858ca9570..ed5784e0f7ba00638bbec0e6325990b4e36056a6 100644 (file)
--- a/www-client/firefox-bin/firefox-bin-53.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-52.1.0-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
+MOZ_ESR=1
 
 # Can be updated using scripts/get_langs.sh from mozilla overlay
 # Missing when bumped : be
@@ -15,11 +16,15 @@ son sq sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
 MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
 MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
 MOZ_PN="${PN/-bin}"
+if [[ ${MOZ_ESR} == 1 ]]; then
+       # ESR releases have slightly version numbers
+       MOZ_PV="${MOZ_PV}esr"
+fi
 MOZ_P="${MOZ_PN}-${MOZ_PV}"
 
 MOZ_HTTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
 
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas-v2 nsplugins
+inherit eutils pax-utils fdo-mime gnome2-utils mozlinguas-v2 nsplugins
 
 DESCRIPTION="Firefox Web Browser"
 SRC_URI="${SRC_URI}
@@ -53,8 +58,8 @@ RDEPEND="dev-libs/atk
        x11-libs/libXt
        >=x11-libs/pango-1.22.0
        virtual/freedesktop-icon-theme
-       pulseaudio? ( || ( media-sound/pulseaudio
-               >=media-sound/apulse-0.1.9 ) )
+       pulseaudio? ( !<media-sound/apulse-0.1.9
+               || ( media-sound/pulseaudio media-sound/apulse ) )
        ffmpeg? ( media-video/ffmpeg )
        selinux? ( sec-policy/selinux-mozilla )
 "

diff --git a/www-client/firefox-bin/firefox-bin-52.1.0.ebuild b/www-client/firefox-bin/firefox-bin-53.0-r1.ebuild
similarity index 97%
rename from www-client/firefox-bin/firefox-bin-52.1.0.ebuild
rename to www-client/firefox-bin/firefox-bin-53.0-r1.ebuild
index c3555bbcab078254482c3549f718d521c57a19e6..69ec314d827c72c3cfb3b26fdac07e626e986cba 100644 (file)
--- a/www-client/firefox-bin/firefox-bin-52.1.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-53.0-r1.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-MOZ_ESR=1
 
 # Can be updated using scripts/get_langs.sh from mozilla overlay
 # Missing when bumped : be
@@ -24,7 +23,7 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}"
 
 MOZ_HTTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
 
-inherit multilib pax-utils fdo-mime gnome2-utils mozlinguas-v2 nsplugins
+inherit eutils pax-utils fdo-mime gnome2-utils mozlinguas-v2
 
 DESCRIPTION="Firefox Web Browser"
 SRC_URI="${SRC_URI}
@@ -58,8 +57,8 @@ RDEPEND="dev-libs/atk
        x11-libs/libXt
        >=x11-libs/pango-1.22.0
        virtual/freedesktop-icon-theme
-       pulseaudio? ( || ( media-sound/pulseaudio
-               >=media-sound/apulse-0.1.9 ) )
+       pulseaudio? ( !<media-sound/apulse-0.1.9
+               || ( media-sound/pulseaudio media-sound/apulse ) )
        ffmpeg? ( media-video/ffmpeg )
        selinux? ( sec-policy/selinux-mozilla )
 "