From aacb5d3be42eb354596ca19db836bd3085bc2da9 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 12 Mar 2009 05:55:37 +0000
Subject: [PATCH] Move ebuild helpers into an ebuild-helpers subdirectory.
 (trunk r13063)

svn path=/main/branches/2.1.6/; revision=13077
---
 bin/{ => ebuild-helpers}/dobin        | 0
 bin/{ => ebuild-helpers}/doconfd      | 0
 bin/{ => ebuild-helpers}/dodir        | 0
 bin/{ => ebuild-helpers}/dodoc        | 0
 bin/{ => ebuild-helpers}/doenvd       | 0
 bin/{ => ebuild-helpers}/doexe        | 0
 bin/{ => ebuild-helpers}/dohard       | 0
 bin/{ => ebuild-helpers}/dohtml       | 0
 bin/{ => ebuild-helpers}/doinfo       | 0
 bin/{ => ebuild-helpers}/doinitd      | 0
 bin/{ => ebuild-helpers}/doins        | 0
 bin/{ => ebuild-helpers}/dolib        | 0
 bin/{ => ebuild-helpers}/dolib.a      | 0
 bin/{ => ebuild-helpers}/dolib.so     | 0
 bin/{ => ebuild-helpers}/doman        | 0
 bin/{ => ebuild-helpers}/domo         | 0
 bin/{ => ebuild-helpers}/dosbin       | 0
 bin/{ => ebuild-helpers}/dosed        | 0
 bin/{ => ebuild-helpers}/dosym        | 0
 bin/{ => ebuild-helpers}/ecompress    | 0
 bin/{ => ebuild-helpers}/ecompressdir | 0
 bin/{ => ebuild-helpers}/emake        | 0
 bin/{ => ebuild-helpers}/fowners      | 0
 bin/{ => ebuild-helpers}/fperms       | 0
 bin/{ => ebuild-helpers}/newbin       | 0
 bin/{ => ebuild-helpers}/newconfd     | 0
 bin/{ => ebuild-helpers}/newdoc       | 0
 bin/{ => ebuild-helpers}/newenvd      | 0
 bin/{ => ebuild-helpers}/newexe       | 0
 bin/{ => ebuild-helpers}/newinitd     | 0
 bin/{ => ebuild-helpers}/newins       | 0
 bin/{ => ebuild-helpers}/newlib.a     | 0
 bin/{ => ebuild-helpers}/newlib.so    | 0
 bin/{ => ebuild-helpers}/newman       | 0
 bin/{ => ebuild-helpers}/newsbin      | 0
 bin/ebuild-helpers/portageq           | 1 +
 bin/{ => ebuild-helpers}/prepall      | 0
 bin/{ => ebuild-helpers}/prepalldocs  | 0
 bin/{ => ebuild-helpers}/prepallinfo  | 0
 bin/{ => ebuild-helpers}/prepallman   | 0
 bin/{ => ebuild-helpers}/prepallstrip | 0
 bin/{ => ebuild-helpers}/prepinfo     | 0
 bin/{ => ebuild-helpers}/preplib      | 0
 bin/{ => ebuild-helpers}/prepman      | 0
 bin/{ => ebuild-helpers}/prepstrip    | 0
 bin/{ => ebuild-helpers}/sed          | 0
 bin/ebuild.sh                         | 2 +-
 bin/misc-functions.sh                 | 3 ++-
 pym/portage/tests/bin/setup_env.py    | 3 ++-
 49 files changed, 6 insertions(+), 3 deletions(-)
 rename bin/{ => ebuild-helpers}/dobin (100%)
 rename bin/{ => ebuild-helpers}/doconfd (100%)
 rename bin/{ => ebuild-helpers}/dodir (100%)
 rename bin/{ => ebuild-helpers}/dodoc (100%)
 rename bin/{ => ebuild-helpers}/doenvd (100%)
 rename bin/{ => ebuild-helpers}/doexe (100%)
 rename bin/{ => ebuild-helpers}/dohard (100%)
 rename bin/{ => ebuild-helpers}/dohtml (100%)
 rename bin/{ => ebuild-helpers}/doinfo (100%)
 rename bin/{ => ebuild-helpers}/doinitd (100%)
 rename bin/{ => ebuild-helpers}/doins (100%)
 rename bin/{ => ebuild-helpers}/dolib (100%)
 rename bin/{ => ebuild-helpers}/dolib.a (100%)
 rename bin/{ => ebuild-helpers}/dolib.so (100%)
 rename bin/{ => ebuild-helpers}/doman (100%)
 rename bin/{ => ebuild-helpers}/domo (100%)
 rename bin/{ => ebuild-helpers}/dosbin (100%)
 rename bin/{ => ebuild-helpers}/dosed (100%)
 rename bin/{ => ebuild-helpers}/dosym (100%)
 rename bin/{ => ebuild-helpers}/ecompress (100%)
 rename bin/{ => ebuild-helpers}/ecompressdir (100%)
 rename bin/{ => ebuild-helpers}/emake (100%)
 rename bin/{ => ebuild-helpers}/fowners (100%)
 rename bin/{ => ebuild-helpers}/fperms (100%)
 rename bin/{ => ebuild-helpers}/newbin (100%)
 rename bin/{ => ebuild-helpers}/newconfd (100%)
 rename bin/{ => ebuild-helpers}/newdoc (100%)
 rename bin/{ => ebuild-helpers}/newenvd (100%)
 rename bin/{ => ebuild-helpers}/newexe (100%)
 rename bin/{ => ebuild-helpers}/newinitd (100%)
 rename bin/{ => ebuild-helpers}/newins (100%)
 rename bin/{ => ebuild-helpers}/newlib.a (100%)
 rename bin/{ => ebuild-helpers}/newlib.so (100%)
 rename bin/{ => ebuild-helpers}/newman (100%)
 rename bin/{ => ebuild-helpers}/newsbin (100%)
 create mode 120000 bin/ebuild-helpers/portageq
 rename bin/{ => ebuild-helpers}/prepall (100%)
 rename bin/{ => ebuild-helpers}/prepalldocs (100%)
 rename bin/{ => ebuild-helpers}/prepallinfo (100%)
 rename bin/{ => ebuild-helpers}/prepallman (100%)
 rename bin/{ => ebuild-helpers}/prepallstrip (100%)
 rename bin/{ => ebuild-helpers}/prepinfo (100%)
 rename bin/{ => ebuild-helpers}/preplib (100%)
 rename bin/{ => ebuild-helpers}/prepman (100%)
 rename bin/{ => ebuild-helpers}/prepstrip (100%)
 rename bin/{ => ebuild-helpers}/sed (100%)

