diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2011-08-09 18:47:40 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2011-08-09 18:47:40 +0000 |
| commit | 4b815925943edf0ddcc6eacccf68663371b3542b (patch) | |
| tree | 93c2d91f6cbddfe319adcafa3c0789f61d794539 /eclass/nsplugins.eclass | |
| parent | migrate Gentoo Prefix changes (diff) | |
| download | gentoo-2-4b815925943edf0ddcc6eacccf68663371b3542b.tar.gz gentoo-2-4b815925943edf0ddcc6eacccf68663371b3542b.tar.bz2 gentoo-2-4b815925943edf0ddcc6eacccf68663371b3542b.zip | |
migrate Gentoo Prefix changes
Diffstat (limited to 'eclass/nsplugins.eclass')
| -rw-r--r-- | eclass/nsplugins.eclass | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/eclass/nsplugins.eclass b/eclass/nsplugins.eclass index fc95ed3f89e2..fa456c8eeb82 100644 --- a/eclass/nsplugins.eclass +++ b/eclass/nsplugins.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.24 2009/05/01 23:03:00 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.25 2011/08/09 18:47:40 darkside Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -16,12 +16,13 @@ PLUGINS_DIR="nsbrowser/plugins" # ${D}/usr/$(get_libdir)/${PLUGIN_DIR}. First argument should be # the full path (without $D) to old plugin dir. src_mv_plugins() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" # Move plugins dir. We use keepdir so that it might not be unmerged # by mistake ... keepdir /usr/$(get_libdir)/${PLUGINS_DIR} - cp -a "${D}"/$1/* "${D}"/usr/$(get_libdir)/${PLUGINS_DIR} - rm -rf "${D}"/$1 + cp -a "${ED}"/$1/* "${ED}"/usr/$(get_libdir)/${PLUGINS_DIR} + rm -rf "${ED}"/$1 dosym /usr/$(get_libdir)/${PLUGINS_DIR} $1 } @@ -29,13 +30,14 @@ src_mv_plugins() { # ${ROOT}/usr/$(get_libdir)/${PLUGIN_DIR}. First argument should be # the full path (without $ROOT) to old plugin dir. pkg_mv_plugins() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${ROOT}" # Move old plugins dir if [ -d "${ROOT}/$1" -a ! -L "${ROOT}/$1" ] then - mkdir -p "${ROOT}"/usr/$(get_libdir)/${PLUGINS_DIR} - cp -a "${ROOT}"/$1/* "${ROOT}"/usr/$(get_libdir)/${PLUGINS_DIR} - rm -rf "${ROOT}"/$1 + mkdir -p "${EROOT}"/usr/$(get_libdir)/${PLUGINS_DIR} + cp -a "${EROOT}"/$1/* "${EROOT}"/usr/$(get_libdir)/${PLUGINS_DIR} + rm -rf "${EROOT}"/$1 fi } |