cleanup, added 1.1.1-r1 (see ChangeLog), fixes Bug ##68441

8 files changed, 143 insertions, 251 deletions

diff --git a/media-tv/linuxtv-dvb/ChangeLog b/media-tv/linuxtv-dvb/ChangeLog
index a943267aec6b..e46c91ed24ab 100644
--- a/media-tv/linuxtv-dvb/ChangeLog
+++ b/media-tv/linuxtv-dvb/ChangeLog
@@ -1,6 +1,18 @@
 # 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.9 2004/08/07 18:27:10 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb/ChangeLog,v 1.10 2004/11/11 18:36:36 lordvan Exp $
+
+*linuxtv-dvb-1.1.1-r1 (11 Nov 2004)
+
+  11 Nov 2004; Thomas Raschbacher <lordvan@gentoo.org>
+  linuxtv-dvb-1.0.0_pre2-r1.ebuild, linuxtv-dvb-1.0.0_pre2-r2.ebuild,
+  linuxtv-dvb-1.1.1-r1.ebuild:
+  cleanup (removed 1.0.0_pre2-r[12])
+
+  using kernel-mod instead of kmod fixes bug #68441 (thanks to Stefan Schweizer
+  <sschweizer@gmail.com>) does NOT compile modules for kernel 2.6 anymore
+  because the modules in newer kernels are more up to date than the ones in the
+  release. installs firmware for dvb-ttpci
 
   08 Aug 2004; Chris White <chriswhite@gentoo.org> linuxtv-dvb-1.1.1.ebuild:
   Added header file installation, this was preventing libdvb from installing.
diff --git a/media-tv/linuxtv-dvb/Manifest b/media-tv/linuxtv-dvb/Manifest
index df4b677f22c7..45a756f3f757 100644
--- a/media-tv/linuxtv-dvb/Manifest
+++ b/media-tv/linuxtv-dvb/Manifest
@@ -1,11 +1,9 @@
-MD5 cd6d3970a0e7e90083f36c0033dda2fc ChangeLog 2428
-MD5 37141f55f354f5c8543ece2c96b5b8a3 linuxtv-dvb-1.0.0_pre2-r1.ebuild 2881
-MD5 cd7883c531ff082f92c7272d35069545 linuxtv-dvb-1.0.0_pre2-r2.ebuild 3127
-MD5 9e51bee5c633a2736f7037d6f59dee73 linuxtv-dvb-1.0.1.ebuild 3101
-MD5 6e77f3196f8735be5ba01cafd0c6b1bc metadata.xml 219
 MD5 9585739619666d93f4e856bc4e14a0b5 linuxtv-dvb-1.1.1.ebuild 2391
-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 2e448d276f55a4a4cad4d64d58d35c3c ChangeLog 2937
+MD5 6e77f3196f8735be5ba01cafd0c6b1bc metadata.xml 219
+MD5 9e51bee5c633a2736f7037d6f59dee73 linuxtv-dvb-1.0.1.ebuild 3101
+MD5 25a4f1b91562b94b288cfec620b3736d linuxtv-dvb-1.1.1-r1.ebuild 3630
 MD5 e1f301cd0191586916bc7c3cd2b02288 files/dvb 179
+MD5 d2fe0d162036705e62a8498c876425e4 files/digest-linuxtv-dvb-1.0.1 69
 MD5 716f0e92472d9b05854840321fab6fb1 files/digest-linuxtv-dvb-1.1.1 70