diff --git a/bin/dobin b/bin/ebuild-helpers/dobin
similarity index 100%
rename from bin/dobin
rename to bin/ebuild-helpers/dobin
diff --git a/bin/doconfd b/bin/ebuild-helpers/doconfd
similarity index 100%
rename from bin/doconfd
rename to bin/ebuild-helpers/doconfd
diff --git a/bin/dodir b/bin/ebuild-helpers/dodir
similarity index 100%
rename from bin/dodir
rename to bin/ebuild-helpers/dodir
diff --git a/bin/dodoc b/bin/ebuild-helpers/dodoc
similarity index 100%
rename from bin/dodoc
rename to bin/ebuild-helpers/dodoc
diff --git a/bin/doenvd b/bin/ebuild-helpers/doenvd
similarity index 100%
rename from bin/doenvd
rename to bin/ebuild-helpers/doenvd
diff --git a/bin/doexe b/bin/ebuild-helpers/doexe
similarity index 100%
rename from bin/doexe
rename to bin/ebuild-helpers/doexe
diff --git a/bin/dohard b/bin/ebuild-helpers/dohard
similarity index 100%
rename from bin/dohard
rename to bin/ebuild-helpers/dohard
diff --git a/bin/dohtml b/bin/ebuild-helpers/dohtml
similarity index 100%
rename from bin/dohtml
rename to bin/ebuild-helpers/dohtml
diff --git a/bin/doinfo b/bin/ebuild-helpers/doinfo
similarity index 100%
rename from bin/doinfo
rename to bin/ebuild-helpers/doinfo
diff --git a/bin/doinitd b/bin/ebuild-helpers/doinitd
similarity index 100%
rename from bin/doinitd
rename to bin/ebuild-helpers/doinitd
diff --git a/bin/doins b/bin/ebuild-helpers/doins
similarity index 100%
rename from bin/doins
rename to bin/ebuild-helpers/doins
diff --git a/bin/dolib b/bin/ebuild-helpers/dolib
similarity index 100%
rename from bin/dolib
rename to bin/ebuild-helpers/dolib
diff --git a/bin/dolib.a b/bin/ebuild-helpers/dolib.a
similarity index 100%
rename from bin/dolib.a
rename to bin/ebuild-helpers/dolib.a
diff --git a/bin/dolib.so b/bin/ebuild-helpers/dolib.so
similarity index 100%
rename from bin/dolib.so
rename to bin/ebuild-helpers/dolib.so
diff --git a/bin/doman b/bin/ebuild-helpers/doman
similarity index 100%
rename from bin/doman
rename to bin/ebuild-helpers/doman
diff --git a/bin/domo b/bin/ebuild-helpers/domo
similarity index 100%
rename from bin/domo
rename to bin/ebuild-helpers/domo
diff --git a/bin/dosbin b/bin/ebuild-helpers/dosbin
similarity index 100%
rename from bin/dosbin
rename to bin/ebuild-helpers/dosbin
diff --git a/bin/dosed b/bin/ebuild-helpers/dosed
similarity index 100%
rename from bin/dosed
rename to bin/ebuild-helpers/dosed
diff --git a/bin/dosym b/bin/ebuild-helpers/dosym
similarity index 100%
rename from bin/dosym
rename to bin/ebuild-helpers/dosym
diff --git a/bin/ecompress b/bin/ebuild-helpers/ecompress
similarity index 100%
rename from bin/ecompress
rename to bin/ebuild-helpers/ecompress
diff --git a/bin/ecompressdir b/bin/ebuild-helpers/ecompressdir
similarity index 100%
rename from bin/ecompressdir
rename to bin/ebuild-helpers/ecompressdir
diff --git a/bin/emake b/bin/ebuild-helpers/emake
similarity index 100%
rename from bin/emake
rename to bin/ebuild-helpers/emake
diff --git a/bin/fowners b/bin/ebuild-helpers/fowners
similarity index 100%
rename from bin/fowners
rename to bin/ebuild-helpers/fowners
diff --git a/bin/fperms b/bin/ebuild-helpers/fperms
similarity index 100%
rename from bin/fperms
rename to bin/ebuild-helpers/fperms
diff --git a/bin/newbin b/bin/ebuild-helpers/newbin
similarity index 100%
rename from bin/newbin
rename to bin/ebuild-helpers/newbin
diff --git a/bin/newconfd b/bin/ebuild-helpers/newconfd
similarity index 100%
rename from bin/newconfd
rename to bin/ebuild-helpers/newconfd
diff --git a/bin/newdoc b/bin/ebuild-helpers/newdoc
similarity index 100%
rename from bin/newdoc
rename to bin/ebuild-helpers/newdoc
diff --git a/bin/newenvd b/bin/ebuild-helpers/newenvd
similarity index 100%
rename from bin/newenvd
rename to bin/ebuild-helpers/newenvd
diff --git a/bin/newexe b/bin/ebuild-helpers/newexe
similarity index 100%
rename from bin/newexe
rename to bin/ebuild-helpers/newexe
diff --git a/bin/newinitd b/bin/ebuild-helpers/newinitd
similarity index 100%
rename from bin/newinitd
rename to bin/ebuild-helpers/newinitd
diff --git a/bin/newins b/bin/ebuild-helpers/newins
similarity index 100%
rename from bin/newins
rename to bin/ebuild-helpers/newins
diff --git a/bin/newlib.a b/bin/ebuild-helpers/newlib.a
similarity index 100%
rename from bin/newlib.a
rename to bin/ebuild-helpers/newlib.a
diff --git a/bin/newlib.so b/bin/ebuild-helpers/newlib.so
similarity index 100%
rename from bin/newlib.so
rename to bin/ebuild-helpers/newlib.so
diff --git a/bin/newman b/bin/ebuild-helpers/newman
similarity index 100%
rename from bin/newman
rename to bin/ebuild-helpers/newman
diff --git a/bin/newsbin b/bin/ebuild-helpers/newsbin
similarity index 100%
rename from bin/newsbin
rename to bin/ebuild-helpers/newsbin
diff --git a/bin/ebuild-helpers/portageq b/bin/ebuild-helpers/portageq
new file mode 120000
index 000000000..4d1273c48
--- /dev/null
+++ b/bin/ebuild-helpers/portageq
@@ -0,0 +1 @@
+../portageq
\ No newline at end of file
diff --git a/bin/prepall b/bin/ebuild-helpers/prepall
similarity index 100%
rename from bin/prepall
rename to bin/ebuild-helpers/prepall
diff --git a/bin/prepalldocs b/bin/ebuild-helpers/prepalldocs
similarity index 100%
rename from bin/prepalldocs
rename to bin/ebuild-helpers/prepalldocs
diff --git a/bin/prepallinfo b/bin/ebuild-helpers/prepallinfo
similarity index 100%
rename from bin/prepallinfo
rename to bin/ebuild-helpers/prepallinfo
diff --git a/bin/prepallman b/bin/ebuild-helpers/prepallman
similarity index 100%
rename from bin/prepallman
rename to bin/ebuild-helpers/prepallman
diff --git a/bin/prepallstrip b/bin/ebuild-helpers/prepallstrip
similarity index 100%
rename from bin/prepallstrip
rename to bin/ebuild-helpers/prepallstrip
diff --git a/bin/prepinfo b/bin/ebuild-helpers/prepinfo
similarity index 100%
rename from bin/prepinfo
rename to bin/ebuild-helpers/prepinfo
diff --git a/bin/preplib b/bin/ebuild-helpers/preplib
similarity index 100%
rename from bin/preplib
rename to bin/ebuild-helpers/preplib
diff --git a/bin/prepman b/bin/ebuild-helpers/prepman
similarity index 100%
rename from bin/prepman
rename to bin/ebuild-helpers/prepman
diff --git a/bin/prepstrip b/bin/ebuild-helpers/prepstrip
similarity index 100%
rename from bin/prepstrip
rename to bin/ebuild-helpers/prepstrip
diff --git a/bin/sed b/bin/ebuild-helpers/sed
similarity index 100%
rename from bin/sed
rename to bin/ebuild-helpers/sed
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 9d3428349..23f1c447f 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -70,7 +70,7 @@ unalias -a
 # Unset some variables that break things.
 unset GZIP BZIP BZIP2 CDPATH GREP_OPTIONS GREP_COLOR GLOBIGNORE
 
-export PATH="/usr/local/sbin:/sbin:/usr/sbin:${PORTAGE_BIN_PATH}:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}"
+export PATH="/usr/local/sbin:/sbin:/usr/sbin:$PORTAGE_BIN_PATH/ebuild-helpers:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}"
 [ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH"
 
 source "${PORTAGE_BIN_PATH}/isolated-functions.sh"  &>/dev/null
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index c29852309..e5de71340 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -382,7 +382,8 @@ install_qa_check() {
 				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,
diff --git a/pym/portage/tests/bin/setup_env.py b/pym/portage/tests/bin/setup_env.py
index 388428a7c..727f02e7b 100644
--- a/pym/portage/tests/bin/setup_env.py
+++ b/pym/portage/tests/bin/setup_env.py
@@ -9,7 +9,8 @@ from portage.tests import TestCase
 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")
-- 
2.26.2