* [gentoo-commits] portage r13095 - in main/branches/prefix: bin bin/ebuild-helpers pym/portage/tests/bin
@ 2009-03-12 19:37 Fabian Groffen (grobian)
0 siblings, 0 replies; only message in thread
From: Fabian Groffen (grobian) @ 2009-03-12 19:37 UTC (permalink / raw
To: gentoo-commits
Author: grobian
Date: 2009-03-12 19:37:31 +0000 (Thu, 12 Mar 2009)
New Revision: 13095
Added:
main/branches/prefix/bin/ebuild-helpers/
Removed:
main/branches/prefix/bin/dobin
main/branches/prefix/bin/doconfd
main/branches/prefix/bin/dodir
main/branches/prefix/bin/dodoc
main/branches/prefix/bin/doenvd
main/branches/prefix/bin/doexe
main/branches/prefix/bin/dohard
main/branches/prefix/bin/dohtml
main/branches/prefix/bin/doinfo
main/branches/prefix/bin/doinitd
main/branches/prefix/bin/doins
main/branches/prefix/bin/dolib
main/branches/prefix/bin/dolib.a
main/branches/prefix/bin/dolib.so
main/branches/prefix/bin/doman
main/branches/prefix/bin/domo
main/branches/prefix/bin/dosbin
main/branches/prefix/bin/dosed
main/branches/prefix/bin/dosym
main/branches/prefix/bin/ecompress
main/branches/prefix/bin/ecompressdir
main/branches/prefix/bin/emake
main/branches/prefix/bin/fowners
main/branches/prefix/bin/fperms
main/branches/prefix/bin/newbin
main/branches/prefix/bin/newconfd
main/branches/prefix/bin/newdoc
main/branches/prefix/bin/newenvd
main/branches/prefix/bin/newexe
main/branches/prefix/bin/newinitd
main/branches/prefix/bin/newins
main/branches/prefix/bin/newlib.a
main/branches/prefix/bin/newlib.so
main/branches/prefix/bin/newman
main/branches/prefix/bin/newsbin
main/branches/prefix/bin/prepall
main/branches/prefix/bin/prepalldocs
main/branches/prefix/bin/prepallinfo
main/branches/prefix/bin/prepallman
main/branches/prefix/bin/prepallstrip
main/branches/prefix/bin/prepinfo
main/branches/prefix/bin/preplib
main/branches/prefix/bin/prepman
main/branches/prefix/bin/prepstrip
main/branches/prefix/bin/sed
Modified:
main/branches/prefix/bin/ebuild-helpers/dobin
main/branches/prefix/bin/ebuild-helpers/doconfd
main/branches/prefix/bin/ebuild-helpers/dodir
main/branches/prefix/bin/ebuild-helpers/dodoc
main/branches/prefix/bin/ebuild-helpers/doenvd
main/branches/prefix/bin/ebuild-helpers/doexe
main/branches/prefix/bin/ebuild-helpers/dohard
main/branches/prefix/bin/ebuild-helpers/dohtml
main/branches/prefix/bin/ebuild-helpers/doinfo
main/branches/prefix/bin/ebuild-helpers/doinitd
main/branches/prefix/bin/ebuild-helpers/doins
main/branches/prefix/bin/ebuild-helpers/dolib
main/branches/prefix/bin/ebuild-helpers/dolib.a
main/branches/prefix/bin/ebuild-helpers/dolib.so
main/branches/prefix/bin/ebuild-helpers/doman
main/branches/prefix/bin/ebuild-helpers/domo
main/branches/prefix/bin/ebuild-helpers/dosbin
main/branches/prefix/bin/ebuild-helpers/dosed
main/branches/prefix/bin/ebuild-helpers/dosym
main/branches/prefix/bin/ebuild-helpers/ecompress
main/branches/prefix/bin/ebuild-helpers/ecompressdir
main/branches/prefix/bin/ebuild-helpers/emake
main/branches/prefix/bin/ebuild-helpers/fowners
main/branches/prefix/bin/ebuild-helpers/fperms
main/branches/prefix/bin/ebuild-helpers/newbin
main/branches/prefix/bin/ebuild-helpers/newconfd
main/branches/prefix/bin/ebuild-helpers/newdoc
main/branches/prefix/bin/ebuild-helpers/newenvd
main/branches/prefix/bin/ebuild-helpers/newexe
main/branches/prefix/bin/ebuild-helpers/newinitd
main/branches/prefix/bin/ebuild-helpers/newins
main/branches/prefix/bin/ebuild-helpers/newlib.a
main/branches/prefix/bin/ebuild-helpers/newlib.so
main/branches/prefix/bin/ebuild-helpers/newman
main/branches/prefix/bin/ebuild-helpers/newsbin
main/branches/prefix/bin/ebuild-helpers/prepall
main/branches/prefix/bin/ebuild-helpers/prepalldocs
main/branches/prefix/bin/ebuild-helpers/prepallinfo
main/branches/prefix/bin/ebuild-helpers/prepallman
main/branches/prefix/bin/ebuild-helpers/prepallstrip
main/branches/prefix/bin/ebuild-helpers/prepinfo
main/branches/prefix/bin/ebuild-helpers/preplib
main/branches/prefix/bin/ebuild-helpers/prepman
main/branches/prefix/bin/ebuild-helpers/prepstrip
main/branches/prefix/bin/ebuild.sh
main/branches/prefix/bin/misc-functions.sh
main/branches/prefix/pym/portage/tests/bin/setup_env.py
Log:
Merged from trunk -r13062:13063
| 13063 | Move ebuild helpers into an ebuild-helpers subdirectory. |
| zmedico | |
Deleted: main/branches/prefix/bin/dobin
===================================================================
--- main/branches/prefix/bin/dobin 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/dobin 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,29 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
-
-if [[ $# -lt 1 ]] ; then
- vecho "$0: at least one argument needed" 1>&2
- exit 1
-fi
-
-if [[ ! -d ${ED}${DESTTREE}/bin ]] ; then
- install -d "${ED}${DESTTREE}/bin" || exit 2
-fi
-
-ret=0
-
-for x in "$@" ; do
- if [[ -e ${x} ]] ; then
- install -m 0755 -o ${PORTAGE_INST_UID:-0} -g ${PORTAGE_INST_GID:-0} "${x}" "${ED}${DESTTREE}/bin"
- else
- echo "!!! ${0##*/}: $x does not exist" 1>&2
- false
- fi
- ((ret+=$?))
-done
-
-exit ${ret}
Deleted: main/branches/prefix/bin/doconfd
===================================================================
--- main/branches/prefix/bin/doconfd 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/doconfd 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,14 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ $# -lt 1 ]] ; then
- echo "$0: at least one argument needed" 1>&2
- exit 1
-fi
-
-exec \
-env \
-INSDESTTREE="/etc/conf.d/" \
-doins "$@"
Deleted: main/branches/prefix/bin/dodir
===================================================================
--- main/branches/prefix/bin/dodir 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/dodir 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,6 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-exec install -d ${DIROPTIONS} "${@/#/${ED}/}"
Deleted: main/branches/prefix/bin/dodoc
===================================================================
--- main/branches/prefix/bin/dodoc 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/dodoc 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,28 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [ $# -lt 1 ] ; then
- source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
- vecho "${0##*/}: at least one argument needed" 1>&2
- exit 1
-fi
-
-dir="${ED}/usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
-if [ ! -d "${dir}" ] ; then
- install -d "${dir}"
-fi
-
-ret=0
-for x in "$@" ; do
- if [ -s "${x}" ] ; then
- install -m0644 "${x}" "${dir}"
- ecompress --queue "${dir}/${x##*/}"
- elif [ ! -e "${x}" ] ; then
- echo "!!! ${0##*/}: $x does not exist" 1>&2
- ((++ret))
- fi
-done
-
-exit ${ret}
Deleted: main/branches/prefix/bin/doenvd
===================================================================
--- main/branches/prefix/bin/doenvd 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/doenvd 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,14 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ $# -lt 1 ]] ; then
- echo "$0: at least one argument needed" 1>&2
- exit 1
-fi
-
-exec \
-env \
-INSDESTTREE="/etc/env.d/" \
-doins "$@"
Deleted: main/branches/prefix/bin/doexe
===================================================================
--- main/branches/prefix/bin/doexe 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/doexe 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,29 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
-
-if [[ $# -lt 1 ]] ; then
- echo "$0: at least one argument needed" 1>&2
- exit 1
-fi
-
-if [[ ! -d ${ED}${_E_EXEDESTTREE_} ]] ; then
- install -d "${ED}${_E_EXEDESTTREE_}"
-fi
-
-for x in "$@" ; do
- if [ -L "${x}" ] ; then
- cp "${x}" "${T}"
- mysrc="${T}"/$(basename "${x}")
- elif [ -d "${x}" ] ; then
- vecho "doexe: warning, skipping directory ${x}"
- continue
- else
- mysrc="${x}"
- fi
- install $EXEOPTIONS "$mysrc" "$ED$_E_EXEDESTTREE_" || \
- echo "!!! ${0##*/}: $mysrc does not exist" 1>&2
-done
Deleted: main/branches/prefix/bin/dohard
===================================================================
--- main/branches/prefix/bin/dohard 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/dohard 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,14 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ $# -ne 2 ]] ; then
- echo "$0: two arguments needed" 1>&2
- exit 1
-fi
-
-destdir=${2%/*}
-[[ ! -d ${ED}${destdir} ]] && dodir "${destdir}"
-
-exec ln -f "${ED}$1" "${ED}$2"
Deleted: main/branches/prefix/bin/dohtml
===================================================================
--- main/branches/prefix/bin/dohtml 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/dohtml 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,186 +0,0 @@
-#!@PORTAGE_PYTHON@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-#
-# Typical usage:
-# dohtml -r docs/*
-# - put all files and directories in docs into /usr/share/doc/${PF}/html
-# dohtml foo.html
-# - put foo.html into /usr/share/doc/${PF}/html
-#
-#
-# Detailed usage:
-# dohtml <list-of-files>
-# - will install the files in the list of files (space-separated list) into
-# /usr/share/doc/${PF}/html, provided the file ends in .htm, .html, .css,
-# .js, ,gif, .jpeg, .jpg, or .png.
-# dohtml -r <list-of-files-and-directories>
-# - will do as 'dohtml', but recurse into all directories, as long as the
-# directory name is not CVS
-# dohtml -A jpe,java [-r] <list-of-files[-and-directories]>
-# - will do as 'dohtml' but add .jpe,.java (default filter list is
-# added to your list)
-# dohtml -a png,gif,html,htm [-r] <list-of-files[-and-directories]>
-# - will do as 'dohtml' but filter on .png,.gif,.html,.htm (default filter
-# list is ignored)
-# dohtml -x CVS,SCCS,RCS -r <list-of-files-and-directories>
-# - will do as 'dohtml -r', but ignore directories named CVS, SCCS, RCS
-#
-
-import os
-import sys
-
-def dodir(path):
- os.spawnlp(os.P_WAIT, "install", "install", "-d", path)
-
-def dofile(src,dst):
- os.spawnlp(os.P_WAIT, "install", "install", "-m0644", src, dst)
-
-def eqawarn(lines):
- cmd = "source '%s/isolated-functions.sh' ; " % \
- os.environ["PORTAGE_BIN_PATH"]
- for line in lines:
- cmd += "eqawarn \"%s\" ; " % line
- os.spawnlp(os.P_WAIT, "bash", "bash", "-c", cmd)
-
-skipped_directories = []
-
-def install(basename, dirname, options, prefix=""):
- fullpath = basename
- if prefix:
- fullpath = prefix + "/" + fullpath
- if dirname:
- fullpath = dirname + "/" + fullpath
-
- if options.DOCDESTTREE:
- destdir = options.ED + "/usr/share/doc/" + options.PF + "/" + options.DOCDESTTREE + "/" + options.doc_prefix + "/" + prefix
- else:
- destdir = options.ED + "/usr/share/doc/" + options.PF + "/html/" + options.doc_prefix + "/" + prefix
-
- if os.path.isfile(fullpath):
- ext = os.path.splitext(basename)[1]
- if (len(ext) and ext[1:] in options.allowed_exts) or basename in options.allowed_files:
- dodir(destdir)
- dofile(fullpath, destdir + "/" + basename)
- elif options.recurse and os.path.isdir(fullpath) and \
- basename not in options.disallowed_dirs:
- for i in os.listdir(fullpath):
- pfx = basename
- if prefix: pfx = prefix + "/" + pfx
- install(i, dirname, options, pfx)
- elif not options.recurse and os.path.isdir(fullpath):
- global skipped_directories
- skipped_directories.append(fullpath)
- return False
- else:
- return False
- return True
-
-
-class OptionsClass:
- def __init__(self):
- self.PF = ""
- self.ED = ""
- self.DOCDESTTREE = ""
-
- if "PF" in os.environ:
- self.PF = os.environ["PF"]
- if os.environ.has_key("ED"):
- self.ED = os.environ["ED"]
- if "_E_DOCDESTTREE_" in os.environ:
- self.DOCDESTTREE = os.environ["_E_DOCDESTTREE_"]
-
- self.allowed_exts = [ 'htm', 'html', 'css', 'js',
- 'gif', 'jpeg', 'jpg', 'png' ]
- self.allowed_files = []
- self.disallowed_dirs = [ 'CVS' ]
- self.recurse = False
- self.verbose = False
- self.doc_prefix = ""
-
-def print_help():
- opts = OptionsClass()
-
- print "dohtml [-a .foo,.bar] [-A .foo,.bar] [-f foo,bar] [-x foo,bar]"
- print " [-r] [-V] <file> [file ...]"
- print
- print " -a Set the list of allowed to those that are specified."
- print " Default:", ",".join(opts.allowed_exts)
- print " -A Extend the list of allowed file types."
- print " -f Set list of allowed extensionless file names."
- print " -x Set directories to be excluded from recursion."
- print " Default:", ",".join(opts.disallowed_dirs)
- print " -p Set a document prefix for installed files (empty by default)."
- print " -r Install files and directories recursively."
- print " -V Be verbose."
- print
-
-def parse_args():
- options = OptionsClass()
- args = []
-
- x = 1
- while x < len(sys.argv):
- arg = sys.argv[x]
- if arg in ["-h","-r","-V"]:
- if arg == "-h":
- print_help()
- sys.exit(0)
- elif arg == "-r":
- options.recurse = True
- elif arg == "-V":
- options.verbose = True
- elif sys.argv[x] in ["-A","-a","-f","-x","-p"]:
- x += 1
- if x == len(sys.argv):
- print_help()
- sys.exit(0)
- elif arg == "-p":
- options.doc_prefix = sys.argv[x]
- else:
- values = sys.argv[x].split(",")
- if arg == "-A":
- options.allowed_exts.extend(values)
- elif arg == "-a":
- options.allowed_exts = values
- elif arg == "-f":
- options.allowed_files = values
- elif arg == "-x":
- options.disallowed_dirs = values
- else:
- args.append(sys.argv[x])
- x += 1
-
- return (options, args)
-
-def main():
-
- (options, args) = parse_args()
-
- if options.verbose:
- print "Allowed extensions:", options.allowed_exts
- print "Document prefix : '" + options.doc_prefix + "'"
- print "Allowed files :", options.allowed_files
-
- success = False
-
- for x in args:
- basename = os.path.basename(x)
- dirname = os.path.dirname(x)
- success |= install(basename, dirname, options)
-
- if success:
- retcode = 0
- else:
- retcode = 1
- global skipped_directories
- for x in skipped_directories:
- eqawarn(["QA Notice: dohtml on directory " + \
- "'%s' without recursion option" % x])
-
- sys.exit(retcode)
-
-if __name__ == "__main__":
- main()
Deleted: main/branches/prefix/bin/doinfo
===================================================================
--- main/branches/prefix/bin/doinfo 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/doinfo 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,22 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ -z $1 ]] ; then
- vecho "${0##*/}: at least one argument needed"
- exit 1
-fi
-
-if [[ ! -d ${ED}usr/share/info ]] ; then
- install -d "${ED}usr/share/info" || exit 1
-fi
-
-install -m0644 "$@" "${ED}usr/share/info"
-rval=$?
-if [ $rval -ne 0 ] ; then
- for x in "$@" ; do
- [ -e "$x" ] || echo "!!! ${0##*/}: $x does not exist" 1>&2
- done
-fi
-exit $rval
Deleted: main/branches/prefix/bin/doinitd
===================================================================
--- main/branches/prefix/bin/doinitd 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/doinitd 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,14 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ $# -lt 1 ]] ; then
- echo "$0: at least one argument needed" 1>&2
- exit 1
-fi
-
-exec \
-env \
-_E_EXEDESTTREE_="/etc/init.d/" \
-doexe "$@"
Deleted: main/branches/prefix/bin/doins
===================================================================
--- main/branches/prefix/bin/doins 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/doins 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,106 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
-
-if [ $# -lt 1 ] ; then
- echo "${0##*/}: at least one argument needed" 1>&2
- exit 1
-fi
-
-if [[ "$1" == "-r" ]] ; then
- DOINSRECUR=y
- shift
-else
- DOINSRECUR=n
-fi
-
-if [[ ${INSDESTTREE#${D}} != "${INSDESTTREE}" ]]; then
- vecho "-------------------------------------------------------" 1>&2
- vecho "You should not use \${D} or \${ED} with helpers." 1>&2
- vecho " --> ${INSDESTTREE}" 1>&2
- vecho "-------------------------------------------------------" 1>&2
- exit 1
-fi
-
-export TMP=$T/.doins_tmp
-# Use separate directories to avoid potential name collisions.
-mkdir -p "$TMP"/{1,2}
-
-if [[ ${INSDESTTREE#${EPREFIX}} != "${INSDESTTREE}" ]]; then
- vecho "-------------------------------------------------------" 1>&2
- vecho "You should not use \${EPREFIX} with helpers." 1>&2
- vecho " --> ${INSDESTTREE}" 1>&2
- vecho "-------------------------------------------------------" 1>&2
- exit 1
-fi
-
-[[ ! -d ${ED}${INSDESTTREE} ]] && dodir "${INSDESTTREE}"
-
-_doins() {
- local mysrc="$1" mydir="$2" cleanup="" rval
-
- if [ -L "$mysrc" ] ; then
- cp "$mysrc" "$TMP/2"
- mysrc="$TMP/2/${mysrc##*/}"
- cleanup=${mysrc}
- fi
-
- install ${INSOPTIONS} "${mysrc}" "${ED}${INSDESTTREE}/${mydir}"
- rval=$?
- [[ -n ${cleanup} ]] && rm -f "${cleanup}"
- [ $rval -ne 0 ] && echo "!!! ${0##*/}: $mysrc does not exist" 1>&2
- return $rval
-}
-
-_xdoins() {
- while read -d $'\0' x ; do
- _doins "$x" "${x%/*}"
- done
-}
-
-success=0
-
-for x in "$@" ; do
- if [ -d "$x" ] ; then
- if [ "${DOINSRECUR}" == "n" ] ; then
- continue
- fi
-
- while [ "$x" != "${x%/}" ] ; do
- x=${x%/}
- done
- if [ "$x" = "${x%/*}" ] ; then
- pushd "$PWD" >/dev/null
- else
- pushd "${x%/*}" >/dev/null
- fi
- x=${x##*/}
- x_orig=$x
- # Follow any symlinks recursively until we've got
- # a normal directory for 'find' to traverse.
- while [ -L "$x" ] ; do
- pushd "$(readlink "$x")" >/dev/null
- x=${PWD##*/}
- pushd "${PWD%/*}" >/dev/null
- done
- if [[ $x != $x_orig ]] ; then
- mv "$x" "$TMP/1/$x_orig"
- pushd "$TMP/1" >/dev/null
- fi
- find "$x_orig" -type d -exec dodir "${INSDESTTREE}/{}" \;
- find "$x_orig" \( -type f -or -type l \) -print0 | _xdoins
- if [[ $x != $x_orig ]] ; then
- popd >/dev/null
- mv "$TMP/1/$x_orig" "$x"
- fi
- while popd >/dev/null 2>&1 ; do true ; done
- ((++success))
- else
- _doins "${x}" && ((++success))
- fi
-done
-rm -rf "$TMP"
-[ $success -gt 0 ] && exit 0 || exit 1
Deleted: main/branches/prefix/bin/dolib
===================================================================
--- main/branches/prefix/bin/dolib 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/dolib 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,41 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Setup ABI cruft
-LIBDIR_VAR="LIBDIR_${ABI}"
-if [[ -n ${ABI} && -n ${!LIBDIR_VAR} ]] ; then
- CONF_LIBDIR=${!LIBDIR_VAR}
-fi
-unset LIBDIR_VAR
-# we need this to default to lib so that things dont break
-CONF_LIBDIR=${CONF_LIBDIR:-lib}
-libdir="${ED}${DESTTREE}/${CONF_LIBDIR}"
-
-
-if [[ $# -lt 1 ]] ; then
- echo "$0: at least one argument needed" 1>&2
- exit 1
-fi
-if [[ ! -d ${libdir} ]] ; then
- install -d "${libdir}" || exit 1
-fi
-
-ret=0
-
-for x in "$@" ; do
- if [[ -e ${x} ]] ; then
- if [[ ! -L ${x} ]] ; then
- install ${LIBOPTIONS} "${x}" "${libdir}"
- else
- ln -s "$(readlink "${x}")" "${libdir}/${x##*/}"
- fi
- else
- echo "!!! ${0##*/}: ${x} does not exist" 1>&2
- false
- fi
- ((ret+=$?))
-done
-
-exit ${ret}
Deleted: main/branches/prefix/bin/dolib.a
===================================================================
--- main/branches/prefix/bin/dolib.a 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/dolib.a 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,7 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-exec env LIBOPTIONS="-m0644" \
- dolib "$@"
Deleted: main/branches/prefix/bin/dolib.so
===================================================================
--- main/branches/prefix/bin/dolib.so 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/dolib.so 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,7 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-exec env LIBOPTIONS="-m0755" \
- dolib "$@"
Deleted: main/branches/prefix/bin/doman
===================================================================
--- main/branches/prefix/bin/doman 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/doman 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,61 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
-
-if [[ $# -lt 1 ]] ; then
- echo "$0: at least one argument needed" 1>&2
- exit 1
-fi
-
-i18n=""
-
-ret=0
-
-for x in "$@" ; do
- if [[ ${x:0:6} == "-i18n=" ]] ; then
- i18n=${x:6}/
- continue
- fi
- if [[ ${x:0:6} == ".keep_" ]] ; then
- continue
- fi
-
- suffix=${x##*.}
-
- # These will be automatically decompressed by ecompressdir.
- if hasq ${suffix} Z gz bz2 ; then
- realname=${x%.*}
- suffix=${realname##*.}
- fi
-
- if ! hasq "${EAPI:-0}" 0 1 && \
- [[ $x =~ (.*)\.([a-z][a-z](_[A-Z][A-Z])?)\.(.*) ]] ; then
- name=${BASH_REMATCH[1]##*/}.${BASH_REMATCH[4]}
- mandir=${BASH_REMATCH[2]}/man${suffix:0:1}
- else
- name=${x##*/}
- mandir=${i18n}man${suffix:0:1}
- fi
-
- if [[ ${mandir} =~ man[0-9n](f|p|pm)?$ ]] ; then
- if [[ -s ${x} ]] ; then
- if [[ ! -d ${ED}/usr/share/man/${mandir} ]] ; then
- install -d "${ED}/usr/share/man/${mandir}"
- fi
-
- install -m0644 "${x}" "${ED}/usr/share/man/${mandir}/${name}"
- ((ret+=$?))
- elif [[ ! -e ${x} ]] ; then
- echo "!!! ${0##*/}: $x does not exist" 1>&2
- ((++ret))
- fi
- else
- vecho "doman: '${x}' is probably not a man page; skipping" 1>&2
- ((++ret))
- fi
-done
-
-exit ${ret}
Deleted: main/branches/prefix/bin/domo
===================================================================
--- main/branches/prefix/bin/domo 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/domo 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,26 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-mynum=${#}
-if [ ${mynum} -lt 1 ] ; then
- echo "${0}: at least one argument needed"
- exit 1
-fi
-if [ ! -d "${ED}${DESTTREE}/share/locale" ] ; then
- install -d "${ED}${DESTTREE}/share/locale/"
-fi
-
-for x in "$@" ; do
- if [ -e "${x}" ] ; then
- mytiny="${x##*/}"
- mydir="${ED}${DESTTREE}/share/locale/${mytiny%.*}/LC_MESSAGES"
- if [ ! -d "${mydir}" ] ; then
- install -d "${mydir}"
- fi
- install -m0644 "${x}" "${mydir}/${MOPREFIX}.mo"
- else
- echo "!!! ${0##*/}: $x does not exist" 1>&2
- fi
-done
Deleted: main/branches/prefix/bin/dosbin
===================================================================
--- main/branches/prefix/bin/dosbin 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/dosbin 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,27 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ $# -lt 1 ]] ; then
- echo "$0: at least one argument needed" 1>&2
- exit 1
-fi
-
-if [[ ! -d ${ED}${DESTTREE}/sbin ]] ; then
- install -d "${ED}${DESTTREE}/sbin" || exit 2
-fi
-
-ret=0
-
-for x in "$@" ; do
- if [[ -e ${x} ]] ; then
- install -m0755 -o ${PORTAGE_INST_UID:-0} -g ${PORTAGE_INST_GID:-0} "${x}" "${ED}${DESTTREE}/sbin"
- else
- echo "!!! ${0##*/}: ${x} does not exist" 1>&2
- false
- fi
- ((ret+=$?))
-done
-
-exit ${ret}
Deleted: main/branches/prefix/bin/dosed
===================================================================
--- main/branches/prefix/bin/dosed 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/dosed 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,36 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ $# -lt 1 ]] ; then
- echo "!!! ${0##*/}: at least one argument needed" >&2
- exit 1
-fi
-
-ret=0
-file_found=0
-mysed="s:${ED}::g"
-
-for x in "$@" ; do
- y=$ED${x#/}
- if [ -e "${y}" ] ; then
- if [ -f "${y}" ] ; then
- file_found=1
- sed -i -e "${mysed}" "${y}"
- else
- echo "${y} is not a regular file!" >&2
- false
- fi
- ((ret+=$?))
- else
- mysed="${x}"
- fi
-done
-
-if [ $file_found = 0 ] ; then
- echo "!!! ${0##*/}: $y does not exist" 1>&2
- ((ret+=1))
-fi
-
-exit $ret
Deleted: main/branches/prefix/bin/dosym
===================================================================
--- main/branches/prefix/bin/dosym 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/dosym 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,18 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ $# -ne 2 ]] ; then
- echo "$0: two arguments needed" 1>&2
- exit 1
-fi
-
-target="${1}"
-linkname="${2}"
-[[ ${target:0:1} == "/" ]] && target="${EPREFIX}${target}"
-destdir=${linkname%/*}
-[[ ! -d ${ED}${destdir} ]] && dodir "${destdir}"
-
-exec ln -snf "${target}" "${ED}/${linkname}"
-
Copied: main/branches/prefix/bin/ebuild-helpers (from rev 13063, main/trunk/bin/ebuild-helpers)
Modified: main/branches/prefix/bin/ebuild-helpers/dobin
===================================================================
--- main/trunk/bin/ebuild-helpers/dobin 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/dobin 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,24 +1,24 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
if [[ $# -lt 1 ]] ; then
vecho "$0: at least one argument needed" 1>&2
exit 1
fi
-if [[ ! -d ${D}${DESTTREE}/bin ]] ; then
- install -d "${D}${DESTTREE}/bin" || exit 2
+if [[ ! -d ${ED}${DESTTREE}/bin ]] ; then
+ install -d "${ED}${DESTTREE}/bin" || exit 2
fi
ret=0
for x in "$@" ; do
if [[ -e ${x} ]] ; then
- install -m0755 -o ${PORTAGE_INST_UID:-0} -g ${PORTAGE_INST_GID:-0} "${x}" "${D}${DESTTREE}/bin"
+ install -m 0755 -o ${PORTAGE_INST_UID:-0} -g ${PORTAGE_INST_GID:-0} "${x}" "${ED}${DESTTREE}/bin"
else
echo "!!! ${0##*/}: $x does not exist" 1>&2
false
Modified: main/branches/prefix/bin/ebuild-helpers/doconfd
===================================================================
--- main/trunk/bin/ebuild-helpers/doconfd 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/doconfd 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
Modified: main/branches/prefix/bin/ebuild-helpers/dodir
===================================================================
--- main/trunk/bin/ebuild-helpers/dodir 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/dodir 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,6 +1,6 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-exec install -d ${DIROPTIONS} "${@/#/${D}/}"
+exec install -d ${DIROPTIONS} "${@/#/${ED}/}"
Modified: main/branches/prefix/bin/ebuild-helpers/dodoc
===================================================================
--- main/trunk/bin/ebuild-helpers/dodoc 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/dodoc 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,15 +1,15 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
if [ $# -lt 1 ] ; then
- source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+ source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
vecho "${0##*/}: at least one argument needed" 1>&2
exit 1
fi
-dir="${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
+dir="${ED}/usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
if [ ! -d "${dir}" ] ; then
install -d "${dir}"
fi
Modified: main/branches/prefix/bin/ebuild-helpers/doenvd
===================================================================
--- main/trunk/bin/ebuild-helpers/doenvd 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/doenvd 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
Modified: main/branches/prefix/bin/ebuild-helpers/doexe
===================================================================
--- main/trunk/bin/ebuild-helpers/doexe 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/doexe 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,29 +1,29 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
if [[ $# -lt 1 ]] ; then
echo "$0: at least one argument needed" 1>&2
exit 1
fi
-if [[ ! -d ${D}${_E_EXEDESTTREE_} ]] ; then
- install -d "${D}${_E_EXEDESTTREE_}"
+if [[ ! -d ${ED}${_E_EXEDESTTREE_} ]] ; then
+ install -d "${ED}${_E_EXEDESTTREE_}"
fi
for x in "$@" ; do
if [ -L "${x}" ] ; then
cp "${x}" "${T}"
- mysrc="${T}"/$(/usr/bin/basename "${x}")
+ mysrc="${T}"/$(basename "${x}")
elif [ -d "${x}" ] ; then
vecho "doexe: warning, skipping directory ${x}"
continue
else
mysrc="${x}"
fi
- install $EXEOPTIONS "$mysrc" "$D$_E_EXEDESTTREE_" || \
+ install $EXEOPTIONS "$mysrc" "$ED$_E_EXEDESTTREE_" || \
echo "!!! ${0##*/}: $mysrc does not exist" 1>&2
done
Modified: main/branches/prefix/bin/ebuild-helpers/dohard
===================================================================
--- main/trunk/bin/ebuild-helpers/dohard 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/dohard 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -9,6 +9,6 @@
fi
destdir=${2%/*}
-[[ ! -d ${D}${destdir} ]] && dodir "${destdir}"
+[[ ! -d ${ED}${destdir} ]] && dodir "${destdir}"
-exec ln -f "${D}$1" "${D}$2"
+exec ln -f "${ED}$1" "${ED}$2"
Modified: main/branches/prefix/bin/ebuild-helpers/dohtml
===================================================================
--- main/trunk/bin/ebuild-helpers/dohtml 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/dohtml 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!@PORTAGE_PYTHON@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -55,9 +55,9 @@
fullpath = dirname + "/" + fullpath
if options.DOCDESTTREE:
- destdir = options.D + "usr/share/doc/" + options.PF + "/" + options.DOCDESTTREE + "/" + options.doc_prefix + "/" + prefix
+ destdir = options.ED + "/usr/share/doc/" + options.PF + "/" + options.DOCDESTTREE + "/" + options.doc_prefix + "/" + prefix
else:
- destdir = options.D + "usr/share/doc/" + options.PF + "/html/" + options.doc_prefix + "/" + prefix
+ destdir = options.ED + "/usr/share/doc/" + options.PF + "/html/" + options.doc_prefix + "/" + prefix
if os.path.isfile(fullpath):
ext = os.path.splitext(basename)[1]
@@ -82,13 +82,13 @@
class OptionsClass:
def __init__(self):
self.PF = ""
- self.D = ""
+ self.ED = ""
self.DOCDESTTREE = ""
if "PF" in os.environ:
self.PF = os.environ["PF"]
- if "D" in os.environ:
- self.D = os.environ["D"]
+ if os.environ.has_key("ED"):
+ self.ED = os.environ["ED"]
if "_E_DOCDESTTREE_" in os.environ:
self.DOCDESTTREE = os.environ["_E_DOCDESTTREE_"]
Modified: main/branches/prefix/bin/ebuild-helpers/doinfo
===================================================================
--- main/trunk/bin/ebuild-helpers/doinfo 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/doinfo 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,11 +8,11 @@
exit 1
fi
-if [[ ! -d ${D}usr/share/info ]] ; then
- install -d "${D}usr/share/info" || exit 1
+if [[ ! -d ${ED}usr/share/info ]] ; then
+ install -d "${ED}usr/share/info" || exit 1
fi
-install -m0644 "$@" "${D}usr/share/info"
+install -m0644 "$@" "${ED}usr/share/info"
rval=$?
if [ $rval -ne 0 ] ; then
for x in "$@" ; do
Modified: main/branches/prefix/bin/ebuild-helpers/doinitd
===================================================================
--- main/trunk/bin/ebuild-helpers/doinitd 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/doinitd 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
Modified: main/branches/prefix/bin/ebuild-helpers/doins
===================================================================
--- main/trunk/bin/ebuild-helpers/doins 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/doins 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
if [ $# -lt 1 ] ; then
echo "${0##*/}: at least one argument needed" 1>&2
@@ -19,7 +19,7 @@
if [[ ${INSDESTTREE#${D}} != "${INSDESTTREE}" ]]; then
vecho "-------------------------------------------------------" 1>&2
- vecho "You should not use \${D} with helpers." 1>&2
+ vecho "You should not use \${D} or \${ED} with helpers." 1>&2
vecho " --> ${INSDESTTREE}" 1>&2
vecho "-------------------------------------------------------" 1>&2
exit 1
@@ -29,8 +29,16 @@
# Use separate directories to avoid potential name collisions.
mkdir -p "$TMP"/{1,2}
-[[ ! -d ${D}${INSDESTTREE} ]] && dodir "${INSDESTTREE}"
+if [[ ${INSDESTTREE#${EPREFIX}} != "${INSDESTTREE}" ]]; then
+ vecho "-------------------------------------------------------" 1>&2
+ vecho "You should not use \${EPREFIX} with helpers." 1>&2
+ vecho " --> ${INSDESTTREE}" 1>&2
+ vecho "-------------------------------------------------------" 1>&2
+ exit 1
+fi
+[[ ! -d ${ED}${INSDESTTREE} ]] && dodir "${INSDESTTREE}"
+
_doins() {
local mysrc="$1" mydir="$2" cleanup="" rval
@@ -40,7 +48,7 @@
cleanup=${mysrc}
fi
- install ${INSOPTIONS} "${mysrc}" "${D}${INSDESTTREE}/${mydir}"
+ install ${INSOPTIONS} "${mysrc}" "${ED}${INSDESTTREE}/${mydir}"
rval=$?
[[ -n ${cleanup} ]] && rm -f "${cleanup}"
[ $rval -ne 0 ] && echo "!!! ${0##*/}: $mysrc does not exist" 1>&2
Modified: main/branches/prefix/bin/ebuild-helpers/dolib
===================================================================
--- main/trunk/bin/ebuild-helpers/dolib 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/dolib 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@
unset LIBDIR_VAR
# we need this to default to lib so that things dont break
CONF_LIBDIR=${CONF_LIBDIR:-lib}
-libdir="${D}${DESTTREE}/${CONF_LIBDIR}"
+libdir="${ED}${DESTTREE}/${CONF_LIBDIR}"
if [[ $# -lt 1 ]] ; then
Modified: main/branches/prefix/bin/ebuild-helpers/dolib.a
===================================================================
--- main/trunk/bin/ebuild-helpers/dolib.a 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/dolib.a 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
Modified: main/branches/prefix/bin/ebuild-helpers/dolib.so
===================================================================
--- main/trunk/bin/ebuild-helpers/dolib.so 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/dolib.so 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
Modified: main/branches/prefix/bin/ebuild-helpers/doman
===================================================================
--- main/trunk/bin/ebuild-helpers/doman 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/doman 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
if [[ $# -lt 1 ]] ; then
echo "$0: at least one argument needed" 1>&2
@@ -40,14 +40,13 @@
mandir=${i18n}man${suffix:0:1}
fi
-
if [[ ${mandir} =~ man[0-9n](f|p|pm)?$ ]] ; then
if [[ -s ${x} ]] ; then
- if [[ ! -d ${D}/usr/share/man/${mandir} ]] ; then
- install -d "${D}/usr/share/man/${mandir}"
+ if [[ ! -d ${ED}/usr/share/man/${mandir} ]] ; then
+ install -d "${ED}/usr/share/man/${mandir}"
fi
- install -m0644 "${x}" "${D}/usr/share/man/${mandir}/${name}"
+ install -m0644 "${x}" "${ED}/usr/share/man/${mandir}/${name}"
((ret+=$?))
elif [[ ! -e ${x} ]] ; then
echo "!!! ${0##*/}: $x does not exist" 1>&2
Modified: main/branches/prefix/bin/ebuild-helpers/domo
===================================================================
--- main/trunk/bin/ebuild-helpers/domo 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/domo 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,14 +8,14 @@
echo "${0}: at least one argument needed"
exit 1
fi
-if [ ! -d "${D}${DESTTREE}/share/locale" ] ; then
- install -d "${D}${DESTTREE}/share/locale/"
+if [ ! -d "${ED}${DESTTREE}/share/locale" ] ; then
+ install -d "${ED}${DESTTREE}/share/locale/"
fi
for x in "$@" ; do
if [ -e "${x}" ] ; then
mytiny="${x##*/}"
- mydir="${D}${DESTTREE}/share/locale/${mytiny%.*}/LC_MESSAGES"
+ mydir="${ED}${DESTTREE}/share/locale/${mytiny%.*}/LC_MESSAGES"
if [ ! -d "${mydir}" ] ; then
install -d "${mydir}"
fi
Modified: main/branches/prefix/bin/ebuild-helpers/dosbin
===================================================================
--- main/trunk/bin/ebuild-helpers/dosbin 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/dosbin 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,15 +8,15 @@
exit 1
fi
-if [[ ! -d ${D}${DESTTREE}/sbin ]] ; then
- install -d "${D}${DESTTREE}/sbin" || exit 2
+if [[ ! -d ${ED}${DESTTREE}/sbin ]] ; then
+ install -d "${ED}${DESTTREE}/sbin" || exit 2
fi
ret=0
for x in "$@" ; do
if [[ -e ${x} ]] ; then
- install -m0755 -o ${PORTAGE_INST_UID:-0} -g ${PORTAGE_INST_GID:-0} "${x}" "${D}${DESTTREE}/sbin"
+ install -m0755 -o ${PORTAGE_INST_UID:-0} -g ${PORTAGE_INST_GID:-0} "${x}" "${ED}${DESTTREE}/sbin"
else
echo "!!! ${0##*/}: ${x} does not exist" 1>&2
false
Modified: main/branches/prefix/bin/ebuild-helpers/dosed
===================================================================
--- main/trunk/bin/ebuild-helpers/dosed 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/dosed 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -10,10 +10,10 @@
ret=0
file_found=0
-mysed="s:${D}::g"
+mysed="s:${ED}::g"
for x in "$@" ; do
- y=$D${x#/}
+ y=$ED${x#/}
if [ -e "${y}" ] ; then
if [ -f "${y}" ] ; then
file_found=1
Modified: main/branches/prefix/bin/ebuild-helpers/dosym
===================================================================
--- main/trunk/bin/ebuild-helpers/dosym 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/dosym 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,7 +8,11 @@
exit 1
fi
-destdir=${2%/*}
-[[ ! -d ${D}${destdir} ]] && dodir "${destdir}"
+target="${1}"
+linkname="${2}"
+[[ ${target:0:1} == "/" ]] && target="${EPREFIX}${target}"
+destdir=${linkname%/*}
+[[ ! -d ${ED}${destdir} ]] && dodir "${destdir}"
-exec ln -snf "$1" "${D}$2"
+exec ln -snf "${target}" "${ED}/${linkname}"
+
Modified: main/branches/prefix/bin/ebuild-helpers/ecompress
===================================================================
--- main/trunk/bin/ebuild-helpers/ecompress 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/ecompress 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
if [[ -z $1 ]] ; then
vecho "${0##*/}: at least one argument needed" 1>&2
@@ -53,10 +53,10 @@
;;
--dequeue)
[[ -n $2 ]] && vecho "${0##*/}: --dequeue takes no additional arguments" 1>&2
- find "${D}" -name '*.ecompress.file' -print0 \
+ find "${ED}" -name '*.ecompress.file' -print0 \
| sed -e 's:\.ecompress\.file::g' \
| ${XARGS} -0 ecompress
- find "${D}" -name '*.ecompress.file' -print0 | ${XARGS} -0 rm -f
+ find "${ED}" -name '*.ecompress.file' -print0 | ${XARGS} -0 rm -f
;;
--*)
vecho "${0##*/}: unknown arguments '$*'" 1>&2
Modified: main/branches/prefix/bin/ebuild-helpers/ecompressdir
===================================================================
--- main/trunk/bin/ebuild-helpers/ecompressdir 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/ecompressdir 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
if [[ -z $1 ]] ; then
vecho "${0##*/}: at least one argument needed" 1>&2
@@ -14,22 +14,22 @@
--ignore)
shift
for skip in "$@" ; do
- [[ -d ${D}${skip} ]] && touch "${D}${skip}.ecompress.skip"
+ [[ -d ${ED}${skip} ]] && touch "${ED}${skip}.ecompress.skip"
done
exit 0
;;
--queue)
shift
set -- "${@/%/.ecompress.dir}"
- set -- "${@/#/${D}}"
+ set -- "${@/#/${ED}}"
exec touch "$@"
;;
--dequeue)
[[ -n $2 ]] && vecho "${0##*/}: --dequeue takes no additional arguments" 1>&2
- find "${D}" -name '*.ecompress.dir' -print0 \
- | sed -e 's:\.ecompress\.dir::g' -e "s:${D}:/:g" \
+ find "${ED}" -name '*.ecompress.dir' -print0 \
+ | sed -e 's:\.ecompress\.dir::g' -e "s:${ED}:/:g" \
| ${XARGS} -0 ecompressdir
- find "${D}" -name '*.ecompress.skip' -print0 | ${XARGS} -0 rm -f
+ find "${ED}" -name '*.ecompress.skip' -print0 | ${XARGS} -0 rm -f
exit 0
;;
--*)
@@ -89,8 +89,8 @@
mv "${src}.ecompress.skip" "${dst}.ecompress.skip"
done
}
-hide_skip_dirs() { _relocate_skip_dirs "${D}" "${T}"/ecompress-skip/ ; }
-restore_skip_dirs() { _relocate_skip_dirs "${T}"/ecompress-skip/ "${D}" ; }
+hide_skip_dirs() { _relocate_skip_dirs "${ED}" "${T}"/ecompress-skip/ ; }
+restore_skip_dirs() { _relocate_skip_dirs "${T}"/ecompress-skip/ "${ED}" ; }
ret=0
@@ -98,9 +98,9 @@
for dir in "$@" ; do
dir=${dir#/}
- dir="${D}${dir}"
+ dir="${ED}${dir}"
if [[ ! -d ${dir} ]] ; then
- vecho "${0##*/}: /${dir#${D}} does not exist!"
+ vecho "${0##*/}: /${dir#${ED}} does not exist!"
continue
fi
cd "${dir}"
Modified: main/branches/prefix/bin/ebuild-helpers/emake
===================================================================
--- main/trunk/bin/ebuild-helpers/emake 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/emake 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -22,4 +22,4 @@
) >&2
fi
-exec ${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE} "$@"
+exec ${MAKE:-make} SHELL="${BASH:-/bin/bash}" ${MAKEOPTS} ${EXTRA_EMAKE} "$@"
Modified: main/branches/prefix/bin/ebuild-helpers/fowners
===================================================================
--- main/trunk/bin/ebuild-helpers/fowners 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/fowners 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,4 +6,4 @@
# we can't prefix all arguments because
# chown takes random options
slash="/"
-exec chown "${@/#${slash}/${D}${slash}}"
+exec chown "${@/#${slash}/${ED}${slash}}"
Modified: main/branches/prefix/bin/ebuild-helpers/fperms
===================================================================
--- main/trunk/bin/ebuild-helpers/fperms 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/fperms 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,4 +6,4 @@
# we can't prefix all arguments because
# chmod takes random options
slash="/"
-exec chmod "${@/#${slash}/${D}${slash}}"
+exec chmod "${@/#${slash}/${ED}${slash}}"
Modified: main/branches/prefix/bin/ebuild-helpers/newbin
===================================================================
--- main/trunk/bin/ebuild-helpers/newbin 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/newbin 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
Modified: main/branches/prefix/bin/ebuild-helpers/newconfd
===================================================================
--- main/trunk/bin/ebuild-helpers/newconfd 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/newconfd 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
Modified: main/branches/prefix/bin/ebuild-helpers/newdoc
===================================================================
--- main/trunk/bin/ebuild-helpers/newdoc 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/newdoc 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
Modified: main/branches/prefix/bin/ebuild-helpers/newenvd
===================================================================
--- main/trunk/bin/ebuild-helpers/newenvd 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/newenvd 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
Modified: main/branches/prefix/bin/ebuild-helpers/newexe
===================================================================
--- main/trunk/bin/ebuild-helpers/newexe 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/newexe 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
Modified: main/branches/prefix/bin/ebuild-helpers/newinitd
===================================================================
--- main/trunk/bin/ebuild-helpers/newinitd 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/newinitd 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
Modified: main/branches/prefix/bin/ebuild-helpers/newins
===================================================================
--- main/trunk/bin/ebuild-helpers/newins 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/newins 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
Modified: main/branches/prefix/bin/ebuild-helpers/newlib.a
===================================================================
--- main/trunk/bin/ebuild-helpers/newlib.a 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/newlib.a 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
Modified: main/branches/prefix/bin/ebuild-helpers/newlib.so
===================================================================
--- main/trunk/bin/ebuild-helpers/newlib.so 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/newlib.so 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
Modified: main/branches/prefix/bin/ebuild-helpers/newman
===================================================================
--- main/trunk/bin/ebuild-helpers/newman 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/newman 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
Modified: main/branches/prefix/bin/ebuild-helpers/newsbin
===================================================================
--- main/trunk/bin/ebuild-helpers/newsbin 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/newsbin 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
Modified: main/branches/prefix/bin/ebuild-helpers/prepall
===================================================================
--- main/trunk/bin/ebuild-helpers/prepall 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/prepall 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,16 +1,16 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
if type -P chflags > /dev/null && type -P mtree > /dev/null ; then
# Save all the file flags for restoration at the end of prepall.
- mtree -c -p "${D}" -k flags > "${T}/bsdflags.mtree"
+ mtree -c -p "${ED}" -k flags > "${T}/bsdflags.mtree"
# Remove all the file flags so that prepall can do anything necessary.
- chflags -R noschg,nouchg,nosappnd,nouappnd "${D}"
- chflags -R nosunlnk,nouunlnk "${D}" 2>/dev/null
+ chflags -R noschg,nouchg,nosappnd,nouappnd "${ED}"
+ chflags -R nosunlnk,nouunlnk "${ED}" 2>/dev/null
fi
prepallman
@@ -20,5 +20,5 @@
if type -P chflags > /dev/null && type -P mtree > /dev/null; then
# Restore all the file flags that were saved at the beginning of prepall.
- mtree -U -e -p "${D}" -k flags < "${T}/bsdflags.mtree" &> /dev/null
+ mtree -U -e -p "${ED}" -k flags < "${T}/bsdflags.mtree" &> /dev/null
fi
Modified: main/branches/prefix/bin/ebuild-helpers/prepalldocs
===================================================================
--- main/trunk/bin/ebuild-helpers/prepalldocs 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/prepalldocs 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,15 +1,15 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
if [[ -n $1 ]] ; then
vecho "${0##*/}: invalid usage; takes no arguments" 1>&2
fi
-cd "${D}"
+cd "${ED}"
[[ -d usr/share/doc ]] || exit 0
ecompressdir --ignore /usr/share/doc/${PF}/html
Modified: main/branches/prefix/bin/ebuild-helpers/prepallinfo
===================================================================
--- main/trunk/bin/ebuild-helpers/prepallinfo 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/prepallinfo 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,10 +1,8 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+[[ ! -d ${ED}usr/share/info ]] && exit 0
-[[ ! -d ${D}usr/share/info ]] && exit 0
-
exec prepinfo
Modified: main/branches/prefix/bin/ebuild-helpers/prepallman
===================================================================
--- main/trunk/bin/ebuild-helpers/prepallman 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/prepallman 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,15 +1,13 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
-
ret=0
-find "${D}" -type d -name man > "${T}"/prepallman.filelist
+find "${ED}" -type d -name man > "${T}"/prepallman.filelist
while read mandir ; do
- mandir=${mandir#${D}}
+ mandir=${mandir#${ED}}
prepman "${mandir%/man}"
((ret+=$?))
done < "${T}"/prepallman.filelist
Modified: main/branches/prefix/bin/ebuild-helpers/prepallstrip
===================================================================
--- main/trunk/bin/ebuild-helpers/prepallstrip 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/prepallstrip 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,6 +1,6 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-exec prepstrip "${D}"
+exec prepstrip "${ED}"
Modified: main/branches/prefix/bin/ebuild-helpers/prepinfo
===================================================================
--- main/trunk/bin/ebuild-helpers/prepinfo 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/prepinfo 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,21 +1,21 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
if [[ -z $1 ]] ; then
- infodir="/usr/share/info"
+ infodir="${EPREFIX}/usr/share/info"
else
- if [[ -d ${D}$1/share/info ]] ; then
- infodir="$1/share/info"
+ if [[ -d ${ED}$1/share/info ]] ; then
+ infodir="${EPREFIX}$1/share/info"
else
- infodir="$1/info"
+ infodir="${EPREFIX}$1/info"
fi
fi
-if [[ ! -d ${D}${infodir} ]] ; then
+if [[ ! -d ${ED}${infodir} ]] ; then
if [[ -n $1 ]] ; then
vecho "${0##*/}: '${infodir}' does not exist!"
exit 1
@@ -24,7 +24,7 @@
fi
fi
-find "${D}${infodir}" -type d -print0 | while read -d $'\0' x ; do
+find "${ED}${infodir}" -type d -print0 | while read -d $'\0' x ; do
rm -f "${x}"/dir{,.info}{,.gz,.bz2}
done
Modified: main/branches/prefix/bin/ebuild-helpers/preplib
===================================================================
--- main/trunk/bin/ebuild-helpers/preplib 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/preplib 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
eqawarn "QA Notice: Deprecated call to 'preplib'"
@@ -19,9 +19,9 @@
fi
if [ -z "$1" ] ; then
- z="${D}usr/${CONF_LIBDIR}"
+ z="${ED}/usr/${CONF_LIBDIR}"
else
- z="${D}$1/${CONF_LIBDIR}"
+ z="${ED}$1/${CONF_LIBDIR}"
fi
if [ -d "${z}" ] ; then
Modified: main/branches/prefix/bin/ebuild-helpers/prepman
===================================================================
--- main/trunk/bin/ebuild-helpers/prepman 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/prepman 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,18 +1,18 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
if [[ -z $1 ]] ; then
- mandir="${D}usr/share/man"
+ mandir="${ED}usr/share/man"
else
- mandir="${D}$1/man"
+ mandir="${ED}$1/man"
fi
if [[ ! -d ${mandir} ]] ; then
- eqawarn "QA Notice: prepman called with non-existent dir '${mandir#${D}}'"
+ eqawarn "QA Notice: prepman called with non-existent dir '${mandir#${ED}}'"
exit 0
fi
@@ -25,6 +25,6 @@
[[ -d ${subdir} ]] && really_is_mandir=1 && break
done
-[[ ${really_is_mandir} == 1 ]] && exec ecompressdir --queue "${mandir#${D}}"
+[[ ${really_is_mandir} == 1 ]] && exec ecompressdir --queue "${mandir#${ED}}"
exit 0
Modified: main/branches/prefix/bin/ebuild-helpers/prepstrip
===================================================================
--- main/trunk/bin/ebuild-helpers/prepstrip 2009-03-12 00:28:45 UTC (rev 13063)
+++ main/branches/prefix/bin/ebuild-helpers/prepstrip 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
banner=false
SKIP_STRIP=false
@@ -48,7 +48,7 @@
local x=$1
local inode=$(inode_var_name "$x")
[[ -n ${!inode} ]] && return 0
- local sources_dir=/usr/src/debug/${CATEGORY}/${PF}
+ local sources_dir=${EPREFIX}/usr/src/debug/${CATEGORY}/${PF}
debugedit -b "${WORKDIR}" -d "${sources_dir}" \
-l "${T}"/debug.sources "${x}"
if [[ -s ${T}/debug.sources ]] ; then
@@ -63,7 +63,7 @@
hasq splitdebug ${FEATURES} || return 0
local x=$1
- local y="${D}usr/lib/debug/${x:${#D}}.debug"
+ local y="${ED}usr/lib/debug/${x:${#D}}.debug"
# dont save debug info twice
[[ ${x} == *".debug" ]] && return 0
@@ -148,6 +148,15 @@
strip_this=false
fi
+ # In Prefix we are usually an unprivileged user, so we can't strip
+ # unwritable objects. Make them temporarily writable for the
+ # stripping.
+ was_not_writable=false
+ if [[ ! -w ${x} ]] ; then
+ was_not_writable=true
+ chmod u+w "${x}"
+ fi
+
# only split debug info for final linked objects
# or kernel modules as debuginfo for intermediatary
# files (think crt*.o from gcc/glibc) is useless and
@@ -155,24 +164,28 @@
# elf types though cause that stuff is good.
if [[ ${f} == *"current ar archive"* ]] ; then
- vecho " ${x:${#D}}"
+ vecho " ${x:${#ED}}"
if ${strip_this} ; then
# hmm, can we split debug/sources for .a ?
${STRIP} -g "${x}"
fi
elif [[ ${f} == *"SB executable"* || ${f} == *"SB shared object"* ]] ; then
- vecho " ${x:${#D}}"
+ vecho " ${x:${#ED}}"
save_elf_sources "${x}"
if ${strip_this} ; then
save_elf_debug "${x}"
${STRIP} ${PORTAGE_STRIP_FLAGS} "${x}"
fi
elif [[ ${f} == *"SB relocatable"* ]] ; then
- vecho " ${x:${#D}}"
+ vecho " ${x:${#ED}}"
save_elf_sources "${x}"
if ${strip_this} ; then
[[ ${x} == *.ko ]] && save_elf_debug "${x}"
${STRIP} ${SAFE_STRIP_FLAGS} "${x}"
fi
fi
+
+ if [[ ${was_not_writable} == "true" ]] ; then
+ chmod u-w "${x}"
+ fi
done
Modified: main/branches/prefix/bin/ebuild.sh
===================================================================
--- main/branches/prefix/bin/ebuild.sh 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/ebuild.sh 2009-03-12 19:37:31 UTC (rev 13095)
@@ -70,7 +70,7 @@
# Unset some variables that break things.
unset GZIP BZIP BZIP2 CDPATH GREP_OPTIONS GREP_COLOR GLOBIGNORE
-export PATH="${DEFAULT_PATH}:${PORTAGE_BIN_PATH}:${ROOTPATH}"
+export PATH="${DEFAULT_PATH}:$PORTAGE_BIN_PATH/ebuild-helpers:${ROOTPATH}"
[ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH"
source "${PORTAGE_BIN_PATH}/isolated-functions.sh" &>/dev/null
Deleted: main/branches/prefix/bin/ecompress
===================================================================
--- main/branches/prefix/bin/ecompress 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/ecompress 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,92 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
-
-if [[ -z $1 ]] ; then
- vecho "${0##*/}: at least one argument needed" 1>&2
- exit 1
-fi
-
-# setup compression stuff
-PORTAGE_COMPRESS=${PORTAGE_COMPRESS-bzip2}
-[[ -z ${PORTAGE_COMPRESS} ]] && exit 0
-
-if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
- case ${PORTAGE_COMPRESS} in
- bzip2|gzip) PORTAGE_COMPRESS_FLAGS="-9";;
- esac
-fi
-
-case $1 in
- --suffix)
- [[ -n $2 ]] && vecho "${0##*/}: --suffix takes no additional arguments" 1>&2
-
- if [[ ! -e ${T}/.ecompress.suffix ]] ; then
- set -e
- tmpdir="${T}"/.ecompress$$.${RANDOM}
- mkdir "${tmpdir}"
- cd "${tmpdir}"
- # we have to fill the file enough so that there is something
- # to compress as some programs will refuse to do compression
- # if it cannot actually compress the file
- echo {0..1000} > compressme
- ${PORTAGE_COMPRESS} ${PORTAGE_COMPRESS_FLAGS} compressme > /dev/null
- suffix=$(ls compressme*)
- suffix=${suffix#compressme}
- cd /
- rm -rf "${tmpdir}"
- echo "${suffix}" > "${T}/.ecompress.suffix"
- fi
- cat "${T}/.ecompress.suffix"
- ;;
- --bin)
- [[ -n $2 ]] && vecho "${0##*/}: --bin takes no additional arguments" 1>&2
-
- echo "${PORTAGE_COMPRESS} ${PORTAGE_COMPRESS_FLAGS}"
- ;;
- --queue)
- shift
- exec touch "${@/%/.ecompress.file}"
- ;;
- --dequeue)
- [[ -n $2 ]] && vecho "${0##*/}: --dequeue takes no additional arguments" 1>&2
- find "${ED}" -name '*.ecompress.file' -print0 \
- | sed -e 's:\.ecompress\.file::g' \
- | ${XARGS} -0 ecompress
- find "${ED}" -name '*.ecompress.file' -print0 | ${XARGS} -0 rm -f
- ;;
- --*)
- vecho "${0##*/}: unknown arguments '$*'" 1>&2
- exit 1
- ;;
- *)
- mask_ext_re=""
- set -f
- for x in $PORTAGE_COMPRESS_EXCLUDE_SUFFIXES ; do
- mask_ext_re+="|$x"
- done
- set +f
- mask_ext_re="^(${mask_ext_re:1})\$"
- declare -a filtered_args=()
- i=0
- for x in "$@" ; do
- [[ ${x##*.} =~ $mask_ext_re ]] && continue
- filtered_args[$i]=$x
- (( i++ ))
- done
- [ $i -eq 0 ] && exit 0
- set -- "${filtered_args[@]}"
-
- # If a compressed version of the file already exists, simply
- # delete it so that the compressor doesn't whine (bzip2 will
- # complain and skip, gzip will prompt for input)
- suffix=$(ecompress --suffix)
- [[ -n ${suffix} ]] && echo -n "${@/%/${suffix}$'\001'}" | \
- tr '\001' '\000' | ${XARGS} -0 rm -f
- # Finally, let's actually do some real work
- exec "${PORTAGE_COMPRESS}" ${PORTAGE_COMPRESS_FLAGS} "$@"
- ;;
-esac
Deleted: main/branches/prefix/bin/ecompressdir
===================================================================
--- main/branches/prefix/bin/ecompressdir 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/ecompressdir 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,136 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
-
-if [[ -z $1 ]] ; then
- vecho "${0##*/}: at least one argument needed" 1>&2
- exit 1
-fi
-
-case $1 in
- --ignore)
- shift
- for skip in "$@" ; do
- [[ -d ${ED}${skip} ]] && touch "${ED}${skip}.ecompress.skip"
- done
- exit 0
- ;;
- --queue)
- shift
- set -- "${@/%/.ecompress.dir}"
- set -- "${@/#/${ED}}"
- exec touch "$@"
- ;;
- --dequeue)
- [[ -n $2 ]] && vecho "${0##*/}: --dequeue takes no additional arguments" 1>&2
- find "${ED}" -name '*.ecompress.dir' -print0 \
- | sed -e 's:\.ecompress\.dir::g' -e "s:${ED}:/:g" \
- | ${XARGS} -0 ecompressdir
- find "${ED}" -name '*.ecompress.skip' -print0 | ${XARGS} -0 rm -f
- exit 0
- ;;
- --*)
- vecho "${0##*/}: unknown arguments '$*'"
- exit 1
- ;;
-esac
-
-# figure out the new suffix
-suffix=$(ecompress --suffix)
-
-# funk_up_dir(action, suffix, binary)
-# - action: compress or decompress
-# - suffix: the compression suffix to work with
-# - binary: the program to execute that'll compress/decompress
-# The directory we act on is implied in the ${dir} variable
-funk_up_dir() {
- local act=$1 suffix=$2 binary=$3
-
- local negate=""
- [[ ${act} == "compress" ]] && negate="!"
-
- # first we act on all the files
- find "${dir}" -type f ${negate} -iname '*'${suffix} -print0 | ${XARGS} -0 ${binary}
- ((ret+=$?))
-
- find "${dir}" -type l -print0 | \
- while read -d $'\0' brokenlink ; do
- [[ -e ${brokenlink} ]] && continue
- olddest=$(readlink "${brokenlink}")
- [[ ${act} == "compress" ]] \
- && newdest="${olddest}${suffix}" \
- || newdest="${olddest%${suffix}}"
- rm -f "${brokenlink}"
- [[ ${act} == "compress" ]] \
- && ln -snf "${newdest}" "${brokenlink}${suffix}" \
- || ln -snf "${newdest}" "${brokenlink%${suffix}}"
- ((ret+=$?))
- done
-}
-
-# _relocate_skip_dirs(srctree, dsttree)
-# Move all the directories we want to skip running compression
-# on from srctree to dsttree.
-_relocate_skip_dirs() {
- local srctree="$1" dsttree="$2"
-
- [[ -d ${srctree} ]] || return 0
-
- find "${srctree}" -name '*.ecompress.skip' -print0 | \
- while read -d $'\0' src ; do
- src=${src%.ecompress.skip}
- dst="${dsttree}${src#${srctree}}"
- parent=${dst%/*}
- mkdir -p "${parent}"
- mv "${src}" "${dst}"
- mv "${src}.ecompress.skip" "${dst}.ecompress.skip"
- done
-}
-hide_skip_dirs() { _relocate_skip_dirs "${ED}" "${T}"/ecompress-skip/ ; }
-restore_skip_dirs() { _relocate_skip_dirs "${T}"/ecompress-skip/ "${ED}" ; }
-
-ret=0
-
-rm -rf "${T}"/ecompress-skip
-
-for dir in "$@" ; do
- dir=${dir#/}
- dir="${ED}${dir}"
- if [[ ! -d ${dir} ]] ; then
- vecho "${0##*/}: /${dir#${ED}} does not exist!"
- continue
- fi
- cd "${dir}"
- actual_dir=${dir}
- dir=. # use relative path to avoid 'Argument list too long' errors
-
- # hide all the stuff we want to skip
- hide_skip_dirs "${dir}"
-
- # since we've been requested to compress the whole dir,
- # delete any individual queued requests
- rm -f "${actual_dir}.ecompress.dir"
- find "${dir}" -type f -name '*.ecompress.file' -print0 | ${XARGS} -0 rm -f
-
- # not uncommon for packages to compress doc files themselves
- funk_up_dir "decompress" ".Z" "gunzip -f"
- funk_up_dir "decompress" ".gz" "gunzip -f"
- funk_up_dir "decompress" ".bz2" "bunzip2 -f"
-
- # forcibly break all hard links as some compressors whine about it
- find "${dir}" -type f -links +1 -exec env file="{}" sh -c \
- 'cp -p "${file}" "${file}.ecompress.break" ; mv -f "${file}.ecompress.break" "${file}"' \;
-
- # now lets do our work
- [[ -z ${suffix} ]] && continue
- vecho "${0##*/}: $(ecompress --bin) /${actual_dir#${D}}"
- funk_up_dir "compress" "${suffix}" "ecompress"
-
- # finally, restore the skipped stuff
- restore_skip_dirs
-done
-
-exit ${ret}
Deleted: main/branches/prefix/bin/emake
===================================================================
--- main/branches/prefix/bin/emake 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/emake 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,25 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-#
-# emake: Supplies some default parameters to GNU make. At the moment the
-# only parameter supplied is -jN, where N is a number of
-# parallel processes that should be ideal for the running host
-# (e.g. on a single-CPU machine, N=2). The MAKEOPTS variable
-# is set in /etc/make.globals. We don't source
-# /etc/make.globals here because emake is only called from an
-# ebuild.
-
-if [[ $PORTAGE_QUIET != 1 ]] ; then
- (
- for arg in ${MAKE:-make} $MAKEOPTS $EXTRA_EMAKE "$@" ; do
- [[ ${arg} == *" "* ]] \
- && printf "'%s' " "${arg}" \
- || printf "%s " "${arg}"
- done
- printf "\n"
- ) >&2
-fi
-
-exec ${MAKE:-make} SHELL="${BASH:-/bin/bash}" ${MAKEOPTS} ${EXTRA_EMAKE} "$@"
Deleted: main/branches/prefix/bin/fowners
===================================================================
--- main/branches/prefix/bin/fowners 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/fowners 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,9 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# we can't prefix all arguments because
-# chown takes random options
-slash="/"
-exec chown "${@/#${slash}/${ED}${slash}}"
Deleted: main/branches/prefix/bin/fperms
===================================================================
--- main/branches/prefix/bin/fperms 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/fperms 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,9 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# we can't prefix all arguments because
-# chmod takes random options
-slash="/"
-exec chmod "${@/#${slash}/${ED}${slash}}"
Modified: main/branches/prefix/bin/misc-functions.sh
===================================================================
--- main/branches/prefix/bin/misc-functions.sh 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/misc-functions.sh 2009-03-12 19:37:31 UTC (rev 13095)
@@ -503,7 +503,8 @@
abort="yes"
fi
done
- f=$(cat "${PORTAGE_LOG_FILE}" | check-implicit-pointer-usage.py)
+ f=$(cat "${PORTAGE_LOG_FILE}" | \
+ "$PORTAGE_BIN_PATH"/check-implicit-pointer-usage.py)
if [[ -n ${f} ]] ; then
# In the future this will be a forced "die". In preparation,
Deleted: main/branches/prefix/bin/newbin
===================================================================
--- main/branches/prefix/bin/newbin 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/newbin 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,18 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
- echo "$0: Need two arguments, old file and new file" 1>&2
- exit 1
-fi
-
-if [ ! -e "$1" ] ; then
- echo "!!! ${0##*/}: $1 does not exist" 1>&2
- exit 1
-fi
-
-rm -rf "${T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
-exec dobin "${T}/${2}"
Deleted: main/branches/prefix/bin/newconfd
===================================================================
--- main/branches/prefix/bin/newconfd 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/newconfd 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,18 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
- echo "$0: Need two arguments, old file and new file" 1>&2
- exit 1
-fi
-
-if [ ! -e "$1" ] ; then
- echo "!!! ${0##*/}: $1 does not exist" 1>&2
- exit 1
-fi
-
-rm -rf "${T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
-exec doconfd "${T}/${2}"
Deleted: main/branches/prefix/bin/newdoc
===================================================================
--- main/branches/prefix/bin/newdoc 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/newdoc 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,18 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
- echo "$0: Need two arguments, old file and new file" 1>&2
- exit 1
-fi
-
-if [ ! -e "$1" ] ; then
- echo "!!! ${0##*/}: $1 does not exist" 1>&2
- exit 1
-fi
-
-rm -rf "${T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
-exec dodoc "${T}/${2}"
Deleted: main/branches/prefix/bin/newenvd
===================================================================
--- main/branches/prefix/bin/newenvd 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/newenvd 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,18 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
- echo "$0: Need two arguments, old file and new file" 1>&2
- exit 1
-fi
-
-if [ ! -e "$1" ] ; then
- echo "!!! ${0##*/}: $1 does not exist" 1>&2
- exit 1
-fi
-
-rm -rf "${T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
-exec doenvd "${T}/${2}"
Deleted: main/branches/prefix/bin/newexe
===================================================================
--- main/branches/prefix/bin/newexe 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/newexe 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,18 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
- echo "$0: Need two arguments, old file and new file" 1>&2
- exit 1
-fi
-
-if [ ! -e "$1" ] ; then
- echo "!!! ${0##*/}: $1 does not exist" 1>&2
- exit 1
-fi
-
-rm -rf "${T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
-exec doexe "${T}/${2}"
Deleted: main/branches/prefix/bin/newinitd
===================================================================
--- main/branches/prefix/bin/newinitd 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/newinitd 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,18 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
- echo "$0: Need two arguments, old file and new file" 1>&2
- exit 1
-fi
-
-if [ ! -e "$1" ] ; then
- echo "!!! ${0##*/}: $1 does not exist" 1>&2
- exit 1
-fi
-
-rm -rf "${T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
-exec doinitd "${T}/${2}"
Deleted: main/branches/prefix/bin/newins
===================================================================
--- main/branches/prefix/bin/newins 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/newins 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,21 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
- echo "$0: Need two arguments, old file and new file" 1>&2
- exit 1
-fi
-
-if [ ! -e "$1" ] ; then
- echo "!!! ${0##*/}: $1 does not exist" 1>&2
- exit 1
-fi
-
-rm -rf "${T}/${2}" || exit $?
-cp -f "${1}" "${T}/${2}" || exit $?
-doins "${T}/${2}"
-ret=$?
-rm -rf "${T}/${2}"
-exit $ret
Deleted: main/branches/prefix/bin/newlib.a
===================================================================
--- main/branches/prefix/bin/newlib.a 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/newlib.a 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,18 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
- echo "$0: Need two arguments, old file and new file" 1>&2
- exit 1
-fi
-
-if [ ! -e "$1" ] ; then
- echo "!!! ${0##*/}: $1 does not exist" 1>&2
- exit 1
-fi
-
-rm -rf "${T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
-exec dolib.a "${T}/${2}"
Deleted: main/branches/prefix/bin/newlib.so
===================================================================
--- main/branches/prefix/bin/newlib.so 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/newlib.so 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,18 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
- echo "$0: Need two arguments, old file and new file" 1>&2
- exit 1
-fi
-
-if [ ! -e "$1" ] ; then
- echo "!!! ${0##*/}: $1 does not exist" 1>&2
- exit 1
-fi
-
-rm -rf "${T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
-exec dolib.so "${T}/${2}"
Deleted: main/branches/prefix/bin/newman
===================================================================
--- main/branches/prefix/bin/newman 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/newman 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,18 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
- echo "$0: Need two arguments, old file and new file" 1>&2
- exit 1
-fi
-
-if [ ! -e "$1" ] ; then
- echo "!!! ${0##*/}: $1 does not exist" 1>&2
- exit 1
-fi
-
-rm -rf "${T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
-exec doman "${T}/${2}"
Deleted: main/branches/prefix/bin/newsbin
===================================================================
--- main/branches/prefix/bin/newsbin 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/newsbin 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,18 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
- echo "$0: Need two arguments, old file and new file" 1>&2
- exit 1
-fi
-
-if [ ! -e "$1" ] ; then
- echo "!!! ${0##*/}: $1 does not exist" 1>&2
- exit 1
-fi
-
-rm -rf "${T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
-exec dosbin "${T}/${2}"
Deleted: main/branches/prefix/bin/prepall
===================================================================
--- main/branches/prefix/bin/prepall 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/prepall 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,24 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
-
-if type -P chflags > /dev/null && type -P mtree > /dev/null ; then
- # Save all the file flags for restoration at the end of prepall.
- mtree -c -p "${ED}" -k flags > "${T}/bsdflags.mtree"
- # Remove all the file flags so that prepall can do anything necessary.
- chflags -R noschg,nouchg,nosappnd,nouappnd "${ED}"
- chflags -R nosunlnk,nouunlnk "${ED}" 2>/dev/null
-fi
-
-prepallman
-prepallinfo
-
-prepallstrip
-
-if type -P chflags > /dev/null && type -P mtree > /dev/null; then
- # Restore all the file flags that were saved at the beginning of prepall.
- mtree -U -e -p "${ED}" -k flags < "${T}/bsdflags.mtree" &> /dev/null
-fi
Deleted: main/branches/prefix/bin/prepalldocs
===================================================================
--- main/branches/prefix/bin/prepalldocs 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/prepalldocs 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,16 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
-
-if [[ -n $1 ]] ; then
- vecho "${0##*/}: invalid usage; takes no arguments" 1>&2
-fi
-
-cd "${ED}"
-[[ -d usr/share/doc ]] || exit 0
-
-ecompressdir --ignore /usr/share/doc/${PF}/html
-ecompressdir --queue /usr/share/doc
Deleted: main/branches/prefix/bin/prepallinfo
===================================================================
--- main/branches/prefix/bin/prepallinfo 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/prepallinfo 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,8 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-[[ ! -d ${ED}usr/share/info ]] && exit 0
-
-exec prepinfo
Deleted: main/branches/prefix/bin/prepallman
===================================================================
--- main/branches/prefix/bin/prepallman 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/prepallman 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,15 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-ret=0
-
-find "${ED}" -type d -name man > "${T}"/prepallman.filelist
-while read mandir ; do
- mandir=${mandir#${ED}}
- prepman "${mandir%/man}"
- ((ret+=$?))
-done < "${T}"/prepallman.filelist
-
-exit ${ret}
Deleted: main/branches/prefix/bin/prepallstrip
===================================================================
--- main/branches/prefix/bin/prepallstrip 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/prepallstrip 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,6 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-exec prepstrip "${ED}"
Deleted: main/branches/prefix/bin/prepinfo
===================================================================
--- main/branches/prefix/bin/prepinfo 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/prepinfo 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,31 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
-
-if [[ -z $1 ]] ; then
- infodir="${EPREFIX}/usr/share/info"
-else
- if [[ -d ${ED}$1/share/info ]] ; then
- infodir="${EPREFIX}$1/share/info"
- else
- infodir="${EPREFIX}$1/info"
- fi
-fi
-
-if [[ ! -d ${ED}${infodir} ]] ; then
- if [[ -n $1 ]] ; then
- vecho "${0##*/}: '${infodir}' does not exist!"
- exit 1
- else
- exit 0
- fi
-fi
-
-find "${ED}${infodir}" -type d -print0 | while read -d $'\0' x ; do
- rm -f "${x}"/dir{,.info}{,.gz,.bz2}
-done
-
-exec ecompressdir --queue "${infodir}"
Deleted: main/branches/prefix/bin/preplib
===================================================================
--- main/branches/prefix/bin/preplib 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/preplib 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,29 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
-
-eqawarn "QA Notice: Deprecated call to 'preplib'"
-
-LIBDIR_VAR="LIBDIR_${ABI}"
-if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
- CONF_LIBDIR="${!LIBDIR_VAR}"
-fi
-unset LIBDIR_VAR
-
-if [ -z "${CONF_LIBDIR}" ]; then
- # we need this to default to lib so that things dont break
- CONF_LIBDIR="lib"
-fi
-
-if [ -z "$1" ] ; then
- z="${ED}/usr/${CONF_LIBDIR}"
-else
- z="${ED}$1/${CONF_LIBDIR}"
-fi
-
-if [ -d "${z}" ] ; then
- ldconfig -n -N "${z}"
-fi
Deleted: main/branches/prefix/bin/prepman
===================================================================
--- main/branches/prefix/bin/prepman 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/prepman 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,30 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
-
-if [[ -z $1 ]] ; then
- mandir="${ED}usr/share/man"
-else
- mandir="${ED}$1/man"
-fi
-
-if [[ ! -d ${mandir} ]] ; then
- eqawarn "QA Notice: prepman called with non-existent dir '${mandir#${ED}}'"
- exit 0
-fi
-
-shopt -s nullglob
-
-really_is_mandir=0
-
-# use some heuristics to test if this is a real mandir
-for subdir in "${mandir}"/man* "${mandir}"/*/man* ; do
- [[ -d ${subdir} ]] && really_is_mandir=1 && break
-done
-
-[[ ${really_is_mandir} == 1 ]] && exec ecompressdir --queue "${mandir#${ED}}"
-
-exit 0
Deleted: main/branches/prefix/bin/prepstrip
===================================================================
--- main/branches/prefix/bin/prepstrip 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/prepstrip 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,191 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
-
-banner=false
-SKIP_STRIP=false
-if hasq nostrip ${FEATURES} || \
- hasq strip ${RESTRICT}
-then
- SKIP_STRIP=true
- banner=true
- hasq installsources ${FEATURES} || exit 0
-fi
-
-STRIP=${STRIP:-${CHOST}-strip}
-type -P -- ${STRIP} > /dev/null || STRIP=strip
-OBJCOPY=${OBJCOPY:-${CHOST}-objcopy}
-type -P -- ${OBJCOPY} > /dev/null || OBJCOPY=objcopy
-
-# We'll leave out -R .note for now until we can check out the relevance
-# of the section when it has the ALLOC flag set on it ...
-export SAFE_STRIP_FLAGS="--strip-unneeded"
-export PORTAGE_STRIP_FLAGS=${PORTAGE_STRIP_FLAGS-${SAFE_STRIP_FLAGS} -R .comment}
-
-if hasq installsources ${FEATURES} && ! type -P debugedit >/dev/null ; then
- ewarn "FEATURES=installsources is enabled but the debugedit binary could not"
- ewarn "be found. This feature will not work unless debugedit is installed!"
-fi
-
-unset ${!INODE_*}
-
-inode_var_name() {
- if [[ $USERLAND = BSD ]] ; then
- stat -f 'INODE_%d_%i' "$1"
- else
- stat -c 'INODE_%d_%i' "$1"
- fi
-}
-
-save_elf_sources() {
- hasq installsources ${FEATURES} || return 0
- hasq installsources ${RESTRICT} && return 0
- type -P debugedit >/dev/null || return 0
-
- local x=$1
- local inode=$(inode_var_name "$x")
- [[ -n ${!inode} ]] && return 0
- local sources_dir=${EPREFIX}/usr/src/debug/${CATEGORY}/${PF}
- debugedit -b "${WORKDIR}" -d "${sources_dir}" \
- -l "${T}"/debug.sources "${x}"
- if [[ -s ${T}/debug.sources ]] ; then
- [[ -d ${D}${sources_dir} ]] || mkdir -p "${D}${sources_dir}"
- grep -zv '/<built-in>$' "${T}"/debug.sources | \
- (cd "${WORKDIR}"; LANG=C sort -z -u | \
- rsync -rtL0 --files-from=- "${WORKDIR}/" "${D}${sources_dir}/" )
- fi
-}
-
-save_elf_debug() {
- hasq splitdebug ${FEATURES} || return 0
-
- local x=$1
- local y="${ED}usr/lib/debug/${x:${#D}}.debug"
-
- # dont save debug info twice
- [[ ${x} == *".debug" ]] && return 0
-
- # this will recompute the build-id, but for now that's ok
- local buildid="$( type -P debugedit >/dev/null && debugedit -i "${x}" )"
-
- mkdir -p $(dirname "${y}")
-
- local inode=$(inode_var_name "$x")
- if [[ -n ${!inode} ]] ; then
- ln "${D}usr/lib/debug/${!inode:${#D}}.debug" "$y"
- else
- eval $inode=\$x
- ${OBJCOPY} --only-keep-debug "${x}" "${y}"
- ${OBJCOPY} --add-gnu-debuglink="${y}" "${x}"
- [[ -g ${x} ]] && chmod go-r "${y}"
- [[ -u ${x} ]] && chmod go-r "${y}"
- chmod a-x,o-w "${y}"
- fi
-
- if [[ -n ${buildid} ]] ; then
- local buildid_dir="${D}usr/lib/debug/.build-id/${buildid:0:2}"
- local buildid_file="${buildid_dir}/${buildid:2}"
- mkdir -p "${buildid_dir}"
- ln -s "../../${x:${#D}}.debug" "${buildid_file}.debug"
- ln -s "/${x:${#D}}" "${buildid_file}"
- fi
-}
-
-# The existance of the section .symtab tells us that a binary is stripped.
-# We want to log already stripped binaries, as this may be a QA violation.
-# They prevent us from getting the splitdebug data.
-if ! hasq binchecks ${RESTRICT} && \
- ! hasq strip ${RESTRICT} ; then
- log=$T/scanelf-already-stripped.log
- scanelf -yqRBF '#k%F' -k '!.symtab' "$@" | sed -e "s#^$D##" > "$log"
- if [[ -n $QA_PRESTRIPPED && -s $log && \
- ${QA_STRICT_PRESTRIPPED-unset} = unset ]] ; then
- shopts=$-
- set -o noglob
- for x in $QA_PRESTRIPPED ; do
- sed -e "s#^${x#/}\$##" -i "$log"
- done
- set +o noglob
- set -$shopts
- fi
- sed -e "/^\$/d" -e "s#^#/#" -i "$log"
- if [[ -s $log ]] ; then
- vecho -e "\a\n"
- eqawarn "QA Notice: Pre-stripped files found:"
- eqawarn "$(<"$log")"
- else
- rm -f "$log"
- fi
-fi
-
-# Now we look for unstripped binaries.
-for x in \
- $(scanelf -yqRBF '#k%F' -k '.symtab' "$@") \
- $(find "$@" -type f -name '*.a')
-do
- if ! ${banner} ; then
- vecho "strip: ${STRIP} ${PORTAGE_STRIP_FLAGS}"
- banner=true
- fi
-
- f=$(file "${x}") || continue
- [[ -z ${f} ]] && continue
-
- if ! ${SKIP_STRIP} ; then
- # The noglob funk is to support STRIP_MASK="/*/booga" and to keep
- # the for loop from expanding the globs.
- # The eval echo is to support STRIP_MASK="/*/{booga,bar}" sex.
- set -o noglob
- strip_this=true
- for m in $(eval echo ${STRIP_MASK}) ; do
- [[ /${x#${D}} == ${m} ]] && strip_this=false && break
- done
- set +o noglob
- else
- strip_this=false
- fi
-
- # In Prefix we are usually an unprivileged user, so we can't strip
- # unwritable objects. Make them temporarily writable for the
- # stripping.
- was_not_writable=false
- if [[ ! -w ${x} ]] ; then
- was_not_writable=true
- chmod u+w "${x}"
- fi
-
- # only split debug info for final linked objects
- # or kernel modules as debuginfo for intermediatary
- # files (think crt*.o from gcc/glibc) is useless and
- # actually causes problems. install sources for all
- # elf types though cause that stuff is good.
-
- if [[ ${f} == *"current ar archive"* ]] ; then
- vecho " ${x:${#ED}}"
- if ${strip_this} ; then
- # hmm, can we split debug/sources for .a ?
- ${STRIP} -g "${x}"
- fi
- elif [[ ${f} == *"SB executable"* || ${f} == *"SB shared object"* ]] ; then
- vecho " ${x:${#ED}}"
- save_elf_sources "${x}"
- if ${strip_this} ; then
- save_elf_debug "${x}"
- ${STRIP} ${PORTAGE_STRIP_FLAGS} "${x}"
- fi
- elif [[ ${f} == *"SB relocatable"* ]] ; then
- vecho " ${x:${#ED}}"
- save_elf_sources "${x}"
- if ${strip_this} ; then
- [[ ${x} == *.ko ]] && save_elf_debug "${x}"
- ${STRIP} ${SAFE_STRIP_FLAGS} "${x}"
- fi
- fi
-
- if [[ ${was_not_writable} == "true" ]] ; then
- chmod u-w "${x}"
- fi
-done
Deleted: main/branches/prefix/bin/sed
===================================================================
--- main/branches/prefix/bin/sed 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/bin/sed 2009-03-12 19:37:31 UTC (rev 13095)
@@ -1,28 +0,0 @@
-#!@PORTAGE_BASH@
-# Copyright 2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-scriptpath=${BASH_SOURCE[0]}
-scriptname=${scriptpath##*/}
-
-if [[ sed == ${scriptname} ]] && [[ -n ${ESED} ]]; then
- exec ${ESED} "$@"
-elif type -P g${scriptname} > /dev/null ; then
- exec g${scriptname} "$@"
-else
- old_IFS="${IFS}"
- IFS=":"
-
- for path in $PATH; do
- [[ ${path}/${scriptname} == ${scriptpath} ]] && continue
- if [[ -x ${path}/${scriptname} ]]; then
- exec ${path}/${scriptname} "$@"
- exit 0
- fi
- done
-
- IFS="${old_IFS}"
-fi
-
-exit 1
Modified: main/branches/prefix/pym/portage/tests/bin/setup_env.py
===================================================================
--- main/branches/prefix/pym/portage/tests/bin/setup_env.py 2009-03-12 19:21:56 UTC (rev 13094)
+++ main/branches/prefix/pym/portage/tests/bin/setup_env.py 2009-03-12 19:37:31 UTC (rev 13095)
@@ -9,7 +9,8 @@
from portage.process import spawn
from portage.const import PORTAGE_BIN_PATH
-bindir = join(dirname(dirname(abspath(__file__))), "..", "..", "..", "bin")
+bindir = join(dirname(dirname(abspath(__file__))),
+ "..", "..", "..", "bin", "ebuild-helpers")
basedir = join(dirname(dirname(abspath(__file__))), "bin", "root")
os.environ["D"] = os.path.join(basedir, "image")
os.environ["T"] = os.path.join(basedir, "temp")
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-03-12 19:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-12 19:37 [gentoo-commits] portage r13095 - in main/branches/prefix: bin bin/ebuild-helpers pym/portage/tests/bin Fabian Groffen (grobian)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox