Add patch + fix typo (Bug #59569 & Bug #74852)

12 files changed, 137 insertions, 34 deletions

diff --git a/media-tv/rivatv/ChangeLog b/media-tv/rivatv/ChangeLog
index fce95ae9af30..90c4f65675dc 100644
--- a/media-tv/rivatv/ChangeLog
+++ b/media-tv/rivatv/ChangeLog
@@ -1,6 +1,11 @@
 # 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.10 2004/10/04 03:37:54 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/ChangeLog,v 1.11 2005/01/10 00:54:38 blauwers Exp $
+
+* rivatv-0.8.5-r2 (10 Jan 2005)
+
+  10 Jan 2005; Bart Lauwers <blauwers@gentoo.org> rivatv-0.8.5-r2:
+  Add patch + fix typo (Bug #59569 & Bug #74852)
 
   03 Oct 2004; <iggy@gentoo.org> rivatv-0.8.5-r1.ebuild:
   switched custom ARCH setting code to use set_arch_to_* from eutils
diff --git a/media-tv/rivatv/Manifest b/media-tv/rivatv/Manifest
index 1c22634f9ffa..1a826fa1acda 100644
--- a/media-tv/rivatv/Manifest
+++ b/media-tv/rivatv/Manifest
@@ -1,27 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7d4ad281585e9fe8b749dfbc1e62cfe8 rivatv-0.8.5.ebuild 1027
-MD5 c27659e7abded9409f553aee80149440 rivatv-0.8.5-r1.ebuild 2458
-MD5 2529b8221049913d7daa60cf99ebda97 rivatv-0.8.2.ebuild 970
-MD5 91985a16ce121b0357f13cac7ff06f77 rivatv-0.8.0-r1.ebuild 1190
-MD5 81eb5a155668cc894508dee246c4f762 rivatv-0.8.4.ebuild 1028
-MD5 3ced533304f863eb0423aa83ca3ed2ad rivatv-0.8.1.ebuild 1187
 MD5 a7a03ed9eb82ab529416740b74667b33 ChangeLog 2841
 MD5 0be39e6eace0493c9141af3c18e13f5e metadata.xml 253
-MD5 2a1e65d98b76518fdc6d120b5801554c rivatv-0.8.3.ebuild 1130
+MD5 24724f84f6724ea3873cee8400ed0471 rivatv-0.8.0-r1.ebuild 1190
+MD5 0c63cf418068539ecb3f425a2e6b144f rivatv-0.8.1.ebuild 1187
+MD5 d5cbdfeadae701c408f74ec19e411196 rivatv-0.8.2.ebuild 970
+MD5 44d2e5dd4421f7fc45a510bcabfda5fb rivatv-0.8.3.ebuild 1130
+MD5 63512923550b31e6795e62d0bbdf5cfd rivatv-0.8.4.ebuild 1028
+MD5 26f53290b47f0472121ba6ab15d71108 rivatv-0.8.5-r1.ebuild 2458
+MD5 caac39e1d8cbf6051d4eb9cf8de7bed5 rivatv-0.8.5.ebuild 1027
+MD5 2b6d7767c2a2828abfb60ffbe01598dc rivatv-0.8.5-r2.ebuild 2405
+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 84ee270b3c1dc945b92fb29af05a6323 files/digest-rivatv-0.8.5 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-r1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBYMWTMSkoRwEucGERAjIpAJ9RqnsRcg6ouoDUsp4LU/+QLVxdjQCfZo6j
-AcW9BrICWQYz1RWgdVtlES0=
-=IImo
------END PGP SIGNATURE-----
+MD5 f6b7a21ad2968b561a94db1b084fad7d files/rivatv-0.8.3-configure.patch 429
+MD5 10cc1de4b118d3a016772dfc98c483e2 files/rivatv-0.8.5-configure.patch 622
+MD5 84ee270b3c1dc945b92fb29af05a6323 files/digest-rivatv-0.8.5-r2 64
diff --git a/media-tv/rivatv/files/digest-rivatv-0.8.5-r2 b/media-tv/rivatv/files/digest-rivatv-0.8.5-r2
new file mode 100644
index 000000000000..ee929ca79fdf
--- /dev/null
+++ b/media-tv/rivatv/files/digest-rivatv-0.8.5-r2
@@ -0,0 +1 @@
+MD5 7e00cad36c0b684b022a833a11b58ed8 rivatv-0.8.5.tar.gz 200588
diff --git a/media-tv/rivatv/files/rivatv-0.8.5-configure.patch b/media-tv/rivatv/files/rivatv-0.8.5-configure.patch
new file mode 100644
index 000000000000..d3c0d6b0ec2f
--- /dev/null
+++ b/media-tv/rivatv/files/rivatv-0.8.5-configure.patch
@@ -0,0 +1,13 @@
+--- /var/tmp/portage/rivatv-0.8.5-r1/work/rivatv-0.8.5/configure	2004-05-28 14:38:27.000000000 +0200
++++ configure	2004-08-07 14:30:03.618051992 +0200
+@@ -220,8 +220,8 @@
+ 
+ echo -n "Checking for kernel gcc... "
+ 
+-kgcc=`cat /proc/version | sed 's/\(.*\)gcc[ -][vV]ersion \([0-9.]*\).*/\2/'`
+-bgcc=`gcc -v 2>&1 |tail -1|sed 's/\(.*\)gcc[ -][vV]ersion \([0-9.]*\).*/\2/'`
++kgcc=`cat /proc/version | sed 's/\(.*\)\(gcc[ -][vV]ersion\|[vV]ersion[ -]gcc\) \([0-9.]*\).*/\3/'`
++bgcc=`gcc -v 2>&1 |tail -1|sed 's/\(.*\)\(gcc[ -][vV]ersion\|[vV]ersion[ -]gcc\) \([0-9.]*\).*/\3/'`
+ echo $kgcc
+ 
+ if test "$bgcc" != "$kgcc"; then
diff --git a/media-tv/rivatv/rivatv-0.8.0-r1.ebuild b/media-tv/rivatv/rivatv-0.8.0-r1.ebuild
index 0a326b39609c..617a5dddd55f 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
+# Copyright 1999-2005 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.5 2004/08/25 02:40:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.0-r1.ebuild,v 1.6 2005/01/10 00:54:38 blauwers Exp $
 
 S=${WORKDIR}/${P/_/-}
 DESCRIPTION="kernel driver for nVidia based cards with video-in"
diff --git a/media-tv/rivatv/rivatv-0.8.1.ebuild b/media-tv/rivatv/rivatv-0.8.1.ebuild
index 8e76719c661f..929833eddba1 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
+# Copyright 1999-2005 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.6 2004/08/25 02:40:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.1.ebuild,v 1.7 2005/01/10 00:54:38 blauwers Exp $
 
 S=${WORKDIR}/${P/_/-}
 DESCRIPTION="kernel driver for nVidia based cards with video-in"
diff --git a/media-tv/rivatv/rivatv-0.8.2.ebuild b/media-tv/rivatv/rivatv-0.8.2.ebuild
index 14bfd7f67253..9d9470e3bb3f 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
+# Copyright 1999-2005 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.6 2004/08/25 02:40:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.2.ebuild,v 1.7 2005/01/10 00:54:38 blauwers Exp $
 
 S=${WORKDIR}/${P/_/-}
 DESCRIPTION="kernel driver for nVidia based cards with video-in"
diff --git a/media-tv/rivatv/rivatv-0.8.3.ebuild b/media-tv/rivatv/rivatv-0.8.3.ebuild
index bde3cb4b8afc..36363e07f905 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
+# Copyright 1999-2005 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.6 2004/08/25 02:40:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.3.ebuild,v 1.7 2005/01/10 00:54:38 blauwers Exp $
 
 inherit eutils
 
diff --git a/media-tv/rivatv/rivatv-0.8.4.ebuild b/media-tv/rivatv/rivatv-0.8.4.ebuild
index 90057d5b1123..2b5e916a4340 100644
--- a/media-tv/rivatv/rivatv-0.8.4.ebuild
+++ b/media-tv/rivatv/rivatv-0.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.6 2004/08/25 02:40:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.4.ebuild,v 1.7 2005/01/10 00:54:38 blauwers Exp $
 
 S=${WORKDIR}/${P/_/-}
 DESCRIPTION="kernel driver for nVidia based cards with video-in"
diff --git a/media-tv/rivatv/rivatv-0.8.5-r1.ebuild b/media-tv/rivatv/rivatv-0.8.5-r1.ebuild
index d6766ec23be0..e489c8da3760 100644
--- a/media-tv/rivatv/rivatv-0.8.5-r1.ebuild
+++ b/media-tv/rivatv/rivatv-0.8.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.3 2004/10/04 03:37:54 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.5-r1.ebuild,v 1.4 2005/01/10 00:54:38 blauwers Exp $
 
 S=${WORKDIR}/${P/_/-}
 DESCRIPTION="kernel driver for nVidia based cards with video-in"
diff --git a/media-tv/rivatv/rivatv-0.8.5-r2.ebuild b/media-tv/rivatv/rivatv-0.8.5-r2.ebuild
new file mode 100644
index 000000000000..b364e3e727e9
--- /dev/null
+++ b/media-tv/rivatv/rivatv-0.8.5-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2005 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-r2.ebuild,v 1.1 2005/01/10 00:54:38 blauwers Exp $
+
+S=${WORKDIR}/${P/_/-}
+DESCRIPTION="kernel driver for nVidia based cards with video-in"
+SRC_URI="mirror://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}
+
+	epatch ${FILESDIR}/${P/_/-}-configure.patch
+
+	# 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
+	set_arch_to_kernel
+	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
+	set_arch_to_portage
+}
+
+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
index 7c8bba953842..67bca4d800e1 100644
--- a/media-tv/rivatv/rivatv-0.8.5.ebuild
+++ b/media-tv/rivatv/rivatv-0.8.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.2 2004/08/25 02:40:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.5.ebuild,v 1.3 2005/01/10 00:54:38 blauwers Exp $
 
 S=${WORKDIR}/${P/_/-}
 DESCRIPTION="kernel driver for nVidia based cards with video-in"