Fix up kernel_is() calls, thanks to Georgi Georgiev <chutz@gg3.net>.

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 5282a1113fe886b51076aaaebc96a9d424ff5a0b..da7cfb51a206339a84b8cee7d1f3654e9c4ac0e6 100644 (file)
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.241 2004/12/11 02:51:42 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.242 2004/12/13 00:42:05 spyderous Exp $
+
+  12 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Fix up kernel_is() calls, thanks to Georgi Georgiev <chutz@gg3.net>.
 
   10 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r4.ebuild:

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 903967a18019ebc3e4f34112d68ca3dc16142c8a..f93df057e9f7166340aa29a367951af290935b27 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,8 +1,8 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 88e62276e07e48e924930ddb651478b8 xorg-x11-6.7.0-r2.ebuild 38098
 MD5 f35b03f0334e20f9ba75a2469fc59e14 xorg-x11-6.8.0-r1.ebuild 41352
-MD5 711c35f73e80fcf325c84cffe0f0d320 ChangeLog 55632
-MD5 509b1d6faa8fce2a5d04d748dfd2b8bd xorg-x11-6.8.0-r4.ebuild 50573
+MD5 a0ae0e37ae6affaee298b96dc71e8d5d ChangeLog 55787
+MD5 9c6c37f0facd57c11e8637646ac11326 xorg-x11-6.8.0-r4.ebuild 50567
 MD5 aaa26043705f4f543594d8fdfca05a9f xorg-x11-6.7.0-r3.ebuild 38116
 MD5 48ee3147d2f3c097a9d262a5473cd04c xorg-x11-6.8.0-r3.ebuild 39807
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904

diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
index e9eeb8434be2d1390c78a3f133d49632e876c657..08d582af889484f5367ddf160ec5b63f2b287a90 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.28 2004/12/11 02:51:42 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.29 2004/12/13 00:42:05 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -670,7 +670,7 @@ host_def_setup() {
                fi
 
                if ( [ -e "${ROOT}/usr/src/linux" ] \
-                       && [ ! $(kernel_is "2" "2") ] ) \
+                       &&  !( kernel_is "2" "2" ) ) \
                        || [ "$(uname -r | cut -d. -f1,2)" != "2.2" ]; then
                        echo "#define HasLinuxInput YES" >> ${HOSTCONF}
                fi
@@ -794,7 +794,7 @@ host_def_setup() {
                                echo "#define ModuleAsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
                        fi
                        if ( [ -e "${ROOT}/usr/src/linux" ] \
-                               && !( $(kernel_is "2" "6") ) ) \
+                               && !( kernel_is "2" "6" ) ) \
                                || [ "$(uname -r | cut -d. -f1,2)" != "2.6" ]; then
                                einfo "Building for kernels less than 2.6 requires special treatment"
                                echo "#define UseDeprecatedKeyboardDriver YES" >> ${HOSTCONF}