[patch] darcs.eclass.patch

darcs.eclass.patch (text/plain), 1.18 KB, created by SpanKY on 2010-07-18 21:48:04 UTC

Index: darcs.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/darcs.eclass,v
retrieving revision 1.8
diff -u -p -r1.8 darcs.eclass
--- darcs.eclass	14 Mar 2010 12:31:41 -0000	1.8
+++ darcs.eclass	18 Jul 2010 21:40:14 -0000
@@ -19,6 +19,8 @@
 
 # TODO: support for tags, ...
 
+inherit eutils # eshopts_{push,pop}
+
 # Don't download anything other than the darcs repository
 SRC_URI=""
 
@@ -122,7 +124,6 @@ darcs_src_unpack() {
 	[ -z "$EDARCS_LOCALREPO" ] && [ -n "$EDARCS_REPOSITORY" ] \
 		&& EDARCS_LOCALREPO=${EDARCS_REPOSITORY%/} \
 		&& EDARCS_LOCALREPO=${EDARCS_LOCALREPO##*/}
-	local EDARCS_SHOPT
 
 	debug-print-function $FUNCNAME $*
 
@@ -146,10 +147,9 @@ darcs_src_unpack() {
 	# Use ${WORKDIR}/${P} rather than ${S} so user can point ${S} to something inside.
 	mkdir -p "${WORKDIR}/${P}"
 
-	EDARCS_SHOPT=$(shopt -p dotglob)
-	shopt -s dotglob	# get any dotfiles too.
+	eshopts_push -s dotglob	# get any dotfiles too.
 	rsync -rlpgo --exclude="_darcs/"  "$EDARCS_TOP_DIR/$EDARCS_LOCALREPO"/* "${WORKDIR}/${P}"
-	eval ${EDARCS_SHOPT}    # reset shopt
+	eshopts_pop
 
 	einfo "Darcs repository contents are now in ${WORKDIR}/${P}"