summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Kolmodin <kolmodin@gentoo.org>2008-05-14 18:13:14 +0000
committerLennart Kolmodin <kolmodin@gentoo.org>2008-05-14 18:13:14 +0000
commitd4d8b76fe7be10b40e3810c3bb40aed8b1a3bc13 (patch)
tree5d91d4fe53594efc4b0992ebf2dbd5f83b3d2a02 /eclass/darcs.eclass
parentStable on ppc64; bug #221063 (diff)
downloadhistorical-d4d8b76fe7be10b40e3810c3bb40aed8b1a3bc13.tar.gz
historical-d4d8b76fe7be10b40e3810c3bb40aed8b1a3bc13.tar.bz2
historical-d4d8b76fe7be10b40e3810c3bb40aed8b1a3bc13.zip
Makes *-darcs work with newer portage and pkgcore.
Patch by mjrosennb@andrew.cmu.edu.
Diffstat (limited to 'eclass/darcs.eclass')
-rw-r--r--eclass/darcs.eclass18
1 files changed, 12 insertions, 6 deletions
diff --git a/eclass/darcs.eclass b/eclass/darcs.eclass
index a84d7ece2163..02e8ad17fbc7 100644
--- a/eclass/darcs.eclass
+++ b/eclass/darcs.eclass
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/darcs.eclass,v 1.6 2007/11/01 19:24:24 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/darcs.eclass,v 1.7 2008/05/14 18:13:14 kolmodin Exp $
#
# darcs eclass author: Andres Loeh <kosmikus@gentoo.org>
# tla eclass author: <rphillips@gentoo.org>
@@ -43,11 +43,6 @@ SRC_URI=""
# The URI to the repository.
[ -z "$EDARCS_REPOSITORY" ] && EDARCS_REPOSITORY=""
-# The local directory to store the repository (useful to ensure a
-# unique local name); relative to EDARCS_TOP_DIR
-[ -z "$EDARCS_LOCALREPO" ] && [ -n "$EDARCS_REPOSITORY" ] \
- && EDARCS_LOCALREPO=${EDARCS_REPOSITORY%/} \
- && EDARCS_LOCALREPO=${EDARCS_LOCALREPO##*/}
# EDARCS_CLEAN: set this to something to get a clean copy when updating
# (removes the working directory, then uses $EDARCS_GET_CMD to
@@ -61,6 +56,12 @@ DEPEND="dev-util/darcs"
# is called from darcs_src_unpack
darcs_fetch() {
+ # The local directory to store the repository (useful to ensure a
+ # unique local name); relative to EDARCS_TOP_DIR
+ [ -z "$EDARCS_LOCALREPO" ] && [ -n "$EDARCS_REPOSITORY" ] \
+ && EDARCS_LOCALREPO=${EDARCS_REPOSITORY%/} \
+ && EDARCS_LOCALREPO=${EDARCS_LOCALREPO##*/}
+
debug-print-function $FUNCNAME $*
if [ -n "$EDARCS_CLEAN" ]; then
@@ -116,6 +117,11 @@ darcs_fetch() {
darcs_src_unpack() {
+ # The local directory to store the repository (useful to ensure a
+ # unique local name); relative to EDARCS_TOP_DIR
+ [ -z "$EDARCS_LOCALREPO" ] && [ -n "$EDARCS_REPOSITORY" ] \
+ && EDARCS_LOCALREPO=${EDARCS_REPOSITORY%/} \
+ && EDARCS_LOCALREPO=${EDARCS_LOCALREPO##*/}
local EDARCS_SHOPT
debug-print-function $FUNCNAME $*