diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-10-08 11:19:48 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-10-08 11:19:48 +0000 |
| commit | bd6a5c94847f7d6e5bda257f0d32bab8f0c75c08 (patch) | |
| tree | 7384a1d849c0b934866011151ef9246c18a5b7b5 | |
| parent | Add missing dev-python/mock dependency. Clean up the ebuild. (diff) | |
| download | historical-bd6a5c94847f7d6e5bda257f0d32bab8f0c75c08.tar.gz historical-bd6a5c94847f7d6e5bda257f0d32bab8f0c75c08.tar.bz2 historical-bd6a5c94847f7d6e5bda257f0d32bab8f0c75c08.zip | |
Fix git-r3 -> git-2 dependency leak, as noted in bug #487026.
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/git-2.eclass | 3 | ||||
| -rw-r--r-- | eclass/git-r3.eclass | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 9b8ac7c3be18..7422e6e7cc7f 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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. diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass index 9efd3359add6..b560cddaac69 100644 --- a/eclass/git-2.eclass +++ b/eclass/git-2.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-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 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: |