From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QULLF-0002tY-Gk for garchives@archives.gentoo.org; Wed, 08 Jun 2011 16:10:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 920261C0E2; Wed, 8 Jun 2011 16:10:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4ED6C1C0E2 for ; Wed, 8 Jun 2011 16:10:42 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C70161B4022 for ; Wed, 8 Jun 2011 16:10:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0F35E8003C for ; Wed, 8 Jun 2011 16:10:41 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: <586760f37fb9784327d8447182d49810662f4427.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/, pym/portage/dep/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/__init__.py pym/portage/dep/__init__.py X-VCS-Directories: pym/portage/ pym/portage/dep/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 586760f37fb9784327d8447182d49810662f4427 Date: Wed, 8 Jun 2011 16:10:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 20ecd3606252bc284cb4607e8315b9e8 commit: 586760f37fb9784327d8447182d49810662f4427 Author: Arfrever Frehtes Taifersar Arahesis Gentoo Org> AuthorDate: Wed Jun 8 16:10:23 2011 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gentoo org> CommitDate: Wed Jun 8 16:10:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D586760f3 Add initial support for EAPI=3D"4-python". --- pym/portage/__init__.py | 2 +- pym/portage/dep/__init__.py | 22 ++++++++++------------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 515a9a7..bc2eedb 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -421,7 +421,7 @@ def abssymlink(symlink): =20 _doebuild_manifest_exempt_depend =3D 0 =20 -_testing_eapis =3D frozenset([]) +_testing_eapis =3D frozenset(["4-python"]) _deprecated_eapis =3D frozenset(["4_pre1", "3_pre2", "3_pre1"]) =20 def _eapi_is_deprecated(eapi): diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index 5911c8c..9dfb125 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -633,7 +633,7 @@ def flatten(mylist): =20 _usedep_re =3D { "0": re.compile("^(?P[!-]?)(?P[A-Za-z0-9][A-Za-z0-9+_@-]*= )(?P(\(\+\)|\(\-\))?)(?P[?=3D]?)$"), -# "5": re.compile("^(?P[!-]?)(?P[A-Za-z0-9][A-Za-z0-9+_@.-= ]*)(?P(\(\+\)|\(\-\))?)(?P[?=3D]?)$"), + "4-python": re.compile("^(?P[!-]?)(?P[A-Za-z0-9][A-Za-z0-= 9+_@.-]*)(?P(\(\+\)|\(\-\))?)(?P[?=3D]?)$"), } =20 def _get_usedep_re(eapi): @@ -644,11 +644,10 @@ def _get_usedep_re(eapi): @return: A regular expression object that matches valid USE flags for t= he given eapi. If eapi is None then the latest supported EAPI is assumed. """ - return _usedep_re["0"] -# if eapi in ("0", "1", "2", "3_pre1", "3_pre2", "3", "4_pre1", "4"): -# return _usedep_re["0"] -# else: -# return _usedep_re["5"] + if eapi in ("4-python",): + return _usedep_re["4-python"] + else: + return _usedep_re["0"] =20 class _use_dep(object): =20 @@ -1615,15 +1614,14 @@ _atom_wildcard_re =3D re.compile('(?P(' += _extended_cat + ')/(' + _extende =20 _useflag_re =3D { "0": re.compile(r'^[A-Za-z0-9][A-Za-z0-9+_@-]*$'), -# "5": re.compile(r'^[A-Za-z0-9][A-Za-z0-9+_@.-]*$'), + "4-python": re.compile(r'^[A-Za-z0-9][A-Za-z0-9+_@.-]*$'), } =20 def _get_useflag_re(eapi): - return _useflag_re["0"] -# if eapi in ("0", "1", "2", "3_pre1", "3_pre2", "3", "4_pre1", "4"): -# return _useflag_re["0"] -# else: -# return _useflag_re["5"] + if eapi in ("4-python",): + return _useflag_re["4-python"] + else: + return _useflag_re["0"] =20 def isvalidatom(atom, allow_blockers=3DFalse, allow_wildcard=3DFalse, al= low_repo=3DFalse): """