Work around 2.4 kernels by changing from a dep to checking for 2.4 linux-headers and USE=usb.

Package-Manager: portage-2.1.1_pre1-r5

6 files changed, 62 insertions, 32 deletions

diff --git a/x11-misc/linuxwacom/ChangeLog b/x11-misc/linuxwacom/ChangeLog
index a16d1315f04c..9d5a2ee5b0b3 100644
--- a/x11-misc/linuxwacom/ChangeLog
+++ b/x11-misc/linuxwacom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/linuxwacom
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.38 2006/06/30 16:46:56 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.39 2006/06/30 16:53:45 spyderous Exp $
+
+  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  linuxwacom-0.6.7.ebuild, linuxwacom-0.6.8.ebuild, linuxwacom-0.6.9.ebuild,
+  linuxwacom-0.7.2.ebuild:
+  Work around 2.4 kernels by changing from a dep to checking for 2.4
+  linux-headers and USE=usb.
 
   30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
   linuxwacom-0.7.2.ebuild:
diff --git a/x11-misc/linuxwacom/Manifest b/x11-misc/linuxwacom/Manifest
index 393aa3913384..cfe5b873158b 100644
--- a/x11-misc/linuxwacom/Manifest
+++ b/x11-misc/linuxwacom/Manifest
@@ -6,26 +6,26 @@ DIST linuxwacom-0.6.7.tar.bz2 496333
 DIST linuxwacom-0.6.8.tar.bz2 496784
 DIST linuxwacom-0.6.9.tar.bz2 475547
 DIST linuxwacom-0.7.2.tar.bz2 781756 RMD160 fa50375d3595f5e968e0bf2482dea4e8d568887c SHA1 e7b9f9a1345972753d851aac5fa8eb86a76a2800 SHA256 639a615d08470168b7da33e2c9f57e35dbee9cfacb739763f5255f62b99dbf1a
