switch to linux-mod (yay!)

Package-Manager: portage-2.0.51-r15

15 files changed, 76 insertions, 315 deletions

diff --git a/media-tv/rivatv/ChangeLog b/media-tv/rivatv/ChangeLog
index 90c4f65675dc..39ee2afdb5a8 100644
--- a/media-tv/rivatv/ChangeLog
+++ b/media-tv/rivatv/ChangeLog
@@ -1,6 +1,15 @@
 # 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.11 2005/01/10 00:54:38 blauwers Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/ChangeLog,v 1.12 2005/01/25 16:09:24 cardoe Exp $
+
+*rivatv-0.8.5-r3 (25 Jan 2005)
+
+  25 Jan 2005; Doug Goldstein <cardoe@gentoo.org> -rivatv-0.8.1.ebuild,
+  -rivatv-0.8.3.ebuild, -rivatv-0.8.4.ebuild, -rivatv-0.8.5-r1.ebuild,
+  +rivatv-0.8.5-r3.ebuild, -rivatv-0.8.5.ebuild:
+  switch to linux-mod (yay!)
+  remove all the BADDDDDDNESS of this ebuild, muy bad!
+  make the ebuild nice a pretty. (Mr_Bones_ would even like it!)
 
 * rivatv-0.8.5-r2 (10 Jan 2005)
 
diff --git a/media-tv/rivatv/Manifest b/media-tv/rivatv/Manifest
index 7ddcf6216868..b7bf74d9c3af 100644
--- a/media-tv/rivatv/Manifest
+++ b/media-tv/rivatv/Manifest
@@ -1,20 +1,20 @@
-MD5 9bfb98be6c22d962f5309102223f3624 ChangeLog 2995
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 718bd9b01897d40d98b4074e95c0ad6f rivatv-0.8.5-r2.ebuild 2536
+MD5 ce15cc766c820b7c09fc326bb5b76517 rivatv-0.8.5-r3.ebuild 1546
 MD5 0be39e6eace0493c9141af3c18e13f5e metadata.xml 253
-MD5 539050139ad47088e22b820c45b8929e rivatv-0.8.0-r1.ebuild 1190
-MD5 60321656d95456d87911c3aba0e70420 rivatv-0.8.1.ebuild 1187
+MD5 e79f70ce7570f8d0b329ba5945b027c1 ChangeLog 3367
 MD5 5131b86f70269727631f034136b8f1fb rivatv-0.8.2.ebuild 970
-MD5 89e07f3d4e95f231597e44102c3b766f rivatv-0.8.3.ebuild 1130
-MD5 ca7ce7d2ad86ccf15c8a4b3526e51715 rivatv-0.8.4.ebuild 1028
-MD5 8c97da3801ed7e16195ef11d41c737ce rivatv-0.8.5-r1.ebuild 2462
-MD5 375c91a64859a202ccbf714deffb09d2 rivatv-0.8.5.ebuild 1027
-MD5 718bd9b01897d40d98b4074e95c0ad6f rivatv-0.8.5-r2.ebuild 2536
-MD5 94dc3c0091e479d11d285de52267521d files/digest-rivatv-0.8.0-r1 63
-MD5 c70f4f5b9e57a7ab53345aa005ac3733 files/digest-rivatv-0.8.1 64
+MD5 84ee270b3c1dc945b92fb29af05a6323 files/digest-rivatv-0.8.5-r3 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 84ee270b3c1dc945b92fb29af05a6323 files/digest-rivatv-0.8.5-r1 64
-MD5 f6b7a21ad2968b561a94db1b084fad7d files/rivatv-0.8.3-configure.patch 429
-MD5 22e60b9c10aa69eaef9978e7998fccb9 files/rivatv-0.8.5-configure.patch 662
 MD5 84ee270b3c1dc945b92fb29af05a6323 files/digest-rivatv-0.8.5-r2 64
