[gentoo-commits] portage r13234 - in main/branches/prefix: . pym/_emerge pym/portage pym/portage/dbapi

[Fabian Groffen (grobian)]

Author: grobian
Date: 2009-03-27 11:43:55 +0000 (Fri, 27 Mar 2009)
New Revision: 13234

Modified:
   main/branches/prefix/configure.in
   main/branches/prefix/pym/_emerge/__init__.py
   main/branches/prefix/pym/portage/__init__.py
   main/branches/prefix/pym/portage/const.py
   main/branches/prefix/pym/portage/const_autotool.py
   main/branches/prefix/pym/portage/dbapi/bintree.py
Log:
Remove EAPIPREFIX, remain backwards compatible for now by still accepting 'prefix' in EAPI, but not caring about it much.  Prefix masking is done solely by our (for this reason) different keywords

Modified: main/branches/prefix/configure.in
===================================================================
--- main/branches/prefix/configure.in	2009-03-27 09:40:37 UTC (rev 13233)
+++ main/branches/prefix/configure.in	2009-03-27 11:43:55 UTC (rev 13234)
@@ -208,10 +208,8 @@
 if test "x$DOMAIN_PREFIX" = "x"
 then
 	PORTAGE_EPREFIX='""'
-	EAPIPREFIX='None'
 else
 	PORTAGE_EPREFIX='path.normpath("'"$DOMAIN_PREFIX"'")'
-	EAPIPREFIX='"prefix"'
 fi
 
 DEFAULT_PATH="${DOMAIN_PREFIX}/usr/bin:${DOMAIN_PREFIX}/usr/sbin:${DOMAIN_PREFIX}/bin:${DOMAIN_PREFIX}/sbin:${prefix}/bin"
@@ -236,7 +234,6 @@
 AC_SUBST(rootgid)
 AC_SUBST(DOMAIN_PREFIX)
 AC_SUBST(PORTAGE_EPREFIX)
-AC_SUBST(EAPIPREFIX)
 AC_SUBST(DEFAULT_PATH)
 AC_SUBST(PORTAGE_BASE,['${exec_prefix}/lib/portage'])
 AM_CONDITIONAL(INSTALL_PYTHON_SOURCES, test x$enable_py_sources = xtrue)

Modified: main/branches/prefix/pym/_emerge/__init__.py
===================================================================
--- main/branches/prefix/pym/_emerge/__init__.py	2009-03-27 09:40:37 UTC (rev 13233)
+++ main/branches/prefix/pym/_emerge/__init__.py	2009-03-27 11:43:55 UTC (rev 13234)
@@ -63,7 +63,7 @@
 import portage.util
 import portage.locks
 import portage.exception
-from portage.const import EPREFIX, BPREFIX, EPREFIX_LSTRIP, EAPIPREFIX
+from portage.const import EPREFIX, BPREFIX, EPREFIX_LSTRIP
 from portage.data import secpass
 from portage.elog.messages import eerror
 from portage.util import normalize_path as normpath
@@ -3032,7 +3032,7 @@
 
 		pkg = self.pkg
 		phases = self._phases
-		eapi = pkg.metadata["EAPI"].replace(EAPIPREFIX, "").strip()
+		eapi = pkg.metadata["EAPI"].replace("prefix", "").strip()
 		if eapi in ("0", "1"):
 			# skip src_prepare and src_configure
 			phases = phases[2:]
@@ -6090,15 +6090,10 @@
 			print "!!! One of the following masked packages is required to complete your request:"
 			have_eapi_mask = show_masked_packages(masked_packages)
 			if have_eapi_mask:
-				if portage.const.EAPIPREFIX:
-					p = portage.const.EAPIPREFIX + " "
-				else:
-					p = ''
-				print
 				msg = ("The current version of portage supports " + \
-					"EAPI '%s%s'. You must upgrade to a newer version" + \
+					"EAPI '%s'. You must upgrade to a newer version" + \
 					" of portage before EAPI masked packages can" + \
-					" be installed.") % (p, portage.const.EAPI)
+					" be installed.") % (portage.const.EAPI)
 				from textwrap import wrap
 				for line in wrap(msg, 75):
 					print line

