Make it usable with firefox-bin, bug 179098

Package-Manager: portage-2.1.2.9

4 files changed, 48 insertions, 26 deletions

diff --git a/x11-plugins/noscript/ChangeLog b/x11-plugins/noscript/ChangeLog
index 800d5da8f78d..23a31e5ec486 100644
--- a/x11-plugins/noscript/ChangeLog
+++ b/x11-plugins/noscript/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/noscript
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/noscript/ChangeLog,v 1.38 2007/06/12 00:05:32 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/noscript/ChangeLog,v 1.39 2007/06/13 12:13:20 armin76 Exp $
+
+  13 Jun 2007; Raúl Porcel <armin76@gentoo.org>
+  noscript-1.1.4.8.070430.ebuild, noscript-1.1.4.8.070602.ebuild:
+  Make it usable with firefox-bin, bug 179098
 
   12 Jun 2007; Christoph Mende <angelos@gentoo.org>
   noscript-1.1.4.8.070430.ebuild:
diff --git a/x11-plugins/noscript/Manifest b/x11-plugins/noscript/Manifest
index a5c4b40f14b0..61e1783d71aa 100644
--- a/x11-plugins/noscript/Manifest
+++ b/x11-plugins/noscript/Manifest
@@ -11,22 +11,22 @@ EBUILD noscript-1.1.4.6.070304.ebuild 841 RMD160 1e9b64ba8fed693305465ad1dc5032e
 MD5 197a0d5efcfcf07541d456cb0cdb1327 noscript-1.1.4.6.070304.ebuild 841
 RMD160 1e9b64ba8fed693305465ad1dc5032ed59419c5f noscript-1.1.4.6.070304.ebuild 841
 SHA256 05a140889a24baba2184e4720804228df3c884ffa7fc8c31607eb1d02be770ec noscript-1.1.4.6.070304.ebuild 841
-EBUILD noscript-1.1.4.8.070430.ebuild 747 RMD160 819b4eba1818dfad1e6138dc3f15d55b839afbc9 SHA1 c39e1ebfc2eac6e7544b030289b048e7a00ce1ea SHA256 3242efb274ebfbcfc0076a68488bc49e68e9ec5308b714b0a40e071246f081f6
-MD5 5376a442d493bacb5bb14af55ac0ef9b noscript-1.1.4.8.070430.ebuild 747
-RMD160 819b4eba1818dfad1e6138dc3f15d55b839afbc9 noscript-1.1.4.8.070430.ebuild 747
-SHA256 3242efb274ebfbcfc0076a68488bc49e68e9ec5308b714b0a40e071246f081f6 noscript-1.1.4.8.070430.ebuild 747
+EBUILD noscript-1.1.4.8.070430.ebuild 1013 RMD160 e9fe9548be83ffe0f9df5bba87762641e0450895 SHA1 cb6857be004e8d87f3c69980d5e713d936f01470 SHA256 4b54eacc5b707d5aa09158ec6f6eab0dfec0f8bc111d3e7d569f6b899a92d3b2
+MD5 f7edd662ac66896c3ee188913940b4d8 noscript-1.1.4.8.070430.ebuild 1013
+RMD160 e9fe9548be83ffe0f9df5bba87762641e0450895 noscript-1.1.4.8.070430.ebuild 1013
+SHA256 4b54eacc5b707d5aa09158ec6f6eab0dfec0f8bc111d3e7d569f6b899a92d3b2 noscript-1.1.4.8.070430.ebuild 1013
 EBUILD noscript-1.1.4.8.070523.ebuild 755 RMD160 b7eb863f45fb56a26ff4d3f141094ef5c73bf0e6 SHA1 cce7b999c2db829c3b4c92ef37ce01a61894122a SHA256 969e5a9ba8bccaf8677a259bb80bdb440b1776efb564c7f6e080256442f1cfd9
 MD5 75d2608177e935e69bc8d7c9ba2813c2 noscript-1.1.4.8.070523.ebuild 755
 RMD160 b7eb863f45fb56a26ff4d3f141094ef5c73bf0e6 noscript-1.1.4.8.070523.ebuild 755
 SHA256 969e5a9ba8bccaf8677a259bb80bdb440b1776efb564c7f6e080256442f1cfd9 noscript-1.1.4.8.070523.ebuild 755