+MD5 22e60b9c10aa69eaef9978e7998fccb9 files/rivatv-0.8.5-configure.patch 662
+MD5 f6b7a21ad2968b561a94db1b084fad7d files/rivatv-0.8.3-configure.patch 429
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB9m9c5+pdB4IBr0URAkTSAKCwF1l3znnQHbJDkv1I63OPNqAcSACgq0Vd
+0Ah3hfzOZEh76dZD7euYci4=
+=pn6b
+-----END PGP SIGNATURE-----
diff --git a/media-tv/rivatv/files/digest-rivatv-0.8.0-r1 b/media-tv/rivatv/files/digest-rivatv-0.8.0-r1
deleted file mode 100644
index 91e5decdb748..000000000000
--- a/media-tv/rivatv/files/digest-rivatv-0.8.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b6b86afefa0735fb4948486983949a28 rivatv-0.8.0.tar.gz 87030
diff --git a/media-tv/rivatv/files/digest-rivatv-0.8.1 b/media-tv/rivatv/files/digest-rivatv-0.8.1
deleted file mode 100644
index 18b2f2d2aa66..000000000000
--- a/media-tv/rivatv/files/digest-rivatv-0.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5192518916b4343effadad542fd37734 rivatv-0.8.1.tar.gz 121671
diff --git a/media-tv/rivatv/files/digest-rivatv-0.8.3 b/media-tv/rivatv/files/digest-rivatv-0.8.3
deleted file mode 100644
index ba193ac57d4d..000000000000
--- a/media-tv/rivatv/files/digest-rivatv-0.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb1454ff24039595190edbfc49985c99 rivatv-0.8.3.tar.gz 147044
diff --git a/media-tv/rivatv/files/digest-rivatv-0.8.4 b/media-tv/rivatv/files/digest-rivatv-0.8.4
deleted file mode 100644
index ad0c5e64c96e..000000000000
--- a/media-tv/rivatv/files/digest-rivatv-0.8.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9fce36141557773ee06980006615848f rivatv-0.8.4.tar.gz 177977
diff --git a/media-tv/rivatv/files/digest-rivatv-0.8.5-r1 b/media-tv/rivatv/files/digest-rivatv-0.8.5-r1
deleted file mode 100644
index ee929ca79fdf..000000000000
--- a/media-tv/rivatv/files/digest-rivatv-0.8.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7e00cad36c0b684b022a833a11b58ed8 rivatv-0.8.5.tar.gz 200588
diff --git a/media-tv/rivatv/files/digest-rivatv-0.8.5 b/media-tv/rivatv/files/digest-rivatv-0.8.5-r3
index ee929ca79fdf..ee929ca79fdf 100644
--- a/media-tv/rivatv/files/digest-rivatv-0.8.5
+++ b/media-tv/rivatv/files/digest-rivatv-0.8.5-r3
diff --git a/media-tv/rivatv/rivatv-0.8.0-r1.ebuild b/media-tv/rivatv/rivatv-0.8.0-r1.ebuild
deleted file mode 100644
index 617a5dddd55f..000000000000
--- a/media-tv/rivatv/rivatv-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.6 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_compile() {
-	#cd rivatv/linux/drivers/media/video
-	emake KERNEL="/usr/src/linux" || die
-}
-
-src_install () {
-	insinto /lib/modules/${KV}/kernel/drivers/media/video
-	doins *.o
-
-	dodoc README
-}
-
-pkg_postinst() {
-	depmod -a
-	einfo "You will need support for videodev, i2c-core, i2c-algo-bit"
-	einfo "for this driver to work, plus your cards' specific modules"
-	einfo "from /lib/modules/${KV}/kernel/drivers/media/video"
-	einfo
-	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."
-	einfo
-	einfo "NOTE: Your kernel must not include framebuffer support."
-}
diff --git a/media-tv/rivatv/rivatv-0.8.1.ebuild b/media-tv/rivatv/rivatv-0.8.1.ebuild
deleted file mode 100644
index 929833eddba1..000000000000
--- a/media-tv/rivatv/rivatv-0.8.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.7 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_compile() {
-	#cd rivatv/linux/drivers/media/video
-	emake KERNEL="/usr/src/linux" || die
-}
-
-src_install () {
-	insinto /lib/modules/${KV}/kernel/drivers/media/video
-	doins *.o
-
-	dodoc README
-}
-
-pkg_postinst() {
-	depmod -a
-	einfo "You will need support for videodev, i2c-core, i2c-algo-bit"
-	einfo "for this driver to work, plus your cards' specific modules"
-	einfo "from /lib/modules/${KV}/kernel/drivers/media/video"
-	einfo
-	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."
-	einfo
-	einfo "NOTE: Your kernel must not include framebuffer support."
-}
diff --git a/media-tv/rivatv/rivatv-0.8.3.ebuild b/media-tv/rivatv/rivatv-0.8.3.ebuild
deleted file mode 100644
index 36363e07f905..000000000000
--- a/media-tv/rivatv/rivatv-0.8.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.7 2005/01/10 00:54:38 blauwers Exp $
-
-inherit eutils
-
-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() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P/_/-}-configure.patch
-}
-
-
-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."
-}
diff --git a/media-tv/rivatv/rivatv-0.8.4.ebuild b/media-tv/rivatv/rivatv-0.8.4.ebuild
deleted file mode 100644
index 2b5e916a4340..000000000000
--- a/media-tv/rivatv/rivatv-0.8.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.7 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_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."
-}
diff --git a/media-tv/rivatv/rivatv-0.8.5-r1.ebuild b/media-tv/rivatv/rivatv-0.8.5-r1.ebuild
deleted file mode 100644
index e489c8da3760..000000000000
--- a/media-tv/rivatv/rivatv-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.4 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}
-
-	# 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-r3.ebuild b/media-tv/rivatv/rivatv-0.8.5-r3.ebuild
new file mode 100644
index 000000000000..89396b373eb2
--- /dev/null
+++ b/media-tv/rivatv/rivatv-0.8.5-r3.ebuild
@@ -0,0 +1,49 @@
+# 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-r3.ebuild,v 1.1 2005/01/25 16:09:24 cardoe Exp $
+
+inherit eutils linux-mod toolchain-funcs
+
+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.20"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE=""
+
+CONFIG_CHECK="VIDEO_DEV"
+MODULE_NAMES="tuner(media/video:${S}:${S}/bttv) tvmixer(media/video:${S}:${S}/bttv) tvaudio(media/video:${S}:${S}/bttv) rivatv(media/video:${S}:${S}/src) \
+	saa7108e(media/video:${S}:${S}/src) saa7111a(media/video:${S}:${S}/src) saa7113h(media/video:${S}:${S}/src) saa7174hl(media/video:${S}:${S}/src) \
+	tw98(media/video:${S}:${S}/src) vpx32xx(media/video:${S}:${S}/src)"
+BUILD_PARAMS="KSRC=${ROOT}${KV_DIR} KVERS=${KV_MAJOR}${KV_MINOR}"
+BUILD_TARGETS="all"
+MODULESD_TUNER_ALIASES=("/dev/video0 char-major-81" "/dev/video1 char-major-81" "/dev/video2 char-major-81" "/dev/video3 char-major-81")
+
+src_unpack() {
+	unpack ${A}
+
+	# set compiler
+	sed -i "s:gcc:$(tc-getCC):" ${S}/Makefile.in
+
+	# fix for new coreutils (#31801)
+	sed -i "s:tail -1:tail -n 1:" ${S}/configure
+
+	convert_to_m ${S}/Makefile.in
+}
+
+
+src_compile() {
+	econf || die "configure failed"
+
+	linux-mod_src_compile
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo "See ${HOMEPAGE} for more information."
+}
diff --git a/media-tv/rivatv/rivatv-0.8.5.ebuild b/media-tv/rivatv/rivatv-0.8.5.ebuild
deleted file mode 100644
index 67bca4d800e1..000000000000
--- a/media-tv/rivatv/rivatv-0.8.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.3 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_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."
-}