Apparently the boolean logic was broken for detecting 2.6 headers on 2.4 kernels. Reported by wa1ter@myrealbox.com.

(Portage version: 2.1.1_pre1-r5)

5 files changed, 47 insertions, 25 deletions

diff --git a/x11-misc/linuxwacom/ChangeLog b/x11-misc/linuxwacom/ChangeLog
index 3bc4155e0a53..6c8a9e0c10b3 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.41 2006/07/01 00:18:42 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.42 2006/07/01 02:18:36 spyderous Exp $
+
+  01 Jul 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:
+  Apparently the boolean logic was broken for detecting 2.6 headers on 2.4
+  kernels. Reported by wa1ter@myrealbox.com.
 
   01 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>;
   linuxwacom-0.7.2.ebuild:
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild
index 92e400f37c6e..3106c99dab7e 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-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.8 2006/06/30 17:09:33 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild,v 1.9 2006/07/01 02:18:36 spyderous Exp $
 
 IUSE="dlloader gtk gtk2 tcltk sdk usb"
 
@@ -44,11 +44,15 @@ pkg_setup() {
 		ewarn "the USE=sdk flag enabled."
 	fi
 
-	if use usb && ! has_version >=sys-kernel/linux-headers-2.6 && kernel_is 2 6; then
-		local msg
-		msg="USB Wacom tablets require 2.6 linux-headers. Please upgrade."
-		eerror "$msg"
-		die "$msg"
+	if use usb; then
+		if ! has_version >=sys-kernel/linux-headers-2.6; then
+			if kernel_is 2 6; then
+				local msg
+				msg="USB Wacom tablets require 2.6 linux-headers. Please upgrade."
+				eerror "$msg"
+				die "$msg"
+			fi
+		fi
 	fi
 }
 
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.8.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.8.ebuild
index fa47257c11d2..325fb4a570c2 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-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.7 2006/06/30 17:09:33 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.8.ebuild,v 1.8 2006/07/01 02:18:36 spyderous Exp $
 
 IUSE="dlloader gtk gtk2 tcltk sdk usb"
 
@@ -44,11 +44,15 @@ pkg_setup() {
 		ewarn "the USE=sdk flag enabled."
 	fi
 
-	if use usb && ! has_version >=sys-kernel/linux-headers-2.6 && kernel_is 2 6; then
-		local msg
-		msg="USB Wacom tablets require 2.6 linux-headers. Please upgrade."
-		eerror "$msg"
-		die "$msg"
+	if use usb; then
+		if ! has_version >=sys-kernel/linux-headers-2.6; then
+			if kernel_is 2 6; then
+				local msg
+				msg="USB Wacom tablets require 2.6 linux-headers. Please upgrade."
+				eerror "$msg"
+				die "$msg"
+			fi
+		fi
 	fi
 }
 
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild
index 3e141bdcb459..a487627d0231 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-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.8 2006/06/30 17:09:33 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild,v 1.9 2006/07/01 02:18:36 spyderous Exp $
 
 IUSE="dlloader gtk gtk2 tcltk sdk usb"
 
@@ -41,11 +41,15 @@ pkg_setup() {
 		ewarn "the USE=sdk flag enabled."
 	fi
 
-	if use usb && ! has_version >=sys-kernel/linux-headers-2.6 && kernel_is 2 6; then
-		local msg
-		msg="USB Wacom tablets require 2.6 linux-headers. Please upgrade."
-		eerror "$msg"
-		die "$msg"
+	if use usb; then
+		if ! has_version >=sys-kernel/linux-headers-2.6; then
+			if kernel_is 2 6; then
+				local msg
+				msg="USB Wacom tablets require 2.6 linux-headers. Please upgrade."
+				eerror "$msg"
+				die "$msg"
+			fi
+		fi
 	fi
 }
 
diff --git a/x11-misc/linuxwacom/linuxwacom-0.7.2.ebuild b/x11-misc/linuxwacom/linuxwacom-0.7.2.ebuild
index a6e4dbb5b797..5bbdc246aecf 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.9 2006/07/01 00:18:42 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.7.2.ebuild,v 1.10 2006/07/01 02:18:36 spyderous Exp $
 
 IUSE="dlloader gtk gtk2 tcltk sdk usb"
 
@@ -43,11 +43,15 @@ pkg_setup() {
 		ewarn "the USE=sdk flag enabled."
 	fi
 
-	if use usb && ! has_version >=sys-kernel/linux-headers-2.6 && kernel_is 2 6; then
-		local msg
-		msg="USB Wacom tablets require 2.6 linux-headers. Please upgrade."
-		eerror "$msg"
-		die "$msg"
+	if use usb; then
+		if ! has_version >=sys-kernel/linux-headers-2.6; then
+			if kernel_is 2 6; then
+				local msg
+				msg="USB Wacom tablets require 2.6 linux-headers. Please upgrade."
+				eerror "$msg"
+				die "$msg"
+			fi
+		fi
 	fi
 }