[gentoo-commits] proj/mozilla:master commit in: eclass/, www-client/firefox/

["Ian Stakenvicius" <axs@gentoo.org>]

commit:     0379fb90513ccbf78f47a7fd89af58a3f2ed0b35
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 20 14:54:02 2017 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 14:54:02 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=0379fb90

firefox-52.0: fix a few outstanding bugs, still some left before release

 eclass/mozconfig-v6.52.eclass          | 6 +-----
 www-client/firefox/firefox-52.0.ebuild | 3 +++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/eclass/mozconfig-v6.52.eclass b/eclass/mozconfig-v6.52.eclass
index 5465168..22c6d44 100644
--- a/eclass/mozconfig-v6.52.eclass
+++ b/eclass/mozconfig-v6.52.eclass
@@ -123,7 +123,7 @@ RDEPEND=">=app-text/hunspell-1.2:=
 	system-libevent? ( >=dev-libs/libevent-2.0:0= )
 	system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] )
 	system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
-	system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0=[icu] >=media-gfx/graphite2-1.3.8 )
+	system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 )
 "
 
 if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
@@ -172,10 +172,6 @@ DEPEND="app-arch/zip
 RDEPEND+="
 	selinux? ( sec-policy/selinux-mozilla )"
 
-# force system-icu if system-harfbuzz is selected, to avoid potential ABI issues
-REQUIRED_USE="
-	system-harfbuzz? ( system-icu )"
-
 # @FUNCTION: mozconfig_config
 # @DESCRIPTION:
 # Set common configure options for mozilla packages.

diff --git a/www-client/firefox/firefox-52.0.ebuild b/www-client/firefox/firefox-52.0.ebuild
index 36a447d..7bffa3c 100644
--- a/www-client/firefox/firefox-52.0.ebuild
+++ b/www-client/firefox/firefox-52.0.ebuild
@@ -124,6 +124,9 @@ src_unpack() {
 }
 
 src_prepare() {
+	# Remove obsolete patches
+	rm "${WORKDIR}"/firefox/2003_include_sysmacros_h.patch
+
 	# Apply our patches
 	eapply "${WORKDIR}/firefox"