[or-cvs] r16594: {incognito} Fix Torbutton ebuild so that it works with self compiled Fir (incognito/branches/hardened/portage.overlay/x11-plugins/torbutton-bin)

[anonym@xxxxxxxx]

Author: anonym
Date: 2008-08-19 09:12:13 -0400 (Tue, 19 Aug 2008)
New Revision: 16594

Modified:
   incognito/branches/hardened/portage.overlay/x11-plugins/torbutton-bin/Manifest
   incognito/branches/hardened/portage.overlay/x11-plugins/torbutton-bin/torbutton-bin-1.2.0.ebuild
Log:
Fix Torbutton ebuild so that it works with self compiled Firefox.


Modified: incognito/branches/hardened/portage.overlay/x11-plugins/torbutton-bin/Manifest
===================================================================
--- incognito/branches/hardened/portage.overlay/x11-plugins/torbutton-bin/Manifest	2008-08-19 13:10:35 UTC (rev 16593)
+++ incognito/branches/hardened/portage.overlay/x11-plugins/torbutton-bin/Manifest	2008-08-19 13:12:13 UTC (rev 16594)
@@ -1,2 +1,2 @@
 DIST torbutton-1.2.0-fx.xpi 197571 RMD160 25fa2d5ed2bb871eb3082f45674c8073b18c6f4f SHA1 086e2a05b8e5393f2f28533cdb715e69465c3169 SHA256 b49993f9e9394ab2d0ef1cafa82f22730cd7f995ec197b2f53770705aa6e9522
-EBUILD torbutton-bin-1.2.0.ebuild 670 RMD160 18f9f83f793c0d9e1a79b1065f75a14fc06c9639 SHA1 757356cc3429ed2c1e85f1fb8df3f93564d5637c SHA256 b81641a6630f2449546c02c2b1bb24d1e49a2a597df8092ba1d7c5e55f66d7fb
+EBUILD torbutton-bin-1.2.0.ebuild 860 RMD160 f95fdf0ae1ecd9c58c6a963f0a062d27d8738631 SHA1 6c397145830242462f47d5746064647337b28b68 SHA256 86eb5505830ec836b3b9617de3c19b5d84e0dd64a072bf944f4ae62926aa12df

Modified: incognito/branches/hardened/portage.overlay/x11-plugins/torbutton-bin/torbutton-bin-1.2.0.ebuild
===================================================================
--- incognito/branches/hardened/portage.overlay/x11-plugins/torbutton-bin/torbutton-bin-1.2.0.ebuild	2008-08-19 13:10:35 UTC (rev 16593)
+++ incognito/branches/hardened/portage.overlay/x11-plugins/torbutton-bin/torbutton-bin-1.2.0.ebuild	2008-08-19 13:12:13 UTC (rev 16594)
@@ -26,6 +26,10 @@
 
 src_install() {
 	declare MOZILLA_FIVE_HOME
-	MOZILLA_FIVE_HOME="/opt/firefox"
+	if has_version '>=www-client/mozilla-firefox-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
+	elif has_version '>=www-client/mozilla-firefox-bin-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/opt/firefox"
+	fi
 	xpi_install "${S}"/"${MY_P}"
 }