From 5e168263d76aabbfc2df79e048d0ced37bebcd66 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 27 Sep 2008 19:24:10 +0000 Subject: Mask packages with deprecated EAPIs in order to prevent them from being installed. Such packages will still behave normally if they are already installed, but preventing new installation will remind people to update the EAPIs in their overlays if necessary. svn path=/main/trunk/; revision=11573 --- pym/_emerge/__init__.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pym/_emerge/__init__.py') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 4926f042d..eb6b855b8 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -1245,11 +1245,14 @@ def visible(pkgsettings, pkg): if pkg.built and not pkg.installed and "CHOST" in pkg.metadata: if not pkgsettings._accept_chost(pkg): return False - if not portage.eapi_is_supported(pkg.metadata["EAPI"]): - return False - if not pkg.installed and \ - pkgsettings._getMissingKeywords(pkg.cpv, pkg.metadata): + eapi = pkg.metadata["EAPI"] + if not portage.eapi_is_supported(eapi): return False + if not pkg.installed: + if portage._eapi_is_deprecated(eapi): + return False + if pkgsettings._getMissingKeywords(pkg.cpv, pkg.metadata): + return False if pkgsettings._getMaskAtom(pkg.cpv, pkg.metadata): return False if pkgsettings._getProfileMaskAtom(pkg.cpv, pkg.metadata): -- cgit v1.2.3-1-g7c22