From e27e3cae80403e212b9eed2274846066d0ad54a9 Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <scarabeus@gentoo.org>
Date: Fri, 4 Sep 2009 08:00:23 +0000
Subject: Adjust git.eclass to support packages with + in their name
 (gtk+,...). Per bug #283436. Thanks to gseba for the patch.

---
 eclass/git.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'eclass/git.eclass')

diff --git a/eclass/git.eclass b/eclass/git.eclass
index c4e65a4d6aef..45e66edcf9a3 100644
--- a/eclass/git.eclass
+++ b/eclass/git.eclass
@@ -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.28 2009/08/24 21:48:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.29 2009/09/04 08:00:23 scarabeus Exp $
 
 # @ECLASS: git.eclass
 # @MAINTAINER:
@@ -75,7 +75,7 @@ EGIT_DIFFSTAT_CMD="git --no-pager diff --stat"
 #   git+ssh://
 #   rsync://
 #   ssh://
-eval X="\$${PN//-/_}_LIVE_REPO"
+eval X="\$${PN//[-+]/_}_LIVE_REPO"
 if [[ ${X} = "" ]]; then
 	EGIT_REPO_URI=${EGIT_REPO_URI:=}
 else
@@ -113,7 +113,7 @@ EGIT_OFFLINE="${EGIT_OFFLINE:-${ESCM_OFFLINE}}"
 # @ECLASS-VARIABLE: EGIT_BRANCH
 # @DESCRIPTION:
 # git eclass can fetch any branch in git_fetch().
-eval X="\$${PN//-/_}_LIVE_BRANCH"
+eval X="\$${PN//[-+]/_}_LIVE_BRANCH"
 if [[ ${X} = "" ]]; then
 	EGIT_BRANCH=${EGIT_BRANCH:=master}
 else
@@ -123,7 +123,7 @@ fi
 # @ECLASS-VARIABLE: EGIT_TREE
 # @DESCRIPTION:
 # git eclass can checkout any tree (commit).
-eval X="\$${PN//-/_}_LIVE_TREE"
+eval X="\$${PN//[-+]/_}_LIVE_TREE"
 if [[ ${X} = "" ]]; then
 	: ${EGIT_TREE:=${EGIT_BRANCH}}
 else
-- 
cgit v1.2.3-65-gdbad