version bump, drop old version

9 files changed, 19 insertions, 264 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index cb6ebb634fca..cb7b94ade937 100644
--- a/media-tv/ivtv/ChangeLog
+++ b/media-tv/ivtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/ivtv
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.16 2004/10/29 03:09:52 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.17 2004/11/30 13:34:24 iggy Exp $
+
+*ivtv-0.2.0_rc3 (30 Nov 2004)
+
+  30 Nov 2004; Brian Jackson <iggy@gentoo.org> -ivtv-0.1.9-r4.ebuild,
+  -ivtv-0.2.0_rc1-r1.ebuild, -ivtv-0.2.0_rc1.ebuild, +ivtv-0.2.0_rc3.ebuild:
+  version bump, drop old version
 
 *ivtv-0.2.0_rc2 (28 Oct 2004)
 
diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index 8c737e6df8ce..694ac347ce18 100644
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 99a63aa5c268690eb893ed50eb8cecf8 ivtv-0.2.0_rc2.ebuild 3634
 MD5 9da8b81328dd2fba10b93b1d2c6b14ae ivtv-0.2.0_rc1-r1.ebuild 3710
 MD5 9ae322027f63420b0508cae24306924c ivtv-0.1.9-r4.ebuild 3493
 MD5 68c5303bfb74087e97261a843f7da938 ivtv-0.2.0_rc1.ebuild 3707
+MD5 0443b5018068815cf991f48f8b3ecae0 ivtv-0.2.0_rc3.ebuild 3673
 MD5 8b7158e7ba985a6d24cdfcb6e497c767 ChangeLog 2210
 MD5 212f198236ed9fef7b10b46f8cb80c63 metadata.xml 446
 MD5 706947f1027708969a61f7b5dcfb3727 files/digest-ivtv-0.2.0_rc1 127
 MD5 f58ee9b309859204cc863b08568d4e24 files/digest-ivtv-0.2.0_rc2 127