+MD5 7644c8c5677e222eacbfc0e2cc2db219 files/digest-linuxtv-dvb-1.1.1-r1 135
diff --git a/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.0.0_pre2-r1 b/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.0.0_pre2-r1
deleted file mode 100644
index aca5e6ecbd81..000000000000
--- a/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.0.0_pre2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ebe57b9cd27535c98df4017abff6d20f linuxtv-dvb-1.0.0-pre2.tar.gz 627453
diff --git a/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.0.0_pre2-r2 b/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.0.0_pre2-r2
deleted file mode 100644
index b08481898008..000000000000
--- a/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.0.0_pre2-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e1f301cd0191586916bc7c3cd2b02288 /files/dvb 179
-MD5 a8a0583b1afdd00108a05eda7607dc08 /linuxtv-dvb-1.0.0_pre2-r2.ebuild 3300
-MD5 ebe57b9cd27535c98df4017abff6d20f linuxtv-dvb-1.0.0-pre2.tar.gz 627453
diff --git a/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.1.1-r1 b/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.1.1-r1
new file mode 100644
index 000000000000..40249fba6ed8
--- /dev/null
+++ b/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.1.1-r1
@@ -0,0 +1,2 @@
+MD5 6dd599f24b7abecd1e32c203eaa7fa8a linuxtv-dvb-1.1.1.tar.bz2 327271
+MD5 7b263de6b0b92d2347319c65adc7d4fb dvb-ttpci-01.fw-261c 226376
diff --git a/media-tv/linuxtv-dvb/linuxtv-dvb-1.0.0_pre2-r1.ebuild b/media-tv/linuxtv-dvb/linuxtv-dvb-1.0.0_pre2-r1.ebuild
deleted file mode 100644
index 2f2219b50497..000000000000
--- a/media-tv/linuxtv-dvb/linuxtv-dvb-1.0.0_pre2-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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.0.0_pre2-r1.ebuild,v 1.7 2004/06/25 00:32:30 agriffis Exp $
-
-DESCRIPTION="Standalone DVB driver for Linux kernel 2.4.x"
-HOMEPAGE="http://www.linuxtv.org"
-SRC_URI="http://www.linuxtv.org/download/dvb/${PN}-1.0.0-pre2.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-DEPEND="virtual/linux-sources"
-#RDEPEND=""
-S=${WORKDIR}/${PN}-1.0.0-pre2
-
-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 ""
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	# install the driver
-	cd ${S}/driver
-	mv Makefile Makefile.orig
-	# don't run depmod now!
-	sed s/'depmod'/'#depmod'/ Makefile.orig > Makefile
-	make DESTDIR=${D} install || die
-
-	# install av7110_loadkeys
-	dobin ${S}/apps/av7110_loadkeys/av7110_loadkeys \
-		${S}/apps/av7110_loadkeys/evtest
-
-	# install dvbnet
-	cd ${S}/apps/dvbnet
-	make DESTDIR=${D}usr/bin install || die
-
-	# install scan
-	dobin ${S}/apps/scan/scan
-
-	# install szap
-	dobin ${S}/apps/szap/[tsc]zap
-	dodoc ${S}/apps/szap/channels.conf-dvb*
-
-	# 'install' test
-	dodir /usr/share/doc/${P}/test
-	insinto /usr/share/doc/${P}/test
-	doins ${S}/apps/test/*
-
-	# install headers
-	dodir /usr/include/linux
-	insinto /usr/include/linux
-	doins ${S}/include/linux/em8300.h
-
-	dodir /usr/include/linux/dvb
-	insinto /usr/include/linux/dvb
-	doins ${S}/include/linux/dvb/*.h
-
-	# install docs
-	dodoc ${S}/doc/*
-	dodoc ${S}/driver/makedev.napi
-	dodir /usr/share/doc/${P}/dvbapi
-	insinto /usr/share/doc/${P}/dvbapi
-	doins ${S}/doc/dvbapi/*
-
-	# install av7110_loadkeys docs
-	dodir /usr/share/doc/${P}/av7110_loadkeys
-	insinto /usr/share/doc/${P}/av7110_loadkeys
-	cd ${S}/apps/av7110_loadkeys
-	doins README *.rc5 *.rcmm
-
-	# install dvbnet scripts
-	dodir /usr/share/doc/${P}/dvbnet
-	insinto /usr/share/doc/${P}/dvbnet
-	doins ${S}/apps/dvbnet/net_start.*
-
-	# install scan docs
-	dodir /usr/share/doc/${P}/scan
-	insinto /usr/share/doc/${P}/scan
-	doins ${S}/apps/scan/README
-
-	# install test docs
-	dodir /usr/share/doc/${P}/test
-	insinto /usr/share/doc/${P}/test
-	doins ${S}/apps/test/README
-
-	cd ${S}
-	dodoc CONTRIBUTORS COPYING INSTALL README NEWS BUGS
-
-}
-
-pkg_postinst() {
-	depmod -a
-	einfo ""
-	einfo "If you don't use devfs, execute makedev.napi o create"
-	einfo "the device nodes. The file is in /usr/share/doc/${PF}/"
-	einfo ""
-	einfo "now copy an appropriate from"
-	einfo "/usr/share/doc/${P}/channels.conf-XXX"
-	einfo "channel list for DVB-S/C/T"
-	einfo "		to ~/.szap/channels.conf"
-	einfo "		~/.czap/channels.conf"
-	einfo "		~/.tzap/channels.conf"
-	einfo "and then call szap for DVB-S, czap for DVB-C or tzap for DVB-T"
-	einfo ""
-}
-
-pkg_postrm() {
-	depmod -a
-}
diff --git a/media-tv/linuxtv-dvb/linuxtv-dvb-1.0.0_pre2-r2.ebuild b/media-tv/linuxtv-dvb/linuxtv-dvb-1.0.0_pre2-r2.ebuild
deleted file mode 100644
index 59dc662c20b8..000000000000
--- a/media-tv/linuxtv-dvb/linuxtv-dvb-1.0.0_pre2-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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.0.0_pre2-r2.ebuild,v 1.7 2004/06/25 00:32:30 agriffis Exp $
-
-DESCRIPTION="Standalone DVB driver for Linux kernel 2.4.x"
-HOMEPAGE="http://www.linuxtv.org"
-SRC_URI="http://www.linuxtv.org/download/dvb/${PN}-1.0.0-pre2.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-DEPEND="virtual/linux-sources"
-#RDEPEND=""
-S=${WORKDIR}/${PN}-1.0.0-pre2
-
-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() {
-	emake
-}
-
-src_install() {
-	# install the driver
-	cd ${S}/driver
-	mv Makefile Makefile.orig
-	# don't run depmod now!
-	sed s/'depmod'/'#depmod'/ Makefile.orig > Makefile
-	make DESTDIR=${D} install || die
-
-	# install av7110_loadkeys
-	dobin ${S}/apps/av7110_loadkeys/av7110_loadkeys \
-		${S}/apps/av7110_loadkeys/evtest
-
-	# install dvbnet
-	cd ${S}/apps/dvbnet
-	make DESTDIR=${D}usr/bin install || die
-
-	# install scan
-	dobin ${S}/apps/scan/scan
-
-	# install szap
-	dobin ${S}/apps/szap/[tsc]zap
-	dodoc ${S}/apps/szap/channels.conf-dvb*
-
-	# 'install' test
-	dodir /usr/share/doc/${P}/test
-	insinto /usr/share/doc/${P}/test
-	doins ${S}/apps/test/*
-
-	# install headers
-	dodir /usr/include/linux
-	insinto /usr/include/linux
-	doins ${S}/include/linux/em8300.h
-
-	dodir /usr/include/linux/dvb
-	insinto /usr/include/linux/dvb
-	doins ${S}/include/linux/dvb/*.h
-
-	# install docs
-	dodoc ${S}/doc/*
-	dodoc ${S}/driver/makedev.napi
-	dodir /usr/share/doc/${P}/dvbapi
-	insinto /usr/share/doc/${P}/dvbapi
-	doins ${S}/doc/dvbapi/*
-
-	# install av7110_loadkeys docs
-	dodir /usr/share/doc/${P}/av7110_loadkeys
-	insinto /usr/share/doc/${P}/av7110_loadkeys
-	cd ${S}/apps/av7110_loadkeys
-	doins README *.rc5 *.rcmm
-
-	# install dvbnet scripts
-	dodir /usr/share/doc/${P}/dvbnet
-	insinto /usr/share/doc/${P}/dvbnet
-	doins ${S}/apps/dvbnet/net_start.*
-
-	# install scan docs
-	dodir /usr/share/doc/${P}/scan
-	insinto /usr/share/doc/${P}/scan
-	doins ${S}/apps/scan/README
-
-	# install test docs
-	dodir /usr/share/doc/${P}/test
-	insinto /usr/share/doc/${P}/test
-	doins ${S}/apps/test/README
-
-	cd ${S}
-	dodoc CONTRIBUTORS COPYING INSTALL README NEWS BUGS
-	dodoc ${FILESDIR}/dvb
-
-}
-
-pkg_postinst() {
-	depmod -a
-	einfo ""
-	einfo "If you don't use devfs, execute makedev.napi o create"
-	einfo "the device nodes. The file is in /usr/share/doc/${PF}/"
-	einfo ""
-	einfo "now copy an appropriate from"
-	einfo "/usr/share/doc/${PF}/channels.conf-XXX"
-	einfo "channel list for DVB-S/C/T"
-	einfo "		to ~/.szap/channels.conf"
-	einfo "		~/.czap/channels.conf"
-	einfo "		~/.tzap/channels.conf"
-	einfo "and then call szap for DVB-S, czap for DVB-C or tzap for DVB-T"
-	einfo ""
-	einfo "If you'd like to load all modules at once, unpack and add"
-	einfo "/usr/share/doc/${PF}/dvb.gz to /etc/modules.d/"
-	einfo "then run #update-modules to update your modules.conf"
-	einfo ""
-}
-
-pkg_postrm() {
-	depmod -a
-}
diff --git a/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1-r1.ebuild b/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..aa6335c5677a
--- /dev/null
+++ b/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1-r1.ebuild
@@ -0,0 +1,122 @@
+# 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-r1.ebuild,v 1.1 2004/11/11 18:36:36 lordvan Exp $
+
+DVB_TTPCI_FW="dvb-ttpci-01.fw-261c"
+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
+		http://www.linuxtv.org/download/dvb/firmware/${DVB_TTPCI_FW}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~ia64 ~amd64 ~ppc"
+IUSE=""
+DEPEND="virtual/linux-sources"
+#RDEPEND=""
+
+inherit eutils kernel-mod
+
+pkg_setup() {
+	if kernel-mod_is_2_4_kernel; then
+		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 ""
+	fi
+}
+
+src_compile() {
+	# Nothing to compile if running on a kernel 2.6 system
+	# modules in kernel are newer!
+	if kernel-mod_is_2_4_kernel; then
+		# don't interfere with the kernel arch variables
+		unset ARCH
+		emake || die "emake failed"
+	else
+		einfo "Nothing to compile."
+	fi
+}
+
+src_install() {
+	# see what kernel directory we need to
+	# go to
+	if kernel-mod_is_2_4_kernel; then
+		cd ${S}/build-2.4
+		KV_OBJ="o"
+	else
+		KV_OBJ="ko"
+	fi
+
+	if kernel-mod_is_2_4_kernel; then
+		#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
+	else
+		# copy kernel 2.6 insmod.sh script
+		sed -e "s:insmod ./:modprobe :" -i build-2.6/insmod.sh
+		sed -e "s:.${KV_OBJ}::" -i build-2.6/insmod.sh
+		newsbin build-2.6/insmod.sh dvb-module-load
+	fi
+
+	if kernel-mod_is_2_4_kernel; then
+		# install the modules
+		insinto /lib/modules/${KV}/misc
+		doins *.${KV_OBJ}
+
+		# install the header files
+		# linux26-headers installs those
+		# FIXME: is it save to assume _all_ kernel 2.6 users got that?
+		cd ${S}/linux/include/linux/dvb
+		insinto /usr/include/linux/dvb
+		doins *.h
+	fi
+	
+	#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
+
+	# install dvb-ttpci firmware
+	if has_version '>=sys-apps/hotplug-20040920'; then
+		insinto /lib/firmware
+	else
+		insinto /usr/lib/hotplug/firmware
+	fi
+	doins ${DISTDIR}/${DVB_TTPCI_FW}
+}
+
+pkg_postinst() {
+	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}'."
+	einfo ""
+	einfo "For information about firmware please see /usr/share/doc/${PF}/README."
+	einfo ""
+
+	if kernel-mod_is_2_4_kernel; then
+		einfo "Checking kernel module dependencies"
+		test -r "${ROOT}/usr/src/linux/System.map" && \
+			depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+	else
+	        einfo ""
+			einfo "Modules for kernel 2.6 will not be built."
+			einfo "According to the README-2.6 the driver in kernel"
+			einfo "2.6.1 and above is regularily kept up-to-date."
+			einfo "Therefore it is very likely that your kernel"
+			einfo "has newer modules then the latest release."
+			einfo "This ebuild will just install the dvb-ttpci"
+			einfo "firmware and docs on kernel 2.6 machines."
+			einfo ""
+	fi
+}