Move ebuild helpers into an ebuild-helpers subdirectory.

svn path=/main/trunk/; revision=13063

49 files changed, 6 insertions, 3 deletions

diff --git a/bin/dobin b/bin/ebuild-helpers/dobin
index 958a37fee..958a37fee 100755
--- a/bin/dobin
+++ b/bin/ebuild-helpers/dobin
diff --git a/bin/doconfd b/bin/ebuild-helpers/doconfd
index 9952ec0f6..9952ec0f6 100755
--- a/bin/doconfd
+++ b/bin/ebuild-helpers/doconfd
diff --git a/bin/dodir b/bin/ebuild-helpers/dodir
index 1902c6f38..1902c6f38 100755
--- a/bin/dodir
+++ b/bin/ebuild-helpers/dodir
diff --git a/bin/dodoc b/bin/ebuild-helpers/dodoc
index adf49d04f..adf49d04f 100755
--- a/bin/dodoc
+++ b/bin/ebuild-helpers/dodoc
diff --git a/bin/doenvd b/bin/ebuild-helpers/doenvd
index eb7dcd720..eb7dcd720 100755
--- a/bin/doenvd
+++ b/bin/ebuild-helpers/doenvd
diff --git a/bin/doexe b/bin/ebuild-helpers/doexe
index 6e72c1c75..6e72c1c75 100755
--- a/bin/doexe
+++ b/bin/ebuild-helpers/doexe
diff --git a/bin/dohard b/bin/ebuild-helpers/dohard
index dfd7bd341..dfd7bd341 100755
--- a/bin/dohard
+++ b/bin/ebuild-helpers/dohard
diff --git a/bin/dohtml b/bin/ebuild-helpers/dohtml
index 1c707bdfd..1c707bdfd 100755
--- a/bin/dohtml
+++ b/bin/ebuild-helpers/dohtml
diff --git a/bin/doinfo b/bin/ebuild-helpers/doinfo
index 1c9e7cc07..1c9e7cc07 100755
--- a/bin/doinfo
+++ b/bin/ebuild-helpers/doinfo
diff --git a/bin/doinitd b/bin/ebuild-helpers/doinitd
index 0f1af9406..0f1af9406 100755
--- a/bin/doinitd
+++ b/bin/ebuild-helpers/doinitd
diff --git a/bin/doins b/bin/ebuild-helpers/doins
index 8c06bfd9a..8c06bfd9a 100755
--- a/bin/doins
+++ b/bin/ebuild-helpers/doins
diff --git a/bin/dolib b/bin/ebuild-helpers/dolib
index 6c6628bda..6c6628bda 100755
--- a/bin/dolib
+++ b/bin/ebuild-helpers/dolib
diff --git a/bin/dolib.a b/bin/ebuild-helpers/dolib.a
index 3ef57d2fb..3ef57d2fb 100755
--- a/bin/dolib.a
+++ b/bin/ebuild-helpers/dolib.a
diff --git a/bin/dolib.so b/bin/ebuild-helpers/dolib.so
index e4d477f60..e4d477f60 100755
--- a/bin/dolib.so
+++ b/bin/ebuild-helpers/dolib.so
diff --git a/bin/doman b/bin/ebuild-helpers/doman
index 48abc39fd..48abc39fd 100755
--- a/bin/doman
+++ b/bin/ebuild-helpers/doman
diff --git a/bin/domo b/bin/ebuild-helpers/domo
index a7ba5775a..a7ba5775a 100755
--- a/bin/domo
+++ b/bin/ebuild-helpers/domo
diff --git a/bin/dosbin b/bin/ebuild-helpers/dosbin
index c9e85c0b8..c9e85c0b8 100755
--- a/bin/dosbin
+++ b/bin/ebuild-helpers/dosbin
diff --git a/bin/dosed b/bin/ebuild-helpers/dosed
index abcb15a79..abcb15a79 100755
--- a/bin/dosed
+++ b/bin/ebuild-helpers/dosed
diff --git a/bin/dosym b/bin/ebuild-helpers/dosym
index da31246cb..da31246cb 100755
--- a/bin/dosym
+++ b/bin/ebuild-helpers/dosym
diff --git a/bin/ecompress b/bin/ebuild-helpers/ecompress
index 6fdde5719..6fdde5719 100755
--- a/bin/ecompress
+++ b/bin/ebuild-helpers/ecompress
diff --git a/bin/ecompressdir b/bin/ebuild-helpers/ecompressdir
index 4dd35e549..4dd35e549 100755
--- a/bin/ecompressdir
+++ b/bin/ebuild-helpers/ecompressdir
diff --git a/bin/emake b/bin/ebuild-helpers/emake
index 18d8f089c..18d8f089c 100755
--- a/bin/emake
+++ b/bin/ebuild-helpers/emake
diff --git a/bin/fowners b/bin/ebuild-helpers/fowners
index 766266a13..766266a13 100755
--- a/bin/fowners
+++ b/bin/ebuild-helpers/fowners
diff --git a/bin/fperms b/bin/ebuild-helpers/fperms
index 1d5326ec9..1d5326ec9 100755
--- a/bin/fperms
+++ b/bin/ebuild-helpers/fperms
diff --git a/bin/newbin b/bin/ebuild-helpers/newbin
index 905b2802e..905b2802e 100755
--- a/bin/newbin
+++ b/bin/ebuild-helpers/newbin
diff --git a/bin/newconfd b/bin/ebuild-helpers/newconfd
index 6d57a343c..6d57a343c 100755
--- a/bin/newconfd
+++ b/bin/ebuild-helpers/newconfd
diff --git a/bin/newdoc b/bin/ebuild-helpers/newdoc
index 331bf0d02..331bf0d02 100755
--- a/bin/newdoc
+++ b/bin/ebuild-helpers/newdoc
diff --git a/bin/newenvd b/bin/ebuild-helpers/newenvd
index 2c03e3738..2c03e3738 100755
--- a/bin/newenvd
+++ b/bin/ebuild-helpers/newenvd
diff --git a/bin/newexe b/bin/ebuild-helpers/newexe
index 32d7d9293..32d7d9293 100755
--- a/bin/newexe
+++ b/bin/ebuild-helpers/newexe
diff --git a/bin/newinitd b/bin/ebuild-helpers/newinitd
index 7ab89ae0b..7ab89ae0b 100755
--- a/bin/newinitd
+++ b/bin/ebuild-helpers/newinitd
diff --git a/bin/newins b/bin/ebuild-helpers/newins
index f235835a2..f235835a2 100755
--- a/bin/newins
+++ b/bin/ebuild-helpers/newins
diff --git a/bin/newlib.a b/bin/ebuild-helpers/newlib.a
index ddcb1af25..ddcb1af25 100755
--- a/bin/newlib.a
+++ b/bin/ebuild-helpers/newlib.a
diff --git a/bin/newlib.so b/bin/ebuild-helpers/newlib.so
index eb23d2675..eb23d2675 100755
--- a/bin/newlib.so
+++ b/bin/ebuild-helpers/newlib.so
diff --git a/bin/newman b/bin/ebuild-helpers/newman
index 2d278aedd..2d278aedd 100755
--- a/bin/newman
+++ b/bin/ebuild-helpers/newman
diff --git a/bin/newsbin b/bin/ebuild-helpers/newsbin
index cfe754501..cfe754501 100755
--- a/bin/newsbin
+++ b/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
index eec5c814c..eec5c814c 100755
--- a/bin/prepall
+++ b/bin/ebuild-helpers/prepall
diff --git a/bin/prepalldocs b/bin/ebuild-helpers/prepalldocs
index c9509d1ff..c9509d1ff 100755
--- a/bin/prepalldocs
+++ b/bin/ebuild-helpers/prepalldocs
diff --git a/bin/prepallinfo b/bin/ebuild-helpers/prepallinfo
index af95bbfce..af95bbfce 100755
--- a/bin/prepallinfo
+++ b/bin/ebuild-helpers/prepallinfo
diff --git a/bin/prepallman b/bin/ebuild-helpers/prepallman
index 747ed1fac..747ed1fac 100755
--- a/bin/prepallman
+++ b/bin/ebuild-helpers/prepallman
diff --git a/bin/prepallstrip b/bin/ebuild-helpers/prepallstrip
index 178ded797..178ded797 100755
--- a/bin/prepallstrip
+++ b/bin/ebuild-helpers/prepallstrip
diff --git a/bin/prepinfo b/bin/ebuild-helpers/prepinfo
index 582f41fed..582f41fed 100755
--- a/bin/prepinfo
+++ b/bin/ebuild-helpers/prepinfo
diff --git a/bin/preplib b/bin/ebuild-helpers/preplib
index 71446316a..71446316a 100755
--- a/bin/preplib
+++ b/bin/ebuild-helpers/preplib
diff --git a/bin/prepman b/bin/ebuild-helpers/prepman
index af6ad1f82..af6ad1f82 100755
--- a/bin/prepman
+++ b/bin/ebuild-helpers/prepman
diff --git a/bin/prepstrip b/bin/ebuild-helpers/prepstrip
index 977ccec7f..977ccec7f 100755
--- a/bin/prepstrip
+++ b/bin/ebuild-helpers/prepstrip
diff --git a/bin/sed b/bin/ebuild-helpers/sed
index 6fc545002..6fc545002 100755
--- a/bin/sed
+++ b/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")