removed firmware-installation from ebuild

Package-Manager: portage-2.0.53

3 files changed, 15 insertions, 19 deletions

diff --git a/media-tv/linuxtv-dvb/ChangeLog b/media-tv/linuxtv-dvb/ChangeLog
index 1a8eb6259d18..e5777a67969c 100644
--- a/media-tv/linuxtv-dvb/ChangeLog
+++ b/media-tv/linuxtv-dvb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/linuxtv-dvb
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb/ChangeLog,v 1.15 2005/09/15 20:05:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb/ChangeLog,v 1.16 2005/12/03 17:01:48 zzam Exp $
+
+  03 Dec 2005; Matthias Schwarzott <zzam@gentoo.org>
+  linuxtv-dvb-1.1.1-r1.ebuild:
+  removed firmware-installation from ebuild
 
   15 Sep 2005; Aron Griffis <agriffis@gentoo.org>
   linuxtv-dvb-1.1.1-r1.ebuild:
diff --git a/media-tv/linuxtv-dvb/Manifest b/media-tv/linuxtv-dvb/Manifest
index a865484a720f..86c888a48a48 100644
--- a/media-tv/linuxtv-dvb/Manifest
+++ b/media-tv/linuxtv-dvb/Manifest
@@ -1,7 +1,7 @@
-MD5 be44fb1374a7c221d630628e5c791350 linuxtv-dvb-1.1.1-r1.ebuild 3578
-MD5 6e77f3196f8735be5ba01cafd0c6b1bc metadata.xml 219
-MD5 68382bf73685f82a469704fcc757b8d1 ChangeLog 3621
-MD5 b0924260da64da807f88467373957c76 linuxtv-dvb-1.0.1.ebuild 3083
+MD5 e5b72363a281120292762849cdc2a9be ChangeLog 3746
 MD5 d2fe0d162036705e62a8498c876425e4 files/digest-linuxtv-dvb-1.0.1 69
 MD5 7644c8c5677e222eacbfc0e2cc2db219 files/digest-linuxtv-dvb-1.1.1-r1 135
 MD5 e1f301cd0191586916bc7c3cd2b02288 files/dvb 179
+MD5 b0924260da64da807f88467373957c76 linuxtv-dvb-1.0.1.ebuild 3083
+MD5 4010065590ab94cdcec344297d14712c linuxtv-dvb-1.1.1-r1.ebuild 3323
+MD5 6e77f3196f8735be5ba01cafd0c6b1bc metadata.xml 219
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
index a643ed11346b..ee13019fe167 100644
--- a/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1-r1.ebuild
+++ b/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1-r1.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2005 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.8 2005/09/15 20:05:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1-r1.ebuild,v 1.9 2005/12/03 17:01:49 zzam Exp $
 
 inherit eutils kernel-mod
 
-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}"
+SRC_URI="http://www.linuxtv.org/download/dvb/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ia64 ppc ~x86"
@@ -84,14 +82,6 @@ src_install() {
 	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
-	donewins ${DISTDIR}/${DVB_TTPCI_FW} dvb-ttpci-01.fw
 }
 
 pkg_postinst() {
@@ -103,6 +93,8 @@ pkg_postinst() {
 	einfo
 	einfo "For information about firmware please see /usr/share/doc/${PF}/README."
 	einfo
+	einfo "Firmware-files can be found in media-tv/linuxtv-dvb-firmware"
+	einfo
 
 	if kernel-mod_is_2_4_kernel; then
 		einfo "Checking kernel module dependencies"
@@ -115,8 +107,8 @@ pkg_postinst() {
 			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 "This ebuild will just install the docs"
+			einfo "on kernel 2.6 machines."
 			einfo
 	fi
 }