Modified: main/branches/prefix/pym/portage/__init__.py
===================================================================
--- main/branches/prefix/pym/portage/__init__.py	2009-03-27 09:40:37 UTC (rev 13233)
+++ main/branches/prefix/pym/portage/__init__.py	2009-03-27 11:43:55 UTC (rev 13234)
@@ -5062,21 +5062,11 @@
 	# However, back to reality, we just look for all <desc> we require,
 	# and don't do version tricks other than the main tree does.
 
-	eapi = str(eapi).split() # note Python's contact for this special case
+	eapi = str(eapi).split() # note Python's contract for this special case
 
-	# these are the properties that MUST be present (should)
-	properties = set()
-	if portage.const.EAPIPREFIX:
-		properties.add(portage.const.EAPIPREFIX) # clumpsy temporary solution
-
-	for prop in properties:
-		if prop not in eapi:
-			return False
-		else:
-			eapi.remove(prop)
-	
-	# now check if what's left is supported (can)
+	# check what's supported (can)
 	properties = set(_testing_eapis) # another clumpsy solution
+	properties.add("prefix") # clumpsy temporary solution
 	for i in range(portage.const.EAPI + 1):
 		properties.add(str(i))
 

Modified: main/branches/prefix/pym/portage/const.py
===================================================================
--- main/branches/prefix/pym/portage/const.py	2009-03-27 09:40:37 UTC (rev 13233)
+++ main/branches/prefix/pym/portage/const.py	2009-03-27 11:43:55 UTC (rev 13234)
@@ -14,8 +14,6 @@
 # pick up EPREFIX from the environment if set
 if "EPREFIX" in os.environ:
 	EPREFIX = os.path.normpath(os.environ["EPREFIX"])
-if "EAPIPREFIX" in os.environ:
-	EAPIPREFIX = os.environ["EAPIPREFIX"]
 
 # ===========================================================================
 # START OF CONSTANTS -- START OF CONSTANTS -- START OF CONSTANTS -- START OF

Modified: main/branches/prefix/pym/portage/const_autotool.py
===================================================================
--- main/branches/prefix/pym/portage/const_autotool.py	2009-03-27 09:40:37 UTC (rev 13233)
+++ main/branches/prefix/pym/portage/const_autotool.py	2009-03-27 11:43:55 UTC (rev 13234)
@@ -1,15 +1,14 @@
-# Copyright: 2005-2007 Gentoo Foundation
+# Copyright: 2005-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # all vars that are to wind up in portage_const must have their name listed in __all__
 
-__all__ = ["EAPIPREFIX", "EPREFIX", "SYSCONFDIR", "DATADIR", "PORTAGE_BASE",
+__all__ = ["EPREFIX", "SYSCONFDIR", "DATADIR", "PORTAGE_BASE",
 		"portageuser", "portagegroup", "rootuser", "rootuid", "rootgid"]
 
 from os import path
 
-EAPIPREFIX   = @EAPIPREFIX@
 EPREFIX      = @PORTAGE_EPREFIX@
 SYSCONFDIR   = path.normpath("@sysconfdir@")
 DATADIR      = path.normpath("@datadir@")

Modified: main/branches/prefix/pym/portage/dbapi/bintree.py
===================================================================
--- main/branches/prefix/pym/portage/dbapi/bintree.py	2009-03-27 09:40:37 UTC (rev 13233)
+++ main/branches/prefix/pym/portage/dbapi/bintree.py	2009-03-27 11:43:55 UTC (rev 13234)
@@ -17,7 +17,7 @@
 from portage.dbapi.virtual import fakedbapi
 from portage.exception import InvalidPackageName, \
 	PermissionDenied, PortageException
-from portage.const import EAPI, EAPIPREFIX
+from portage.const import EAPI
 
 from portage import dep_expand, listdir, _check_distfile, _movefile
 
@@ -170,13 +170,9 @@
 			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 = {
 				"DEPEND"  : "",
-				"EAPI"    : eapi,
+				"EAPI"    : "0",
 				"IUSE"    : "",
 				"KEYWORDS": "",
 				"LICENSE" : "",