-EBUILD linuxwacom-0.6.7.ebuild 3332 RMD160 c1b9b65c1301b9283fbff891a49d4c9f1a329495 SHA1 76dde4e188d92525743fc51ee6e8a997938d4313 SHA256 b82555ce271c0eb3d196d244d6c9f3886f1ec3d49df6a4897f5e91d512253da8
-MD5 9111492a11b718f68ec4bcdd0d8a655d linuxwacom-0.6.7.ebuild 3332
-RMD160 c1b9b65c1301b9283fbff891a49d4c9f1a329495 linuxwacom-0.6.7.ebuild 3332
-SHA256 b82555ce271c0eb3d196d244d6c9f3886f1ec3d49df6a4897f5e91d512253da8 linuxwacom-0.6.7.ebuild 3332
-EBUILD linuxwacom-0.6.8.ebuild 3338 RMD160 de5b70c052591a591ee2b90c65209c60a7b92fdf SHA1 9e4871304e9ff6eac5f47a7abedd870c681922d4 SHA256 6abb2a3281b5ddcff47d398ce75829f2d91785157aba85a9120fdfaaac9ca867
-MD5 7a2955a73037a2929efca7094d01584e linuxwacom-0.6.8.ebuild 3338
-RMD160 de5b70c052591a591ee2b90c65209c60a7b92fdf linuxwacom-0.6.8.ebuild 3338
-SHA256 6abb2a3281b5ddcff47d398ce75829f2d91785157aba85a9120fdfaaac9ca867 linuxwacom-0.6.8.ebuild 3338
-EBUILD linuxwacom-0.6.9.ebuild 2969 RMD160 fe872647166383607db6af8bc8ca1037faf1f9e1 SHA1 fb7b16ce394a32908c937a0c5eebc2552771baba SHA256 cd57f7bf9d824dd938d09f049cfc748a3da08d9dc35f666b78bb60b45f38e6b8
-MD5 d861a7c56b1ede616749e52cfa45f9a4 linuxwacom-0.6.9.ebuild 2969
-RMD160 fe872647166383607db6af8bc8ca1037faf1f9e1 linuxwacom-0.6.9.ebuild 2969
-SHA256 cd57f7bf9d824dd938d09f049cfc748a3da08d9dc35f666b78bb60b45f38e6b8 linuxwacom-0.6.9.ebuild 2969
-EBUILD linuxwacom-0.7.2.ebuild 3659 RMD160 e376674c095d5cd024534ebeaea0de8f89a3faa0 SHA1 778328de44275a876b77a706d871b08c72d6c455 SHA256 122afdf9de24d4a9ffe1445b63899692c768f229ffde1ad81eda312a096e61ce
-MD5 8c519df3eeb1f4e7f311cac9168659c9 linuxwacom-0.7.2.ebuild 3659
-RMD160 e376674c095d5cd024534ebeaea0de8f89a3faa0 linuxwacom-0.7.2.ebuild 3659
-SHA256 122afdf9de24d4a9ffe1445b63899692c768f229ffde1ad81eda312a096e61ce linuxwacom-0.7.2.ebuild 3659
-MISC ChangeLog 6565 RMD160 480b99aae90de3b72b1e33f553a754cf5797d5e2 SHA1 fcaeb3039005dae48c2c73eb854ba3029db3062a SHA256 6c2c9b5cc9ca59cc426f32904df370559f84f1fcf98b01b3a34737c303cf618d
-MD5 61e8105d1071c72b4241927f2faae79a ChangeLog 6565
-RMD160 480b99aae90de3b72b1e33f553a754cf5797d5e2 ChangeLog 6565
-SHA256 6c2c9b5cc9ca59cc426f32904df370559f84f1fcf98b01b3a34737c303cf618d ChangeLog 6565
+EBUILD linuxwacom-0.6.7.ebuild 3472 RMD160 a262f33bf3135a2fef98a53b3d4bdd9efbe038af SHA1 2b786c3044d7b4b7e7e29f432c4a8d12f771dfb0 SHA256 e18f8584d3af05f11e2e06bffb8bf0a502fab6bce4c8080f9c369fd29b057723
+MD5 4d81f8e9c9a0644cc7e63b29017d3d1c linuxwacom-0.6.7.ebuild 3472
+RMD160 a262f33bf3135a2fef98a53b3d4bdd9efbe038af linuxwacom-0.6.7.ebuild 3472
+SHA256 e18f8584d3af05f11e2e06bffb8bf0a502fab6bce4c8080f9c369fd29b057723 linuxwacom-0.6.7.ebuild 3472
+EBUILD linuxwacom-0.6.8.ebuild 3478 RMD160 6e31803e4556d01f8880ee7867baf856a9681880 SHA1 8ff979f5f61b73d53153183d7585f39b4bd9d96b SHA256 d870f9c5128303b2a871fca3b303ac388898ea2213cbf0943fed9157e731a135
+MD5 1881e501a33bc36ab359a952de399aef linuxwacom-0.6.8.ebuild 3478
+RMD160 6e31803e4556d01f8880ee7867baf856a9681880 linuxwacom-0.6.8.ebuild 3478
+SHA256 d870f9c5128303b2a871fca3b303ac388898ea2213cbf0943fed9157e731a135 linuxwacom-0.6.8.ebuild 3478
+EBUILD linuxwacom-0.6.9.ebuild 3109 RMD160 555dcd05b16ec0794463694213dcdba59b9b56af SHA1 80f30bf41f8e1892c05279b173d7b35f60a060f5 SHA256 527cae75e891b735f8bd77642541068dda629526e99a41611612aaa13e66db3b
+MD5 9b5d3296dfd96f03554f77af1d5eea1b linuxwacom-0.6.9.ebuild 3109
+RMD160 555dcd05b16ec0794463694213dcdba59b9b56af linuxwacom-0.6.9.ebuild 3109
+SHA256 527cae75e891b735f8bd77642541068dda629526e99a41611612aaa13e66db3b linuxwacom-0.6.9.ebuild 3109
+EBUILD linuxwacom-0.7.2.ebuild 3799 RMD160 3124778b58ddf419ae1cc262bae84dc6b737f78a SHA1 4981ec9cdd429c94f5ecd344ea1aef2194d62ab9 SHA256 b5724a6c82289f781ef8d63a4790c1536a0e1f4c6f62b685be920d6018ff9fa5
+MD5 53a8201860ff285593fde0a98b4ff857 linuxwacom-0.7.2.ebuild 3799
+RMD160 3124778b58ddf419ae1cc262bae84dc6b737f78a linuxwacom-0.7.2.ebuild 3799
+SHA256 b5724a6c82289f781ef8d63a4790c1536a0e1f4c6f62b685be920d6018ff9fa5 linuxwacom-0.7.2.ebuild 3799
+MISC ChangeLog 6823 RMD160 49e77d8f1d2ee991558f0ae7059bda03b5e63b02 SHA1 ca5c74124711d8b2a009a1a9ab499b1923c893e2 SHA256 b44c92d3885a2c2765e971ba70520f3e917c78c18e14e98e3099b01cd08778fd
+MD5 765441f6423b01821d8f2d15bbb55cc5 ChangeLog 6823
+RMD160 49e77d8f1d2ee991558f0ae7059bda03b5e63b02 ChangeLog 6823
+SHA256 b44c92d3885a2c2765e971ba70520f3e917c78c18e14e98e3099b01cd08778fd ChangeLog 6823
 MISC metadata.xml 268 RMD160 3152329e942d732ece1c03d9e633a92a1012a97b SHA1 accbac976c7847c397f73b97e89582008d47b5f9 SHA256 437b6b7b25a842130a8a726afd95106b0e7c3a6939015d880ef8038a7a6d4e3d
 MD5 086e8fd79eca51dc3b219ade9fbb9a85 metadata.xml 268
 RMD160 3152329e942d732ece1c03d9e633a92a1012a97b metadata.xml 268
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild
index 534932da217d..8ac35d717db1 100644
--- a/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild,v 1.6 2005/12/27 20:43:37 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild,v 1.7 2006/06/30 16:53:45 spyderous Exp $
 
 IUSE="dlloader gtk gtk2 tcltk sdk usb"
 
