print list of possible cards, renamed some cards for ease of use

(Portage version: 2.0.53)

3 files changed, 34 insertions, 13 deletions

diff --git a/media-tv/linuxtv-dvb-firmware/ChangeLog b/media-tv/linuxtv-dvb-firmware/ChangeLog
index 81ba007a41a9..d573a1e4de63 100644
--- a/media-tv/linuxtv-dvb-firmware/ChangeLog
+++ b/media-tv/linuxtv-dvb-firmware/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/linuxtv-dvb-firmware
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/ChangeLog,v 1.2 2005/12/03 14:32:32 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/ChangeLog,v 1.3 2005/12/03 16:12:59 zzam Exp $
+
+  03 Dec 2005; Matthias Schwarzott <zzam@gentoo.org>
+  linuxtv-dvb-firmware-1.ebuild:
+  print list of possible cards, renamed some cards for ease of use
 
   03 Dec 2005; Matthias Schwarzott <zzam@gentoo.org>
   linuxtv-dvb-firmware-1.ebuild:
diff --git a/media-tv/linuxtv-dvb-firmware/Manifest b/media-tv/linuxtv-dvb-firmware/Manifest
index 698ac8502704..4934ad8b6548 100644
--- a/media-tv/linuxtv-dvb-firmware/Manifest
+++ b/media-tv/linuxtv-dvb-firmware/Manifest
@@ -1,5 +1,5 @@
 MD5 4407d0c2c0c0464f501da7a2d3724edc ChangeLog 586
 MD5 72138cbe19fa4abff6f3fb2e75265683 files/digest-linuxtv-dvb-firmware-1 469
 MD5 cf50072da5b600c439d7c82e127a7f62 files/get_dvb_firmware-1 11537
-MD5 073142212bac7111b5aceb36328bf998 linuxtv-dvb-firmware-1.ebuild 4297
+MD5 be6ff5671568e9e72e951529a5e394e3 linuxtv-dvb-firmware-1.ebuild 4638
 MD5 7c30ab7528b676a1a0c2737821599b29 metadata.xml 300
diff --git a/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-1.ebuild b/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-1.ebuild
index 6ab577b2e15b..66bc9c3fc623 100644
--- a/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-1.ebuild
+++ b/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-1.ebuild,v 1.2 2005/12/03 14:32:32 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-1.ebuild,v 1.3 2005/12/03 16:12:59 zzam Exp $
 
 DESCRIPTION="Firmware files needed for operation of some dvb-devices"
 HOMEPAGE="http://www.linuxtv.org"
@@ -24,17 +24,17 @@ PACKET_SRC_URI="http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz
 get_dvb_firmware="${FILESDIR}/get_dvb_firmware-${PV}"
 
 PACKET_FW_NAMES=(
-	"or51132-qam"
-	"or51132-vsb"
+	"or51132"
+	"or51132"
 	"or51211"
-	"avertv"
-	"dibusb"
+	"usb-a800"
+	"dibusb-usb1"
 	"dibusb-usb2"
-	"dtt200u"
-	"umt"
-	"vp702x"
-	"vp7045"
-	"wt220u"
+	"usb-dtt200u"
+	"usb-umt"
+	"usb-vp702x"
+	"usb-vp7045"
+	"usb-wt220u"
 	"ttpci"
 )
 
@@ -57,6 +57,18 @@ PACKET_FW_FILES=(
 FW_NAMES=(
 	"sp8870"
 	"sp887x"
+	"tda1004x"
+	"tda1004x"
+	"ttusb-dec"
+	"ttusb-dec"
+	"ttusb-dec"
+	"nxt2002"
+	"nxt200x"
+)
+
+FW_GET_PARAMETER=(
+	"sp8870"
+	"sp887x"
 	"tda10045"
 	"tda10046"
 	"dec2000t"
@@ -141,6 +153,11 @@ pkg_setup() {
 	if [[ -z ${DVB_CARDS} ]]; then
 		einfo "DVB_CARDS is not set, installing all available firmware files."
 	fi
+	einfo "List of possible card-names to use for DVB_CARDS:"
+	echo ${PACKET_FW_NAMES[*]} ${FW_NAMES[*]}| tr ' ' '\n' | sort | uniq | fmt \
+	| while read line; do
+		einfo "   ${line}"
+	done
 }
 
 src_unpack() {
@@ -164,7 +181,7 @@ src_unpack() {
 		install_dvb_card ${FW_NAMES[CARD]} || continue
 
 		einfo "Extracting ${FW_NAMES[CARD]}"
-		./get_dvb_firmware ${FW_NAMES[CARD]}
+		./get_dvb_firmware ${FW_GET_PARAMETER[CARD]}
 	done
 }