From 621217038b1af9708382062ff8c4a1cb95c788bf Mon Sep 17 00:00:00 2001
From: Kito <kito@gentoo.org>
Date: Sat, 3 Dec 2005 21:24:05 +0000
Subject: [PATCH] More updates from trunk...wheee.

svn path=/main/branches/prefix/; revision=2336
---
 bin/dodoc    | 4 ++++
 bin/ebuild   | 6 ++++--
 bin/portageq | 4 ++--
 bin/quickpkg | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bin/dodoc b/bin/dodoc
index 0caad88f0..aefec427f 100755
--- a/bin/dodoc
+++ b/bin/dodoc
@@ -13,11 +13,15 @@ if [ ! -d "${dir}" ] ; then
 	install -d "${dir}"
 fi
 
+ret=0
 for x in "$@" ; do
 	if [ -s "${x}" ] ; then
 		install -m0644 "${x}" "${dir}"
 		gzip -f -9 "${dir}/${x##*/}"
 	elif [ ! -e "${x}" ] ; then
 		echo "dodoc: ${x} does not exist" 1>&2
+		((++ret))
 	fi
 done
+
+exit ${ret}
diff --git a/bin/ebuild b/bin/ebuild
index 0ab526983..d495e9d0a 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -5,8 +5,10 @@
 
 import getopt, os, sys
 
-if len(sys.argv)<=2:
-	print "expecting two arguments."
+if len(sys.argv) <= 2:
+	print "Usage: ebuild <ebuild file> <command> [command] ..."
+	print ""
+	print "See the ebuild(1) man page for more info"
 	sys.exit(1)
 
 
diff --git a/bin/portageq b/bin/portageq
index 17a81a223..e37dabcfe 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -202,7 +202,7 @@ def envvar(argv):
 # DO NOT CHANGE CODE BEYOND THIS POINT - IT'S NOT NEEDED!
 #
 
-def usage():
+def usage(argv):
 	rev="$Revision: 1.13.2.1 $"
 	ver=string.split(rev, ' ')[1]
 	print ">>> Portage information query tool -- version "+ver
@@ -239,7 +239,7 @@ def usage():
 
 def main():
 	if (len(sys.argv) < 2):
-		usage()
+		usage(sys.argv)
 		sys.exit()
 	
 	cmd = sys.argv[1]
diff --git a/bin/quickpkg b/bin/quickpkg
index a02e66e5e..45df6a193 100755
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -37,7 +37,7 @@ fi
 export PKGDIR=$(portageq envvar PKGDIR)
 export PORTAGE_TMPDIR=$(portageq envvar PORTAGE_TMPDIR)
 
-source @PORTAGE_BASE@/bin/isolated-functions.sh
+source @PORTAGE_BASE@/sbin/functions.sh
 
 # here we make a package given a little info
 # $1 = package-name w/version
-- 
2.26.2