diff options
| author |   Martin Väth <martin@mvath.de> | 2015-02-13 21:09:38 +0100 |
|---|---|---|
| committer | Martin Väth <martin@mvath.de> | 2015-10-11 10:49:21 +0200 |
| commit | 06d75c96877e88485d63779bb39c457b358c87a2 (patch) | |
| tree | 32a961f283231487efb3cd462fd6e2dcbeb40020 /eclass | |
| parent | Bump firewall-mv (diff) | |
| download | mv-06d75c96877e88485d63779bb39c457b358c87a2.tar.gz mv-06d75c96877e88485d63779bb39c457b358c87a2.tar.bz2 mv-06d75c96877e88485d63779bb39c457b358c87a2.zip | |
avoid use_if_iuse. Bump epubreader, classic-theme-restorer, noscript
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/mv_mozextension.eclass | 16 |
2 files changed, 13 insertions, 9 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index dbe1b49b..eb57196a 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 25 Jan 2015; Martin Väth <martin@mvath.de>: + avoid use_if_iuse in mv_mozextenstion.eclass to be fully pms compatible + + 24 Jan 2015; Martin Väth <martin@mvath.de>: + Remove auteps from mv_mozextension.eclass + 14 Aug 2013; Martin Väth <martin@mvath.de>: Simplify EPREFIX diff --git a/eclass/mv_mozextension.eclass b/eclass/mv_mozextension.eclass index 45a7a359..8d20aad8 100644 --- a/eclass/mv_mozextension.eclass +++ b/eclass/mv_mozextension.eclass @@ -30,27 +30,25 @@ case ${EAPI:-0} in die "EAPI ${EAPI} no longer supported by ${ECLASS}";; esac -IUSE= +MV_MOZ_IUSE= RDEPEND='|| (' -REQUIRED_USE='|| (' case ${MV_MOZ_MOZILLAS} in *fire*) - IUSE="${IUSE}${IUSE:+ }firefox firefox-bin" + MV_MOZ_IUSE="${MV_MOZ_IUSE}${MV_MOZ_IUSE:+ }firefox firefox-bin" RDEPEND="${RDEPEND} firefox? ( >=www-client/firefox-21 ) firefox-bin? ( >=www-client/firefox-bin-21 )" - REQUIRED_USE="${REQUIRED_USE} firefox firefox-bin";; esac case ${MV_MOZ_MOZILLAS} in *sea*) - IUSE="${IUSE}${IUSE:+ }seamonkey seamonkey-bin" + MV_MOZ_IUSE="${MV_MOZ_IUSE}${MV_MOZ_IUSE:+ }seamonkey seamonkey-bin" RDEPEND="${RDEPEND} seamonkey? ( www-client/seamonkey ) seamonkey-bin? ( www-client/seamonkey-bin )" - REQUIRED_USE="${REQUIRED_USE} seamonkey seamonkey-bin";; esac RDEPEND="${RDEPEND} )" -REQUIRED_USE="${REQUIRED_USE} )" +IUSE=${MV_MOZ_IUSE} +REQUIRED_USE="|| ( ${MV_MOZ_IUSE} )" DEPEND='app-arch/unzip' @@ -98,7 +96,7 @@ xpi_unpack() { case ${xpi} in ./*|/*) - srcdir='';; + srcdir=;; *) srcdir="${DISTDIR}/";; esac @@ -150,7 +148,7 @@ xpi_install_dirs() { mv_mozextension_install() { local MOZILLA_EXTENSIONS_DIRECTORY - use_if_iuse "${1}" || return 0 + has "${1}" ${MV_MOZ_IUSE} && use "${1}" || return 0 MOZILLA_EXTENSIONS_DIRECTORY=${2} xpi_install_dirs } |