5 files changed, 132 insertions, 10 deletions
diff --git a/media-tv/ivtv-ptune/Manifest b/media-tv/ivtv-ptune/Manifest
index 84709a11380d..ca85e3ec9c65 100644
--- a/media-tv/ivtv-ptune/Manifest
+++ b/media-tv/ivtv-ptune/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 01832929deb7854b226fad42b279c014 ivtv-ptune-0.2.0_rc1.ebuild 753
-MD5 f2d03d403b79cbd0325471b26ed1037f ChangeLog 359
+MD5 48c81afebcbccb4d858785e6c2c316d8 ivtv-ptune-0.2.0_rc1.ebuild 768
+MD5 86d870faad9dc08ac7503b550fbf8da1 ChangeLog 474
 MD5 212f198236ed9fef7b10b46f8cb80c63 metadata.xml 446
 MD5 f741df968e038a530011b187a7a7aa5c files/digest-ivtv-ptune-0.2.0_rc1 64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBcEqDMSkoRwEucGERAsf6AKDO6groc9gBQsa8V6wVlgwudzuBIACg7Vp+
-aoSVobkmikeuxPn2ZsJTFxE=
-=P8q2
+iD8DBQFBcFVsMSkoRwEucGERAogmAJ9KfZ7HrQuefvPUWqzXmu6N4+gJGwCgwIDn
+4qNEYagsz2N4WHdKnYfD7H4=
+=gzDj
 -----END PGP SIGNATURE-----
diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index c7ed9b95421e..c361c09546d4 100644
--- a/media-tv/ivtv/ChangeLog
+++ b/media-tv/ivtv/ChangeLog
@@ -1,6 +1,11 @@
 # 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.10 2004/10/02 17:45:57 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.11 2004/10/15 22:52:40 iggy Exp $
+
+*ivtv-0.2.0_rc1 (15 Oct 2004)
+
+  15 Oct 2004; <iggy@gentoo.org> +ivtv-0.2.0_rc1.ebuild:
+  version bump
 
 *ivtv-0.1.9-r4 (02 Oct 2004)
 
diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index 77f2c9aef66c..a0e0e1d56116 100644
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA1
 
 MD5 9ae322027f63420b0508cae24306924c ivtv-0.1.9-r4.ebuild 3493
-MD5 fbf92fe0f7381399b5e627aad83716c5 ChangeLog 1563
+MD5 62f20d68f54f2a8ec4bef2dd90876c0e ivtv-0.2.0_rc1.ebuild 3355
+MD5 b71d72ee2f292d2bd1f4a19abec442fe ChangeLog 1667
 MD5 1992ed55b53c47d18457afada6ec3445 ivtv-0.1.9-r3.ebuild 3297
 MD5 212f198236ed9fef7b10b46f8cb80c63 metadata.xml 446
+MD5 706947f1027708969a61f7b5dcfb3727 files/digest-ivtv-0.2.0_rc1 127
 MD5 0b541d724c1b04481ef21b872a7631c9 files/digest-ivtv-0.1.9-r3 191
 MD5 c30318ac79a607f6ad308208a5987c3b files/digest-ivtv-0.1.9-r4 129
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBXuldMSkoRwEucGERAtVoAKC9FPJOmNs3r3QiktJGnrscj/wrIQCggVd3
-6FNhELprRApXbruJg/h1YMs=
-=yYiN
+iD8DBQFBcFS3MSkoRwEucGERAvNYAJwLRgpBWlQ5oWsiydDxPPHSF3mjTACg2cng
+FFJQnzUgcas8IMhrOoO96RM=
+=2Gel
 -----END PGP SIGNATURE-----
diff --git a/media-tv/ivtv/files/digest-ivtv-0.2.0_rc1 b/media-tv/ivtv/files/digest-ivtv-0.2.0_rc1
new file mode 100644
index 000000000000..d6266b8571f5
--- /dev/null
+++ b/media-tv/ivtv/files/digest-ivtv-0.2.0_rc1
@@ -0,0 +1,2 @@
+MD5 f214b7ff5db462c6cbc1cae39d6badd8 ivtv-0.2.0-rc1c.tgz 524435
+MD5 173c5ce2c0f16da42a5316ef7cee6834 pvr250_18a_inf.zip 676578
diff --git a/media-tv/ivtv/ivtv-0.2.0_rc1.ebuild b/media-tv/ivtv/ivtv-0.2.0_rc1.ebuild
new file mode 100644
index 000000000000..3bb1fcee9efb
--- /dev/null
+++ b/media-tv/ivtv/ivtv-0.2.0_rc1.ebuild
@@ -0,0 +1,113 @@
+# 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.1 2004/10/15 22:52:40 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}.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="lirc? ( app-misc/lirc )"
+
+src_unpack() {
+	unpack ${MY_P}.tgz
+}
+
+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 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}/${MY_P}/driver
+	make DESTDIR=${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
+}