Stop stradis-module from autoloading based on pci-vendor/device-no.

Package-Manager: portage-2.1.1_pre1

diff --git a/media-tv/v4l-dvb-hg/ChangeLog b/media-tv/v4l-dvb-hg/ChangeLog
index 80d365f910ab49ea692e2823048a7619ce6ec84a..913fd25a7533e6f32a60e2c0e1b7ce2544f9ad91 100644 (file)
--- a/media-tv/v4l-dvb-hg/ChangeLog
+++ b/media-tv/v4l-dvb-hg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/v4l-dvb-hg
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-dvb-hg/ChangeLog,v 1.2 2006/05/24 21:51:21 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-dvb-hg/ChangeLog,v 1.3 2006/06/18 12:29:30 zzam Exp $
+
+*v4l-dvb-hg-0.1-r2 (18 Jun 2006)
+
+  18 Jun 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +v4l-dvb-hg-0.1-r2.ebuild:
+  Stop stradis-module from autoloading based on pci-vendor/device-no.
 
 *v4l-dvb-hg-0.1-r1 (24 May 2006)
 

diff --git a/media-tv/v4l-dvb-hg/Manifest b/media-tv/v4l-dvb-hg/Manifest
index 39d866bb05a4a9372efc6a6567008f324af56c22..03ddbab8af0ce5f233619900bebbc9284069996c 100644 (file)
--- a/media-tv/v4l-dvb-hg/Manifest
+++ b/media-tv/v4l-dvb-hg/Manifest
@@ -9,14 +9,18 @@ EBUILD v4l-dvb-hg-0.1-r1.ebuild 2603 RMD160 d0347482ae0f0d5bf7bcd937abb002b70295
 MD5 c0c27ab445f5617ebcf916c5f094a3a2 v4l-dvb-hg-0.1-r1.ebuild 2603
 RMD160 d0347482ae0f0d5bf7bcd937abb002b702959a3f v4l-dvb-hg-0.1-r1.ebuild 2603
 SHA256 89e27053c81e13a909a21219337f315a19b8c55d726d3a54dcd756d718d2d1b6 v4l-dvb-hg-0.1-r1.ebuild 2603
+EBUILD v4l-dvb-hg-0.1-r2.ebuild 2695 RMD160 c4ca74153a34edbe664e1f113b71d66b3a30f87a SHA1 1547e4d73a940a84a43656794771d6bef615c3c7 SHA256 254aab8ecf3d478f842c282470ca213c747d6ab74bc22f471d275e163a4987cc
+MD5 384c2feeba9e12900764fd59ddb2ff19 v4l-dvb-hg-0.1-r2.ebuild 2695
+RMD160 c4ca74153a34edbe664e1f113b71d66b3a30f87a v4l-dvb-hg-0.1-r2.ebuild 2695
+SHA256 254aab8ecf3d478f842c282470ca213c747d6ab74bc22f471d275e163a4987cc v4l-dvb-hg-0.1-r2.ebuild 2695
 EBUILD v4l-dvb-hg-0.1.ebuild 2188 RMD160 23d9f87f94be17bd74075f7285a0c0a9522bdb59 SHA1 add0eb5d3b6095e5b640fe64bb1722726aa3f6e0 SHA256 7df5dec56ac1d912e1a5b1ea89b780901d6f39d5f67bfd313d7e2ea9f35ecbcb
 MD5 30c9fe2d66f4d85be87263c9ae4d0e86 v4l-dvb-hg-0.1.ebuild 2188
 RMD160 23d9f87f94be17bd74075f7285a0c0a9522bdb59 v4l-dvb-hg-0.1.ebuild 2188
 SHA256 7df5dec56ac1d912e1a5b1ea89b780901d6f39d5f67bfd313d7e2ea9f35ecbcb v4l-dvb-hg-0.1.ebuild 2188
-MISC ChangeLog 575 RMD160 f3b0be46a3e0ca356a4971fca9c08333c6203d27 SHA1 6aa64ef9ab63ce7afca8547ba1169abc5eac7ec7 SHA256 388c999319cadfdcf6d5f22fc8d3c795dd7466dd5f81482c8b941872f8cc2e85
-MD5 863fd5f9a0e594d27f0741434f4edf7f ChangeLog 575
-RMD160 f3b0be46a3e0ca356a4971fca9c08333c6203d27 ChangeLog 575
-SHA256 388c999319cadfdcf6d5f22fc8d3c795dd7466dd5f81482c8b941872f8cc2e85 ChangeLog 575
+MISC ChangeLog 762 RMD160 7d5f7aeab4d3d8fde01d74507170e554de6dec89 SHA1 1eb879592492b0da3443020c284e9e16d99ba191 SHA256 d5e929a5abc9076d16e9dee2b5f536f40849c200f0e53307901437019acb41e7
+MD5 c73219932b230d41ff50d87741908a11 ChangeLog 762
+RMD160 7d5f7aeab4d3d8fde01d74507170e554de6dec89 ChangeLog 762
+SHA256 d5e929a5abc9076d16e9dee2b5f536f40849c200f0e53307901437019acb41e7 ChangeLog 762
 MISC metadata.xml 300 RMD160 c85719cef743cf573efe73f8f84564292085c91c SHA1 4c00933e1ed60039fae091034d83e28d0890e87c SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587
 MD5 7c30ab7528b676a1a0c2737821599b29 metadata.xml 300
 RMD160 c85719cef743cf573efe73f8f84564292085c91c metadata.xml 300
