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

Package-Manager: portage-2.1.1_rc1-r1

6 files changed, 43 insertions, 37 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/Manifest b/x11-base/x11-drm/Manifest
index 1c8e6d3d4dad..0e409a15a3bb 100644
--- a/x11-base/x11-drm/Manifest
+++ b/x11-base/x11-drm/Manifest
@@ -14,7 +14,7 @@ DIST x11-drm-20050502-gentoo-0.2.tar.bz2 3319
 DIST x11-drm-20050807-gentoo-0.1.tar.bz2 2095
 DIST x11-drm-20051028-gentoo-0.1.tar.bz2 2106 RMD160 2eb369902c7071b9beb3c0fc0c111b697b6493ab SHA256 0e51f4331b41dd1ed912bea924631a1681b30617a87b500a12a589b93372d639
 DIST x11-drm-20051223-gentoo-0.2.tar.bz2 2451 RMD160 f04dc1d07b81b384d53db68f3b1385693187c283 SHA256 1fcab4021db6135d2346a7547f89afda0042fc6cefaaf20ee0db5fed7bd9c4b2
-DIST x11-drm-20060608-gentoo-0.1.tar.bz2 2106 RMD160 2eb369902c7071b9beb3c0fc0c111b697b6493ab SHA1 134c1b35e55de049f4648ca555e11261e4bb403d SHA256 0e51f4331b41dd1ed912bea924631a1681b30617a87b500a12a589b93372d639
+DIST x11-drm-20060608-gentoo-0.2.tar.bz2 2355 RMD160 ac7f0ffa100de58c140da02a23a69040af1f67bb SHA1 a553bcd2e4e6a11e8b1e65b7a17e5e60217951f3 SHA256 4539c6a855b0f3db7b57196c4dbf67f22a5ebc0d2050a5dc2fa715f8d2945136
 DIST xfree-drm-4.3.0-r7-gentoo-0.4.tar.bz2 8143
 EBUILD x11-drm-20050502.ebuild 5995 RMD160 58a3b73d8bc28a4fd530de4b113c6719fbc25f5a SHA1 20e577de6a157af1ea19a468fe5188bd4a667ce2 SHA256 2732d86ae5a175f2c5ffe6bb1c4b6866a4812ad45553169c492992aefd1b6095
 MD5 26e6c8a761c5cf3bc4a556748c68b4af x11-drm-20050502.ebuild 5995
@@ -24,26 +24,26 @@ EBUILD x11-drm-20050807.ebuild 6189 RMD160 6e35ff646a0ac309dd1d421246211b1409e86
 MD5 28a56b217b1624adfb504f7f536abc7e x11-drm-20050807.ebuild 6189
 RMD160 6e35ff646a0ac309dd1d421246211b1409e86a2f x11-drm-20050807.ebuild 6189
 SHA256 c939638624899b066f2285c6688074d3674cb7e955b358e9a77f2703e78eded7 x11-drm-20050807.ebuild 6189
