Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: git.eclass
Date: Wed, 08 Apr 2009 16:46:36
Message-Id: E1Lrav4-00077m-Uf@stork.gentoo.org
scarabeus    09/04/08 16:46:34

  Modified:             git.eclass
  Log:
  Apply patches from PATCHES variable too in git eclass. Now it was applying only EGIT_PATCHES.

Revision  Changes    Path
1.22                 eclass/git.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/git.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/git.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/git.eclass?r1=1.21&r2=1.22

Index: git.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/git.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- git.eclass	7 Apr 2009 15:03:32 -0000	1.21
+++ git.eclass	8 Apr 2009 16:46:34 -0000	1.22
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.21 2009/04/07 15:03:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.22 2009/04/08 16:46:34 scarabeus Exp $
 
 # @ECLASS: git.eclass
 # @MAINTAINER:
@@ -14,7 +14,7 @@
 # @THANKS TO:
 # Fernando J. Pereda <ferdy@g.o>
 
-inherit eutils
+inherit eutils base
 
 EGIT="git.eclass"
 
@@ -334,7 +334,10 @@
 # src_prepare function for git stuff. Patches, bootstrap...
 git_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
-
+	
+	# apply EGIT_PATCHES
 	git_apply_patches
+	# apply patches from PATCHES array too
+	base_src_prepare
 	git_bootstrap
 }