Add USE_EXPAND to avoid downloading unneeded drivers. Thanks to tove for the idea.

Package-Manager: portage-1.586-cvs

3 files changed, 42 insertions, 25 deletions

diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog
index 80403495cedd..605d358b87d8 100644
--- a/net-dialup/fcdsl/ChangeLog
+++ b/net-dialup/fcdsl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/fcdsl
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.16 2005/04/15 20:05:48 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.17 2005/04/24 10:24:25 genstef Exp $
+
+  24 Apr 2005; Stefan Schweizer <genstef@gentoo.org>
+  fcdsl-2.6.20.7-r4.ebuild:
+  Add USE_EXPAND to avoid downloading unneeded drivers. Thanks to tove for the
+  idea.
 
   15 Apr 2005; Stefan Schweizer <genstef@gentoo.org>
   fcdsl-2.6.20.7-r4.ebuild:
diff --git a/net-dialup/fcdsl/Manifest b/net-dialup/fcdsl/Manifest
index 39d365aa0001..ca569cc81a50 100644
--- a/net-dialup/fcdsl/Manifest
+++ b/net-dialup/fcdsl/Manifest
@@ -1,6 +1,6 @@
-MD5 4f3206da9ca37190c4d59c4cbd67003c ChangeLog 3073
+MD5 7d72eadc99149d3beecfa5dc10547559 ChangeLog 3242
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 ac0475c53a004954e61ffc8e2060e20a fcdsl-2.6.20.7-r4.ebuild 7402
+MD5 205b21adb0d0bd9075de172258fb9243 fcdsl-2.6.20.7-r4.ebuild 7891
 MD5 35e156955da1166d6de5e56bb66857db files/fcdslslusb.diff 4002
 MD5 776e0c65eda5432a30f9beae8896ca97 files/fcdslsl.diff 1896
 MD5 22a65f3dcb8b67dc53a23ef35886bf18 files/fcdsl.diff 4636
diff --git a/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild b/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild
index d9863c51e83e..50bbc0c3ea5a 100644
--- a/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild
+++ b/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild
@@ -1,22 +1,39 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild,v 1.7 2005/04/15 20:03:57 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild,v 1.8 2005/04/24 10:24:25 genstef Exp $
 
 inherit linux-mod eutils
 
