Changed XFREE_CARDS to VIDEO_CARDS so non-xfree apps can use it. Also made the USE + VIDEO_CARDS work better.

3 files changed, 29 insertions, 29 deletions

diff --git a/x11-base/xfree-drm/ChangeLog b/x11-base/xfree-drm/ChangeLog
index 74024b7073f8..d9e9702e3aa0 100644
--- a/x11-base/xfree-drm/ChangeLog
+++ b/x11-base/xfree-drm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xfree-drm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.26 2003/06/29 10:42:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.27 2003/06/30 06:10:36 spyderous Exp $
+
+  30 Jun 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r4.ebuild:
+  Changed XFREE_CARDS to VIDEO_CARDS so non-xfree apps can use it. Also made the
+  USE + VIDEO_CARDS work better.
 
   29 Jun 2003; Donnie Berkholz <spyderous@gentoo.org>;
   xfree-drm-4.3.0-r4.ebuild:
diff --git a/x11-base/xfree-drm/Manifest b/x11-base/xfree-drm/Manifest
index 592b293ddab1..b3d50dba8e1a 100644
--- a/x11-base/xfree-drm/Manifest
+++ b/x11-base/xfree-drm/Manifest
@@ -1,7 +1,7 @@
-MD5 505e0420f7d0bb767f716f95e175a633 ChangeLog 5704
+MD5 152c80322d44b9ec3631b973d12dd258 ChangeLog 5903
 MD5 6b1f0d725e8037cbf3c62d9ebee51ec8 xfree-drm-4.3.0-r2.ebuild 2655
 MD5 0ed345e1687362bd46dbb26d1b3958e8 xfree-drm-4.3.0-r3.ebuild 2917
-MD5 db5bb849006ef37244d8b7c13c1b9d73 xfree-drm-4.3.0-r4.ebuild 4000
+MD5 6e4f83191b106d1d4b1a7439b4d1bb37 xfree-drm-4.3.0-r4.ebuild 4062
 MD5 b340ab262c964f235620a98d7626d6b9 files/digest-xfree-drm-4.3.0-r2 166
 MD5 08d125fc239e02143fe64d48dcadb64c files/digest-xfree-drm-4.3.0-r3 169
 MD5 ac5dd043f538e9fed0825d46d6e999e4 files/digest-xfree-drm-4.3.0-r4 168
diff --git a/x11-base/xfree-drm/xfree-drm-4.3.0-r4.ebuild b/x11-base/xfree-drm/xfree-drm-4.3.0-r4.ebuild
index 6692cd8f44ea..48b69a08fbcc 100644
--- a/x11-base/xfree-drm/xfree-drm-4.3.0-r4.ebuild
+++ b/x11-base/xfree-drm/xfree-drm-4.3.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r4.ebuild,v 1.4 2003/06/29 10:42:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r4.ebuild,v 1.5 2003/06/30 06:10:36 spyderous Exp $
 
 # Small note:  we should prob consider using a DRM only tarball, as it will ease
 #              some of the overhead on older systems, and will enable us to
@@ -8,7 +8,7 @@
 
 IUSE="3dfx gamma i8x0 matrox rage128 radeon sis"
 
-# XFREE_CARDS="3dfx gamma i810 i830 matrox rage128 radeon sis"
+# VIDEO_CARDS="3dfx gamma i810 i830 matrox rage128 radeon sis"
 
 inherit eutils xfree
 
@@ -50,23 +50,23 @@ PROVIDE="virtual/drm"
 
 VIDCARDS=""
 
-if use matrox &>/dev/null
+if [ `use matrox || vcards matrox` ]
 then
 	VIDCARDS="${VIDCARDS} mga.o"
 fi
-if use 3dfx &>/dev/null
+if [ `use 3dfx || vcards 3dfx` ]
 then
 	VIDCARDS="${VIDCARDS} tdfx.o"
 fi
-if use rage128 &>/dev/null
+if [ `use rage128 || vcards rage128` ]
 then
 	VIDCARDS="${VIDCARDS} r128.o"
 fi
-if use radeon &>/dev/null
+if [ `use radeon || vcards radeon` ]
 then
 	VIDCARDS="${VIDCARDS} radeon.o"
 fi
-if use sis &>/dev/null
+if [ `use sis || vcards sis` ]
 then
 	VIDCARDS="${VIDCARDS} sis.o"
 fi
@@ -74,30 +74,25 @@ if use i8x0 &>/dev/null
 then
 	VIDCARDS="${VIDCARDS} i810.o i830.o"
 fi
-if use gamma &>/dev/null
+if [ `use gamma || vcards gamma` ]
 then
 	VIDCARDS="${VIDCARDS} gamma.o"
 fi
 
-# Add XFREE_CARDS functionality.
-# Having a module twice (once from USE, once from XFREE_CARDS)
+# Add VIDEO_CARDS functionality.
+# Having a module twice (once from USE, once from VIDEO_CARDS)
 # doesn't matter at all.
 
-xcards matrox &>/dev/null && VIDCARDS="${VIDCARDS} mga.o"
+#vcards matrox &>/dev/null && VIDCARDS="${VIDCARDS} mga.o"
+#vcards 3dfx &>/dev/null && VIDCARDS="${VIDCARDS} tdfx.o"
+#vcards rage128 &>/dev/null && VIDCARDS="${VIDCARDS} r128.o"
+#vcards radeon &>/dev/null && VIDCARDS="${VIDCARDS} radeon.o"
+#vcards sis &>/dev/null && VIDCARDS="${VIDCARDS} sis.o"
+#vcards gamma &>/dev/null && VIDCARDS="${VIDCARDS} gamma.o"
 
-xcards 3dfx &>/dev/null && VIDCARDS="${VIDCARDS} tdfx.o"
+vcards i810 &>/dev/null && VIDCARDS="${VIDCARDS} i810.o"
 
-xcards rage128 &>/dev/null && VIDCARDS="${VIDCARDS} r128.o"
-
-xcards radeon &>/dev/null && VIDCARDS="${VIDCARDS} radeon.o"
-
-xcards sis &>/dev/null && VIDCARDS="${VIDCARDS} sis.o"
-
-xcards i810 &>/dev/null && VIDCARDS="${VIDCARDS} i810.o"
-
-xcards i830 &>/dev/null && VIDCARDS="${VIDCARDS} i830.o"
-
-xcards gamma &>/dev/null && VIDCARDS="${VIDCARDS} gamma.o"
+vcards i830 &>/dev/null && VIDCARDS="${VIDCARDS} i830.o"
 
 # This builds everything if none of the cards are in USE.
 #if [ -z "${VIDCARDS}" ]
@@ -116,7 +111,7 @@ src_unpack() {
 	fi
 
 	if [ -z "${VIDCARDS}" ] ; then
-		die "Please set at least one video card in XFREE_CARDS. USE is deprecated."
+		die "Please set at least one video card in VIDEO_CARDS. USE is deprecated."
 	fi
 
 	unpack ${A}
@@ -158,7 +153,7 @@ pkg_postinst() {
 		/sbin/modules-update
 	fi
 
-	einfo "USE is deprecated. Please set your video cards using XFREE_CARDS."
-	einfo "Possible XFREE_CARDS values are matrox, 3dfx, rage128, radeon, sis, i810, i830, and gamma."
+	einfo "USE is deprecated. Please set your video cards using VIDEO_CARDS."
+	einfo "Possible VIDEO_CARDS values are matrox, 3dfx, rage128, radeon, sis, i810, i830, and gamma."
 
 }