diff options
| author |   Christoph Junghans <ottxor@gentoo.org> | 2013-09-28 16:22:29 +0000 |
|---|---|---|
| committer | Christoph Junghans <ottxor@gentoo.org> | 2013-09-28 16:22:29 +0000 |
| commit | 8415e4f28d1080dbb8eadfbbdd1acaf2d4b7de9e (patch) | |
| tree | 5d335617b7292ff0c4815edec916336eb849e8ff /eclass | |
| parent | Bump. (diff) | |
| download | gentoo-2-8415e4f28d1080dbb8eadfbbdd1acaf2d4b7de9e.tar.gz gentoo-2-8415e4f28d1080dbb8eadfbbdd1acaf2d4b7de9e.tar.bz2 gentoo-2-8415e4f28d1080dbb8eadfbbdd1acaf2d4b7de9e.zip | |
added prefix support
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/cvs.eclass | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index d78033bf475f..95734d2d7192 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.994 2013/09/27 19:21:43 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.995 2013/09/28 16:22:29 ottxor Exp $ + + 28 Sep 2013; Christoph Junghans <ottxor@gentoo.org> cvs.eclass: + added prefix support 27 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass: Use pydistutils.cfg to set build-dirs instead of passing commands explicitly. diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass index 3b60b585ba28..9471e3a8fb09 100644 --- a/eclass/cvs.eclass +++ b/eclass/cvs.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/cvs.eclass,v 1.82 2013/06/18 04:31:44 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.83 2013/09/28 16:22:29 ottxor Exp $ # @ECLASS: cvs.eclass # @MAINTAINER: @@ -202,6 +202,7 @@ fi # called from cvs_src_unpack cvs_fetch() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= # Make these options local variables so that the global values are # not affected by modifications in this function. @@ -392,7 +393,7 @@ cvs_fetch() { export CVS_RSH="${T}/cvs_sshwrapper" cat > "${CVS_RSH}"<<EOF -#!/usr/bin/python +#!${EPREFIX}/usr/bin/python import fcntl import os import sys @@ -436,7 +437,7 @@ EOF >> "${CVS_RSH}" echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \ >> "${CVS_RSH}" - echo "os.execv('/usr/bin/ssh', newarglist)" \ + echo "os.execv('${EPREFIX}/usr/bin/ssh', newarglist)" \ >> "${CVS_RSH}" chmod a+x "${CVS_RSH}" |