[gentoo-commits] proj/portage:master commit in: lib/portage/, cnf/sets/

[Ulrich Müller]

commit:     6dac8b15297ef5619effb0858a92cb59d8c13c2f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 09:25:47 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 23:00:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=6dac8b15

Drop removed git and tla from list of live eclasses.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 cnf/sets/portage.conf | 2 +-
 lib/portage/const.py  | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cnf/sets/portage.conf b/cnf/sets/portage.conf
index ed4c6d9a7..38c50a647 100644
--- a/cnf/sets/portage.conf
+++ b/cnf/sets/portage.conf
@@ -65,7 +65,7 @@ includes = live
 [deprecated-live-rebuild]
 class = portage.sets.dbapi.VariableSet
 variable = INHERITED
-includes = bzr cvs darcs git git-2 git-r3 golang-vcs mercurial subversion tla
+includes = bzr cvs darcs git-2 git-r3 golang-vcs mercurial subversion
 
 # Installed packages that own files inside /lib/modules.
 [module-rebuild]

diff --git a/lib/portage/const.py b/lib/portage/const.py
index edbfb9f17..0ed64a742 100644
--- a/lib/portage/const.py
+++ b/lib/portage/const.py
@@ -1,5 +1,5 @@
 # portage: Constants
-# Copyright 1998-2018 Gentoo Authors
+# Copyright 1998-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 from __future__ import unicode_literals
@@ -240,13 +240,11 @@ LIVE_ECLASSES = frozenset([
        "bzr",
        "cvs",
        "darcs",
-       "git",
        "git-2",
        "git-r3",
        "golang-vcs",
        "mercurial",
        "subversion",
-       "tla",
 ])
 
 SUPPORTED_BINPKG_FORMATS = ("tar", "rpm")