[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-2.eclass git-r3.eclass

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-2.eclass git-r3.eclass

[Michal Gorny (mgorny)]

mgorny      13/10/08 11:19:48

  Modified:             ChangeLog git-2.eclass git-r3.eclass
  Log:
  Fix git-r3 -> git-2 dependency leak, as noted in bug #487026.

Revision  Changes    Path
1.1014               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1014&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1014&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1013&r2=1.1014

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1013
retrieving revision 1.1014
diff -u -r1.1013 -r1.1014
--- ChangeLog	8 Oct 2013 10:34:45 -0000	1.1013
+++ ChangeLog	8 Oct 2013 11:19:48 -0000	1.1014
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1013 2013/10/08 10:34:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1014 2013/10/08 11:19:48 mgorny Exp $
+
+  08 Oct 2013; Michał Górny <mgorny@gentoo.org> git-2.eclass, git-r3.eclass:
+  Fix git-r3 -> git-2 dependency leak, as noted in bug #487026.
 
   08 Oct 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
   Remove deprecated autotools-utils_autoreconf.



1.33                 eclass/git-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-2.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-2.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-2.eclass?r1=1.32&r2=1.33

Index: git-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- git-2.eclass	8 Sep 2013 22:54:24 -0000	1.32
+++ git-2.eclass	8 Oct 2013 11:19:48 -0000	1.33
@@ -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-2.eclass,v 1.32 2013/09/08 22:54:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.33 2013/10/08 11:19:48 mgorny Exp $
 
 # @ECLASS: git-2.eclass
 # @MAINTAINER:
@@ -18,6 +18,7 @@
 # for early testing of git-r3 and is to be set in make.conf.
 
 # (since we override src_unpack this doesn't hurt)
+_INHERITED_BY_GIT_2=1 \
 inherit git-r3
 
 # This eclass support all EAPIs



1.14                 eclass/git-r3.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.13&r2=1.14

Index: git-r3.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- git-r3.eclass	5 Oct 2013 16:48:25 -0000	1.13
+++ git-r3.eclass	8 Oct 2013 11:19:48 -0000	1.14
@@ -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 @@
 
 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: