Move from custom is_kernel() in x11.eclass to kernel_is() in linux-info.eclass. It's not maintained by us, and that's a plus in itself.

8 files changed, 35 insertions, 24 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 7f3de4116f9e..54ce9c0404a3 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.368 2004/11/17 18:33:27 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.369 2004/12/07 03:59:46 spyderous Exp $
+
+  06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-4.3.0-r7.ebuild, xfree-4.3.0-r8.ebuild:
+  Move from custom is_kernel() in x11.eclass to kernel_is() in
+  linux-info.eclass. It's not maintained by us, and that's a plus in itself.
 
   17 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>; :
   Update credits on xpm-secfix-thomas.diff.
diff --git a/x11-base/xfree/xfree-4.3.0-r7.ebuild b/x11-base/xfree/xfree-4.3.0-r7.ebuild
index 6dee0c9d07a7..b1ceb13322aa 100644
--- a/x11-base/xfree/xfree-4.3.0-r7.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r7.ebuild,v 1.14 2004/11/11 06:50:47 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r7.ebuild,v 1.15 2004/12/07 03:59:46 spyderous Exp $
 
-inherit eutils flag-o-matic toolchain-funcs x11
+inherit eutils flag-o-matic toolchain-funcs x11 linux-info
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -312,7 +312,7 @@ src_unpack() {
 	#  http://people.mandrakesoft.com/~flepied/projects/wacom/
 	#
 	if ( [ -e "${ROOT}/usr/src/linux" ] && \
-		[ ! `is_kernel "2" "2"` ] ) || \
+		[ ! `kernel_is "2" "2"` ] ) || \
 		[ "`uname -r | cut -d. -f1,2`" != "2.2" ]
 	then
 		ebegin "Updating Wacom USB Driver"
@@ -366,7 +366,7 @@ src_unpack() {
 	fi
 
 	if ( [ -e "${ROOT}/usr/src/linux" ] && \
-		[ ! `is_kernel "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/xfree/xfree-4.3.0-r8.ebuild b/x11-base/xfree/xfree-4.3.0-r8.ebuild
index 8c43037f601c..3c723b3bceca 100644
--- a/x11-base/xfree/xfree-4.3.0-r8.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r8.ebuild,v 1.2 2004/11/17 17:45:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r8.ebuild,v 1.3 2004/12/07 03:59:46 spyderous Exp $
 
-inherit eutils flag-o-matic toolchain-funcs x11
+inherit eutils flag-o-matic toolchain-funcs x11 linux-info
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -315,7 +315,7 @@ src_unpack() {
 	#  http://people.mandrakesoft.com/~flepied/projects/wacom/
 	#
 	if ( [ -e "${ROOT}/usr/src/linux" ] && \
-		[ ! `is_kernel "2" "2"` ] ) || \
+		[ ! `kernel_is "2" "2"` ] ) || \
 		[ "`uname -r | cut -d. -f1,2`" != "2.2" ]
 	then
 		ebegin "Updating Wacom USB Driver"
@@ -369,7 +369,7 @@ src_unpack() {
 	fi
 
 	if ( [ -e "${ROOT}/usr/src/linux" ] && \
-		[ ! `is_kernel "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/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 3b98a75098b9..751976accd26 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,12 @@
 # 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.238 2004/12/07 03:48:15 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.239 2004/12/07 04:03:52 spyderous Exp $
+
+  06 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:
+  Move from custom is_kernel() in x11.eclass to kernel_is() in
+  linux-info.eclass. It's not maintained by us, and that's a plus in itself.
 
   06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r4.ebuild:
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 3044ec30c138..b62c41c80e22 100644
--- 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.31 2004/11/24 02:17:56 spyderous Exp $
+# $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 $
 
 # 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,
@@ -12,7 +12,7 @@
 #   TARGET: patchset 1.3
 #		Nothing yet =)
 
-inherit eutils flag-o-matic toolchain-funcs x11
+inherit eutils flag-o-matic toolchain-funcs x11 linux-info
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -251,7 +251,7 @@ host_def_setup() {
 		fi
 
 		if ( [ -e "${ROOT}/usr/src/linux" ] && \
-			[ ! `is_kernel "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 3b0ff96d5592..5fedfb36935e 100644
--- 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.3 2004/11/24 02:17:56 spyderous Exp $
+# $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 $
 
 # 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,
@@ -12,7 +12,7 @@
 #   TARGET: patchset 1.3
 #		Nothing yet =)
 
-inherit eutils flag-o-matic toolchain-funcs x11
+inherit eutils flag-o-matic toolchain-funcs x11 linux-info
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -251,7 +251,7 @@ host_def_setup() {
 		fi
 
 		if ( [ -e "${ROOT}/usr/src/linux" ] && \
-			[ ! `is_kernel "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 1e9fcba8b9cf..aaa8acd9815a 100644
--- 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.34 2004/11/24 02:17:56 spyderous Exp $
+# $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 $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -15,7 +15,7 @@
 #   TARGET: patchset 0.2
 #		Nothing yet =)
 
-inherit eutils flag-o-matic toolchain-funcs x11
+inherit eutils flag-o-matic toolchain-funcs x11 linux-info
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -302,7 +302,7 @@ host_def_setup() {
 		fi
 
 		if ( [ -e "${ROOT}/usr/src/linux" ] && \
-			[ ! `is_kernel "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" ] && \
-			  !( `is_kernel "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 50ebe6157eb6..552cf64dc24a 100644
--- 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.4 2004/11/24 02:17:56 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild,v 1.5 2004/12/07 04:03:52 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -15,7 +15,7 @@
 #   TARGET: patchset 0.2
 #		Nothing yet =)
 
-inherit eutils flag-o-matic toolchain-funcs x11
+inherit eutils flag-o-matic toolchain-funcs x11 linux-info
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -302,7 +302,7 @@ host_def_setup() {
 		fi
 
 		if ( [ -e "${ROOT}/usr/src/linux" ] && \
-			[ ! `is_kernel "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" ] && \
-			  !( `is_kernel "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"