From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 14 Feb 2011 15:36:12 +0000 (-0800)
Subject: Recognize git-2.eclass as a live eclass.
X-Git-Tag: v2.2.0_alpha24~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60f55ab3ee1575c2d72870c351b7b336a4900caa;p=portage.git

Recognize git-2.eclass as a live eclass.
---

diff --git a/bin/repoman b/bin/repoman
index 700b247a1..985350fcf 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -442,6 +442,7 @@ live_eclasses = frozenset([
 	"cvs",
 	"darcs",
 	"git",
+	"git-2",
 	"mercurial",
 	"subversion",
 	"tla",
diff --git a/cnf/sets/portage.conf b/cnf/sets/portage.conf
index 49f25f666..c5c787bb5 100644
--- a/cnf/sets/portage.conf
+++ b/cnf/sets/portage.conf
@@ -51,7 +51,7 @@ class = portage.sets.libs.PreservedLibraryConsumerSet
 [live-rebuild]
 class = portage.sets.dbapi.VariableSet
 variable = INHERITED
-includes = bzr cvs darcs git mercurial subversion tla
+includes = bzr cvs darcs git git-2 mercurial subversion tla
 
 # Installed packages that own files inside /lib/modules.
 [module-rebuild]
diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py
index d3a4dd8dd..95614de87 100644
--- a/pym/_emerge/EbuildExecuter.py
+++ b/pym/_emerge/EbuildExecuter.py
@@ -21,6 +21,7 @@ class EbuildExecuter(CompositeTask):
 		"cvs",
 		"darcs",
 		"git",
+		"git-2",
 		"mercurial",
 		"subversion",
 		"tla",