Version bump + fixes + new ebuild which should work on 2.6 per Bug#45811

12 files changed, 159 insertions, 23 deletions

diff --git a/media-tv/rivatv/ChangeLog b/media-tv/rivatv/ChangeLog
index 6c489d646e16..01b8a824fd02 100644
--- a/media-tv/rivatv/ChangeLog
+++ b/media-tv/rivatv/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for media-tv/rivatv
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/ChangeLog,v 1.7 2004/06/25 00:34:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/ChangeLog,v 1.8 2004/07/11 14:31:31 blauwers Exp $
+
+* rivatv-0.8.5-r1 (11 Jul 2004)
+
+  11 Jul 2004; Bart Lauwers <blauwers@gentoo.org> rivatv-0.8.5-r1.ebuild:
+  Added workaround for build on 2.6 kernels per Bug #45811
+
+* rivatv-0.8.5 (11 Jul 2004)
+
+  11 Jul 2004; Bart Lauwers <blauwers@gentoo.org> rivatv-0.8.0-r1.ebuild, rivatv-0.8.2.ebuild, rivatv-0.8.4.ebuild, rivatv-0.8.5.ebuild, rivatv-0.8.1.ebuild, rivatv-0.8.3.ebuild metadata.xml:
+  metadata did not like herd video (dixit repoman)
+  Clean up copyright notices for Gentoo Foundation
+  Add IUSE as suggested by repoman
+  Version bump to 0.8.5
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> rivatv-0.8.3.ebuild,
   rivatv-0.8.4.ebuild:
diff --git a/media-tv/rivatv/Manifest b/media-tv/rivatv/Manifest
index fc90d8f13556..e42fd9aca3ab 100644
--- a/media-tv/rivatv/Manifest
+++ b/media-tv/rivatv/Manifest
@@ -1,13 +1,17 @@
-MD5 e95e59fff566fc6cd30bf176871952d4 rivatv-0.8.2.ebuild 983
-MD5 9058c781b5b10d17c237c807379d7f9b rivatv-0.8.0-r1.ebuild 1203
-MD5 ca22d5412945145ea57a400cd9f602af rivatv-0.8.4.ebuild 1148
-MD5 4094dfe45873155de8bfbf8add88c2b5 rivatv-0.8.1.ebuild 1200
 MD5 332a9dfc7fb1d78850b64c5da1cec8e3 ChangeLog 1915
 MD5 b861930e8153f29f69509dcb0c576031 metadata.xml 397
+MD5 9058c781b5b10d17c237c807379d7f9b rivatv-0.8.0-r1.ebuild 1203
+MD5 4094dfe45873155de8bfbf8add88c2b5 rivatv-0.8.1.ebuild 1200
+MD5 e95e59fff566fc6cd30bf176871952d4 rivatv-0.8.2.ebuild 983
 MD5 dd456a858d7a837278faab5646665e3f rivatv-0.8.3.ebuild 1143
+MD5 0b9edf4f7624b89da88b159fb18ad6b0 rivatv-0.8.4.ebuild 1041
+MD5 f37d08ca007374875e2b8751988ec4ca rivatv-0.8.5-r1.ebuild 2440
+MD5 7668b205b7f955ac7a00a5fb48cef920 rivatv-0.8.5.ebuild 940
+MD5 94dc3c0091e479d11d285de52267521d files/digest-rivatv-0.8.0-r1 63
 MD5 c70f4f5b9e57a7ab53345aa005ac3733 files/digest-rivatv-0.8.1 64
 MD5 675738a65f00503869783cd7f88ce0b1 files/digest-rivatv-0.8.2 64
 MD5 b8ad0ea54d8eaf1691d5e98e1bf8a15b files/digest-rivatv-0.8.3 64
 MD5 acf3e72cc79919b0614cf5b2970274a5 files/digest-rivatv-0.8.4 64
 MD5 f6b7a21ad2968b561a94db1b084fad7d files/rivatv-0.8.3-configure.patch 429
-MD5 94dc3c0091e479d11d285de52267521d files/digest-rivatv-0.8.0-r1 63
+MD5 84ee270b3c1dc945b92fb29af05a6323 files/digest-rivatv-0.8.5 64
+MD5 84ee270b3c1dc945b92fb29af05a6323 files/digest-rivatv-0.8.5-r1 64
diff --git a/media-tv/rivatv/files/digest-rivatv-0.8.5 b/media-tv/rivatv/files/digest-rivatv-0.8.5
new file mode 100644
index 000000000000..ee929ca79fdf
--- /dev/null
+++ b/media-tv/rivatv/files/digest-rivatv-0.8.5
@@ -0,0 +1 @@
+MD5 7e00cad36c0b684b022a833a11b58ed8 rivatv-0.8.5.tar.gz 200588
diff --git a/media-tv/rivatv/files/digest-rivatv-0.8.5-r1 b/media-tv/rivatv/files/digest-rivatv-0.8.5-r1
new file mode 100644
index 000000000000..ee929ca79fdf
--- /dev/null
+++ b/media-tv/rivatv/files/digest-rivatv-0.8.5-r1
@@ -0,0 +1 @@
+MD5 7e00cad36c0b684b022a833a11b58ed8 rivatv-0.8.5.tar.gz 200588
diff --git a/media-tv/rivatv/metadata.xml b/media-tv/rivatv/metadata.xml
index 38fa116e2a88..dab3a166d972 100644
--- a/media-tv/rivatv/metadata.xml
+++ b/media-tv/rivatv/metadata.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
+<herd>media-tv</herd>
 <maintainer>
   <email>blauwers@gentoo.org</email>
   <name>Bart Lauwers</name>
