From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 17 Aug 2010 04:52:31 +0000 (-0700)
Subject: For ebuilds from $ROOT/var/db/pkg, don't give /var/db/pkg with the
X-Git-Tag: v2.2_rc68~137
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fc1eae78e3f086da4ce8fb32504b7a3d615d054c;p=portage.git

For ebuilds from $ROOT/var/db/pkg, don't give /var/db/pkg with the
"Appending /var/db/pkg to PORTDIR_OVERLAY..." treatment.
---

diff --git a/bin/ebuild b/bin/ebuild
index 617cad355..658652f5a 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -74,6 +74,7 @@ from portage import _encodings
 from portage import _shell_quote
 from portage import _unicode_decode
 from portage import _unicode_encode
+from portage.const import VDB_PATH
 
 if not opts.ignore_default_opts:
 	default_opts = portage.settings.get("EBUILD_DEFAULT_OPTS", "").split()
@@ -129,9 +130,11 @@ ebuild = portage.normalize_path(ebuild)
 ebuild_portdir = os.path.realpath(
 	os.path.dirname(os.path.dirname(os.path.dirname(ebuild))))
 ebuild = os.path.join(ebuild_portdir, *ebuild.split(os.path.sep)[-3:])
+vdb_path = os.path.join(portage.settings['ROOT'], VDB_PATH)
 
 # Make sure that portdb.findname() returns the correct ebuild.
-if ebuild_portdir not in portage.portdb.porttrees:
+if ebuild_portdir != vdb_path and \
+	ebuild_portdir not in portage.portdb.porttrees:
 	if sys.hexversion >= 0x3000000:
 		os.environ["PORTDIR_OVERLAY"] = \
 			os.environ.get("PORTDIR_OVERLAY","") + \