summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Armak <danarmak@gentoo.org>2003-07-17 14:55:10 +0000
committerDan Armak <danarmak@gentoo.org>2003-07-17 14:55:10 +0000
commit24ec55df4e9a490edfc9aedbfa26cc059200bc09 (patch)
tree42f6a5bfcb622298a21aab68a1381cee72ee0a57 /eclass/kde-source.eclass
parentBump (diff)
downloadhistorical-24ec55df4e9a490edfc9aedbfa26cc059200bc09.tar.gz
historical-24ec55df4e9a490edfc9aedbfa26cc059200bc09.tar.bz2
historical-24ec55df4e9a490edfc9aedbfa26cc059200bc09.zip
i finally understood why $S was sometimes getting the wrong value (eg of $WORKDIR or of $WORKDIR/$P): it's being
set from ECVS_MODULE, but that can itself be unset, and initialized rfom $PN later on (at the beginning of _src_unpack). so we now initialize $S from $PN as well if $ECVS_MODULE is empty. also i removed a big chunk of code that is no longer needed because we now always have a correct $S setting at that point.
Diffstat (limited to 'eclass/kde-source.eclass')
-rw-r--r--eclass/kde-source.eclass17
1 files changed, 4 insertions, 13 deletions
diff --git a/eclass/kde-source.eclass b/eclass/kde-source.eclass
index 02b78fccc6df..84f074249c1b 100644
--- a/eclass/kde-source.eclass
+++ b/eclass/kde-source.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-source.eclass,v 1.17 2003/07/13 13:04:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-source.eclass,v 1.18 2003/07/17 14:55:10 danarmak Exp $
#
# Author Dan Armak <danarmak@gentoo.org>
#
@@ -64,14 +64,12 @@ DESCRIPTION="$DESCRIPTION (cvs) "
# inheriting kde_source.
SRC_URI=""
-# this is here because it needs to be in the main section of the eclass,
-# even though the code setting ECVS_MODULE from KCVS_MODULE is all inside
-# kde-source_src_unpack
+
if [ -n "$KCVS_SUBDIR" -o -n "$KCVS_MODULE" ]; then
S="$WORKDIR/$KCVS_MODULE"
else
# default for kde-base ebuilds
- S="$WORKDIR/$ECVS_MODULE"
+ S="$WORKDIR/${ECVS_MODULE:-$PN}"
fi
@@ -134,14 +132,7 @@ kde-source_src_unpack() {
# which is also needed
if [ ! -d "$S/admin" ]; then
ECVS_MODULE="kde-common/admin" cvs_src_unpack
- IFS2="$IFS"
- IFS="/"
- path=""
- for x in $ECVS_MODULE; do
- [ -z "$path" ] && path="$x"
- done
- IFS="$IFS2"
- mv ${WORKDIR}/kde-common/admin $WORKDIR/$path
+ mv ${WORKDIR}/kde-common/admin $S/
fi
# make sure we give them a clean cvs checkout