--- /usr/portage/media-tv/ivtv/ivtv-0.7.0.ebuild	2006-07-08 11:36:08.000000000 -0500
+++ /usr/local/portage/media-tv/ivtv/ivtv-0.7.0.ebuild	2006-07-09 20:44:02.000000000 -0500
@@ -1,24 +1,20 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.7.0.ebuild,v 1.2 2006/07/08 16:08:28 cardoe Exp $
+# $Header: $
 
 inherit eutils linux-mod
 
 DESCRIPTION="ivtv driver for Hauppauge PVR PCI cards"
 HOMEPAGE="http://www.ivtvdriver.org"
 
-FW_VER_DEC="pvr_1.18.21.22254_inf.zip"
-FW_VER_ENC="pvr_2.0.43.24103_whql.zip"
-#Switched to recommended firmware by driver
-
-SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/0.7.x/${P}.tar.gz
-	ftp://ftp.shspvr.com/download/wintv-pvr_150-500/inf/${FW_VER_ENC}
-	ftp://ftp.shspvr.com/download/wintv-pvr_250-350/inf/${FW_VER_DEC}"
+FW="firmware"
+SRC_URI="http://dl.ivtvdriver.org/ivtv/stable/${P}.tar.gz
+	http://dl.ivtvdriver.org/ivtv/firmware/${FW}.tar.gz"
 
 RESTRICT="nomirror"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~ppc"
+KEYWORDS="~amd64"
 
 IUSE=""
 
@@ -27,16 +23,14 @@
 CONFIG_CHECK="I2C_ALGOBIT VIDEO_DEV I2C_CHARDEV I2C"
 
 RDEPEND="sys-apps/hotplug"
-DEPEND="app-arch/unzip"
 
 pkg_setup() {
 	linux-mod_pkg_setup
-	MODULE_NAMES="ivtv(extra:${S}/driver) \
-			saa717x(extra:${S}/i2c-drivers)"
+	MODULE_NAMES="ivtv(extra:${S}/driver)"
 
 	if kernel_is 2 6 17; then
+		CONFIG_CHECK="${CONFIG_CHECK} VIDEO_SAA7127 VIDEO_SAA711X VIDEO_BT848 VIDEO_TVEEPROM"
 		CONFIG_CHECK="${CONFIG_CHECK} VIDEO_WM8775 VIDEO_MSP3400 VIDEO_CX25840 VIDEO_TUNER"
-		CONFIG_CHECK="${CONFIG_CHECK} VIDEO_SAA711X VIDEO_SAA7127 VIDEO_BT848 VIDEO_TVEEPROM"
 	else
 		die "This only works on 2.6.17 kernels"
 	fi
@@ -49,15 +43,11 @@
 
 src_unpack() {
 	unpack ${P}.tar.gz
-	unpack ${FW_VER_ENC}
-
-	cd ${S}
-	sed -e "s:^VERS26=.*:VERS26=${KV_MAJOR}.${KV_MINOR}:g" \
-		-i ${S}/driver/Makefile || die "sed failed"
+	unpack ${FW}.tar.gz
 }
 
 src_compile() {
-	cd ${S}/driver
+	cd ${S}
 	linux-mod_src_compile || die "failed to build driver "
 
 	cd ${S}/utils
@@ -65,17 +55,11 @@
 }
 
 src_install() {
-	cd ${S}/utils
+	cd ${S}
 	dodir /lib/firmware
-	./ivtvfwextract.pl "${DISTDIR}"/${FW_VER_DEC} \
-		"${D}"/lib/firmware/v4l-cx2341x-enc.fw \
-		"${D}"/lib/firmware/v4l-cx2341x-dec.fw
-
-	make KERNELDIR="${KERNEL_DIR}" DESTDIR="${D}" PREFIX=/usr install || die "failed to install"
-
 	insinto /lib/firmware
-	newins "${WORKDIR}"/DriverA2/HcwMakoC.ROM v4l-cx25840.fw
-	newins ${S}/v4l-cx2341x-init.mpg v4l-cx2341x-init.mpg
+	doins "${WORKDIR}"/*.fw
+	doins ${S}/v4l-cx2341x-init.mpg
 
 	cd ${S}
 	dodoc README doc/* utils/README.X11
@@ -87,3 +71,4 @@
 	insinto /etc/modules.d
 	newins "${FILESDIR}"/ivtv ivtv
 }
+