From fd2f2a80bd918091b8828e1e8f7de94aae2904d5 Mon Sep 17 00:00:00 2001
From: Brian Harring <ferringb@gentoo.org>
Date: Wed, 28 Sep 2005 04:45:41 +0000
Subject: bye bye global portageq's.

svn path=/main/branches/2.0/; revision=2033
---
 ChangeLog     |  4 ++++
 bin/ebuild.sh | 21 +++------------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a6288b32d..52fe1fcb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
     2. /var/cache/edb/world is now /var/lib/portage/world.
     3. /etc/portage/profile/virtuals is _USER_ configs only.
 
+  27 Sep 2005; Brian Harring <ferringb@gentoo.org> bin/ebuild.sh:
+  No more portageq in the global scope.
+  Instant die.
+
   27 Sep 2005; Brian Harring <ferringb@gentoo.org> bin/ebuild.sh:
   Tweak to make EAPI work for existing vdb entries.
 
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 967fe4ced..58713f9d2 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -182,12 +182,7 @@ hasq() {
 
 has_version() {
 	if [ "${EBUILD_PHASE}" == "depend" ]; then
-		echo -n "QA Notice: has_version() in global scope: " >&2
-		if [ ${ECLASS_DEPTH} -gt 0 ]; then
-			echo "eclass ${ECLASS}" >&2
-		else
-			echo "${CATEGORY}/${PF}" >&2
-		fi
+		die "portageq calls (has_version calls portageq) are not allowed in the global scope"
 	fi
 	# return shell-true/shell-false if exists.
 	# Takes single depend-type atoms.
@@ -200,12 +195,7 @@ has_version() {
 
 portageq() {
 	if [ "${EBUILD_PHASE}" == "depend" ]; then
-		echo -n "QA Notice: portageq in global scope: " >&2
-		if [ ${ECLASS_DEPTH} -gt 0 ]; then
-			echo "eclass ${ECLASS}" >&2
-		else
-			echo "${CATEGORY}/${PF}" >&2
-		fi
+		die "portageq calls are not allowed in the global scope"
 	fi
 	/usr/lib/portage/bin/portageq "$@"
 }
@@ -218,12 +208,7 @@ portageq() {
 
 best_version() {
 	if [ "${EBUILD_PHASE}" == "depend" ]; then
-		echo -n "QA Notice: best_version() in global scope: " >&2
-		if [ ${ECLASS_DEPTH} -gt 0 ]; then
-			echo "eclass ${ECLASS}" >&2
-		else
-			echo "${CATEGORY}/${PF}" >&2
-		fi
+		die "portageq calls (best_version calls portageq) are not allowed in the global scope"
 	fi
 	# returns the best/most-current match.
 	# Takes single depend-type atoms.
-- 
cgit v1.2.3-1-g7c22