diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2005-08-23 15:03:41 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2005-08-23 15:03:41 +0000 |
| commit | 29708a2ca064c58e5b6799adfc01649be262ae0f (patch) | |
| tree | 8902b9d2e646a9159d190ff83a8017849f431675 /eclass/scsh.eclass | |
| parent | No need to treat IUSE as incremental, portage handles it. (diff) | |
| download | gentoo-2-29708a2ca064c58e5b6799adfc01649be262ae0f.tar.gz gentoo-2-29708a2ca064c58e5b6799adfc01649be262ae0f.tar.bz2 gentoo-2-29708a2ca064c58e5b6799adfc01649be262ae0f.zip | |
We no longer need to set ECLASS and INHERITED in the eclass itself, portage handles it.
Diffstat (limited to 'eclass/scsh.eclass')
| -rw-r--r-- | eclass/scsh.eclass | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/eclass/scsh.eclass b/eclass/scsh.eclass index 69010733f922..e1d027194eed 100644 --- a/eclass/scsh.eclass +++ b/eclass/scsh.eclass @@ -1,13 +1,10 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/scsh.eclass,v 1.4 2005/08/09 18:10:18 mkennedy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/scsh.eclass,v 1.5 2005/08/23 15:03:41 swegener Exp $ # inherit eutils -ECLASS=scsh -INHERITED="$INHERITED $ECLASS" - LICENSE="as-is BSD" SLOT="0" KEYWORDS="~x86" @@ -32,14 +29,14 @@ set_path_variables() { SCSH_MV="${SCSH_MV//app-shells\/scsh-}" export SCSH_VERSION SCSH_MV - case $SCSH_LAYOUT in + case ${SCSH_LAYOUT} in fhs) SCSH_PREFIX=/usr - SCSH_MODULES_PATH=/usr/share/scsh-$SCSH_MV/modules + SCSH_MODULES_PATH=/usr/share/scsh-${SCSH_MV}/modules ;; scsh) SCSH_PREFIX=/usr/$(get_libdir)/scsh/modules - SCSH_MODULES_PATH=/usr/$(get_libdir)/scsh/modules/$SCSH_MV + SCSH_MODULES_PATH=/usr/$(get_libdir)/scsh/modules/${SCSH_MV} ;; esac export SCSH_PREFIX SCSH_MODULES_PATH @@ -51,15 +48,15 @@ set_path_variables() { scsh_src_unpack() { set_layout set_path_variables - einfo "Using $SCSH_LAYOUT layout" + einfo "Using ${SCSH_LAYOUT} layout" unpack ${A} } scsh_get_layout_conf() { - SCSH_LAYOUT_CONF=" --build $CHOST + SCSH_LAYOUT_CONF=" --build ${CHOST} --force - --layout $SCSH_LAYOUT - --prefix $SCSH_PREFIX + --layout ${SCSH_LAYOUT} + --prefix ${SCSH_PREFIX} --no-user-defaults --dest-dir ${D}" export SCSH_LAYOUT_CONF @@ -70,7 +67,7 @@ scsh_src_compile() { } scsh_src_install() { - dodir $SCSH_MODULES_PATH + dodir ${SCSH_MODULES_PATH} scsh-install-pkg ${SCSH_LAYOUT_CONF} || die "./scsh-install-pkg failed" } |