-<!--  <description>Description of the maintainership</description> -->
 </maintainer>
-<!-- <longdescription>Long description of the package</longdescription> -->
 </pkgmetadata>
diff --git a/media-tv/rivatv/rivatv-0.8.0-r1.ebuild b/media-tv/rivatv/rivatv-0.8.0-r1.ebuild
index cc87ff35e07c..975b43977ab8 100644
--- a/media-tv/rivatv/rivatv-0.8.0-r1.ebuild
+++ b/media-tv/rivatv/rivatv-0.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.0-r1.ebuild,v 1.3 2004/06/25 00:34:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.0-r1.ebuild,v 1.4 2004/07/11 14:31:31 blauwers Exp $
 
 S=${WORKDIR}/${P/_/-}
 DESCRIPTION="kernel driver for nVidia based cards with video-in"
@@ -13,6 +13,7 @@ DEPEND="virtual/x11
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
+IUSE=""
 
 src_compile() {
 	#cd rivatv/linux/drivers/media/video
diff --git a/media-tv/rivatv/rivatv-0.8.1.ebuild b/media-tv/rivatv/rivatv-0.8.1.ebuild
index 388a37c125a8..5c7bde5443ed 100644
--- a/media-tv/rivatv/rivatv-0.8.1.ebuild
+++ b/media-tv/rivatv/rivatv-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.1.ebuild,v 1.4 2004/06/25 00:34:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.1.ebuild,v 1.5 2004/07/11 14:31:31 blauwers Exp $
 
 S=${WORKDIR}/${P/_/-}
 DESCRIPTION="kernel driver for nVidia based cards with video-in"
@@ -13,6 +13,7 @@ DEPEND="virtual/x11
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
+IUSE=""
 
 src_compile() {
 	#cd rivatv/linux/drivers/media/video
diff --git a/media-tv/rivatv/rivatv-0.8.2.ebuild b/media-tv/rivatv/rivatv-0.8.2.ebuild
index 142ae2b5de27..b119e4661161 100644
--- a/media-tv/rivatv/rivatv-0.8.2.ebuild
+++ b/media-tv/rivatv/rivatv-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.2.ebuild,v 1.4 2004/06/25 00:34:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.2.ebuild,v 1.5 2004/07/11 14:31:31 blauwers Exp $
 
 S=${WORKDIR}/${P/_/-}
 DESCRIPTION="kernel driver for nVidia based cards with video-in"
@@ -12,6 +12,7 @@ DEPEND="virtual/x11
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
+IUSE=""
 
 src_compile() {
 	#cd rivatv/linux/drivers/media/video
diff --git a/media-tv/rivatv/rivatv-0.8.3.ebuild b/media-tv/rivatv/rivatv-0.8.3.ebuild
index c156262192bd..cf46e7e6242f 100644
--- a/media-tv/rivatv/rivatv-0.8.3.ebuild
+++ b/media-tv/rivatv/rivatv-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.3.ebuild,v 1.4 2004/06/25 00:34:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.3.ebuild,v 1.5 2004/07/11 14:31:31 blauwers Exp $
 
 inherit eutils
 
@@ -14,6 +14,7 @@ DEPEND="virtual/x11
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
+IUSE=""
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-tv/rivatv/rivatv-0.8.4.ebuild b/media-tv/rivatv/rivatv-0.8.4.ebuild
index e077793b8e9e..278a1925e8ef 100644
--- a/media-tv/rivatv/rivatv-0.8.4.ebuild
+++ b/media-tv/rivatv/rivatv-0.8.4.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.4.ebuild,v 1.4 2004/06/25 00:34:06 agriffis Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.4.ebuild,v 1.5 2004/07/11 14:31:31 blauwers Exp $
 
 S=${WORKDIR}/${P/_/-}
 DESCRIPTION="kernel driver for nVidia based cards with video-in"
@@ -14,13 +12,7 @@ DEPEND="virtual/x11
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
-
-#src_unpack() {
-	#unpack ${A}
-	#cd ${S}
-	#epatch ${FILESDIR}/${P/_/-}-configure.patch
-#}
-
+IUSE=""
 
 src_compile() {
 	#cd rivatv/linux/drivers/media/video
diff --git a/media-tv/rivatv/rivatv-0.8.5-r1.ebuild b/media-tv/rivatv/rivatv-0.8.5-r1.ebuild
new file mode 100644
index 000000000000..433c607ad0c4
--- /dev/null
+++ b/media-tv/rivatv/rivatv-0.8.5-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.5-r1.ebuild,v 1.1 2004/07/11 14:31:31 blauwers Exp $
+
+S=${WORKDIR}/${P/_/-}
+DESCRIPTION="kernel driver for nVidia based cards with video-in"
+SRC_URI="http://unc.dl.sourceforge.net/sourceforge/rivatv/${P/_/-}.tar.gz"
+HOMEPAGE="http://rivatv.sourceforge.net/"
+DEPEND="virtual/x11
+	>=virtual/linux-sources-2.4.17"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE=""
+
+src_unpack() {
+	check_KV
+	unpack ${A}
+
+	# Symlink kernel source to a directory we have permissions for
+	mkdir ${WORKDIR}/build
+	cd ${WORKDIR}/build
+	SRC=/lib/modules/${KV}/build
+	for f in ${SRC}/.config ${SRC}/.version ${SRC}/*; do ln -s $f; done
+}
+
+
+src_compile() {
+	# Alter Makefile.in to install into an alternate directory and
+	# set the kernel source path to the build folder
+	cd ${S}
+	sed 's/\@KERNEL\@/\$\{KDIR\}/' Makefile.in > Makefile.in.new || die
+	mv -f Makefile.in.new Makefile.in || die
+	sed 's/install\: devices/install\:/' Makefile.in > Makefile.in.new || die
+	mv -f Makefile.in.new Makefile.in || die
+	sed 's/\/lib\/modules\//\$\{D\}lib\/modules\//' Makefile.in > Makefile.in.new || die
+	mv -f Makefile.in.new Makefile.in || die
+	sed 's/\$(DEPMOD)/echo replaced/' Makefile.in > Makefile.in.new || die
+	mv -f Makefile.in.new Makefile.in || die
+
+	# Configure and build
+	econf || die
+	emake KDIR=${WORKDIR}/build ARCH=i386 V=1 DEPMOD='' || die
+}
+
+src_install () {
+	# Create kernel modules folder in the image directory
+	dodir lib/modules/${KV}/kernel
+
+	# Install to the image directory
+	make install DESTDIR=${D} || die
+}
+
+pkg_postinst() {
+	# Update modules
+	depmod -a
+
+	# If devfsd is not being used create devices
+	if [ "${ROOT}" = "/" ]
+	then
+		if [ ! -e /dev/.devfsd ] && [! -e /dev/video0 ]
+		then
+			# Create devices
+			mknod /dev/video0 c 81 0
+			chmod 660 /dev/video0
+			mknod /dev/video1 c 81 0
+			chmod 660 /dev/video1
+			mknod /dev/video2 c 81 0
+			chmod 660 /dev/video2
+			mknod /dev/video3 c 81 0
+			chmod 660 /dev/video3
+			ln -s /dev/video0 /dev/video
+		fi
+	fi
+
+	einfo "To load the module automatically at boot up, add these and"
+	einfo "\"rivatv\" to your /etc/modules.autoload."
+	einfo
+	einfo "Also, see ${HOMEPAGE} for more information."
+}
+
+pkg_postrm() {
+	# Update modules
+	depmod -a
+	einfo "If you added modules to /etc/modules.autoload remember to"
+	einfo "remove them now."
+}
diff --git a/media-tv/rivatv/rivatv-0.8.5.ebuild b/media-tv/rivatv/rivatv-0.8.5.ebuild
new file mode 100644
index 000000000000..bdc10fe81e48
--- /dev/null
+++ b/media-tv/rivatv/rivatv-0.8.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.5.ebuild,v 1.1 2004/07/11 14:31:31 blauwers Exp $
+
+S=${WORKDIR}/${P/_/-}
+DESCRIPTION="kernel driver for nVidia based cards with video-in"
+SRC_URI="http://unc.dl.sourceforge.net/sourceforge/rivatv/${P/_/-}.tar.gz"
+HOMEPAGE="http://rivatv.sourceforge.net/"
+DEPEND="virtual/x11
+	>=virtual/linux-sources-2.4.17"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE=""
+
+src_compile() {
+	#cd rivatv/linux/drivers/media/video
+	sed -i -e 's/^install: devices.*/install:/' Makefile.in
+	econf || die
+	emake || die
+}
+
+src_install () {
+	modp=`awk '/^MODULES/{ print "'${D}'"  $3}' Makefile` || die
+	mkdir -p ${modp} || die
+	emake MODULES=${modp} DEPMOD=":" install || die
+	dodoc README
+}
+
+pkg_postinst() {
+	depmod -a
+	einfo "To load the module automatically at boot up, add these and"
+	einfo "\"rivatv\" to your /etc/modules.autoload."
+	einfo
+	einfo "Also, see ${HOMEPAGE} for more information."
+}