Add warning about >=2.6.16 kernels in 0.4.x driver. Changed to kernel_is

(Portage version: 2.1)

7 files changed, 32 insertions, 6 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index 83eda7a73546..e153b079fc49 100644
--- a/media-tv/ivtv/ChangeLog
+++ b/media-tv/ivtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/ivtv
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.43 2006/06/04 23:13:04 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.44 2006/06/11 15:41:08 cardoe Exp $
+
+  11 Jun 2006; Doug Goldstein <cardoe@gentoo.org> ivtv-0.4.5.ebuild,
+  ivtv-0.6.2.ebuild:
+  Add warning about >=2.6.16 kernels in 0.4.x driver. Changed to kernel_is
 
   04 Jun 2006; Doug Goldstein <cardoe@gentoo.org> ivtv-0.6.2.ebuild:
   Correct kernel version
diff --git a/media-tv/ivtv/files/digest-ivtv-0.4.0-r3 b/media-tv/ivtv/files/digest-ivtv-0.4.0-r3
index ab9f88ff72fa..0057d6044c42 100644
--- a/media-tv/ivtv/files/digest-ivtv-0.4.0-r3
+++ b/media-tv/ivtv/files/digest-ivtv-0.4.0-r3
@@ -1,3 +1,7 @@
 MD5 6d48e10b25c21ec9b4d478bd6edf2a44 ivtv-0.4.0.tar.gz 475881
 MD5 f48ad2cda962879bc093cc6867dc86d2 pvr_1.18.21.22254_inf.zip 593441
+RMD160 9549dddfddacf6bee3c73def508a2c347c5e25f2 pvr_1.18.21.22254_inf.zip 593441
+SHA256 156c0cfaa2cb3f482b48f95b94a9247690e4ed2d0cb8962a52db8846c683bff1 pvr_1.18.21.22254_inf.zip 593441
 MD5 dc84a41b3b296b856da3d0f9edbb7a08 pvr_2.0.24.23035.zip 281620
+RMD160 fbd439efa5793e9a65fd6fac2093c523cd458027 pvr_2.0.24.23035.zip 281620
+SHA256 2387e7a042342f7b401222aac7f99a19b733fded8118339edd402a58279e5f95 pvr_2.0.24.23035.zip 281620
diff --git a/media-tv/ivtv/files/digest-ivtv-0.4.2 b/media-tv/ivtv/files/digest-ivtv-0.4.2
index daed70ae2fab..2925e786fd36 100644
--- a/media-tv/ivtv/files/digest-ivtv-0.4.2
+++ b/media-tv/ivtv/files/digest-ivtv-0.4.2
@@ -1,3 +1,7 @@
 MD5 9d29e03b9562a2cb0bde5d1fe6c3d465 ivtv-0.4.2.tar.gz 500961
 MD5 f48ad2cda962879bc093cc6867dc86d2 pvr_1.18.21.22254_inf.zip 593441
+RMD160 9549dddfddacf6bee3c73def508a2c347c5e25f2 pvr_1.18.21.22254_inf.zip 593441
+SHA256 156c0cfaa2cb3f482b48f95b94a9247690e4ed2d0cb8962a52db8846c683bff1 pvr_1.18.21.22254_inf.zip 593441
 MD5 dc84a41b3b296b856da3d0f9edbb7a08 pvr_2.0.24.23035.zip 281620
+RMD160 fbd439efa5793e9a65fd6fac2093c523cd458027 pvr_2.0.24.23035.zip 281620
+SHA256 2387e7a042342f7b401222aac7f99a19b733fded8118339edd402a58279e5f95 pvr_2.0.24.23035.zip 281620
diff --git a/media-tv/ivtv/files/digest-ivtv-0.4.5 b/media-tv/ivtv/files/digest-ivtv-0.4.5
index 872a6029ca00..4e65a7b52734 100644
--- a/media-tv/ivtv/files/digest-ivtv-0.4.5
+++ b/media-tv/ivtv/files/digest-ivtv-0.4.5
@@ -2,4 +2,8 @@ MD5 2310979e0bc6b0a6e0a1861b818c80b4 ivtv-0.4.5.tar.gz 502679
 RMD160 8b6c1bf532797ec19ec148a26515fd38a0d983e7 ivtv-0.4.5.tar.gz 502679
 SHA256 a600339247f16f0b3028581f3f84154e6b352f166b238b0c5c282a11fc1a603d ivtv-0.4.5.tar.gz 502679
 MD5 f48ad2cda962879bc093cc6867dc86d2 pvr_1.18.21.22254_inf.zip 593441
