is_kernel -> kernel_is. Patch for TRUE/FALSE if nonexistent. Bug #137712.

(Portage version: 2.1.1_rc1-r1)

5 files changed, 23 insertions, 17 deletions

diff --git a/x11-base/x11-drm/ChangeLog b/x11-base/x11-drm/ChangeLog
index 23c272e01b94..cdf456a728fe 100644
--- a/x11-base/x11-drm/ChangeLog
+++ b/x11-base/x11-drm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/x11-drm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.37 2006/09/01 02:29:10 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.38 2006/09/07 04:47:34 battousai Exp $
+
+  07 Sep 2006; Bryan Stine <battousai@gentoo.org> x11-drm-20051028.ebuild,
+  x11-drm-20051223.ebuild, x11-drm-20060608.ebuild:
+  Snapshot ebuilds is_kernel -> kernel_is. Bump 20060608 patchball version to
+  0.2 with a new patch to define TRUE, FALSE if they don't already exist for
+  some reason. Thanks to Alon Bar-Lev (bug #137712).
 
   01 Sep 2006; Bryan Stine <battousai@gentoo.org> x11-drm-20050807.ebuild,
   x11-drm-20051028.ebuild, x11-drm-20051223.ebuild, x11-drm-20060608.ebuild:
diff --git a/x11-base/x11-drm/files/digest-x11-drm-20060608 b/x11-base/x11-drm/files/digest-x11-drm-20060608
index 6f48ada3a256..8199c7931566 100644
--- a/x11-base/x11-drm/files/digest-x11-drm-20060608
+++ b/x11-base/x11-drm/files/digest-x11-drm-20060608
@@ -1,6 +1,6 @@
 MD5 b43b229f76a38ae31fd35c69733d00cb linux-drm-20060608-kernelsource.tar.bz2 568004
 RMD160 253608313539a651ad6724bcb67b5f4ab28eaf4f linux-drm-20060608-kernelsource.tar.bz2 568004
 SHA256 5f2346f3eba114c4d5655325f3fd51e0b74f6f627bf0c4e435103c8972f52731 linux-drm-20060608-kernelsource.tar.bz2 568004
-MD5 0831381f1bfccba6fc80e5c1551dafb8 x11-drm-20060608-gentoo-0.1.tar.bz2 2106
-RMD160 2eb369902c7071b9beb3c0fc0c111b697b6493ab x11-drm-20060608-gentoo-0.1.tar.bz2 2106
-SHA256 0e51f4331b41dd1ed912bea924631a1681b30617a87b500a12a589b93372d639 x11-drm-20060608-gentoo-0.1.tar.bz2 2106
+MD5 831398aec823d8c2a97738a09cafbda9 x11-drm-20060608-gentoo-0.2.tar.bz2 2355
+RMD160 ac7f0ffa100de58c140da02a23a69040af1f67bb x11-drm-20060608-gentoo-0.2.tar.bz2 2355
+SHA256 4539c6a855b0f3db7b57196c4dbf67f22a5ebc0d2050a5dc2fa715f8d2945136 x11-drm-20060608-gentoo-0.2.tar.bz2 2355
diff --git a/x11-base/x11-drm/x11-drm-20051028.ebuild b/x11-base/x11-drm/x11-drm-20051028.ebuild
index f408df5ed7cb..abce8f5416be 100644
--- a/x11-base/x11-drm/x11-drm-20051028.ebuild
+++ b/x11-base/x11-drm/x11-drm-20051028.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-base/x11-drm/x11-drm-20051028.ebuild,v 1.7 2006/09/01 02:29:10 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20051028.ebuild,v 1.8 2006/09/07 04:47:34 battousai Exp $
 
 inherit eutils x11 linux-mod
 
@@ -46,7 +46,7 @@ pkg_setup() {
 		die "The ffb driver is for sparc-specific hardware. Please remove it from your VIDEO_CARDS."
 	fi
 
-	if is_kernel 2 6
+	if kernel_is 2 6
 	then
 		if linux_chkconfig_builtin "DRM"
 		then
@@ -59,7 +59,7 @@ pkg_setup() {
 			einfo "work, so you might want to double-check that setting. (CONFIG_AGP)"
 			echo
 		fi
-	elif is_kernel 2 4
+	elif kernel_is 2 4
 	then
 		if ! linux_chkconfig_present "DRM"
 		then
@@ -133,7 +133,7 @@ src_install() {
 	cd ${SRC_BUILD}
 
 	unset ARCH
-	is_kernel 2 6 && DRM_KMOD="drm.${KV_OBJ}"
+	kernel_is 2 6 && DRM_KMOD="drm.${KV_OBJ}"
 	make KV="${KV_FULL}" \
 		LINUXDIR="${KERNEL_DIR}" \
 		DESTDIR="${D}" \
diff --git a/x11-base/x11-drm/x11-drm-20051223.ebuild b/x11-base/x11-drm/x11-drm-20051223.ebuild
index 83dbc54dd3c5..ba4cf9549b2d 100644
--- a/x11-base/x11-drm/x11-drm-20051223.ebuild
+++ b/x11-base/x11-drm/x11-drm-20051223.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-base/x11-drm/x11-drm-20051223.ebuild,v 1.11 2006/09/01 02:29:10 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20051223.ebuild,v 1.12 2006/09/07 04:47:34 battousai Exp $
 
 inherit eutils x11 linux-mod
 
@@ -46,7 +46,7 @@ DEPEND=">=sys-devel/automake-1.7
 pkg_setup() {
 	get_version
 
-	if is_kernel 2 6
+	if kernel_is 2 6
 	then
 		if linux_chkconfig_builtin "DRM"
 		then
@@ -59,7 +59,7 @@ pkg_setup() {
 			einfo "work, so you might want to double-check that setting. (CONFIG_AGP)"
 			echo
 		fi
-	elif is_kernel 2 4
+	elif kernel_is 2 4
 	then
 		if ! linux_chkconfig_present "DRM"
 		then
@@ -133,7 +133,7 @@ src_install() {
 	cd ${SRC_BUILD}
 
 	unset ARCH
-	is_kernel 2 6 && DRM_KMOD="drm.${KV_OBJ}"
+	kernel_is 2 6 && DRM_KMOD="drm.${KV_OBJ}"
 	make KV="${KV_FULL}" \
 		LINUXDIR="${KERNEL_DIR}" \
 		DESTDIR="${D}" \
diff --git a/x11-base/x11-drm/x11-drm-20060608.ebuild b/x11-base/x11-drm/x11-drm-20060608.ebuild
index 50345bb269ea..52de61eeef64 100644
--- a/x11-base/x11-drm/x11-drm-20060608.ebuild
+++ b/x11-base/x11-drm/x11-drm-20060608.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-base/x11-drm/x11-drm-20060608.ebuild,v 1.4 2006/09/01 02:29:10 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608.ebuild,v 1.5 2006/09/07 04:47:34 battousai Exp $
 
 inherit eutils x11 linux-mod
 
@@ -23,7 +23,7 @@ IUSE="${IUSE_VIDEO_CARDS}"
 RESTRICT="nostrip"
 
 S="${WORKDIR}/drm"
-PATCHVER="0.1"
+PATCHVER="0.2"
 PATCHDIR="${WORKDIR}/patch"
 EXCLUDED="${WORKDIR}/excluded"
 
@@ -46,7 +46,7 @@ DEPEND=">=sys-devel/automake-1.7
 pkg_setup() {
 	get_version
 
-	if is_kernel 2 6
+	if kernel_is 2 6
 	then
 		if linux_chkconfig_builtin "DRM"
 		then
@@ -59,7 +59,7 @@ pkg_setup() {
 			einfo "work, so you might want to double-check that setting. (CONFIG_AGP)"
 			echo
 		fi
-	elif is_kernel 2 4
+	elif kernel_is 2 4
 	then
 		if ! linux_chkconfig_present "DRM"
 		then
@@ -133,7 +133,7 @@ src_install() {
 	cd ${SRC_BUILD}
 
 	unset ARCH
-	is_kernel 2 6 && DRM_KMOD="drm.${KV_OBJ}"
+	kernel_is 2 6 && DRM_KMOD="drm.${KV_OBJ}"
 	make KV="${KV_FULL}" \
 		LINUXDIR="${KERNEL_DIR}" \
 		DESTDIR="${D}" \