Bump to 1.1.1 for kernel 2.6 compatibility. Fixes vlc not being able to build on kernel 2.6 systems with dvb in USE flags.

4 files changed, 103 insertions, 6 deletions

diff --git a/media-tv/linuxtv-dvb/ChangeLog b/media-tv/linuxtv-dvb/ChangeLog
index 1ad5a1681302..600b847e42fd 100644
--- a/media-tv/linuxtv-dvb/ChangeLog
+++ b/media-tv/linuxtv-dvb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/linuxtv-dvb
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb/ChangeLog,v 1.7 2004/06/25 00:32:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb/ChangeLog,v 1.8 2004/08/07 17:53:26 chriswhite Exp $
+
+*linuxtv-dvb-1.1.1 (08 Aug 2004)
+
+  08 Aug 2004; Chris White <chriswhite@gentoo.org> +linuxtv-dvb-1.1.1.ebuild:
+  Version bump of dvb to 1.1.1 to support 2.6 kernels.
 
   26 Mar 2004; David Holm <dholm@gentoo.org> linuxtv-dvb-1.0.1.ebuild:
   Added to ~ppc.
diff --git a/media-tv/linuxtv-dvb/Manifest b/media-tv/linuxtv-dvb/Manifest
index 1a59cae82fa3..252617aed742 100644
--- a/media-tv/linuxtv-dvb/Manifest
+++ b/media-tv/linuxtv-dvb/Manifest
@@ -1,9 +1,11 @@
-MD5 cd7883c531ff082f92c7272d35069545 linuxtv-dvb-1.0.0_pre2-r2.ebuild 3127
+MD5 3efdb9e35fed7309028c6cb4f408c8fa ChangeLog 2270
 MD5 37141f55f354f5c8543ece2c96b5b8a3 linuxtv-dvb-1.0.0_pre2-r1.ebuild 2881
-MD5 6121b6cc8d6ff48ae23c313ff031d31c ChangeLog 2102
-MD5 6e77f3196f8735be5ba01cafd0c6b1bc metadata.xml 219
+MD5 cd7883c531ff082f92c7272d35069545 linuxtv-dvb-1.0.0_pre2-r2.ebuild 3127
 MD5 9e51bee5c633a2736f7037d6f59dee73 linuxtv-dvb-1.0.1.ebuild 3101
-MD5 e1f301cd0191586916bc7c3cd2b02288 files/dvb 179
-MD5 d2fe0d162036705e62a8498c876425e4 files/digest-linuxtv-dvb-1.0.1 69
+MD5 6e77f3196f8735be5ba01cafd0c6b1bc metadata.xml 219
+MD5 d0ba737128de57c7d233456014fa5635 linuxtv-dvb-1.1.1.ebuild 2285
 MD5 f7b660880f7e9eb4f5fdafaf794dfbe6 files/digest-linuxtv-dvb-1.0.0_pre2-r1 74
 MD5 66b431d6eaf4602db12b6c0647ee70f9 files/digest-linuxtv-dvb-1.0.0_pre2-r2 202
+MD5 d2fe0d162036705e62a8498c876425e4 files/digest-linuxtv-dvb-1.0.1 69
+MD5 e1f301cd0191586916bc7c3cd2b02288 files/dvb 179
+MD5 716f0e92472d9b05854840321fab6fb1 files/digest-linuxtv-dvb-1.1.1 70
diff --git a/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.1.1 b/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.1.1
new file mode 100644
index 000000000000..6a9316610344
--- /dev/null
+++ b/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.1.1
@@ -0,0 +1 @@
+MD5 6dd599f24b7abecd1e32c203eaa7fa8a linuxtv-dvb-1.1.1.tar.bz2 327271
diff --git a/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1.ebuild b/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1.ebuild
new file mode 100644
index 000000000000..630a1ebefd35
--- /dev/null
+++ b/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1.ebuild,v 1.1 2004/08/07 17:53:26 chriswhite Exp $
+
+DESCRIPTION="Standalone DVB driver for Linux kernel 2.4.x"
+HOMEPAGE="http://www.linuxtv.org"
+SRC_URI="http://www.linuxtv.org/download/dvb/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~ia64 ~amd64 ~ppc"
+IUSE=""
+DEPEND="virtual/linux-sources"
+#RDEPEND=""
+
+inherit eutils kmod
+
+pkg_setup() {
+	einfo ""
+	einfo "Please make sure that the following option is enabled"
+	einfo "in your current kernel 'Multimedia devices'"
+	einfo "and /usr/src/linux point's to your current kernel"
+	einfo "or make will die."
+	einfo ""
+}
+
+src_compile() {
+	# don't interfere with the kernel arch variables
+	unset ARCH
+
+	#until kmod can be fudged for 
+	#this to not have to be included
+	addwrite /usr/src/linux
+
+	emake
+}
+
+src_install() {
+	# see what kernel directory we need to
+	# go to
+	get_kernel_info
+	if is_kernel 2 6
+	then
+		cd ${S}/build-2.6
+	else
+		cd ${S}/build-2.4
+	fi
+
+	#copy over the insmod.sh script
+	#for loading all modules
+	sed -e "s:insmod ./:modprobe :" -i insmod.sh
+	sed -e "s:.${KV_OBJ}::" -i insmod.sh
+	newsbin insmod.sh dvb-module-load
+
+	#install the modules
+	insinto /lib/modules/${KV}/misc
+	doins *.${KV_OBJ}
+
+	#note, REAME-2.6 is an alternative method
+	#of installing dvb besides the ebuild.
+	#since this ebuild is being installed (obviously)
+	#there is no nead for the information contained
+	#within it.  If you want to use the README-2.6
+	#method, please get a source tarball, as it will
+	#not be supported - ChrisWhite
+
+	#install the main docs
+	cd ${S}
+	dodoc MAKEDEV-DVB.sh NEWS README README.bt8xx TODO TROUBLESHOOTING
+
+	#install the other docs
+	cd ${S}/doc
+	dodoc HOWTO-use-the-demux-api \
+	README.valgrind HOWTO-use-the-frontend-api \
+	convert.sh valgrind-2.1.0-dvb.patch
+}
+
+pkg_postinst() {
+	depmod -a
+	einfo ""
+	einfo "If you don't use devfs, execute MAKEDEV-DVB.sh to create"
+	einfo "the device nodes. The file is in /usr/share/doc/${PF}/"
+	einfo ""
+	einfo "A file called dvb-module-load has been created to simplify loading all modules."
+	einfo "Call it using 'dvb-module-load {load|debug|unload}'."
+}
+
+pkg_postrm() {
+	depmod -a
+}