summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-10-08 11:19:48 +0000
committerMichał Górny <mgorny@gentoo.org>2013-10-08 11:19:48 +0000
commitbd6a5c94847f7d6e5bda257f0d32bab8f0c75c08 (patch)
tree7384a1d849c0b934866011151ef9246c18a5b7b5 /eclass/git-r3.eclass
parentAdd missing dev-python/mock dependency. Clean up the ebuild. (diff)
downloadhistorical-bd6a5c94847f7d6e5bda257f0d32bab8f0c75c08.tar.gz
historical-bd6a5c94847f7d6e5bda257f0d32bab8f0c75c08.tar.bz2
historical-bd6a5c94847f7d6e5bda257f0d32bab8f0c75c08.zip
Fix git-r3 -> git-2 dependency leak, as noted in bug #487026.
Diffstat (limited to 'eclass/git-r3.eclass')
-rw-r--r--eclass/git-r3.eclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index 6e48c49b3feb..cd0b5fa98c46 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.13 2013/10/05 16:48:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.14 2013/10/08 11:19:48 mgorny Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
@@ -29,7 +29,9 @@ EXPORT_FUNCTIONS src_unpack
if [[ ! ${_GIT_R3} ]]; then
-DEPEND=">=dev-vcs/git-1.8.2.1"
+if [[ ! ${_INHERITED_BY_GIT_2} ]]; then
+ DEPEND=">=dev-vcs/git-1.8.2.1"
+fi
# @ECLASS-VARIABLE: EGIT3_STORE_DIR
# @DESCRIPTION: