support for the new kde-i18n live cvs ebuilds. shouldn't affect anything else in any way.

1 files changed, 30 insertions, 18 deletions

diff --git a/eclass/kde-source.eclass b/eclass/kde-source.eclass
index 32860105b149..46310338d701 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.15 2003/04/19 11:52:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-source.eclass,v 1.16 2003/07/13 09:08:26 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -33,23 +33,18 @@ INHERITED="$INHERITED $ECLASS"
 [ -z "$ECVS_SERVER" ] && ECVS_SERVER="anoncvs.kde.org:/home/kde"
 [ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver"
 
-# ECVS_SUBDIR reimplementation
-if [ -n "$KCVS_SUBDIR" ]; then
-    ECVS_MODULE="$KCVS_MODULE/$KCVS_SUBDIR"
-	S="$WORKDIR/$KCVS_MODULE"
-elif [ -n "$KCVS_MODULE" ]; then
-    ECVS_MODULE="$KCVS_MODULE"
-	S="$WORKDIR/$KCVS_MODULE"
-else
-    # default for kde-base ebuilds
-    ECVS_MODULE="$PN"
-	S="$WORKDIR/$ECVS_MODULE"
-fi
+# for apps living inside modules like kdenonbeta - see beginning of our _src_unpack
+# KCVS_SUBDIR=...
 
 # If a tag is specified as ECVS_BRANCH, it will be used for the kde-common module
 # as well. If that is wrong (fex when checking out kopete branch kopete_0_6_2_release),
 # use KCVS_BRANCH instead.
 
+# you can set this variable (in your ebuild, of course) to disable fetching of <module>/doc/*
+# under the KCVS_SUBDIR scheme. this is appropriate for kde-i18n stuff, but not for
+# eg kdeextragear, kdenonbeta etc.
+# KCVS_SUBDIR_NODOC=true
+
 # Other variables: see cvs.eclass
 
 # we do this here and not in the very beginning because we need to keep
@@ -73,7 +68,19 @@ kde-source_src_unpack() {
 
 	debug-print-function $FUNCNAME $*
 
-	cvs_src_unpack
+	if [ -n "$KCVS_SUBDIR" ]; then
+	    ECVS_MODULE="$KCVS_MODULE/$KCVS_SUBDIR"
+	    S="$WORKDIR/$KCVS_MODULE"
+	elif [ -n "$KCVS_MODULE" ]; then
+	    ECVS_MODULE="$KCVS_MODULE"
+	    S="$WORKDIR/$KCVS_MODULE"
+	else
+	    # default for kde-base ebuilds
+	    ECVS_MODULE="$PN"
+	    S="$WORKDIR/$ECVS_MODULE"
+	fi
+
+        cvs_src_unpack
 
 	# subdirs of kde modules get special treatment that is designed for
 	# subdirs which are separate selfcontained apps and only need
@@ -81,23 +88,28 @@ kde-source_src_unpack() {
 	# this fits for apps from kdenonbeta, kdeextragear modules etc.
 	# So, if we just fetched a module's subdir, fetch the top directory
 	# of the module (non-recursively) and make it build only the subdirectory
-	# we need
+	# we need.
+	# ECVS_LOCALNAME note: disabled when KCVS_SUBDIR is enabled because the logic
+	# of how it should work is unclear and I don't see any need for it here anyway
 	if [ -n "$KCVS_SUBDIR" ]; then
 	
 		if [ -n "$KCVS_BRANCH" ]; then
 		    ECVS_BRANCH2="$ECVS_BRANCH"
 		    ECVS_BRANCH="$KCVS_BRANCH"
 		fi
-
+		
 		ECVS_MODULE="$KCVS_MODULE" ECVS_LOCAL=yes cvs_src_unpack
 
 		# we need the <module>/doc/<name> directory too,
 		# and we need the top-level doc/ directory fetched locally
 		ECVS_MODULE="${KCVS_MODULE}/doc" ECVS_LOCAL=yes cvs_src_unpack
+
 		# but, if such a directory doesn't exist on the cvs server and we're
 		# in offline mode cvs.eclass will abort, so only call this if we're
 		# in online mode or the dir is already fetched
-		if [ -d "$ECVS_TOP_DIR/$KCVS_MODULE/doc/$KCVS_SUBDIR" -o "$ECVS_SERVER" != "offline" ]; then
+		# also, the ebuild might have disabled this functionality explicitly
+		# (kde-i18n stuff does this for now)
+		if [ -z "$KCVS_SUBDIR_NODOC" ] && [ -d "$ECVS_TOP_DIR/$KCVS_MODULE/doc/$KCVS_SUBDIR" -o "$ECVS_SERVER" != "offline" ]; then
 			ECVS_MODULE="${KCVS_MODULE}/doc/${KCVS_SUBDIR}" cvs_src_unpack
 		fi
 		
@@ -107,7 +119,7 @@ kde-source_src_unpack() {
 
 	fi
 
-	# typically for kde cvs, the admin subdir lives in the kde-common module
+	# typically for kde cvs apps, the admin subdir lives in the kde-common module
 	# which is also needed
 	if [ ! -d "$S/admin" ]; then
 		ECVS_MODULE="kde-common/admin" cvs_src_unpack