-EBUILD x11-drm-20051028.ebuild 6505 RMD160 2d34bb40bdc8741ec107d2f4a2890901d9082ac9 SHA1 cded6d5cdb2cb0fcd387dc53787e26f9066f8d93 SHA256 4d2abc06b24d7ccf32dad02b5540dccb4be6db493870881fc718c97914061877
-MD5 bf0175445fd3d36f8a99372473536658 x11-drm-20051028.ebuild 6505
-RMD160 2d34bb40bdc8741ec107d2f4a2890901d9082ac9 x11-drm-20051028.ebuild 6505
-SHA256 4d2abc06b24d7ccf32dad02b5540dccb4be6db493870881fc718c97914061877 x11-drm-20051028.ebuild 6505
-EBUILD x11-drm-20051223.ebuild 6384 RMD160 60a5af34a90021d095d05318fa3af59aa37c9525 SHA1 f83cf28735151125186dde6dcc8090fa640ad29c SHA256 900bd7499b826098ca34736406b0b8dd48cd9a94bad4f1b021db60485661234a
-MD5 c34050d00ac443cc3bae025387233345 x11-drm-20051223.ebuild 6384
-RMD160 60a5af34a90021d095d05318fa3af59aa37c9525 x11-drm-20051223.ebuild 6384
-SHA256 900bd7499b826098ca34736406b0b8dd48cd9a94bad4f1b021db60485661234a x11-drm-20051223.ebuild 6384
-EBUILD x11-drm-20060608.ebuild 6383 RMD160 a2d08b8baf2cb4706fe22acbfb5e494ad465b7d5 SHA1 9cbd10a29762a6ddd496548be0805c3530ea9db3 SHA256 a971f6aa70294ae23f7e9f80811e44d606336b3e974378b18cdad663fd3c6870
-MD5 d486c115b7952c940a7a3b704031ec90 x11-drm-20060608.ebuild 6383
-RMD160 a2d08b8baf2cb4706fe22acbfb5e494ad465b7d5 x11-drm-20060608.ebuild 6383
-SHA256 a971f6aa70294ae23f7e9f80811e44d606336b3e974378b18cdad663fd3c6870 x11-drm-20060608.ebuild 6383
+EBUILD x11-drm-20051028.ebuild 6505 RMD160 27d9982aa4855d4faa80cb958b663abb3bc88abe SHA1 af5e98731ec9a7a7e9ee718474ca52614127c560 SHA256 a454cce021cc323c40bd2e815a3881393fcbbd898a23202a7754685116174b5a
+MD5 b4fb59a9551342a9e64a59bc1e497e1b x11-drm-20051028.ebuild 6505
+RMD160 27d9982aa4855d4faa80cb958b663abb3bc88abe x11-drm-20051028.ebuild 6505
+SHA256 a454cce021cc323c40bd2e815a3881393fcbbd898a23202a7754685116174b5a x11-drm-20051028.ebuild 6505
+EBUILD x11-drm-20051223.ebuild 6384 RMD160 e28ebee2ce1caf5c90dc2e944a04911ba2c02089 SHA1 eda5b06dfda1efd02c98760b1167247a3a627bcc SHA256 1b38d0282cab1bfbbeb36bade40ea03a3604e8d50121aef958611afcadc464ac
+MD5 95c3e96dee51eaca5684499b709a2b9b x11-drm-20051223.ebuild 6384
+RMD160 e28ebee2ce1caf5c90dc2e944a04911ba2c02089 x11-drm-20051223.ebuild 6384
+SHA256 1b38d0282cab1bfbbeb36bade40ea03a3604e8d50121aef958611afcadc464ac x11-drm-20051223.ebuild 6384
+EBUILD x11-drm-20060608.ebuild 6383 RMD160 6e39db8cd6a9e66ef9d683f0183383bb07bdb501 SHA1 f69d5652e05734da069e94da22682d48423cdca1 SHA256 cfe22f4a92abd7302e9dafed228fde9084964bb3ed02a3d4ad6cb6b19440f2db
+MD5 ecd1a4edeae48c92b066ea4167747747 x11-drm-20060608.ebuild 6383
+RMD160 6e39db8cd6a9e66ef9d683f0183383bb07bdb501 x11-drm-20060608.ebuild 6383
+SHA256 cfe22f4a92abd7302e9dafed228fde9084964bb3ed02a3d4ad6cb6b19440f2db x11-drm-20060608.ebuild 6383
 EBUILD x11-drm-4.3.0-r7.ebuild 6983 RMD160 34eabe5596ed5609ef978dadc850431b61b3c6c8 SHA1 a17c1d315a881c18a95d0f2962b3fb54b49634ba SHA256 049580786153610b31973b4e041656da1189ebedbdee5cd2ae3f728b32be0fac
 MD5 7a519793ef2ad0ff85a9f90d59bb2ab9 x11-drm-4.3.0-r7.ebuild 6983
 RMD160 34eabe5596ed5609ef978dadc850431b61b3c6c8 x11-drm-4.3.0-r7.ebuild 6983
 SHA256 049580786153610b31973b4e041656da1189ebedbdee5cd2ae3f728b32be0fac x11-drm-4.3.0-r7.ebuild 6983
