From: Fabian Groffen <grobian@gentoo.org>
Date: Thu, 8 Nov 2007 22:31:55 +0000 (-0000)
Subject: Make sure EAPI is a string, and that it includes 'prefix' if appropriate.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3ca31533717d9834db9733f13ac8847c4b5a3446;p=portage.git

Make sure EAPI is a string, and that it includes 'prefix' if appropriate.

svn path=/main/branches/prefix/; revision=8467
---

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index fa579dc4e..ef9d7c3c5 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -9,7 +9,7 @@ from portage.output import green
 from portage.util import normalize_path, writemsg, writemsg_stdout
 from portage.versions import best, catpkgsplit, catsplit
 from portage.update import update_dbentries
-from portage.const import EAPI
+from portage.const import EAPI, EAPIPREFIX
 
 from portage import dep_expand, listdir, _movefile
 
@@ -153,8 +153,12 @@ class binarytree(object):
 			self._pkgindex_header_keys = set(["ACCEPT_KEYWORDS", "CBUILD",
 				"CHOST", "CONFIG_PROTECT", "CONFIG_PROTECT_MASK", "FEATURES",
 				"GENTOO_MIRRORS", "INSTALL_MASK", "SYNC", "USE", "EAPI", "EPREFIX"])
+			if EAPIPREFIX:
+				eapi = EAPIPREFIX + " " + str(EAPI)
+			else:
+				eapi = str(EAPI)
 			self._pkgindex_default_pkg_data = {
-				"EAPI"    : EAPI,
+				"EAPI"    : eapi,
 				"IUSE"    : "",
 				"PROVIDE" : "",
 				"SLOT"    : "0",