+MD5 8af31e29d594effa9af1bf2f135b7536 files/digest-ivtv-0.2.0_rc3 133
 MD5 c30318ac79a607f6ad308208a5987c3b files/digest-ivtv-0.1.9-r4 129
 MD5 706947f1027708969a61f7b5dcfb3727 files/digest-ivtv-0.2.0_rc1-r1 127
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBgbR7MSkoRwEucGERAiQVAJ9NYP7u/nDRlr+gIJL+b9Qw/LqT5gCg8OiJ
-75pNWQmsTZuwrQaETQzn3CQ=
-=BHhC
------END PGP SIGNATURE-----
diff --git a/media-tv/ivtv/files/digest-ivtv-0.1.9-r4 b/media-tv/ivtv/files/digest-ivtv-0.1.9-r4
deleted file mode 100644
index 8b8857dd2f18..000000000000
--- a/media-tv/ivtv/files/digest-ivtv-0.1.9-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d3ca3cdbb9a637ac99382307abfb25cc ivtv-0.1.9-r4.tar.bz2 380229
-MD5 173c5ce2c0f16da42a5316ef7cee6834 pvr250_18a_inf.zip 676578
diff --git a/media-tv/ivtv/files/digest-ivtv-0.2.0_rc1 b/media-tv/ivtv/files/digest-ivtv-0.2.0_rc1
deleted file mode 100644
index d6266b8571f5..000000000000
--- a/media-tv/ivtv/files/digest-ivtv-0.2.0_rc1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f214b7ff5db462c6cbc1cae39d6badd8 ivtv-0.2.0-rc1c.tgz 524435
-MD5 173c5ce2c0f16da42a5316ef7cee6834 pvr250_18a_inf.zip 676578
diff --git a/media-tv/ivtv/files/digest-ivtv-0.2.0_rc1-r1 b/media-tv/ivtv/files/digest-ivtv-0.2.0_rc1-r1
deleted file mode 100644
index d6266b8571f5..000000000000
--- a/media-tv/ivtv/files/digest-ivtv-0.2.0_rc1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f214b7ff5db462c6cbc1cae39d6badd8 ivtv-0.2.0-rc1c.tgz 524435
-MD5 173c5ce2c0f16da42a5316ef7cee6834 pvr250_18a_inf.zip 676578
diff --git a/media-tv/ivtv/files/digest-ivtv-0.2.0_rc3 b/media-tv/ivtv/files/digest-ivtv-0.2.0_rc3
new file mode 100644
index 000000000000..91c54081ea01
--- /dev/null
+++ b/media-tv/ivtv/files/digest-ivtv-0.2.0_rc3
@@ -0,0 +1,2 @@
+MD5 052098067e7fa93bc9ffaf73e50eda7c ivtv-0.2.0-rc3.tgz 515266
+MD5 173c5ce2c0f16da42a5316ef7cee6834 pvr_1.18.21.22168_inf.zip 676578
diff --git a/media-tv/ivtv/ivtv-0.1.9-r4.ebuild b/media-tv/ivtv/ivtv-0.1.9-r4.ebuild
deleted file mode 100644
index bde3dfb6cb18..000000000000
--- a/media-tv/ivtv/ivtv-0.1.9-r4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.1.9-r4.ebuild,v 1.3 2004/10/02 17:45:57 iggy Exp $
-
-# TODO
-# the "Gentoo way" is to use /usr/src/linux, not the running kernel
-# removed ptune*.pl, need to make a seperate package for it
-# check for other msp3400 modules
-# add a few notes to the postinst output about what's needed (bttv/tuner, etc.)
-
-inherit eutils
-
-DESCRIPTION="ivtv driver for Hauppauge PVR[23]50 cards"
-HOMEPAGE="http://ivtv.sourceforge.net"
-
-SRC_URI="mirror://gentoo/${P}-${PR}.tar.bz2
-	http://hauppauge.lightpath.net/software/pvr250/pvr250_18a_inf.zip"
-
-RESTRICT="nomirror"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-[ "`echo ${KV} | cut -f2 -d.`" == 6 ] && SANDBOX_DISABLED="1"
-
-IUSE="lirc"
-
-DEPEND="lirc? ( app-misc/lirc )
-	app-arch/unzip"
-
-src_unpack() {
-	unpack ${P}-${PR}.tar.bz2
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	cd ${WORKDIR}/${P}-${PR}/driver
-	make || die "build of driver failed"
-
-	cd ${WORKDIR}/${P}-${PR}/utils
-	make ||  die "build of utils failed"
-}
-
-src_install() {
-	cd ${WORKDIR}/${P}-${PR}/utils
-	cp ${DISTDIR}/pvr250_18a_inf.zip .
-	dodir /lib/modules
-	touch ${D}/lib/modules/ivtv-fw-{enc,dec}.bin
-	./ivtvfwextract.pl pvr250_18a_inf.zip \
-		${D}/lib/modules/ivtv-fw-enc.bin \
-		${D}/lib/modules/ivtv-fw-dec.bin
-
-	cd ${WORKDIR}/${P}-${PR}
-	dodoc README doc/*
-
-	cd ${WORKDIR}/${P}-${PR}/utils
-	newbin test_ioctl ivtvctl
-	newbin encoder ivtv-encoder
-	newbin fwapi ivtv-fwapi
-	newbin radio ivtv-radio
-	newbin vbi ivtv-vbi
-	newbin mpegindex ivtv-mpegindex
-	dobin ivtvfbctl ivtvplay
-	newdoc README README.utils
-	dodoc README.mythtv-ivtv README.radio README.vbi zvbi.diff
-	dodoc lircd-g.conf lircd.conf lircrc
-
-	cd ${WORKDIR}/${P}-${PR}/driver
-	make DESTDIR=${D} install || die "installation of driver failed"
-
-	set_arch_to_portage
-
-	dodir /etc/modules.d
-
-	echo <<-myEOF >>${D}/etc/modules.d/ivtv
-	alias char-major-81     videodev
-	alias char-major-81-0   ivtv
-	options ivtv debug=1
-	options tuner type=2
-	options saa7127 enable_output=1 output_select=0
-	options msp3400 once=1 simple=1
-	add below ivtv msp3400 saa7115 tuner
-	post-install ivtv /usr/local/bin/test_ioctl -d /dev/video0 -u 0x3000
-	myEOF
-
-	if [ `has app-misc/lirc` ] || use lirc ; then
-		echo "alias char-major-61 lirc_i2c" >> ${D}/etc/modules.d/ivtv
-		echo "add above ivtv lirc_dev lirc_i2c" >> ${D}/etc/modules.d/ivtv
-	else
-		einfo "Not enabling lirc support. emerge lirc to get it."
-	fi
-
-}
-
-pkg_postinst() {
-	depmod -ae
-
-	einfo "You now have the driver for the Hauppauge PVR-[23]50 cards."
-	einfo "Add ivtv to /etc/modules.autoload.d/kernel-2.X"
-	einfo "You'll now need an application to watch tv. MythTV is the only choice at"
-	einfo "the moment. To get the ir remote working, you'll need to emerge lirc"
-	einfo "with the following env variable set:"
-	einfo "LIRC_OPTS=\"--with-x --with-driver=hauppauge --with-major=61"
-	einfo "	--with-port=none --with-irq=none\""
-	einfo "see http://ivtv.sourceforge.net for more info"
-	echo
-	einfo "to use vbi, you'll need a few other things, check README.vbi in the docs dir"
-	echo
-	einfo "you'll also need to add 'LIRCD_OPTS=\"--device=/dev/lirc/0\"' to /etc/conf.d/lircd"
-
-	if [ -f "/lib/modules/`uname -r`/kernel/drivers/media/video/msp3400.ko" ] ; then
-		ewarn "You have the msp3400 module that comes with the kernel. It isn't compatible"
-		ewarn "with ivtv. You need to back it up to somewhere else, then run depmod -ae again"
-	fi
-}
diff --git a/media-tv/ivtv/ivtv-0.2.0_rc1-r1.ebuild b/media-tv/ivtv/ivtv-0.2.0_rc1-r1.ebuild
deleted file mode 100644
index 01afa67c60a9..000000000000
--- a/media-tv/ivtv/ivtv-0.2.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.2.0_rc1-r1.ebuild,v 1.1 2004/10/26 20:49:46 iggy Exp $
-
-# TODO
-# the "Gentoo way" is to use /usr/src/linux, not the running kernel
-# removed ptune*.pl, need to make a seperate package for it
-# check for other msp3400 modules
-# add a few notes to the postinst output about what's needed (bttv/tuner, etc.)
-
-inherit eutils
-
-DESCRIPTION="ivtv driver for Hauppauge PVR[23]50 cards"
-HOMEPAGE="http://ivtv.sourceforge.net"
-
-# stupidly named tarballs
-MY_P="${P/_/-}c"
-
-
-SRC_URI="http://67.18.1.101/~ckennedy/ivtv/${MY_P/1c/}/${MY_P}.tgz
-	http://hauppauge.lightpath.net/software/pvr250/pvr250_18a_inf.zip"
-
-RESTRICT="nomirror"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-[ "`echo ${KV} | cut -f2 -d.`" == 6 ] && SANDBOX_DISABLED="1"
-
-IUSE="lirc"
-
-DEPEND="app-arch/unzip
-	lirc? ( app-misc/lirc )"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-	cd ${WORKDIR}/${MY_P}/driver
-	sed -i -e 's:$(MODDIR):$(DESTDIR)/$(MODDIR):g' \
-		-e 's:$(INCLUDEDIR):$(DESTDIR)/$(INCLUDEDIR):g' \
-		Makefile2.4 || die "sed failed"
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	cd ${WORKDIR}/${MY_P}/driver
-	make || die "build of driver failed"
-
-	cd ${WORKDIR}/${MY_P}/utils
-	make ||  die "build of utils failed"
-}
-
-src_install() {
-	cd ${WORKDIR}/${MY_P}/utils
-	cp ${DISTDIR}/pvr250_18a_inf.zip .
-	dodir /lib/modules
-	touch ${D}/lib/modules/ivtv-fw-{enc,dec}.bin
-	./ivtvfwextract.pl pvr250_18a_inf.zip \
-		${D}/lib/modules/ivtv-fw-enc.bin \
-		${D}/lib/modules/ivtv-fw-dec.bin
-
-	cd ${WORKDIR}/${MY_P}
-	dodoc README doc/*
-
-	cd ${WORKDIR}/${MY_P}/utils
-	newbin encoder ivtv-encoder
-	newbin fwapi ivtv-fwapi
-	newbin radio ivtv-radio
-	newbin vbi ivtv-vbi
-	newbin mpegindex ivtv-mpegindex
-	dobin ivtvfbctl ivtvplay ivtvctl
-	newdoc README README.utils
-	dodoc README.mythtv-ivtv README.radio README.vbi zvbi.diff
-	dodoc lircd-g.conf lircd.conf lircrc
-
-	# for whatever reason, the Makefile doesn't make the dirs we need
-	# fixes bug # 68110
-	dodir /usr/include/linux
-	dodir /lib/modules/`uname -r`/extra
-	cd ${WORKDIR}/${MY_P}/driver
-	make DESTDIR=${D} INSTALL_MOD_PATH=${D} \
-		install || die "installation of driver failed"
-
-	set_arch_to_portage
-
-	dodir /etc/modules.d
-
-	echo "alias char-major-81     videodev" >>${D}/etc/modules.d/ivtv
-	echo "alias char-major-81-0   ivtv" >>${D}/etc/modules.d/ivtv
-
-	if [ `has app-misc/lirc` ] || use lirc ; then
-		echo "alias char-major-61 lirc_i2c" >> ${D}/etc/modules.d/ivtv
-		echo "add above ivtv lirc_dev lirc_i2c" >> ${D}/etc/modules.d/ivtv
-	else
-		einfo "Not enabling lirc support. emerge lirc to get it."
-	fi
-
-}
-
-pkg_postinst() {
-	depmod -ae
-
-	einfo "You now have the driver for the Hauppauge PVR-[23]50 cards."
-	einfo "Add ivtv to /etc/modules.autoload.d/kernel-2.X"
-	einfo "You'll now need an application to watch tv. "
-	einfo "To get the ir remote working, you'll need to emerge lirc"
-	einfo "with the following env variable set:"
-	einfo "LIRC_OPTS=\"--with-x --with-driver=hauppauge --with-major=61"
-	einfo "	--with-port=none --with-irq=none\""
-	einfo "see http://ivtv.sourceforge.net for more info"
-	echo
-	einfo "to use vbi, you'll need a few other things, check README.vbi in the docs dir"
-	echo
-	einfo "you'll also need to add 'LIRCD_OPTS=\"--device=/dev/lirc/0\"' to /etc/conf.d/lircd"
-	echo
-	einfo "The ptune* scripts have moved to media-tv/ivtv-ptune, emerge that to use those scripts"
-
-	if [ -f "/lib/modules/`uname -r`/kernel/drivers/media/video/msp3400.ko" ] ; then
-		ewarn "You have the msp3400 module that comes with the kernel. It isn't compatible"
-		ewarn "with ivtv. You need to back it up to somewhere else, then run depmod -ae again"
-	fi
-}
diff --git a/media-tv/ivtv/ivtv-0.2.0_rc1.ebuild b/media-tv/ivtv/ivtv-0.2.0_rc3.ebuild
index 11c438ae4b2a..57e9845dee18 100644
--- a/media-tv/ivtv/ivtv-0.2.0_rc1.ebuild
+++ b/media-tv/ivtv/ivtv-0.2.0_rc3.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.2.0_rc1.ebuild,v 1.4 2004/10/26 20:46:29 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.2.0_rc3.ebuild,v 1.1 2004/11/30 13:34:24 iggy Exp $
 
 # TODO
 # the "Gentoo way" is to use /usr/src/linux, not the running kernel
-# removed ptune*.pl, need to make a seperate package for it
-# check for other msp3400 modules
 # add a few notes to the postinst output about what's needed (bttv/tuner, etc.)
 
 inherit eutils
@@ -14,11 +12,12 @@ DESCRIPTION="ivtv driver for Hauppauge PVR[23]50 cards"
 HOMEPAGE="http://ivtv.sourceforge.net"
 
 # stupidly named tarballs
-MY_P="${P/_/-}c"
+MY_P="${P/_/-}"
+FW_VER="pvr_1.18.21.22168_inf.zip"
 
-
-SRC_URI="http://67.18.1.101/~ckennedy/ivtv/${MY_P/1c/}/${MY_P}.tgz
-	http://hauppauge.lightpath.net/software/pvr250/pvr250_18a_inf.zip"
+SRC_URI="http://67.18.1.101/~ckennedy/ivtv/${MY_P}.tgz
+	http://67.18.1.101/~ckennedy/ivtv/ivtv-0.2.0-rc/${MY_P}.tgz
+	ftp://ftp.shspvr.com/download/wintv-pvr_250-350/inf/${FW_VER}"
 
 RESTRICT="nomirror"
 SLOT="0"
@@ -52,10 +51,10 @@ src_compile() {
 
 src_install() {
 	cd ${WORKDIR}/${MY_P}/utils
-	cp ${DISTDIR}/pvr250_18a_inf.zip .
+	cp ${DISTDIR}/${FW_VER} .
 	dodir /lib/modules
 	touch ${D}/lib/modules/ivtv-fw-{enc,dec}.bin
-	./ivtvfwextract.pl pvr250_18a_inf.zip \
+	./ivtvfwextract.pl ${FW_VER} \
 		${D}/lib/modules/ivtv-fw-enc.bin \
 		${D}/lib/modules/ivtv-fw-dec.bin