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

Package-Manager: portage-2.1.1_pre1-r5

6 files changed, 67 insertions, 45 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/Manifest b/x11-misc/linuxwacom/Manifest
index 5d7c121b4fd9..f4f752f6c603 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 3489 RMD160 b893753f525da73ff9270def60017b07122c999f SHA1 ee49bc16fa084a9a5c38cac8f3d7ff03a81ba484 SHA256 42734e3c50045689fd084525f2e82505f70f04d06f77c5fa2091b02aac0387ab
-MD5 fb6b3f1431700ca5da1decd610056e7d linuxwacom-0.6.7.ebuild 3489
-RMD160 b893753f525da73ff9270def60017b07122c999f linuxwacom-0.6.7.ebuild 3489
-SHA256 42734e3c50045689fd084525f2e82505f70f04d06f77c5fa2091b02aac0387ab linuxwacom-0.6.7.ebuild 3489
-EBUILD linuxwacom-0.6.8.ebuild 3495 RMD160 079b80ec533a8f41c6c29d8d695947fd8463c026 SHA1 6acc70c93b8bc53e23d5d95ad4aba2fe4ebeb6d7 SHA256 c71f2d6ce54d37788f477af004835842da9f1c98bfadeb3274fa1533951e36c7
-MD5 8e23beabcef44c4aa82cf9cf1f2b3245 linuxwacom-0.6.8.ebuild 3495
-RMD160 079b80ec533a8f41c6c29d8d695947fd8463c026 linuxwacom-0.6.8.ebuild 3495
-SHA256 c71f2d6ce54d37788f477af004835842da9f1c98bfadeb3274fa1533951e36c7 linuxwacom-0.6.8.ebuild 3495
-EBUILD linuxwacom-0.6.9.ebuild 3126 RMD160 fe721cc06e306a31e9370220c22a292f3a161cf8 SHA1 f0124388f59773e8661ac85f13f2cd4fbf61e73b SHA256 2cf8dc2fb3eb8f995a542cafc70a26542f523e95c672be9bf62c059bbf738313
-MD5 d10c34c9caee9c7fd016b999be57e405 linuxwacom-0.6.9.ebuild 3126
-RMD160 fe721cc06e306a31e9370220c22a292f3a161cf8 linuxwacom-0.6.9.ebuild 3126
-SHA256 2cf8dc2fb3eb8f995a542cafc70a26542f523e95c672be9bf62c059bbf738313 linuxwacom-0.6.9.ebuild 3126
-EBUILD linuxwacom-0.7.2.ebuild 3825 RMD160 85f9d2de8a4fd86e692ca5d78e513e3eef5fdd52 SHA1 40fd6054bdf76892452f752f57fcb58c93a49ffd SHA256 82d420591fad4d2bb9e77eefeefaade90b1b0d967a00d1e3d54bc6788d29006e
-MD5 8e819dcfe01ec0f045585b31b4eb49e3 linuxwacom-0.7.2.ebuild 3825
-RMD160 85f9d2de8a4fd86e692ca5d78e513e3eef5fdd52 linuxwacom-0.7.2.ebuild 3825
-SHA256 82d420591fad4d2bb9e77eefeefaade90b1b0d967a00d1e3d54bc6788d29006e linuxwacom-0.7.2.ebuild 3825
-MISC ChangeLog 7165 RMD160 6074d2f0df8475295b753c2b1ddedb3142fe9d2f SHA1 566bc585a6f77ff8e31a36b0da91a7432dfd2089 SHA256 4f0f1469eacbad0c90237c9d7832714491da24e1dc430de48cb95631e5fae52b
-MD5 1dfb08d1f90b8e77a4a6a4c6f479780b ChangeLog 7165
-RMD160 6074d2f0df8475295b753c2b1ddedb3142fe9d2f ChangeLog 7165
-SHA256 4f0f1469eacbad0c90237c9d7832714491da24e1dc430de48cb95631e5fae52b ChangeLog 7165
+EBUILD linuxwacom-0.6.7.ebuild 3525 RMD160 a81f7bf3bddb3366667c35918e0224ef6b384d05 SHA1 e4ad4d7e6ae6653f789beed09a14280ab14e9547 SHA256 a8bd2c279e6445eede67873132805351a0850c243527d002aa069c729ca875cc
+MD5 6ba939891393470ac8f1e08bf5dbc605 linuxwacom-0.6.7.ebuild 3525
+RMD160 a81f7bf3bddb3366667c35918e0224ef6b384d05 linuxwacom-0.6.7.ebuild 3525
+SHA256 a8bd2c279e6445eede67873132805351a0850c243527d002aa069c729ca875cc linuxwacom-0.6.7.ebuild 3525
+EBUILD linuxwacom-0.6.8.ebuild 3531 RMD160 d35205e192070e1fe38a8449bb2ccde26eafe88c SHA1 4f7e82e0966f96f568adb42c287aa97eceec4fa0 SHA256 dc962b5c5e085637982e0e5cc152c5238897a1c7b4170ef135c1d02f5d2b68c0
+MD5 109ed931a82be8148bf97b2c71a59784 linuxwacom-0.6.8.ebuild 3531
+RMD160 d35205e192070e1fe38a8449bb2ccde26eafe88c linuxwacom-0.6.8.ebuild 3531
+SHA256 dc962b5c5e085637982e0e5cc152c5238897a1c7b4170ef135c1d02f5d2b68c0 linuxwacom-0.6.8.ebuild 3531
+EBUILD linuxwacom-0.6.9.ebuild 3162 RMD160 4258aa27cc147e9e8b037f11eb019398bbe8233f SHA1 cc0e9a2762a401e8f9700f30a330b0f605944b25 SHA256 70a93aaf89be36d005d4a499e0864baf619cdd9856cbb21fd352b3311ed69e41
+MD5 d7c319844d6f224967df96cc4c84b98c linuxwacom-0.6.9.ebuild 3162
+RMD160 4258aa27cc147e9e8b037f11eb019398bbe8233f linuxwacom-0.6.9.ebuild 3162
+SHA256 70a93aaf89be36d005d4a499e0864baf619cdd9856cbb21fd352b3311ed69e41 linuxwacom-0.6.9.ebuild 3162
+EBUILD linuxwacom-0.7.2.ebuild 3862 RMD160 62d1681c45de94637f3a9c08079de8ad9091ab35 SHA1 8400990842ebbb32844792c460c91d818422119a SHA256 e95c9c198c16e56cc6c872f936e0cdd18199bafc4bfed8abee90c0d9f6c2ccd7
+MD5 428cf325efc07e3af1a43463e10601ae linuxwacom-0.7.2.ebuild 3862
+RMD160 62d1681c45de94637f3a9c08079de8ad9091ab35 linuxwacom-0.7.2.ebuild 3862
+SHA256 e95c9c198c16e56cc6c872f936e0cdd18199bafc4bfed8abee90c0d9f6c2ccd7 linuxwacom-0.7.2.ebuild 3862
+MISC ChangeLog 7445 RMD160 e9fa69ae552f8ac102c6db6d458b2cca54fdb788 SHA1 1f0877c7461514261ef84c1206de9a71dcf7f0e3 SHA256 438b7244d87048f8478a806b3c0f0eb191297c407c42be29e01cea99f7892209
+MD5 ca02db1d8cb45d65f069b7f38cf5e0d9 ChangeLog 7445
+RMD160 e9fa69ae552f8ac102c6db6d458b2cca54fdb788 ChangeLog 7445
+SHA256 438b7244d87048f8478a806b3c0f0eb191297c407c42be29e01cea99f7892209 ChangeLog 7445
 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 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
 }