diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-09-04 08:00:23 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-09-04 08:00:23 +0000 |
| commit | e27e3cae80403e212b9eed2274846066d0ad54a9 (patch) | |
| tree | fb40876bbc4ef203e4c52fdac97ec265f58defc0 /eclass/git.eclass | |
| parent | Fix build with no useflag enabled, bug #283267 (diff) | |
| download | historical-e27e3cae80403e212b9eed2274846066d0ad54a9.tar.gz historical-e27e3cae80403e212b9eed2274846066d0ad54a9.tar.bz2 historical-e27e3cae80403e212b9eed2274846066d0ad54a9.zip | |
Adjust git.eclass to support packages with + in their name (gtk+,...). Per bug #283436. Thanks to gseba for the patch.
Diffstat (limited to 'eclass/git.eclass')
| -rw-r--r-- | eclass/git.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
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 |