From ef358e4b94cdc0ab46ca1ac0b5701c2ddb6be035 Mon Sep 17 00:00:00 2001
From: Anton Bolshakov <blshkv@users.noreply.github.com>
Date: Fri, 31 May 2013 03:02:30 +0000
Subject: [PATCH] firefox.eclass: make it work with ff21

---
 eclass/firefox-plugin.eclass | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/eclass/firefox-plugin.eclass b/eclass/firefox-plugin.eclass
index dc239b9d9..1fe653065 100644
--- a/eclass/firefox-plugin.eclass
+++ b/eclass/firefox-plugin.eclass
@@ -42,12 +42,15 @@ firefox-plugin_src_unpack() {
 # Default install function for firefox plugins
 firefox-plugin_src_install() {
 	declare MOZILLA_FIVE_HOME
-	if has_version 'www-client/firefox'; then
+	if has_version '>=www-client/firefox-21'; then
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox/browser"
+	else
 		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
-		xpi_install "${S}/${FFP_XPI_FILE}"
 	fi
-	if has_version 'www-client/firefox-bin'; then
-		MOZILLA_FIVE_HOME="/opt/firefox"
-		xpi_install "${S}/${FFP_XPI_FILE}"
+	if has_version '>=www-client/firefox-bin-21'; then
+		MOZILLA_FIVE_HOME="/opt/firefox/browser"
+	else
+		MOZILLA_FIVE_HOME="/opt/firefox/"
 	fi
+	xpi_install "${S}/${FFP_XPI_FILE}"
 }