projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e97db85)
(#75034, #75329) Fix kernel_is() calls, various problems with subshells and tests...
authorDonnie Berkholz <dberkholz@gentoo.org>
Thu, 23 Dec 2004 08:18:03 +0000 (08:18 +0000)
committerDonnie Berkholz <dberkholz@gentoo.org>
Thu, 23 Dec 2004 08:18:03 +0000 (08:18 +0000)
x11-base/xorg-x11/ChangeLog patch | blob | history
x11-base/xorg-x11/Manifest patch | blob | history
x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild patch | blob | history
x11-base/xorg-x11/xorg-x11-6.7.0-r3.ebuild patch | blob | history
x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild patch | blob | history
x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild patch | blob | history
x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild patch | blob | history
x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild patch | blob | history

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 7c5a5c853f4b60cec5c467c8f14b9f41d9e8d460..35ef79608d416c0b95911bd665ad8b1cab86a3db 100644 (file)
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,13 @@
 # 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.250 2004/12/22 19:20:48 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.251 2004/12/23 08:18:03 spyderous Exp $
+
+  23 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r2.ebuild, xorg-x11-6.7.0-r3.ebuild,
+  xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r3.ebuild,
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901.ebuild:
+  (#75034, #75329) Fix kernel_is() calls, various problems with subshells and
+  tests. Thanks to splite for some of the fixes.
 
   22 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.1.901.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 2fb1cec6fb729b85632a77bdc79dfb5e48f3660e..6a10c66dd1b2543d3f5b9e8477f3ba742eb33a88 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,11 +1,11 @@
 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 bd03bd7421eae11618744f5d81a4a0f3 ChangeLog 61826
-MD5 fc15e0395f3e3961e62f7794dea6fa83 xorg-x11-6.8.0-r4.ebuild 50579
-MD5 aaa26043705f4f543594d8fdfca05a9f xorg-x11-6.7.0-r3.ebuild 38116
-MD5 554ecef181cb4aae70aed5d37e570203 xorg-x11-6.8.0-r3.ebuild 39949
-MD5 5eb8c4a3219f851f7201ce91842f4c54 xorg-x11-6.8.1.901.ebuild 50575
+MD5 3218cfcb99517853fe80c90d7a2f83e2 xorg-x11-6.7.0-r2.ebuild 38092
+MD5 9fa28616e69e2ed595e896fff1c22bd4 xorg-x11-6.8.0-r1.ebuild 41341
+MD5 e4331e90055578fd72bfd2f7f44b7d0f ChangeLog 62172
+MD5 ce18a22263b24a01a594804bbd0a7d32 xorg-x11-6.8.0-r4.ebuild 50573
+MD5 7915931e5d6788dc9e28f46e199e10e6 xorg-x11-6.7.0-r3.ebuild 38110
+MD5 cbeb285718e1c2c3922471cd7c1350d3 xorg-x11-6.8.0-r3.ebuild 39938
+MD5 6b93874870ab87e28c12c4f6e397c8b9 xorg-x11-6.8.1.901.ebuild 50569
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
 MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
index b62c41c80e22af07976fd3e1bd656851a08ee296..04cd7c89c58a70c585114de19810784524c05aea 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r2.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.7.0-r2.ebuild,v 1.32 2004/12/07 04:03:52 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.33 2004/12/23 08:18:03 spyderous Exp $
 
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -251,7 +251,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" >> config/cf/host.def
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r3.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r3.ebuild
index 5fedfb36935e5b415dfe929915a7342c38c53508..c49606e38c2ff6fdc2b57d2e1457e8d575844ed3 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r3.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r3.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.7.0-r3.ebuild,v 1.4 2004/12/07 04:03:52 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r3.ebuild,v 1.5 2004/12/23 08:18:03 spyderous Exp $
 
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -251,7 +251,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" >> config/cf/host.def
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild
index aaa8acd9815a280aed2f6fc2a6053b2e7ddc4b3d..527b64c94da39e041047d36568c21a7a3f6cfcd7 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r1.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-r1.ebuild,v 1.35 2004/12/07 04:03:52 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild,v 1.36 2004/12/23 08:18:03 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -302,7 +302,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}
@@ -419,7 +419,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"
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild
index e53ec83d989acc0d133e40406b8d569b49288753..def6a596cf4a17864dcac6e31d16f685d48e6c2d 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r3.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-r3.ebuild,v 1.7 2004/12/20 19:19:16 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild,v 1.8 2004/12/23 08:18:03 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -304,7 +304,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}
@@ -421,7 +421,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"
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 02a71033b179a6a02890866bda4124cd0a4431c0..7c734872dbc64b882df43ec96f80f1c14db415e2 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.32 2004/12/20 19:19:16 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.33 2004/12/23 08:18:03 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -672,7 +672,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
@@ -796,7 +796,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}
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild
index 930babe24cb56a00aab221b6edadecfaf86e053a..aba92a689e579df667e2e468de4b1c5e2fd6af78 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.1.901.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.1.901.ebuild,v 1.6 2004/12/22 19:20:48 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild,v 1.7 2004/12/23 08:18:03 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -673,7 +673,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
@@ -797,7 +797,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}
Unnamed repository; edit this file 'description' to name the repository.