diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2013-05-28 03:29:50 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2013-05-28 03:29:50 +0000 |
| commit | de32ab03fcab67350e34106c67f2a86cd765a308 (patch) | |
| tree | 3ab074c4e6372875fee59c1f98a7eadd85e5a8d5 /eclass | |
| parent | fixed a typo, which prevented cuda build (diff) | |
| download | gentoo-2-de32ab03fcab67350e34106c67f2a86cd765a308.tar.gz gentoo-2-de32ab03fcab67350e34106c67f2a86cd765a308.tar.bz2 gentoo-2-de32ab03fcab67350e34106c67f2a86cd765a308.zip | |
Ensure plugins/extensions are in correct place for >=firefox{-bin}-21.0
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/mozextension.eclass | 20 | ||||
| -rw-r--r-- | eclass/nsplugins.eclass | 6 |
3 files changed, 25 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 4b067af5e75a..d328055710df 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.840 2013/05/26 14:08:21 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.841 2013/05/28 03:29:50 anarchy Exp $ + + 28 May 2013; <anarchy@gentoo.org> mozextension.eclass, nsplugins.eclass: + Ensure plugins/extensions are in correct place for >=firefox{-bin}-21.0 26 May 2013; Pacho Ramos <pacho@gentoo.org> gnome2.eclass: Pass --enable-compile-warnings=minimum as we don't want -Werror* flags, bug diff --git a/eclass/mozextension.eclass b/eclass/mozextension.eclass index c443cc48bf8b..cf103133539a 100644 --- a/eclass/mozextension.eclass +++ b/eclass/mozextension.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mozextension.eclass,v 1.8 2013/04/05 15:27:40 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mozextension.eclass,v 1.9 2013/05/28 03:29:50 anarchy Exp $ # # @ECLASS: mozextension.eclass # @MAINTAINER: @@ -12,6 +12,18 @@ inherit eutils DEPEND="app-arch/unzip" +mozversion_extension_location() { + case ${PN} in + firefox|firefox-bin) + if [[ $(get_version_component_range 1) -ge 21 ]] ; then + return 0 + fi + ;; + esac + + return 1 +} + xpi_unpack() { local xpi xpiname srcdir @@ -53,6 +65,10 @@ xpi_install() { # determine id for extension emid="$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${x}"/install.rdf)" \ || die "failed to determine extension id" - insinto "${MOZILLA_FIVE_HOME}"/extensions/${emid} + if $(mozversion_extension_location) ; then + insinto "${MOZILLA_FIVE_HOME}"/browser/extensions/${emid} + else + insinto "${MOZILLA_FIVE_HOME}"/extensions/${emid} + fi doins -r "${x}"/* || die "failed to copy extension" } diff --git a/eclass/nsplugins.eclass b/eclass/nsplugins.eclass index acbe070e2e88..d63fc45ae129 100644 --- a/eclass/nsplugins.eclass +++ b/eclass/nsplugins.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.32 2013/05/17 04:01:54 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.33 2013/05/28 03:29:50 anarchy Exp $ # # @ECLASS: nsplugins.eclass # @MAINTAINER: @@ -12,7 +12,7 @@ # Reusable functions that promote sharing of netscape/moz plugins, also provides # share_plugins_dir function for mozilla applications. -inherit eutils multilib versionator +inherit eutils multilib versionator mozextension PLUGINS_DIR="nsbrowser/plugins" @@ -72,7 +72,7 @@ share_plugins_dir() { PLUGIN_BASE_PATH=".." fi - if version_is_at_least "21.0"; then + if $(mozversion_extension_location) ; then dosym "${PLUGIN_BASE_PATH}/nsbrowser/plugins" "${MOZILLA_FIVE_HOME}/browser/plugins" else dosym "${PLUGIN_BASE_PATH}/nsbrowser/plugins" "${MOZILLA_FIVE_HOME}/plugins" |