--- /usr/portage/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.09.19.ebuild	2009-11-12 19:36:37.000000000 +0100
+++ /usr/local/portage/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.09.19.ebuild	2010-02-19 15:23:30.170295743 +0100
@@ -20,8 +20,10 @@
 # Files which can be fetched from linuxtv.org
 PACKET_NAME=dvb-firmwares-1.tar.bz2
 PACKET_SRC_URI="http://www.linuxtv.org/downloads/firmware/${PACKET_NAME}"
-TEVII_NAME=Tevii_linuxdriver_0815.rar
-TEVII_SRC_URI="http://tevii.com/${TEVII_NAME}"
+TEVII_S650=Tevii_linuxdriver_0815.rar
+TEVII_S650_SRC_URI="http://tevii.com/${TEVII_S650}"
+TEVII_S660=100205_linux_tevii_ds3000.rar
+TEVII_S660_SRC_URI="http://tevii.com/${TEVII_S660}"
 get_dvb_firmware="${FILESDIR}/get_dvb_firmware-${PV}"
 # from http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6-stable.git;a=history;f=Documentation/dvb/get_dvb_firmware
 
@@ -40,6 +42,8 @@
 	"or51132"
 	"usb-dw2104"
 	"usb-dw2104"
+	"usb-s630"
+	"usb-s630"
 # own URL
 	"ttpci"
 	"bcm3510"
@@ -87,6 +91,8 @@
 	"dvb-fe-or51132-vsb.fw"
 	"dvb-usb-dw2104.fw"
 	"dvb-fe-cx24116.fw"
+	"dvb-usb-s630.fw"
+	"dvb-fe-ds3000.fw"
 # own URL
 	"dvb-ttpci-01.fw"
 	"dvb-fe-bcm3510-01.fw"
@@ -134,6 +140,8 @@
 	"-"
 	"-"
 	"-"
+	"-"
+	"-"
 # own URL
 	"-"
 	"-"
@@ -179,8 +187,10 @@
 	"${PACKET_SRC_URI}"
 	"${PACKET_SRC_URI}"
 	"${PACKET_SRC_URI}"
-	"${TEVII_SRC_URI}"
-	"${TEVII_SRC_URI}"
+	"${TEVII_S650_SRC_URI}"
+	"${TEVII_S650_SRC_URI}"
+	"${TEVII_S660_SRC_URI}"
+	"${TEVII_S660_SRC_URI}"
 # own URL
 	"http://www.escape-edv.de/endriss/firmware/dvb-ttpci-01.fw-fc2624"
 	"http://www.linuxtv.org/downloads/firmware/dvb-fe-bcm3510-01.fw"
@@ -314,9 +324,14 @@
 		unpack ${PACKET_NAME}
 	fi
 
-	# unpack tevii packet
-	if has ${TEVII_NAME} ${A}; then
-		unpack ${TEVII_NAME}
+	# unpack tevii s650 packet
+	if has ${TEVII_S650} ${A}; then
+		unpack ${TEVII_S650}
+	fi
+
+	# unpack tevii s660 packet
+	if has ${TEVII_S660} ${A}; then
+		unpack ${TEVII_S660}
 	fi
 
 	if [[ -z ${DVB_CARDS} ]] || use dvb_cards_mpc718 ; then
@@ -331,6 +346,11 @@
 		mv tevii_linuxdriver_0815/fw/dvb-fe-cx24116.fw ./
 	fi
 
+	if [[ -z ${DVB_CARDS} ]] || use dvb_cards_usb-s630 ; then
+		mv 100205_linux_tevii_ds3000/dvb-usb-teviis660.fw dvb-usb-s630.fw
+		mv 100205_linux_tevii_ds3000/dvb-fe-d3000.fw ./
+	fi
+
 	local script_v=${PV}
 
 	# Adjust temp-dir of get_dvb_firmware