-MISC ChangeLog 20578 RMD160 0af41fc280f42cd76a671308ce264efe1b72bef8 SHA1 3e5b8123ebba0fcaff2a94e6717a3a61272f14cf SHA256 18ab5322b42690c61899d7a8062f3a9822fd5ceea40a46b9b0e45c863c110d02
-MD5 471199962c4480f300d491e1ed856607 ChangeLog 20578
-RMD160 0af41fc280f42cd76a671308ce264efe1b72bef8 ChangeLog 20578
-SHA256 18ab5322b42690c61899d7a8062f3a9822fd5ceea40a46b9b0e45c863c110d02 ChangeLog 20578
+MISC ChangeLog 20914 RMD160 798e16da424bbcbee4f9a4cd0d4544b68bb7a6a6 SHA1 a41545a4a498759e36d04e17e51ac9a7b7c2d7f1 SHA256 1f80019cc1313bc80a28245e743d583a4660d2cdd19917be8b54babd10dfbdd9
+MD5 2849ab98ac476213cb8b690044ed79d5 ChangeLog 20914
+RMD160 798e16da424bbcbee4f9a4cd0d4544b68bb7a6a6 ChangeLog 20914
+SHA256 1f80019cc1313bc80a28245e743d583a4660d2cdd19917be8b54babd10dfbdd9 ChangeLog 20914
 MISC metadata.xml 368 RMD160 cbe279aeafeae0af3633fbd1ecaa59d2f54579b8 SHA1 5104adf2f1ebe1ddffe4ca95e7b5e5f06267f842 SHA256 e73a5c428f39881de8ae5acf40958e8ad37a5fe92c2bb8cc4060704c9be45ef1
 MD5 782be9470cf76716a15aa5a70f4b8af7 metadata.xml 368
 RMD160 cbe279aeafeae0af3633fbd1ecaa59d2f54579b8 metadata.xml 368
@@ -60,9 +60,9 @@ SHA256 c10ee716d3ddb617b46f106fd3a3600b07079fe4c3695cc151575bd1843c6fcd files/di
 MD5 b05ad66fcf6e2c5be503ba699600e01a files/digest-x11-drm-20051223 578
 RMD160 e34723c94d71200ae4fabde55d24aa1a92774884 files/digest-x11-drm-20051223 578
 SHA256 484c497bc5fe0de82872d1159be883711a93d74dcb29ad26a8d1d103c8eb35c2 files/digest-x11-drm-20051223 578
-MD5 7b64d777176450a72c719800307f6274 files/digest-x11-drm-20060608 578
-RMD160 4da41cad762f404895183cd9d8d2207260cd1748 files/digest-x11-drm-20060608 578
-SHA256 efa37f00325b071099870fa8d0d6d443c65b26330d350ec47fb9d7dbf1fb54f6 files/digest-x11-drm-20060608 578
+MD5 25e0af623be815585fdd845044e4e48e files/digest-x11-drm-20060608 578
+RMD160 8d8f952ce15390917b686efec62fbf4deba18712 files/digest-x11-drm-20060608 578
+SHA256 b0e147eed5017b8305847803abc08a8a82c25531edf27f4ef0005b32989fa121 files/digest-x11-drm-20060608 578
 MD5 db87006ec48bc9579dcdc989c5ed86d6 files/digest-x11-drm-4.3.0-r7 363
 RMD160 fb090eee55f87cb2a83cded1fdcd42c82d7f040d files/digest-x11-drm-4.3.0-r7 363
 SHA256 e25f7f22669877ab1a0b524b42acf09b30a2f4bdb61ca152d6c0e3736c190bbb files/digest-x11-drm-4.3.0-r7 363
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}" \