-FCDSL_SRC=("fritzcrd.dsl" "fritzcrd.dsl_v20" "fritzcrd.dsl_sl"
+DESCRIPTION="AVM FRITZ!Card DSL drivers for 2.6 kernel"
+HOMEPAGE="http://www.avm.de/"
+
+FCDSL_MODULES=("fcdsl" "fcdsl2" "fcdslsl" "fcdslusb" "fcdslslusb")
+FCDSL_NAMES=("AVM FRITZ!Card DSL" "AVM FRITZ!Card DSL v2.0" "AVM FRITZ!Card DSL SL" "AVM FRITZ!Card DSL USB" "AVM FRITZ!Card DSL SL USB")
+FCDSL_BUSTYPES=("pci" "pci" "pci" "usb" "usb")
+FCDSL_IDS=("1131:5402" "1244:2900" "1244:2700" "057c:2300" "057c:3500")
+FCDSL_FIRMWARES=("fdslbase.bin" "fds2base.bin" "fdssbase.bin" "fdsubase.frm" "fdlubase.frm")
+
+FCDSL_DIRS=("fritzcrd.dsl" "fritzcrd.dsl_v20" "fritzcrd.dsl_sl"
 	"fritzcrd.dsl_usb" "fritzcrd.dsl_sl_usb")
 FCDSL_FILES=("fcdsl-suse9.1-3.11-02" "fcdsl2-suse9.1-3.11-04"
 	"fcdslsl-suse9.1-3.11-04" "fcdslusb-suse9.1-3.11-02"
 	"fcdslslusb-suse9.1-3.11-04")
+for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
+	FCDSL_SRC[${CARD}]="ftp://ftp.avm.de/cardware/${FCDSL_DIRS[CARD]}/linux/suse.91/${FCDSL_FILES[CARD]}.tar.gz"
+done
 
-DESCRIPTION="AVM FRITZ!Card DSL drivers for 2.6 kernel"
-HOMEPAGE="http://www.avm.de/"
-SRC_URI=""
-for ((CARD=0; CARD < ${#FCDSL_SRC[*]}; CARD++)); do
-	SRC_URI="${SRC_URI}
-	ftp://ftp.avm.de/cardware/${FCDSL_SRC[CARD]}/linux/suse.91/${FCDSL_FILES[CARD]}.tar.gz"
+#specific selection
+for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
+	SRC_URI="${SRC_URI} fcdsl_cards_${FCDSL_MODULES[CARD]}? ( ${FCDSL_SRC[CARD]} )"
+done
+
+#in case nothing is selected take all SRC_URI's
+for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
+	BEGIN="${BEGIN} !fcdsl_cards_${FCDSL_MODULES[CARD]}? ("
+	MIDDLE="${MIDDLE} ${FCDSL_SRC[CARD]}"
+	END="${END} )"
 done
+SRC_URI="${SRC_URI}${BEGIN}${MIDDLE}${END}"
 
 LICENSE="LGPL-2"
 KEYWORDS="x86"
@@ -26,12 +43,6 @@ S=${WORKDIR}/fritz
 
 RDEPEND=">=net-dialup/capi4k-utils-20040810"
 
-FCDSL_NAMES=("AVM FRITZ!Card DSL" "AVM FRITZ!Card DSL v2.0" "AVM FRITZ!Card DSL SL" "AVM FRITZ!Card DSL USB" "AVM FRITZ!Card DSL SL USB")
-FCDSL_BUSTYPES=("pci" "pci" "pci" "usb" "usb")
-FCDSL_IDS=("1131:5402" "1244:2900" "1244:2700" "057c:2300" "057c:3500")
-FCDSL_FIRMWARES=("fdslbase.bin" "fds2base.bin" "fdssbase.bin" "fdsubase.frm" "fdlubase.frm")
-FCDSL_MODULES=("fcdsl" "fcdsl2" "fcdslsl" "fcdslusb" "fcdslslusb")
-
 pkg_setup() {
 	CONFIG_CHECK="ISDN_CAPI_CAPI20"
 	linux-mod_pkg_setup
@@ -60,20 +71,21 @@ pkg_setup() {
 	fi
 	BUILD_TARGETS="all"
 	BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}"
-	NO_MODULESD="1"
 }
 
 src_unpack() {
 	for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
-		tar xzf ${DISTDIR}/${FCDSL_FILES[CARD]}.tar.gz
-		mv fritz ${FCDSL_MODULES[CARD]/fc/fritz.}
-		cd ${FCDSL_MODULES[CARD]/fc/fritz.}/src
-		[ -f ${FILESDIR}/${FCDSL_MODULES[CARD]}.diff ] && patch -p0 < ${FILESDIR}/${FCDSL_MODULES[CARD]}.diff
-		cd ../..
+		if [ -f ${DISTDIR}/${FCDSL_FILES[CARD]}.tar.gz ]; then
+			rm fritz
+			tar xzf ${DISTDIR}/${FCDSL_FILES[CARD]}.tar.gz
+			mv fritz ${FCDSL_MODULES[CARD]/fc/fritz.}
+			cd ${FCDSL_MODULES[CARD]/fc/fritz.}/src
+			[ -f ${FILESDIR}/${FCDSL_MODULES[CARD]}.diff ] && patch -p0 < ${FILESDIR}/${FCDSL_MODULES[CARD]}.diff
+			cd ../..
+			ln -s ${FCDSL_MODULES[CARD]/fc/fritz.} fritz
+		fi
 	done
 
-	ln -s ${FCDSL_MODULES[0]/fc/fritz.} fritz
-
 	# convert docs from latin1 to UTF-8
 	if useq utf8; then
 		for i in fritz/compile-help-german.txt; do