bump to make sure everybody gets the fixes

6 files changed, 132 insertions, 126 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index bc49899566ed..1045ba6a8bb6 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.14 2004/10/26 20:46:29 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.15 2004/10/26 20:49:46 iggy Exp $
+
+  26 Oct 2004; <iggy@gentoo.org> :
+  bump to make sure everybody gets the fixes
+
+*ivtv-0.2.0_rc1-r1
 
   26 Oct 2004; <iggy@gentoo.org> ivtv-0.2.0_rc1.ebuild:
   fixed a few bugs, 68228, 68231, 68516
diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index e641b4f85e33..fdec9bf43f3b 100644
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 68c5303bfb74087e97261a843f7da938 ivtv-0.2.0_rc1-r1.ebuild 3707
 MD5 9ae322027f63420b0508cae24306924c ivtv-0.1.9-r4.ebuild 3493
 MD5 68c5303bfb74087e97261a843f7da938 ivtv-0.2.0_rc1.ebuild 3707
 MD5 930c60b2a42ebe45a7a3be22097cf1e0 ChangeLog 2005
@@ -9,10 +7,4 @@ 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)
-
-iD8DBQFBfremMSkoRwEucGERAowoAKDz8InQ6EBsF1JnsY40Nfg09m1f0gCg4mN+
-Q/W3msCBjBCgIJYaM5t/vfI=
-=PzVe
------END PGP SIGNATURE-----
+MD5 706947f1027708969a61f7b5dcfb3727 files/digest-ivtv-0.2.0_rc1-r1 127
diff --git a/media-tv/ivtv/files/digest-ivtv-0.1.9-r3 b/media-tv/ivtv/files/digest-ivtv-0.1.9-r3
deleted file mode 100644
index a375a7f187c9..000000000000
--- a/media-tv/ivtv/files/digest-ivtv-0.1.9-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ff350ebc9f3f593031085e63381ca362 ivtv-0.1.9.tar.gz 168331
-MD5 c34803bc1ca86567076ac7dc0df91076 pvr250_17_21288.exe 2615322
-MD5 d48620c63fcf651805b4a971cde44da1 ivtv-0.1.9-r3.patch 162633
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
new file mode 100644
index 000000000000..d6266b8571f5
--- /dev/null
+++ b/media-tv/ivtv/files/digest-ivtv-0.2.0_rc1-r1
@@ -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.1.9-r3.ebuild b/media-tv/ivtv/ivtv-0.1.9-r3.ebuild
deleted file mode 100644
index 5e14d0a603e4..000000000000
--- a/media-tv/ivtv/ivtv-0.1.9-r3.ebuild
+++ /dev/null
@@ -1,112 +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-r3.ebuild,v 1.4 2004/06/25 00:31:50 agriffis Exp $
-
-# TODO
-# the "Gentoo way" is to use /usr/src/linux, not the running kernel
-# make it detect whether it's a 2.6 kernel and patch if necessary
-
-inherit eutils
-
-DESCRIPTION="ivtv driver for Hauppauge PVR[23]50 cards"
-HOMEPAGE="http://ivtv.sourceforge.net"
-
-SRC_URI="mirror://sourceforge/ivtv/${P}.tar.gz
-	http://hauppauge.lightpath.net/software/pvr250/pvr250_17_21288.exe
-	mirror://gentoo/${PF}.patch"
-
-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}.tar.gz
-
-	cd ${WORKDIR}/ivtv
-	epatch ${DISTDIR}/${PF}.patch || die "${PF} patch failed"
-}
-
-src_compile() {
-	[ "${ARCH}" == "x86" ] && old_ARCH="${ARCH}" && ARCH="i386"
-
-	cd ${WORKDIR}/ivtv/driver
-	make || die "build of driver failed"
-
-	[ -n "${old_ARCH}" ] && ARCH="${old_ARCH}"
-
-	cd ${WORKDIR}/ivtv/utils
-	make ||  die "build of utils failed"
-}
-
-src_install() {
-	cd ${WORKDIR}/ivtv/utils
-	cp ${DISTDIR}/pvr250_17_21288.exe .
-	dodir /lib/modules
-	touch ${D}/lib/modules/ivtv-{enc,dec}-fw.bin
-	./ivtvfwextract.pl pvr250_17_21288.exe \
-		${D}/lib/modules/ivtv-fw-enc.bin \
-		${D}/lib/modules/ivtv-fw-dec.bin
-
-	cd ${WORKDIR}/ivtv
-	dodoc README doc/*
-
-	cd ${WORKDIR}/ivtv/utils
-	dobin test_ioctl ivtvfbctl ivtvplay ptune-ui.pl ptune.pl record-v4l2.pl
-	dobin radio vbi mpegindex
-	newdoc README README.utils
-	dodoc README.mythtv-ivtv README.ptune README.radio README.vbi zvbi.diff
-	dodoc lircd-g.conf lircd.conf lircrc
-
-	[ "${ARCH}" == "x86" ] && old_ARCH="${ARCH}" && ARCH="i386"
-
-	cd ${WORKDIR}/ivtv/driver
-	make DESTDIR=${D} install || die "installation of driver failed"
-
-	[ -n "${old_ARCH}" ] && ARCH="${old_ARCH}"
-
-	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"
-}
diff --git a/media-tv/ivtv/ivtv-0.2.0_rc1-r1.ebuild b/media-tv/ivtv/ivtv-0.2.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..01afa67c60a9
--- /dev/null
+++ b/media-tv/ivtv/ivtv-0.2.0_rc1-r1.ebuild
@@ -0,0 +1,122 @@
+# 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
+}