Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/
Date: Sun, 25 Feb 2018 20:58:30
Message-Id: 1519592280.b49646b5bcfdfb9ea64a1028f0003e255f294fec.mgorny@gentoo
1 commit: b49646b5bcfdfb9ea64a1028f0003e255f294fec
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 25 19:59:03 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 25 20:58:00 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b49646b5
7
8 Deprecate EAPI 6_pre1
9
10 Reviewed-by: Zac Medico <zmedico <AT> gentoo.org>
11
12 pym/portage/__init__.py | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15 diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
16 index 99f3f98ac..4773738b2 100644
17 --- a/pym/portage/__init__.py
18 +++ b/pym/portage/__init__.py
19 @@ -1,4 +1,4 @@
20 -# Copyright 1998-2014 Gentoo Foundation
21 +# Copyright 1998-2018 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23
24 from __future__ import unicode_literals
25 @@ -462,8 +462,8 @@ def abssymlink(symlink, target=None):
26
27 _doebuild_manifest_exempt_depend = 0
28
29 -_testing_eapis = frozenset(["4-python", "4-slot-abi", "5-progress", "5-hdepend", "6_pre1"])
30 -_deprecated_eapis = frozenset(["4_pre1", "3_pre2", "3_pre1", "5_pre1", "5_pre2"])
31 +_testing_eapis = frozenset(["4-python", "4-slot-abi", "5-progress", "5-hdepend"])
32 +_deprecated_eapis = frozenset(["4_pre1", "3_pre2", "3_pre1", "5_pre1", "5_pre2", "6_pre1"])
33 _supported_eapis = frozenset([str(x) for x in range(portage.const.EAPI + 1)] + list(_testing_eapis) + list(_deprecated_eapis))
34
35 def _eapi_is_deprecated(eapi):