--- /media/system/repositories/portage/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.09.19.ebuild	2009-11-12 19:36:37.000000000 +0100
+++ /home/billie/Desktop/todo/linuxtv-dvb-firmware/ebuild/linuxtv-dvb-firmware-2010.02.26.ebuild	2010-04-11 14:52:02.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.09.19.ebuild,v 1.2 2009/11/12 18:18:55 billie Exp $
 
+inherit eutils
+
 DESCRIPTION="Firmware files needed for operation of some dvb-devices"
 HOMEPAGE="http://www.linuxtv.org"
 
@@ -20,8 +22,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 +44,8 @@
 	"or51132"
 	"usb-dw2104"
 	"usb-dw2104"
+	"usb-s630"
+	"usb-s630"
 # own URL
 	"ttpci"
 	"bcm3510"
@@ -57,6 +63,10 @@
 	"pvrusb2"
 	"usb-bluebird"
 	"tda10045"
+	"ngene"
+	"ngene"
+	"usb-af9015"
+	"au0828"
 # get_dvb_firmware
 	"sp8870"
 	"tda10046"
@@ -69,7 +79,6 @@
 	"vp7041"
 	"nxt200x"
 	"mpc718"
-	"usb-af9015"
 )
 
 FW_FILES=(
@@ -87,6 +96,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"
@@ -104,6 +115,10 @@
 	"v4l-cx25840.fw"
 	"dvb-usb-bluebird-01.fw"
 	"dvb-fe-tda10045.fw"
+	"ngene_15.fw"
+	"ngene_17.fw"
+	"dvb-usb-af9015.fw"
+	"dvb-fe-xc5000-1.6.114.fw"
 # get_dvb_firmware
 	"dvb-fe-sp8870.fw"
 	"dvb-fe-tda10046.fw"
@@ -116,7 +131,6 @@
 	"dvb-vp7041-2.422.fw"
 	"dvb-fe-nxt2004.fw"
 	"dvb-cx18-mpc718-mt352.fw"
-	"dvb-usb-af9015.fw"
 )
 
 FW_GET_PARAMETER=(
@@ -134,6 +148,8 @@
 	"-"
 	"-"
 	"-"
+	"-"
+	"-"
 # own URL
 	"-"
 	"-"
@@ -151,6 +167,10 @@
 	"-"
 	"-"
 	"-"
+	"-"
+	"-"
+	"-"
+	"-"
 # get_dvb_firmware
 	"sp8870"
 	"tda10046"
@@ -163,7 +183,6 @@
 	"vp7041"
 	"nxt2004"
 	"mpc718"
-	"af9015"
 )
 
 FW_URLS=(
@@ -179,14 +198,16 @@
 	"${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"
 	"http://www.linuxtv.org/downloads/firmware/dvb-usb-wt220u-02.fw"
 	"http://home.arcor.de/efocht/dvb-usb-wt220u-fc03.fw"
-	"http://www.wi-bw.tfh-wildau.de/~pboettch/home/files/dvb-usb-dib0700-1.20.fw"
+	"http://www.linuxtv.org/downloads/firmware/dvb-usb-dib0700-1.20.fw"
 	"http://peterdamen.com/dvb-fe-sp887x.fw"
 	"http://ventoso.org/luca/af9005/af9005.fw"
 	"http://linuxtv.org/downloads/firmware/v4l-cx231xx-avcore-01.fw"
@@ -198,6 +219,10 @@
 	"http://linuxtv.org/downloads/firmware/v4l-cx25840.fw"
 	"http://linuxtv.org/downloads/firmware/dvb-usb-bluebird-01.fw"
 	"http://www.fireburn.co.uk/dvb-fe-tda10045.fw"
+	"http://www.digitaldevices.de/download/ngene_15.fw"
+	"http://www.digitaldevices.de/download/ngene_17.fw"
+	"http://www.otit.fi/~crope/v4l-dvb/af9015/af9015_firmware_cutter/firmware_files/4.95.0/dvb-usb-af9015.fw"
+	"http://www.linuxtv.org/downloads/firmware/dvb-fe-xc5000-1.6.114.fw"
 # get_dvb_firmware
 	"http://2.download.softwarepatch.pl/1619edb0dcb493dd5337b94a1f79c3f6/tt_Premium_217g.zip"
 	"http://www.tt-download.com/download/updates/219/TT_PCI_2.19h_28_11_2006.zip"
@@ -210,7 +235,6 @@
 	"http://www.twinhan.com/files/AW/Software/TwinhanDTV2.608a.zip"
 	"http://www.avermedia-usa.com/support/Drivers/AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip"
 	"ftp://ftp.work.acer-euro.com/desktop/aspire_idea510/vista/Drivers/Yuan%20MPC718%20TV%20Tuner%20Card%202.13.10.1016.zip"
-	"http://www.ite.com.tw/EN/Services/download.ashx?file=57"
 )
 
 SRC_URI=""
@@ -237,6 +261,12 @@
 		# all firmwares extracted by get_dvb_firmware need unzip
 		DEPEND="${DEPEND} dvb_cards_${FW_USE_FLAGS[CARD]}? ( app-arch/unzip )"
 	fi
+
+	USE_FLAG="${FW_USE_FLAGS[CARD]}"
+	if [[ ${USE_FLAG} = "usb-dw2104" ]] || [[ ${USE_FLAG} = "usb-s630" ]]; then
+		# TEVII firmwares need unrar
+		DEPEND="${DEPEND} dvb_cards_${FW_USE_FLAGS[CARD]}? ( app-arch/unrar )"
+	fi
 done
 
 SRC_URI="${SRC_URI} ${NEGATIVE_USE_FLAGS} ${ALL_URLS} ${NEGATIVE_END_BRACKETS}"
@@ -314,11 +344,16 @@
 		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
 		mv Yuan%20MPC718%20TV%20Tuner%20Card%202.13.10.1016.zip "Yuan MPC718 TV Tuner Card 2.13.10.1016.zip"
 	fi
@@ -331,11 +366,19 @@
 		mv tevii_linuxdriver_0815/fw/dvb-fe-cx24116.fw ./
 	fi
 
+	if [[ -z ${DVB_CARDS} ]] || use dvb_cards_usb-s630 ; then
+		mv dvb-usb-teviis660.fw dvb-usb-s630.fw
+	fi
+
 	local script_v=${PV}
 
 	# Adjust temp-dir of get_dvb_firmware
 	sed "${FILESDIR}"/get_dvb_firmware-${script_v} \
 		-e "s#/tmp#${T}#g" > get_dvb_firmware
+
+	# patch get_dvb_firmware
+	epatch "${FILESDIR}"/get_dvb_firmware-${script_v}.patch
+
 	chmod a+x get_dvb_firmware
 
 	# extract the firmware-files