-EBUILD noscript-1.1.4.8.070602.ebuild 755 RMD160 cc6e123b21a9f473e8670a0f5d6b42a840561963 SHA1 dd77273cd1c44ff07de2d8b5a84503d252492165 SHA256 a7dad97d2f0b60d5b6054cc7bd890b14cf34663ffc2da6113af82b9ee7e1554d
-MD5 3273d83503230935204f57ffc0b0aa64 noscript-1.1.4.8.070602.ebuild 755
-RMD160 cc6e123b21a9f473e8670a0f5d6b42a840561963 noscript-1.1.4.8.070602.ebuild 755
-SHA256 a7dad97d2f0b60d5b6054cc7bd890b14cf34663ffc2da6113af82b9ee7e1554d noscript-1.1.4.8.070602.ebuild 755
-MISC ChangeLog 5469 RMD160 b5512b3edccdcefd6e84e661e149b9c2802c035b SHA1 b73a232b0b64fde61557aa522d68d1703ad124dc SHA256 37dda5d7d9c42560bf11af409e0d224e9bf0f8bae7de55efeef6ebc213217075
-MD5 98472082087a5acb7b3e333f43470e32 ChangeLog 5469
-RMD160 b5512b3edccdcefd6e84e661e149b9c2802c035b ChangeLog 5469
-SHA256 37dda5d7d9c42560bf11af409e0d224e9bf0f8bae7de55efeef6ebc213217075 ChangeLog 5469
+EBUILD noscript-1.1.4.8.070602.ebuild 1020 RMD160 5566b5cc582f27924cf2e57667da1f49d927a505 SHA1 e0acfe522a2f684013223d6bacaeeab8907380de SHA256 33e5b5e97427e0842b2d2e0a58c92f2adaad654acb6f61eed77487c1c70bc279
+MD5 b75b9c851a4a01ba4a3c1b1c9714c84a noscript-1.1.4.8.070602.ebuild 1020
+RMD160 5566b5cc582f27924cf2e57667da1f49d927a505 noscript-1.1.4.8.070602.ebuild 1020
+SHA256 33e5b5e97427e0842b2d2e0a58c92f2adaad654acb6f61eed77487c1c70bc279 noscript-1.1.4.8.070602.ebuild 1020
+MISC ChangeLog 5631 RMD160 b8a3965eff9b08883bdc71c7707e179c10dbc0f8 SHA1 9c1b98f6795889af2f91782a7b85ea4fd88a0094 SHA256 c817222444400c6baf508b2c7283974648785e7814c70b9b6b635b9aa472a336
+MD5 0e6c659176212ba25ff37dbbc2537699 ChangeLog 5631
+RMD160 b8a3965eff9b08883bdc71c7707e179c10dbc0f8 ChangeLog 5631
+SHA256 c817222444400c6baf508b2c7283974648785e7814c70b9b6b635b9aa472a336 ChangeLog 5631
 MISC metadata.xml 328 RMD160 7d2512727c4295ca86b028edea2c2150191ee27b SHA1 f4db49bbc73bc75d69cc7e8dd1f436e91dea3c9f SHA256 3a75ad0084a701a164df71d693b92548e9e48b710a86528f1f3fa1f8f5686f4c
 MD5 2551df0aa2494f110f83cbbdf7577d5f metadata.xml 328
 RMD160 7d2512727c4295ca86b028edea2c2150191ee27b metadata.xml 328
diff --git a/x11-plugins/noscript/noscript-1.1.4.8.070430.ebuild b/x11-plugins/noscript/noscript-1.1.4.8.070430.ebuild
index 52056799092e..2f7f9a1989d5 100644
--- a/x11-plugins/noscript/noscript-1.1.4.8.070430.ebuild
+++ b/x11-plugins/noscript/noscript-1.1.4.8.070430.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/noscript/noscript-1.1.4.8.070430.ebuild,v 1.6 2007/06/12 00:05:32 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/noscript/noscript-1.1.4.8.070430.ebuild,v 1.7 2007/06/13 12:13:20 armin76 Exp $
 
 inherit mozextension multilib
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND=">=www-client/mozilla-firefox-1.5.0.7"
+RDEPEND="|| (
+	>=www-client/mozilla-firefox-bin-1.5.0.7
+	>=www-client/mozilla-firefox-1.5.0.7
+)"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}
@@ -23,7 +26,13 @@ src_unpack() {
 }
 
 src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
-
-	xpi_install "${S}"/"${P}"
-}
+	declare MOZILLA_FIVE_HOME
+	if has_version '>=www-client/mozilla-firefox-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
+		xpi_install "${S}"/"${P}"
+	fi
+	if has_version '>=www-client/mozilla-firefox-bin-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/opt/firefox"
+		xpi_install "${S}"/"${P}"
+	fi
+}
\ No newline at end of file
diff --git a/x11-plugins/noscript/noscript-1.1.4.8.070602.ebuild b/x11-plugins/noscript/noscript-1.1.4.8.070602.ebuild
index 4504b1a4d78d..6bf2b7238c57 100644
--- a/x11-plugins/noscript/noscript-1.1.4.8.070602.ebuild
+++ b/x11-plugins/noscript/noscript-1.1.4.8.070602.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/noscript/noscript-1.1.4.8.070602.ebuild,v 1.1 2007/06/05 16:39:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/noscript/noscript-1.1.4.8.070602.ebuild,v 1.2 2007/06/13 12:13:20 armin76 Exp $
 
 inherit mozextension multilib
 
@@ -10,10 +10,13 @@ SRC_URI="http://software.informaction.com/data/releases/${P}.xpi"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=www-client/mozilla-firefox-1.5.0.7"
+RDEPEND="|| (
+	>=www-client/mozilla-firefox-bin-1.5.0.7
+	>=www-client/mozilla-firefox-1.5.0.7
+)"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}
@@ -23,7 +26,13 @@ src_unpack() {
 }
 
 src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
-
-	xpi_install "${S}"/"${P}"
-}
+	declare MOZILLA_FIVE_HOME
+	if has_version '>=www-client/mozilla-firefox-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
+		xpi_install "${S}"/"${P}"
+	fi
+	if has_version '>=www-client/mozilla-firefox-bin-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/opt/firefox"
+		xpi_install "${S}"/"${P}"
+	fi
+}
\ No newline at end of file