@@ -27,7 +27,6 @@ DEPEND="${RDEPEND}
 	!x86? ( >=sys-devel/automake-1.6
 	        >=sys-devel/autoconf-2.53 )
 	dev-util/pkgconfig
-	usb? ( >=sys-kernel/linux-headers-2.6 )
 	>=sys-apps/sed-4"
 
 pkg_setup() {
@@ -44,6 +43,13 @@ pkg_setup() {
 		ewarn "the updated external driver for your X server, please remerge your X11 package with"
 		ewarn "the USE=sdk flag enabled."
 	fi
+
+	if use usb && ! has_version >=sys-kernel/linux-headers-2.6; then
+		local msg
+		msg="USB Wacom tablets require 2.6 linux-headers. Please upgrade."
+		eerror "$msg"
+		die "$msg"
+	fi
 }
 
 src_unpack() {
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.8.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.8.ebuild
index 811c22071a63..58c4f2f61730 100644
--- a/x11-misc/linuxwacom/linuxwacom-0.6.8.ebuild
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.8.ebuild,v 1.5 2005/12/27 20:43:37 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.8.ebuild,v 1.6 2006/06/30 16:53:45 spyderous Exp $
 
 IUSE="dlloader gtk gtk2 tcltk sdk usb"
 
@@ -27,7 +27,6 @@ DEPEND="${RDEPEND}
 	!x86? ( >=sys-devel/automake-1.6
 	        >=sys-devel/autoconf-2.53 )
 	dev-util/pkgconfig
-	usb? ( >=sys-kernel/linux-headers-2.6 )
 	>=sys-apps/sed-4"
 
 pkg_setup() {
@@ -44,6 +43,13 @@ pkg_setup() {
 		ewarn "the updated external driver for your X server, please remerge your X11 package with"
 		ewarn "the USE=sdk flag enabled."
 	fi
+
+	if use usb && ! has_version >=sys-kernel/linux-headers-2.6; then
+		local msg
+		msg="USB Wacom tablets require 2.6 linux-headers. Please upgrade."
+		eerror "$msg"
+		die "$msg"
+	fi
 }
 
 src_unpack() {
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild
index 56e968a5f566..7162812bd60e 100644
--- a/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild,v 1.6 2005/12/27 20:43:37 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild,v 1.7 2006/06/30 16:53:45 spyderous Exp $
 
 IUSE="dlloader gtk gtk2 tcltk sdk usb"
 
@@ -24,7 +24,6 @@ RDEPEND="virtual/x11
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	usb? ( >=sys-kernel/linux-headers-2.6 )
 	>=sys-apps/sed-4"
 
 pkg_setup() {
@@ -41,6 +40,13 @@ pkg_setup() {
 		ewarn "the updated external driver for your X server, please remerge your X11 package with"
 		ewarn "the USE=sdk flag enabled."
 	fi
+
+	if use usb && ! has_version >=sys-kernel/linux-headers-2.6; then
+		local msg
+		msg="USB Wacom tablets require 2.6 linux-headers. Please upgrade."
+		eerror "$msg"
+		die "$msg"
+	fi
 }
 
 src_unpack() {
diff --git a/x11-misc/linuxwacom/linuxwacom-0.7.2.ebuild b/x11-misc/linuxwacom/linuxwacom-0.7.2.ebuild
index 1e8208dac21c..480709679308 100644
--- a/x11-misc/linuxwacom/linuxwacom-0.7.2.ebuild
+++ b/x11-misc/linuxwacom/linuxwacom-0.7.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/x11-misc/linuxwacom/linuxwacom-0.7.2.ebuild,v 1.6 2006/06/30 16:46:56 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.7.2.ebuild,v 1.7 2006/06/30 16:53:45 spyderous Exp $
 
 IUSE="dlloader gtk gtk2 tcltk sdk usb"
 
@@ -26,7 +26,6 @@ RDEPEND="|| ( ( x11-proto/inputproto
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	usb? ( >=sys-kernel/linux-headers-2.6 )
 	>=sys-apps/sed-4"
 
 pkg_setup() {
@@ -43,6 +42,13 @@ pkg_setup() {
 		ewarn "the updated external driver for your X server, please remerge your X11 package with"
 		ewarn "the USE=sdk flag enabled."
 	fi
+
+	if use usb && ! has_version >=sys-kernel/linux-headers-2.6; then
+		local msg
+		msg="USB Wacom tablets require 2.6 linux-headers. Please upgrade."
+		eerror "$msg"
+		die "$msg"
+	fi
 }
 
 src_unpack() {