Fix up VIDEO_CARDS naming and use to be consistent with xorg-x11.

Package-Manager: portage-2.1_pre4-r1

3 files changed, 45 insertions, 61 deletions

diff --git a/x11-base/x11-drm/ChangeLog b/x11-base/x11-drm/ChangeLog
index 6a6ae27b28d7..e9d2d04fb18a 100644
--- a/x11-base/x11-drm/ChangeLog
+++ b/x11-base/x11-drm/ChangeLog
@@ -1,6 +1,10 @@
 # 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.27 2006/01/28 21:56:26 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.28 2006/02/03 18:24:48 spyderous Exp $
+
+  03 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  x11-drm-20051223.ebuild:
+  Fix up VIDEO_CARDS naming and use to be consistent with xorg-x11.
 
   28 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>;
   x11-drm-20051223.ebuild:
diff --git a/x11-base/x11-drm/Manifest b/x11-base/x11-drm/Manifest
index 80dca19c7813..53c05c6c9733 100644
--- a/x11-base/x11-drm/Manifest
+++ b/x11-base/x11-drm/Manifest
@@ -1,6 +1,6 @@
-MD5 cdc2c006345748e59d952d2137153bf4 ChangeLog 18876
-RMD160 9a4a9569f9673b647c87a6bab730481912791ca0 ChangeLog 18876
-SHA256 689ef87d8a0c4a195d68f78bf74a1b91155049076a347a4c41c46e5bfa1d9a0a ChangeLog 18876
+MD5 b2fb488e97c4d9c7155f42e3b7944c43 ChangeLog 19027
+RMD160 5d4d219feed19901887cb4b426ab55552f38ade6 ChangeLog 19027
+SHA256 01901f50860a4fe0f19da0c20710bf29cb1cb8a639bd1347ce8724b035aac56f ChangeLog 19027
 MD5 528f707ef73b50376334dd2a7abbdb83 files/digest-x11-drm-20050502 162
 RMD160 ea497471e28acdf15ec51d86b20b59b19ce52767 files/digest-x11-drm-20050502 162
 SHA256 71387b8d2686d28f16826fa31b3f4dfa7b4092c39b494231e9faac9006835c7b files/digest-x11-drm-20050502 162
@@ -31,9 +31,9 @@ SHA256 a8700f17d40aa552cd16075b8b998133cda7695c1751626244ecf2ca7b6fbb79 x11-drm-
 MD5 26d0a65cab2460138ba9c39a501904c9 x11-drm-20051028.ebuild 6314
 RMD160 f477a5840ce2a17b8fd3749ed9a328b87134523e x11-drm-20051028.ebuild 6314
 SHA256 ddc971ee0538160f11ac86d51e9423ea871e3cce9a7e3d18f990f1d2f50efbc9 x11-drm-20051028.ebuild 6314
-MD5 ac577fa00f025b560044bc09d27c3ae7 x11-drm-20051223.ebuild 6674
-RMD160 9d6b1e30ac0906d08f187ee07a77f46fb5130ef6 x11-drm-20051223.ebuild 6674
-SHA256 52bfa1a01e24d6971d24d6cefb7756a09f59b88d2ee415876b0f49a201c06b39 x11-drm-20051223.ebuild 6674
+MD5 c4dfc913a75a85b3beb9abccd5aeb1e9 x11-drm-20051223.ebuild 6019
+RMD160 c4a7f4e20b87bacb0634c865a0ff5e036e53a326 x11-drm-20051223.ebuild 6019
+SHA256 45551cbaf9f53a30ec3e439978ce4cff08155df9abd76c147b2d325db0db0ed1 x11-drm-20051223.ebuild 6019
 MD5 2b7da451b5f2daf704a7d7c162be861f x11-drm-4.3.0-r7.ebuild 6995
 RMD160 408ef955155caa6ff43b13d259d8e9a8f1c3dbf6 x11-drm-4.3.0-r7.ebuild 6995
 SHA256 75fb556b1d0fab30cdec7edd28e48895926f2caebaa2c948e1b8e1aac02e77c2 x11-drm-4.3.0-r7.ebuild 6995
diff --git a/x11-base/x11-drm/x11-drm-20051223.ebuild b/x11-base/x11-drm/x11-drm-20051223.ebuild
index 3457176f8fce..a51bf7396fdd 100644
--- a/x11-base/x11-drm/x11-drm-20051223.ebuild
+++ b/x11-base/x11-drm/x11-drm-20051223.ebuild
@@ -1,26 +1,18 @@
 # 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.4 2006/01/28 21:56:26 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20051223.ebuild,v 1.5 2006/02/03 18:24:48 spyderous Exp $
 
 inherit eutils x11 linux-mod
 
 IUSE_VIDEO_CARDS="
-	video_cards_3dfx
+	video_cards_tdfx
 	video_cards_ati
-	video_cards_ffb
-	video_cards_ffb
+	video_cards_sunffb
 	video_cards_i810
-	video_cards_i830
-	video_cards_i915
-	video_cards_mach64
-	video_cards_mach64
 	video_cards_mga
 	video_cards_nv
-	video_cards_radeon
-	video_cards_rage128
 	video_cards_savage
 	video_cards_sis
