new gentoo patch, hack for compiling on 2.6 until the new modules stuff gets in

4 files changed, 25 insertions, 14 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index f22aebabcfac..7cc15d852cf3 100644
--- a/media-tv/ivtv/ChangeLog
+++ b/media-tv/ivtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/ivtv
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.4 2004/03/24 17:03:12 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.5 2004/03/30 00:05:44 iggy Exp $
+
+*ivtv-0.1.9-r3 (29 Mar 2004)
+
+  29 Mar 2004; Brian Jackson <iggy@gentoo.org> ivtv-0.1.9-r2.ebuild,
+  ivtv-0.1.9-r3.ebuild:
+  new gentoo patch, hack for compiling on 2.6 until the new modules stuff gets in
 
   24 Mar 2004; Martin Holzer <mholzer@gentoo.org> ivtv-0.1.9-r1.ebuild,
   ivtv-0.1.9-r2.ebuild:
diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index 54d2b8ef3974..3e4d516497ee 100644
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -1,6 +1,6 @@
-MD5 c7f22d7eca1b33b5b7572e12fdc0f318 ivtv-0.1.9-r2.ebuild 3225
-MD5 212f198236ed9fef7b10b46f8cb80c63 metadata.xml 446
-MD5 43449ca6637bea28e906f84a70aebac4 ChangeLog 871
 MD5 a85fe65f26a9afb50b21fdf7ffeaeb68 ivtv-0.1.9-r1.ebuild 3225
-MD5 75be3f5e54f30252df7ffba8922ee46d files/digest-ivtv-0.1.9-r2 188
+MD5 6b52f3417428934c73f0eb8e08c1279f ChangeLog 1074
+MD5 c3b88cbcf89bfd810d806bd5b28bcac6 ivtv-0.1.9-r3.ebuild 3292
+MD5 212f198236ed9fef7b10b46f8cb80c63 metadata.xml 446
 MD5 5f8ee4e434626f37d191131c01e61bf2 files/digest-ivtv-0.1.9-r1 191
+MD5 0b541d724c1b04481ef21b872a7631c9 files/digest-ivtv-0.1.9-r3 191
diff --git a/media-tv/ivtv/files/digest-ivtv-0.1.9-r2 b/media-tv/ivtv/files/digest-ivtv-0.1.9-r3
index b943d3545d6e..a375a7f187c9 100644
--- a/media-tv/ivtv/files/digest-ivtv-0.1.9-r2
+++ b/media-tv/ivtv/files/digest-ivtv-0.1.9-r3
@@ -1,3 +1,3 @@
 MD5 ff350ebc9f3f593031085e63381ca362 ivtv-0.1.9.tar.gz 168331
 MD5 c34803bc1ca86567076ac7dc0df91076 pvr250_17_21288.exe 2615322
-MD5 e93720281d1907d6350cc94889197a9a ivtv-0.1.9-r2.patch 201
+MD5 d48620c63fcf651805b4a971cde44da1 ivtv-0.1.9-r3.patch 162633
diff --git a/media-tv/ivtv/ivtv-0.1.9-r2.ebuild b/media-tv/ivtv/ivtv-0.1.9-r3.ebuild
index 48404b8f1f01..b0644101fe44 100644
--- a/media-tv/ivtv/ivtv-0.1.9-r2.ebuild
+++ b/media-tv/ivtv/ivtv-0.1.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.1.9-r2.ebuild,v 1.2 2004/03/24 17:03:12 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.1.9-r3.ebuild,v 1.1 2004/03/30 00:05:44 iggy Exp $
 
 # TODO
 # the "Gentoo way" is to use /usr/src/linux, not the running kernel
@@ -20,6 +20,8 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
+[ "`echo ${KV} | cut -f2 -d.`" == 6 ] && SANDBOX_DISABLED="1"
+
 IUSE="lirc"
 
 DEPEND="lirc? ( app-misc/lirc )"
@@ -29,20 +31,16 @@ src_unpack() {
 
 	cd ${WORKDIR}/ivtv
 	epatch ${DISTDIR}/${PF}.patch || die "${PF} patch failed"
-	sed -i -e 's:include <linux/videodev2.h>:include "videodev2.h":' utils/radio.c
 }
 
 src_compile() {
-#	if `grep -q I2C_VERSION.*2\.8 /usr/src/linux/include/linux/i2c.h` ;then
-#		einfo "found new i2c in your kernel source"
-#		sed -i -e \
-#			's:^#CFLAGS += -DNEW_I2C:CFLAGS += -DNEW_I2C:' \
-#			${WORKDIR}/ivtv/driver/Makefile
-#	fi
+	[ "${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"
 }
@@ -66,9 +64,13 @@ src_install() {
 	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
@@ -102,5 +104,8 @@ pkg_postinst() {
 	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"
 }