[patch] only use live ebuild's *DEPEND if the EAPI is supported

eapi_supported.patch (text/plain), 865 bytes, created by Zac Medico on 2008-10-06 17:37:15 UTC

Index: bin/emerge
===================================================================
--- bin/emerge	(revision 11639)
+++ bin/emerge	(revision 11640)
@@ -1083,7 +1083,7 @@
 		self._aux_get = self.dbapi.aux_get
 		self.dbapi.aux_get = self._aux_get_wrapper
 		self._aux_get_history = set()
-		self._portdb_keys = ["DEPEND", "RDEPEND", "PDEPEND"]
+		self._portdb_keys = ["EAPI", "DEPEND", "RDEPEND", "PDEPEND"]
 		self._portdb = portdb
 		self._global_updates = None
 
@@ -1095,6 +1095,8 @@
 			# Use the live ebuild metadata if possible.
 			live_metadata = dict(izip(self._portdb_keys,
 				self._portdb.aux_get(pkg, self._portdb_keys)))
+			if not portage.eapi_is_supported(live_metadata["EAPI"]):
+				raise KeyError(pkg)
 			self.dbapi.aux_update(pkg, live_metadata)
 		except (KeyError, portage_exception.PortageException):
 			if self._global_updates is None: