Removed version 1.1.1, solving #121964, Marking 1.1.1_p20060108 stable on x86, removing ppc-keyword completely, Bug #125670

(Portage version: 2.1_pre7-r3)

6 files changed, 9 insertions, 205 deletions

diff --git a/media-tv/linuxtv-dvb/ChangeLog b/media-tv/linuxtv-dvb/ChangeLog
index cc85692bccbf..22a345f87e99 100644
--- a/media-tv/linuxtv-dvb/ChangeLog
+++ b/media-tv/linuxtv-dvb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/linuxtv-dvb
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb/ChangeLog,v 1.25 2006/04/01 13:17:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb/ChangeLog,v 1.26 2006/04/01 16:17:56 zzam Exp $
+
+  01 Apr 2006; Matthias Schwarzott <zzam@gentoo.org>
+  -linuxtv-dvb-1.1.1-r1.ebuild, -linuxtv-dvb-1.1.1-r2.ebuild,
+  linuxtv-dvb-1.1.1_p20060108.ebuild:
+  Removed version 1.1.1, solving #121964, Marking 1.1.1_p20060108 stable on
+  x86, removing ppc-keyword completely, Bug #125670
 
   01 Apr 2006; Aron Griffis <agriffis@gentoo.org>
   linuxtv-dvb-1.1.1_p20060108.ebuild:
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
deleted file mode 100644
index 6a9316610344..000000000000
--- a/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6dd599f24b7abecd1e32c203eaa7fa8a linuxtv-dvb-1.1.1.tar.bz2 327271
diff --git a/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.1.1-r2 b/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.1.1-r2
deleted file mode 100644
index 42c06dcdfca9..000000000000
--- a/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.1.1-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2496d5ca3ae8ae61abc9cfce7bb60b05 dvb-ttpci-01.fw-2622 239956
-MD5 6dd599f24b7abecd1e32c203eaa7fa8a linuxtv-dvb-1.1.1.tar.bz2 327271
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
deleted file mode 100644
index 3cc6ddfb2409..000000000000
--- a/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2006 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.12 2006/03/24 17:36:37 agriffis Exp $
-
-inherit eutils kernel-mod
-
-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="alpha amd64 ppc x86"
-IUSE=""
-DEPEND="virtual/linux-sources"
-#RDEPEND=""
-
-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 BUILD_DIR=${S}/build-2.4 KDIR=/usr/src/linux || 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
-}
-
-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
-	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"
-		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 docs"
-			einfo "on kernel 2.6 machines."
-			einfo
-	fi
-}
diff --git a/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1-r2.ebuild b/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1-r2.ebuild
deleted file mode 100644
index 9158d4ebc9b2..000000000000
--- a/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2006 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-r2.ebuild,v 1.4 2006/03/24 17:36:37 agriffis Exp $
-
-inherit eutils linux-mod
-
-DVB_TTPCI_FW="dvb-ttpci-01.fw-2622"
-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="~alpha ~amd64 ppc x86"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${P}/build-2.4
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	if [[ ${KV_MAJOR}.${KV_MINOR} != 2.4 ]]; then
-		einfo "This ebuild only provides drivers for Kernel 2.4"
-		einfo "Kernel 2.6 has included drivers for DVB devices."
-		einfo "please use these"
-		die "Kernel 2.6 not supported"
-	fi
-
-	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
-	MODULE_NAMES="dvb(dvb:${S})"
-	BUILD_PARAMS="KDIR=${KERNEL_DIR}"
-	BUILD_TARGETS="build"
-}
-
-src_unpack() {
-	unpack ${A}
-	cp ${DISTDIR}/${DVB_TTPCI_FW} ${S}/dvb-ttpci-01.fw
-}
-
-src_install() {
-	#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
-	make install DESTDIR="${D}" DEST="/lib/modules/${KV_FULL}/dvb"
-
-	# 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
-
-	#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() {
-	linux-mod_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
-	einfo "Firmware-files can be found in media-tv/linuxtv-dvb-firmware"
-	einfo
-}
diff --git a/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1_p20060108.ebuild b/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1_p20060108.ebuild
index 7bdbc68d9784..8d3af5785315 100644
--- a/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1_p20060108.ebuild
+++ b/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1_p20060108.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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_p20060108.ebuild,v 1.3 2006/04/01 13:17:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1_p20060108.ebuild,v 1.4 2006/04/01 16:17:56 zzam Exp $
 
 inherit eutils linux-mod
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/dvb-kernel_linux_2_4-${MY_PV}.tar.bz2
 	http://www.linuxtv.org/download/dvb/firmware/${DVB_TTPCI_FW}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~ppc ~x86"
+KEYWORDS="alpha ~amd64 x86"
 IUSE=""
 DEPEND="virtual/linux-sources"
 RDEPEND=""