@@ -27,10 +31,13 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-v4l-dvb-hg-0.1-r1 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-v4l-dvb-hg-0.1-r1 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-v4l-dvb-hg-0.1-r1 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-v4l-dvb-hg-0.1-r2 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-v4l-dvb-hg-0.1-r2 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-v4l-dvb-hg-0.1-r2 1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEdNUfZfSl1Kp5KmoRAnwuAKDV2LpqBTkai+yxSJ2kFhpc8POSRwCg1QCf
-w5s/TZTSgpEF5xa8jBDpvic=
-=gt+R
+iD8DBQFElUc0ZfSl1Kp5KmoRApCcAJ4gOSbhMugRiyNPFjE8Y/ksEawa1wCgtZVe
+weMEjoCc9+tkxwW0liQnINk=
+=hzfk
 -----END PGP SIGNATURE-----

diff --git a/media-tv/v4l-dvb-hg/files/digest-v4l-dvb-hg-0.1-r2 b/media-tv/v4l-dvb-hg/files/digest-v4l-dvb-hg-0.1-r2
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
+++ b/media-tv/v4l-dvb-hg/files/digest-v4l-dvb-hg-0.1-r2
@@ -0,0 +1 @@
+

diff --git a/media-tv/v4l-dvb-hg/v4l-dvb-hg-0.1-r2.ebuild b/media-tv/v4l-dvb-hg/v4l-dvb-hg-0.1-r2.ebuild
new file mode 100644 (file)
index 0000000..cda6378
--- /dev/null
+++ b/media-tv/v4l-dvb-hg/v4l-dvb-hg-0.1-r2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-dvb-hg/v4l-dvb-hg-0.1-r2.ebuild,v 1.1 2006/06/18 12:29:30 zzam Exp $
+
+
+: ${EHG_REPO_URI:=http://linuxtv.org/hg/v4l-dvb}
+
+inherit linux-mod eutils toolchain-funcs mercurial
+
+DESCRIPTION="live development version of v4l&dvb-driver for Kernel 2.6"
+SRC_URI=""
+HOMEPAGE="http://www.linuxtv.org"
+
+KEYWORDS="~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+
+S=${WORKDIR}/v4l-dvb/v4l
+
+pkg_setup()
+{
+       linux-mod_pkg_setup
+       if [[ "${KV_MAJOR}.${KV_MINOR}" != "2.6"  ]]; then
+               ewarn "other Kernel than 2.6.x are not supported at the moment."
+               die "unsupported Kernel (not 2.6.x)"
+       fi
+       MODULE_NAMES="dvb(dvb:${S})"
+       BUILD_PARAMS="KDIR=${KERNEL_DIR}"
+       BUILD_TARGETS="default"
+
+       if [[ -d ${ROOT}/lib/modules/${KV_FULL}/v4l-dvb-cvs ]]; then
+               ewarn "There are stale dvb-modules from the ebuild v4l-dvb-cvs."
+               ewarn "Please remove the directory /lib/modules/${KV_FULL}/v4l-dvb-cvs"
+               ewarn "with all its files and subdirectories and then restart emerge."
+               ewarn
+               ewarn "# rm -rf /lib/modules/${KV_FULL}/v4l-dvb-cvs"
+               die "Stale dvb-modules found, restart merge after removing them."
+       fi
+}
+
+src_unpack() {
+       # download and copy files
+       S=${WORKDIR}/v4l-dvb mercurial_src_unpack
+
+       cd ${WORKDIR}
+       epatch ${FILESDIR}/${PN}-fix-makefile-recursion.diff
+
+       cd ${S}
+
+       export ARCH=$(tc-arch-kernel)
+       make allmodconfig ${BUILD_PARAMS}
+       export ARCH=$(tc-arch)
+
+       # apply local patches
+       if test -n "${DVB_LOCAL_PATCHES}";
+       then
+               ewarn "Applying local patches:"
+               for LOCALPATCH in ${DVB_LOCAL_PATCHES};
+               do
+                       if test -f "${LOCALPATCH}";
+                       then
+                               if grep -q linux/drivers ${LOCALPATCH}; then
+                                       cd ${S}/..
+                               else
+                                       cd ${S}
+                               fi
+                               epatch ${LOCALPATCH}
+                       fi
+               done
+       else
+               einfo "No additional local patches to use"
+       fi
+       echo
+
+       sed -i ${WORKDIR}/v4l-dvb/linux/drivers/media/video/stradis.c -e '/MODULE_DEVICE_TABLE/d'
+
+       cd ${S}
+       sed -e 's#/lib/modules/$(KERNELRELEASE)/kernel/drivers/media#$(DESTDIR)/$(DEST)#' \
+               -e '/-install::/s:rminstall::' \
+               -i Makefile
+       sed -e '/depmod/d' -i Makefile*
+}
+
+src_install() {
+       # install the modules
+       make install DESTDIR="${D}" \
+               DEST="/lib/modules/${KV_FULL}/v4l-dvb" \
+       || die "make install failed"
+
+       cd ${S}/..
+       dodoc linux/Documentation/dvb/*.txt
+       dosbin linux/Documentation/dvb/get_dvb_firmware
+}
+
+pkg_postinst() {
+       einfo
+       einfo "Firmware-files can be found in media-tv/linuxtv-dvb-firmware"
+       einfo
+
+       linux-mod_pkg_postinst
+       einfo
+       einfo
+       einfo "if you want to use the IR-port or networking"
+       einfo "with the dvb-card you need to"
+       einfo "install linuxtv-dvb-apps"
+       einfo
+}