From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-588004-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 1463B1381F3
for <garchives@archives.gentoo.org>; Mon, 6 May 2013 14:17:18 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D71A9E08C2;
Mon, 6 May 2013 14:17:14 +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 5CBABE08C2
for <gentoo-commits@lists.gentoo.org>; Mon, 6 May 2013 14:17:14 +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 18A1D33DC38
for <gentoo-commits@lists.gentoo.org>; Mon, 6 May 2013 14:17:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 9C910E4CAE
for <gentoo-commits@lists.gentoo.org>; Mon, 6 May 2013 14:17:11 +0000 (UTC)
From: "Jory Pratt" <anarchy@gentoo.org>
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" <anarchy@gentoo.org>
Message-ID: <1367849820.6c910bc2e263fddaa8ce5d2677453e6925df752d.anarchy@gentoo>
Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/
X-VCS-Repository: proj/mozilla
X-VCS-Files: www-client/firefox/Manifest www-client/firefox/firefox-21.0_beta5.ebuild
X-VCS-Directories: www-client/firefox/
X-VCS-Committer: anarchy
X-VCS-Committer-Name: Jory Pratt
X-VCS-Revision: 6c910bc2e263fddaa8ce5d2677453e6925df752d
X-VCS-Branch: master
Date: Mon, 6 May 2013 14:17:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: a76b3e55-698f-486d-a21b-95bef34c598c
X-Archives-Hash: ff4566e4f2069c8c37e22ab2aa6bacbf
commit: 6c910bc2e263fddaa8ce5d2677453e6925df752d
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon May 6 14:16:40 2013 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon May 6 14:17:00 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=6c910bc2
Fix plugin detection
---
www-client/firefox/Manifest | 2 +-
www-client/firefox/firefox-21.0_beta5.ebuild | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 118b297..9702f9d 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -94,4 +94,4 @@ DIST firefox-17.0.5esr.source.tar.bz2 91105421 SHA256 ba2cb1c1bf747190dceb71a31a
DIST firefox-21.0-patches-0.1.tar.xz 7056 SHA256 b4c1c796da7ac15edda87160a6d2f6db02d089c5119e6882570c7cfd2c62875a SHA512 2b9b1dd1d29a4ec6b1787b1bef8e74f4669022b574536f25aed327b55051c38100f7bf389bd70c5b4f2c5997f94f0c2f03ff6a3f074d8ee2417880a3520c69cc WHIRLPOOL f92027b3cb4d80b30ec9cd6f21204f0a38706fe7a8c7a29a75a7781450a0f2da56a42d393133c473c7a2fdcf218a552cab14fff769642df9544acf11a0594477
DIST firefox-21.0b5.source.tar.bz2 105626892 SHA256 68cb2e65ef434c437747f9ce2853270e711712308f473977ee507912b1a57b2b SHA512 ea1df107c77d7189b30d4d4f881b817e08d27aceff5e153bd9271f2325b2cd0a7e8ce00ff60b5573465e24303836144810574bb69f7cf9ae06d099fd0f9cb05f WHIRLPOOL e15f00b53acafbbbe691b900d1543b362a72bb129fc3a28135d396feaac0e66d08c1e6095f1e4f5b127cbf955ac920629fb2abe4fbd56379f87983ba819543ce
EBUILD firefox-17.0.5-r1.ebuild 11995 SHA256 56bda12b3558a84d8b2de4b2cfc9f80f0134d35c3fe45a0e23f9115b625ca29b SHA512 b23b3279032a6031855240cbe251a07bc738f0fd54824d6689b67639c54d464a54084c9fd1c27d96e257bf4cda54e19dfc37011e4780582e6dbede2848225f8e WHIRLPOOL 08b2b681e816b6a7b9d204da97a84280e59359ba6ede6287c9582ef843937a51e3b49d8c1090c55e9c643bfbde214fb9d2c599b6a3f4f97bf48a2626d6d3d917
-EBUILD firefox-21.0_beta5.ebuild 11818 SHA256 84c6387c48755f9252b17caadb4575675bf0d646f3e668cae8357e9eb7a30691 SHA512 7248c94555666886852cca5febfc1c96b5b7d98719d57fd02df7f5969dccf85d727efe9b8cc2d20d0d426db99ce0b08d4b68d40c975dbeeba18635cb9ed7bc90 WHIRLPOOL 05c448fae5578e19329e70ae82c8e9d8c5d5ef8631fe156e400a32dc2aadf75a66eb72faad336e08bfe2959968b5ffab7a5df44d205e3ae83e6b9050d68fe179
+EBUILD firefox-21.0_beta5.ebuild 11994 SHA256 a948452f0a353af0e047cceb9345e9aaef9ab4aba0d6b4c16e83d22b6000894a SHA512 5672b31c2ba912cf43aaf4bfbd0ec8689405fe0fb5bc13e5fbb4ccf8229b85f29eb34644f7f40dfb639195b20e210597ed266b711c38ffb8d5d670d8af59ae33 WHIRLPOOL 49c35eda31ba5e367afdb8673179157d31cdb12023176c135e7feb886efc8171567409d32548131e6ad197eebfe9230b0a057c4299f1b6ae95b7572a9f792370
diff --git a/www-client/firefox/firefox-21.0_beta5.ebuild b/www-client/firefox/firefox-21.0_beta5.ebuild
index 2016973..24fda58 100644
--- a/www-client/firefox/firefox-21.0_beta5.ebuild
+++ b/www-client/firefox/firefox-21.0_beta5.ebuild
@@ -163,8 +163,10 @@ src_prepare() {
fi
# Ensure that are plugins dir is enabled as default
- sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
- "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
+ sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+ "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+ sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+ "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
# Fix sandbox violations during make clean, bug 372817
sed -e "s:\(/no-such-file\):${T}\1:g" \