Removing deprecated versions, adding deprecation notice for kernel >= 2.6.18 to current versions.

Package-Manager: portage-2.1.1-r2

3 files changed, 27 insertions, 4 deletions

diff --git a/media-video/usb-pwc-re/ChangeLog b/media-video/usb-pwc-re/ChangeLog
index 106feefd9098..3da8c0cda729 100644
--- a/media-video/usb-pwc-re/ChangeLog
+++ b/media-video/usb-pwc-re/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/usb-pwc-re
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/ChangeLog,v 1.30 2007/01/30 05:08:10 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/ChangeLog,v 1.31 2007/04/12 10:36:35 phosphan Exp $
+
+  12 Apr 2007; Patrick Kursawe <phosphan@gentoo.org>
+  -usb-pwc-re-10.0.7.ebuild, -usb-pwc-re-10.0.11.ebuild,
+  usb-pwc-re-10.0.12_rc1.ebuild, -usb-pwc-re-20061023.042702.ebuild,
+  usb-pwc-re-20061023.042702-r1.ebuild:
+  Removing deprecated versions, adding deprecation notice for kernel >= 2.6.18
+  to current versions.
 
   30 Jan 2007; Steve Dibb <beandog@gentoo.org>
   usb-pwc-re-20061023.042702-r1.ebuild:
diff --git a/media-video/usb-pwc-re/usb-pwc-re-10.0.12_rc1.ebuild b/media-video/usb-pwc-re/usb-pwc-re-10.0.12_rc1.ebuild
index 74e246b6eefa..5faea2b371e3 100644
--- a/media-video/usb-pwc-re/usb-pwc-re-10.0.12_rc1.ebuild
+++ b/media-video/usb-pwc-re/usb-pwc-re-10.0.12_rc1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-10.0.12_rc1.ebuild,v 1.5 2006/06/13 10:29:20 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-10.0.12_rc1.ebuild,v 1.6 2007/04/12 10:36:35 phosphan Exp $
 
 
 inherit linux-info toolchain-funcs eutils
@@ -20,6 +20,14 @@ RDEPEND=""
 
 S=${WORKDIR}/pwc-${MY_PV}
 
+pkg_setup() {
+	if kernel_is 2 6; then
+		if [ "${KV_PATCH}" -ge 18 ] ; then
+			die "In kernel ${KV_FULL} this module is deprecated by the builtin driver."
+		fi
+	fi
+}
+
 src_compile() {
 	export ARCH="$(tc-arch-kernel)"
 	emake KSRC="${KERNEL_DIR}" || die "make failed"
diff --git a/media-video/usb-pwc-re/usb-pwc-re-20061023.042702-r1.ebuild b/media-video/usb-pwc-re/usb-pwc-re-20061023.042702-r1.ebuild
index f484b5aae517..d6d10067bc56 100644
--- a/media-video/usb-pwc-re/usb-pwc-re-20061023.042702-r1.ebuild
+++ b/media-video/usb-pwc-re/usb-pwc-re-20061023.042702-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-20061023.042702-r1.ebuild,v 1.5 2007/01/30 05:08:10 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-20061023.042702-r1.ebuild,v 1.6 2007/04/12 10:36:35 phosphan Exp $
 
 inherit linux-mod eutils
 
@@ -28,6 +28,14 @@ ERROR_VIDEO_V4L1_COMPAT="{$P} requires support for the Video For Linux API 1 com
 
 S=${WORKDIR}/pwc-v4l2-${MY_PV}
 
+pkg_setup() {
+	if kernel_is 2 6; then
+		if [ "${KV_PATCH}" -ge 18 ] ; then
+			die "In kernel ${KV_FULL} this module is deprecated by the builtin driver."
+		fi
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}