-	video_cards_sis
 	video_cards_via"
 IUSE="${IUSE_VIDEO_CARDS}"
 
@@ -52,17 +44,6 @@ DEPEND=">=sys-devel/automake-1.7
 pkg_setup() {
 	get_version
 
-	# Require at least one video card
-	if [ -z "${VIDEO_CARDS}" ]
-	then
-		die "Please set at least one video card in VIDEO_CARDS in make.conf or the environment. Possible VIDEO_CARDS values are: ${IUSE_VIDEO_CARDS}."
-	fi
-
-	if [ "${ARCH}" != "sparc" ] && use video_cards_ffb
-	then
-		die "The ffb driver is for sparc-specific hardware. Please remove it from your VIDEO_CARDS."
-	fi
-
 	if linux_chkconfig_builtin "DRM"
 	then
 		die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
@@ -168,12 +149,12 @@ pkg_postinst() {
 		einfo "SiS framebuffer also needs to be enabled in the kernel."
 	fi
 
-	if use video_cards_mach64
+	if use video_cards_ati
 	then
 		einfo "The Mach64 DRI driver is insecure."
 		einfo "Malicious clients can write to system memory."
 		einfo "For more information, see:"
-		einfo "http://dri.sourceforge.net/cgi-bin/moin.cgi/ATIMach64?value=CategoryHardwareChipset."
+		einfo "http://dri.freedesktop.org/wiki/ATIMach64."
 	fi
 
 	einfo "Checking kernel module dependencies"
@@ -186,38 +167,37 @@ pkg_postinst() {
 set_vidcards() {
 	set_kvobj
 
+	POSSIBLE_VIDCARDS="mga tdfx r128 radeon i810 i830 i915 mach64 nv savage
+		sis via"
+	if use sparc; then
+		POSSIBLE_VIDCARDS="${POSSIBLE_VIDCARDS} ffb"
+	fi
 	VIDCARDS=""
 
-	use video_cards_mga && \
-		VIDCARDS="${VIDCARDS} mga.${KV_OBJ}"
-	use video_cards_3dfx && \
-		VIDCARDS="${VIDCARDS} tdfx.${KV_OBJ}"
-	use video_cards_rage128 && \
-		VIDCARDS="${VIDCARDS} r128.${KV_OBJ}"
-	use video_cards_radeon && \
-		VIDCARDS="${VIDCARDS} radeon.${KV_OBJ}"
-	use video_cards_i810 && \
-		VIDCARDS="${VIDCARDS} i810.${KV_OBJ}"
-	use video_cards_i830 && \
-		VIDCARDS="${VIDCARDS} i830.${KV_OBJ}"
-	use video_cards_i915 && \
-		VIDCARDS="${VIDCARDS} i915.${KV_OBJ}"
-#	use video_cards_gamma && \
-#		VIDCARDS="${VIDCARDS} gamma.${KV_OBJ}"
-	use video_cards_mach64 && \
-		VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}"
-	use video_cards_nv && \
-		VIDCARDS="${VIDCARDS} nv.${KV_OBJ}"
-	use video_cards_savage && \
-		VIDCARDS="${VIDCARDS} savage.${KV_OBJ}"
-	use video_cards_sis && \
-		VIDCARDS="${VIDCARDS} sis.${KV_OBJ}"
-	use video_cards_via && \
-		VIDCARDS="${VIDCARDS} via.${KV_OBJ}"
-	use video_cards_ffb && \
-		VIDCARDS="${VIDCARDS} ffb.${KV_OBJ}"
-	use video_cards_ati && \
-		VIDCARDS="${VIDCARDS} r128.${KV_OBJ} radeon.${KV_OBJ} mach64.${KV_OBJ}"
+	if [[ -n "${VIDEO_CARDS}" ]]; then
+		use video_cards_mga && \
+			VIDCARDS="${VIDCARDS} mga.${KV_OBJ}"
+		use video_cards_tdfx && \
+			VIDCARDS="${VIDCARDS} tdfx.${KV_OBJ}"
+		use video_cards_ati && \
+			VIDCARDS="${VIDCARDS} mach64.${KV_OBJ} r128.${KV_OBJ} radeon.${KV_OBJ}"
+		use video_cards_i810 && \
+			VIDCARDS="${VIDCARDS} i810.${KV_OBJ} i830.${KV_OBJ} i915.${KV_OBJ}"
+		use video_cards_nv && \
+			VIDCARDS="${VIDCARDS} nv.${KV_OBJ}"
+		use video_cards_savage && \
+			VIDCARDS="${VIDCARDS} savage.${KV_OBJ}"
+		use video_cards_sis && \
+			VIDCARDS="${VIDCARDS} sis.${KV_OBJ}"
+		use video_cards_via && \
+			VIDCARDS="${VIDCARDS} via.${KV_OBJ}"
+		use video_cards_sunffb && \
+			VIDCARDS="${VIDCARDS} ffb.${KV_OBJ}"
+	else
+		for card in ${POSSIBLE_VIDCARDS}; do
+			VIDCARDS="${VIDCARDS} ${card}"
+		done
+	fi
 }
 
 patch_prepare() {