diff options
| author |   Martin Väth <martin@mvath.de> | 2012-08-26 16:49:47 +0200 |
|---|---|---|
| committer | Martin Väth <martin@mvath.de> | 2015-10-11 10:48:19 +0200 |
| commit | c960a571247f208d6d805c69c9e3f099ca18dfb4 (patch) | |
| tree | df602ebd73c4901102cf32f02bdd544ec9590606 /eclass | |
| parent | Bump trickyfetch (diff) | |
| download | mv-c960a571247f208d6d805c69c9e3f099ca18dfb4.tar.gz mv-c960a571247f208d6d805c69c9e3f099ca18dfb4.tar.bz2 mv-c960a571247f208d6d805c69c9e3f099ca18dfb4.zip | |
Bump squash_dir. s/_/-/ in IUSE to avoid possible collision with USE_EXPAND
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 4 | ||||
| -rw-r--r-- | eclass/mv_mozextension.eclass | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index bb04c662..365b1f13 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 26 Aug 2012; Martin Väth <martin@mvath.de> + Rename IUSE={copy,symlink}_extensions to {copy,symlink}-extensions to avoid + possible collision with USE_EXPAND + 10 Jun 2012; Martin Väth <martin@mvath.de> Remove support for icecat. Fix headers to make repoman happy. diff --git a/eclass/mv_mozextension.eclass b/eclass/mv_mozextension.eclass index 37ce3b8e..58ba6937 100644 --- a/eclass/mv_mozextension.eclass +++ b/eclass/mv_mozextension.eclass @@ -57,7 +57,7 @@ DEPEND='app-arch/unzip' [ -n "${RDEPEND}" ] && DEPEND="${DEPEND} ${RDEPEND}" -[ "${MV_MOZ_EXTDIR}" = '*' ] || IUSE='copy_extensions symlink_extensions' +[ "${MV_MOZ_EXTDIR}" = '*' ] || IUSE='copy-extensions symlink-extensions' mv_mozextension_src_unpack() { local i @@ -114,7 +114,7 @@ mv_mozextension_src_install() { fi MV_MOZ_SYM=() MV_MOZ_LNK=false - if [ "${d}" = '*' ] || ! use symlink_extensions + if [ "${d}" = '*' ] || ! use symlink-extensions then MV_MOZ_CPY=: else MV_MOZ_CPY=false if [ -n "${d}" ] @@ -122,7 +122,7 @@ mv_mozextension_src_install() { else mv_mozextension_install "${b}mozilla/extensions" fi fi - use copy_extensions || MV_MOZ_LNK=: + use copy-extensions || MV_MOZ_LNK=: for i in "${MV_MOZ_DIR[@]}" do j="${i}/extensions" ${MV_MOZ_CPY} && mv_mozextension_install "${j}" @@ -247,11 +247,11 @@ xpi_install() { test -d "${D}${d}" || dodir "${d}" || die "failed to create ${d}" ${MV_MOZ_LNK} && cp -RPl -- "${x}"/* "${D}${d}" || { ${MV_MOZ_LNK} && \ - ewarn 'Failed to hardlink extension. Falling back to USE=copy_extension' + ewarn 'Failed to hardlink extension. Falling back to USE=copy-extensions' insinto "${d}" && doins -r "${x}"/* } || { ${MV_MOZ_LNK} && \ - die 'failed to copy extension. Please retry emerging with USE=copy_extension' + die 'failed to copy extension. Please retry emerging with USE=copy-extensions' die 'failed to copy extension' } } @@ -265,5 +265,3 @@ xpi_install_dirs() { do [ -n "${d}" ] && test -d "${d}" && xpi_install "${d}" done } - - |