+RMD160 9549dddfddacf6bee3c73def508a2c347c5e25f2 pvr_1.18.21.22254_inf.zip 593441
+SHA256 156c0cfaa2cb3f482b48f95b94a9247690e4ed2d0cb8962a52db8846c683bff1 pvr_1.18.21.22254_inf.zip 593441
 MD5 dc84a41b3b296b856da3d0f9edbb7a08 pvr_2.0.24.23035.zip 281620
+RMD160 fbd439efa5793e9a65fd6fac2093c523cd458027 pvr_2.0.24.23035.zip 281620
+SHA256 2387e7a042342f7b401222aac7f99a19b733fded8118339edd402a58279e5f95 pvr_2.0.24.23035.zip 281620
diff --git a/media-tv/ivtv/files/digest-ivtv-0.6.2 b/media-tv/ivtv/files/digest-ivtv-0.6.2
index 687d17b4b90d..3cc3524e537b 100644
--- a/media-tv/ivtv/files/digest-ivtv-0.6.2
+++ b/media-tv/ivtv/files/digest-ivtv-0.6.2
@@ -2,4 +2,8 @@ MD5 93ce8acbb3008956486ee30ff21f7e14 ivtv-0.6.2.tar.gz 432308
 RMD160 69d64a40bd861902aab982c2e047372ebbcf217c ivtv-0.6.2.tar.gz 432308
 SHA256 3cdae3e8f7d2e67e2c8be3474130e4d6fea2f7576ac62823d7e47eb7475c6756 ivtv-0.6.2.tar.gz 432308
 MD5 f48ad2cda962879bc093cc6867dc86d2 pvr_1.18.21.22254_inf.zip 593441
+RMD160 9549dddfddacf6bee3c73def508a2c347c5e25f2 pvr_1.18.21.22254_inf.zip 593441
+SHA256 156c0cfaa2cb3f482b48f95b94a9247690e4ed2d0cb8962a52db8846c683bff1 pvr_1.18.21.22254_inf.zip 593441
 MD5 dc84a41b3b296b856da3d0f9edbb7a08 pvr_2.0.24.23035.zip 281620
+RMD160 fbd439efa5793e9a65fd6fac2093c523cd458027 pvr_2.0.24.23035.zip 281620
+SHA256 2387e7a042342f7b401222aac7f99a19b733fded8118339edd402a58279e5f95 pvr_2.0.24.23035.zip 281620
diff --git a/media-tv/ivtv/ivtv-0.4.5.ebuild b/media-tv/ivtv/ivtv-0.4.5.ebuild
index fe567052ff61..a4183e377389 100644
--- a/media-tv/ivtv/ivtv-0.4.5.ebuild
+++ b/media-tv/ivtv/ivtv-0.4.5.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/ivtv/ivtv-0.4.5.ebuild,v 1.1 2006/05/27 02:04:36 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.4.5.ebuild,v 1.2 2006/06/11 15:41:08 cardoe Exp $
 
 inherit eutils linux-mod
 
@@ -30,10 +30,16 @@ RDEPEND="sys-apps/hotplug"
 DEPEND="app-arch/unzip"
 
 pkg_setup() {
-	linux-mod_pkg_setup
 	MODULE_NAMES="ivtv(extra:${S}/driver)"
 
-	if [ ${KV_PATCH} -le 14 ]; then
+	if kernel_is gt 2 6 15; then
+		ewarn "You must use 0.6.x with a 2.6.16 kernel. However the kernel is broken"
+		ewarn "with IVTV for a great number of people. Including the maintainer of"
+		ewarn "IVTV in Gentoo. Your best bet is to use a 2.6.15 kernel"
+		die "This does not work with kernel versions higher then 2.6.15"
+	fi
+
+	if kernel_is le 2 6 14; then
 		MODULE_NAMES="${MODULE_NAMES}
 		msp3400(extra:${S}/driver)
 		saa7115(extra:${S}/driver)
diff --git a/media-tv/ivtv/ivtv-0.6.2.ebuild b/media-tv/ivtv/ivtv-0.6.2.ebuild
index 58d6628de4f5..8e2427c598e2 100644
--- a/media-tv/ivtv/ivtv-0.6.2.ebuild
+++ b/media-tv/ivtv/ivtv-0.6.2.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/ivtv/ivtv-0.6.2.ebuild,v 1.2 2006/06/04 23:13:04 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.6.2.ebuild,v 1.3 2006/06/11 15:41:08 cardoe Exp $
 
 inherit eutils linux-mod
 
@@ -33,7 +33,7 @@ pkg_setup() {
 	linux-mod_pkg_setup
 	MODULE_NAMES="ivtv(extra:${S}/driver)"
 
-	if [ ${KV_PATCH} -eq 16 ]; then
+	if kernel_is 2 6 16; then
 		CONFIG_CHECK="${CONFIG_CHECK} VIDEO_DECODER VIDEO_AUDIO_DECODER VIDEO_BT848"
 	else
 		die "This only works on 2.6.16 kernels"