| 1 |
anarchy 13/05/28 03:29:50 |
| 2 |
|
| 3 |
Modified: ChangeLog mozextension.eclass nsplugins.eclass |
| 4 |
Log: |
| 5 |
Ensure plugins/extensions are in correct place for >=firefox{-bin}-21.0 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.841 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.841&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.841&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.840&r2=1.841 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.840 |
| 18 |
retrieving revision 1.841 |
| 19 |
diff -u -r1.840 -r1.841 |
| 20 |
--- ChangeLog 26 May 2013 14:08:21 -0000 1.840 |
| 21 |
+++ ChangeLog 28 May 2013 03:29:50 -0000 1.841 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.840 2013/05/26 14:08:21 pacho Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.841 2013/05/28 03:29:50 anarchy Exp $ |
| 27 |
+ |
| 28 |
+ 28 May 2013; <anarchy@g.o> mozextension.eclass, nsplugins.eclass: |
| 29 |
+ Ensure plugins/extensions are in correct place for >=firefox{-bin}-21.0 |
| 30 |
|
| 31 |
26 May 2013; Pacho Ramos <pacho@g.o> gnome2.eclass: |
| 32 |
Pass --enable-compile-warnings=minimum as we don't want -Werror* flags, bug |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.9 eclass/mozextension.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozextension.eclass?rev=1.9&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozextension.eclass?rev=1.9&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozextension.eclass?r1=1.8&r2=1.9 |
| 41 |
|
| 42 |
Index: mozextension.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mozextension.eclass,v |
| 45 |
retrieving revision 1.8 |
| 46 |
retrieving revision 1.9 |
| 47 |
diff -u -r1.8 -r1.9 |
| 48 |
--- mozextension.eclass 5 Apr 2013 15:27:40 -0000 1.8 |
| 49 |
+++ mozextension.eclass 28 May 2013 03:29:50 -0000 1.9 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2013 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozextension.eclass,v 1.8 2013/04/05 15:27:40 floppym Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozextension.eclass,v 1.9 2013/05/28 03:29:50 anarchy Exp $ |
| 55 |
# |
| 56 |
# @ECLASS: mozextension.eclass |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -12,6 +12,18 @@ |
| 59 |
|
| 60 |
DEPEND="app-arch/unzip" |
| 61 |
|
| 62 |
+mozversion_extension_location() { |
| 63 |
+ case ${PN} in |
| 64 |
+ firefox|firefox-bin) |
| 65 |
+ if [[ $(get_version_component_range 1) -ge 21 ]] ; then |
| 66 |
+ return 0 |
| 67 |
+ fi |
| 68 |
+ ;; |
| 69 |
+ esac |
| 70 |
+ |
| 71 |
+ return 1 |
| 72 |
+} |
| 73 |
+ |
| 74 |
xpi_unpack() { |
| 75 |
local xpi xpiname srcdir |
| 76 |
|
| 77 |
@@ -53,6 +65,10 @@ |
| 78 |
# determine id for extension |
| 79 |
emid="$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${x}"/install.rdf)" \ |
| 80 |
|| die "failed to determine extension id" |
| 81 |
- insinto "${MOZILLA_FIVE_HOME}"/extensions/${emid} |
| 82 |
+ if $(mozversion_extension_location) ; then |
| 83 |
+ insinto "${MOZILLA_FIVE_HOME}"/browser/extensions/${emid} |
| 84 |
+ else |
| 85 |
+ insinto "${MOZILLA_FIVE_HOME}"/extensions/${emid} |
| 86 |
+ fi |
| 87 |
doins -r "${x}"/* || die "failed to copy extension" |
| 88 |
} |
| 89 |
|
| 90 |
|
| 91 |
|
| 92 |
1.33 eclass/nsplugins.eclass |
| 93 |
|
| 94 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nsplugins.eclass?rev=1.33&view=markup |
| 95 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nsplugins.eclass?rev=1.33&content-type=text/plain |
| 96 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nsplugins.eclass?r1=1.32&r2=1.33 |
| 97 |
|
| 98 |
Index: nsplugins.eclass |
| 99 |
=================================================================== |
| 100 |
RCS file: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v |
| 101 |
retrieving revision 1.32 |
| 102 |
retrieving revision 1.33 |
| 103 |
diff -u -r1.32 -r1.33 |
| 104 |
--- nsplugins.eclass 17 May 2013 04:01:54 -0000 1.32 |
| 105 |
+++ nsplugins.eclass 28 May 2013 03:29:50 -0000 1.33 |
| 106 |
@@ -1,6 +1,6 @@ |
| 107 |
# Copyright 1999-2013 Gentoo Foundation |
| 108 |
# Distributed under the terms of the GNU General Public License v2 |
| 109 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.32 2013/05/17 04:01:54 jdhore Exp $ |
| 110 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.33 2013/05/28 03:29:50 anarchy Exp $ |
| 111 |
# |
| 112 |
# @ECLASS: nsplugins.eclass |
| 113 |
# @MAINTAINER: |
| 114 |
@@ -12,7 +12,7 @@ |
| 115 |
# Reusable functions that promote sharing of netscape/moz plugins, also provides |
| 116 |
# share_plugins_dir function for mozilla applications. |
| 117 |
|
| 118 |
-inherit eutils multilib versionator |
| 119 |
+inherit eutils multilib versionator mozextension |
| 120 |
|
| 121 |
PLUGINS_DIR="nsbrowser/plugins" |
| 122 |
|
| 123 |
@@ -72,7 +72,7 @@ |
| 124 |
PLUGIN_BASE_PATH=".." |
| 125 |
fi |
| 126 |
|
| 127 |
- if version_is_at_least "21.0"; then |
| 128 |
+ if $(mozversion_extension_location) ; then |
| 129 |
dosym "${PLUGIN_BASE_PATH}/nsbrowser/plugins" "${MOZILLA_FIVE_HOME}/browser/plugins" |
| 130 |
else |
| 131 |
dosym "${PLUGIN_BASE_PATH}/nsbrowser/plugins" "${MOZILLA_FIVE_HOME}/plugins" |
Archives