From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3AFFF1381F3 for ; Sat, 1 Dec 2012 03:49:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0185E0665; Sat, 1 Dec 2012 03:49:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4CE08E0665 for ; Sat, 1 Dec 2012 03:49:03 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1DC6533D985 for ; Sat, 1 Dec 2012 03:49:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1732FE5436 for ; Sat, 1 Dec 2012 03:49:00 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1354333711.c047287f493cc937180418f2ad88272b9cf664f9.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, eclass/ X-VCS-Repository: proj/mozilla X-VCS-Files: eclass/mozconfig-3.eclass www-client/firefox/Manifest www-client/firefox/firefox-17.0-r2.ebuild X-VCS-Directories: www-client/firefox/ eclass/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: c047287f493cc937180418f2ad88272b9cf664f9 X-VCS-Branch: master Date: Sat, 1 Dec 2012 03:49:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1e43b7d5-4137-4102-b966-e7d284d96258 X-Archives-Hash: f19a4223ce4b2b917d8389011d96c61f commit: c047287f493cc937180418f2ad88272b9cf664f9 Author: Jory A. Pratt gentoo org> AuthorDate: Sat Dec 1 03:48:31 2012 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sat Dec 1 03:48:31 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=c047287f remove rpath hack, move webrtc changes to eclass --- eclass/mozconfig-3.eclass | 5 +++++ www-client/firefox/Manifest | 2 +- www-client/firefox/firefox-17.0-r2.ebuild | 8 -------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass index 38c3be7..e5c1c0f 100644 --- a/eclass/mozconfig-3.eclass +++ b/eclass/mozconfig-3.eclass @@ -82,6 +82,11 @@ mozconfig_config() { mozconfig_annotate '' --enable-tracejit fi + # Disable webrtc for arches that it doesn't support, bug 444780 + if use ppc || use ppc64 || arm; then + mozconfig_annotate '' --disable-webrtc + fi + # These are enabled by default in all mozilla applications mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index 4318ddb..0e7a44c 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -92,4 +92,4 @@ DIST firefox-17.0-zh-CN.xpi 304250 SHA256 111256e6a6960aaf8c737d24a024b5c2613196 DIST firefox-17.0-zh-TW.xpi 305437 SHA256 a11e96586b0e880a04a3d32f6a9251e8555b61eede0faa32b8c2365bb821ad76 SHA512 a0c898909c3eba9d3284ee867135d12d1fabd1345bcd8bb6f4dc33d60984d9727a4a948232c643567985c8321f3fb093e95f03f09a034342bff6e0ff4a954b77 WHIRLPOOL 250faef25402876df45c84e3ed579643175fec217187bfa1b949817aed337d538c78ca61d857dee27a4697732eefc925e79f448c5a29a0b16fad493d48f033dd DIST firefox-17.0-zu.xpi 296594 SHA256 52a3f87725cda80949d9d57c47f59d066ae7cf833de047681851401b97401229 SHA512 d75937a4d31321527b6b3682f73bbacb94fd7721f88151b8ee93f3e4dbb7eaffc459e6e0f9ff2a38734d9f0b10b7fff2d0f032f0d1dd7260bfb2ada2d880887b WHIRLPOOL 0d4a421a44eabf46168a328dda6edc1d90aab77bee64a5b1992ee49ce2c9b08935300fdace8a7f86db11eebff094b3d097782583c374bcd65bd16b8faf26d96b DIST firefox-17.0.source.tar.bz2 90780755 SHA256 7f05658701be88505747ea3537546b98a1c0e74ba23ba428d754ea838a192348 SHA512 2f5d4242d4cb2488d35a961bfd62a87cfdda7b119c8c502ce9cff54b0ce71f1f34016f30383284b424e8904c9c75a543cfcae0e2d40b7eed7cd0e4e55fdf6f55 WHIRLPOOL e837fc455ae55f045cc8d3e67683c52da6b3f71d0867b13e9d7d78b709127d0dd1e9a25832f64fb84880dc391433f7acde49067210093b6286059eb683a6e7cb -EBUILD firefox-17.0-r2.ebuild 11967 SHA256 75994af3ebc31311f298e560a09e6aa5f2826bf7708bf7111da3260b28d26774 SHA512 c1fb823ad1b7565dc4d41cecbfdc01427dd1195532f3e673b9cf09a978b4c9b1216d6f6262d31d3bb1c0e385e555353ad8e5b3de7ac850ab84529494ff2129b0 WHIRLPOOL 1b90b63ec6cb58de1d82ad15d888cc5990e8fedc7c4d4d79aa357b318b2192a952048b91de6d25dd8c182af458f2f2d3713c75ee5ebaa59abb2f8aa3bc6bc7b6 +EBUILD firefox-17.0-r2.ebuild 11716 SHA256 9a1038767459f4563b737d45e4a4c2b2734b466ff2dd7689278d274aab981ec5 SHA512 f0fb503d5ca99a14ccd3ea67c50454fc1caeab408a9987c3e2cd1e8b67aec48963f53a80dcf24d305c39af049b16ef6be6a1312e95e0351f0a0ce1788c8b304e WHIRLPOOL a31f97135386578fbf410cca9e507d2672a041821b8e0cc5387d2874ae32e9846adcd736cafbe628d15d45fbfa5541c9ac6715aaa3bd76c02fe58e5fbe203d07 diff --git a/www-client/firefox/firefox-17.0-r2.ebuild b/www-client/firefox/firefox-17.0-r2.ebuild index ec40ef1..b739677 100644 --- a/www-client/firefox/firefox-17.0-r2.ebuild +++ b/www-client/firefox/firefox-17.0-r2.ebuild @@ -228,11 +228,6 @@ src_configure() { mozconfig_use_enable jit methodjit mozconfig_use_enable jit tracejit - # Disable webrtc for arches that it doesn't support, bug 444780 - if use ppc || use ppc64 ; then - mozconfig_annotate '' --disable-webrtc - fi - # Allow for a proper pgo build if use pgo; then echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig @@ -251,9 +246,6 @@ src_configure() { } src_compile() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - export LDFLAGS="${LDFLAGS} -Wl,-rpath=${MOZILLA_FIVE_HOME}" - if use pgo; then addpredict /root addpredict /etc/gconf