QA - move video card tests into pkg_setup, fix use invocation

5 files changed, 53 insertions, 48 deletions

diff --git a/x11-base/xfree-drm/ChangeLog b/x11-base/xfree-drm/ChangeLog
index 8a01eb319592..3e8e7e66fc67 100644
--- a/x11-base/xfree-drm/ChangeLog
+++ b/x11-base/xfree-drm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xfree-drm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.67 2004/04/12 02:17:02 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.68 2004/06/24 00:12:20 agriffis Exp $
+
+  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> xfree-drm-4.3.0-r6.ebuild,
+  xfree-drm-4.3.0-r7.ebuild, xfree-drm-4.3.0-r8.ebuild:
+  QA - move video card tests into pkg_setup, fix use invocation
 
   11 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xfree-drm-4.3.0-r6.ebuild, xfree-drm-4.3.0-r7.ebuild,
diff --git a/x11-base/xfree-drm/Manifest b/x11-base/xfree-drm/Manifest
index 0ce5e97d2b65..ff85d3896169 100644
--- a/x11-base/xfree-drm/Manifest
+++ b/x11-base/xfree-drm/Manifest
@@ -1,9 +1,9 @@
-MD5 23225ad5bdcbe1e844b75ffe5a8e0425 ChangeLog 13052
+MD5 26ddc1d95e626ed5ca24115f4e52d748 xfree-drm-4.3.0-r7.ebuild 6918
+MD5 5751d57b273c956431bb158f6548cbb1 xfree-drm-4.3.0-r6.ebuild 5679
+MD5 564b60b36c207df4f7dd75976766364a xfree-drm-4.3.0-r8.ebuild 7461
+MD5 0577c50cf372230226819bbd132c4ebb ChangeLog 13248
 MD5 cd0b06404869599fa61bb7976be237a2 metadata.xml 476
-MD5 9a33d8b10e813cadfc048d37fa1e3176 xfree-drm-4.3.0-r6.ebuild 5656
-MD5 1bed0eea83304a39965b989745352d5e xfree-drm-4.3.0-r7.ebuild 6948
-MD5 e7561731568a039d903138cd479b69ed xfree-drm-4.3.0-r8.ebuild 7491
 MD5 916b08e6047de0eeabce236b45a16b34 files/digest-xfree-drm-4.3.0-r6 169
 MD5 db87006ec48bc9579dcdc989c5ed86d6 files/digest-xfree-drm-4.3.0-r7 363
-MD5 56daae7df692be235c4161bdc849ead3 files/modules.d-xfree-drm 50
 MD5 fd10b2e76fb5efc94b7310d9c016484c files/digest-xfree-drm-4.3.0-r8 364
+MD5 56daae7df692be235c4161bdc849ead3 files/modules.d-xfree-drm 50
diff --git a/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild b/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild
index 89aaaaee7752..26c8cb878cd4 100644
--- a/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild
+++ b/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r6.ebuild,v 1.18 2004/04/12 02:17:02 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild,v 1.19 2004/06/24 00:12:20 agriffis 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
@@ -49,40 +49,41 @@ DEPEND="virtual/x11
 
 PROVIDE="virtual/drm"
 
+pkg_setup() {
+	VIDCARDS=""
 
-VIDCARDS=""
-
-if [ `use matrox || use video_cards_matrox` ]
-then
-	VIDCARDS="${VIDCARDS} mga.o"
-fi
-if [ `use 3dfx || use video_cards_3dfx` ]
-then
-	VIDCARDS="${VIDCARDS} tdfx.o"
-fi
-if [ `use rage128 || use video_cards_rage128` ]
-then
-	VIDCARDS="${VIDCARDS} r128.o"
-fi
-if [ `use radeon || use video_cards_radeon` ]
-then
-	VIDCARDS="${VIDCARDS} radeon.o"
-fi
-if [ `use sis || use video_cards_sis` ]
-then
-	VIDCARDS="${VIDCARDS} sis.o"
-fi
-if use i8x0
-then
-	VIDCARDS="${VIDCARDS} i810.o i830.o"
-fi
-if [ `use gamma || use video_cards_gamma` ]
-then
-	VIDCARDS="${VIDCARDS} gamma.o"
-fi
-
-use video_cards_i810 && VIDCARDS="${VIDCARDS} i810.o"
-use video_cards_i830 && VIDCARDS="${VIDCARDS} i830.o"
+	if useq matrox || useq video_cards_matrox
+	then
+		VIDCARDS="${VIDCARDS} mga.o"
+	fi
+	if useq 3dfx || useq video_cards_3dfx
+	then
+		VIDCARDS="${VIDCARDS} tdfx.o"
+	fi
+	if useq rage128 || useq video_cards_rage128
+	then
+		VIDCARDS="${VIDCARDS} r128.o"
+	fi
+	if useq radeon || useq video_cards_radeon
+	then
+		VIDCARDS="${VIDCARDS} radeon.o"
+	fi
+	if useq sis || useq video_cards_sis
+	then
+		VIDCARDS="${VIDCARDS} sis.o"
+	fi
+	if useq i8x0
+	then
+		VIDCARDS="${VIDCARDS} i810.o i830.o"
+	fi
+	if useq gamma || useq video_cards_gamma
+	then
+		VIDCARDS="${VIDCARDS} gamma.o"
+	fi
+
+	useq video_cards_i810 && VIDCARDS="${VIDCARDS} i810.o"
+	useq video_cards_i830 && VIDCARDS="${VIDCARDS} i830.o"
+}
 
 src_unpack() {
 	# 2.6 kernels are broken for now
diff --git a/x11-base/xfree-drm/xfree-drm-4.3.0-r7.ebuild b/x11-base/xfree-drm/xfree-drm-4.3.0-r7.ebuild
index e973d5632ff0..6a27c8c01653 100644
--- a/x11-base/xfree-drm/xfree-drm-4.3.0-r7.ebuild
+++ b/x11-base/xfree-drm/xfree-drm-4.3.0-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r7.ebuild,v 1.16 2004/04/12 02:17:02 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r7.ebuild,v 1.17 2004/06/24 00:12:20 agriffis Exp $
 
 IUSE="gatos"
 IUSE_VIDEO_CARDS="3dfx gamma i810 i830 matrox rage128 radeon sis mach64"
@@ -60,7 +60,7 @@ pkg_setup() {
 	# gatos doesn't build on anything but radeon
 	if use gatos
 	then
-		if [ ! "`use video_cards_radeon`" -a ! "`use video_cards_rage128`" ]
+		if ! use video_cards_radeon && ! use video_cards_rage128
 		then
 			die "Remove gatos from your USE flags. It does not build for cards other than radeon and rage128."
 		fi
@@ -117,7 +117,7 @@ src_compile() {
 		TREE="/usr/src/linux/include" KV="${KV}"
 	# Build dristat utility (bug #18799)
 	# But, don't do it if the GATOS drivers are being built, since it won't work
-	if [ ! "`use gatos`" ]
+	if ! use gatos
 	then
 		make dristat || die
 	fi
@@ -132,7 +132,7 @@ src_install() {
 		MODS="${VIDCARDS}" \
 		install || die
 	dodoc README*
-	if [ ! "`use gatos`" ]
+	if ! use gatos
 	then
 		exeinto /usr/X11R6/bin
 		doexe dristat
diff --git a/x11-base/xfree-drm/xfree-drm-4.3.0-r8.ebuild b/x11-base/xfree-drm/xfree-drm-4.3.0-r8.ebuild
index 926ff8125f94..61e8192f0231 100644
--- a/x11-base/xfree-drm/xfree-drm-4.3.0-r8.ebuild
+++ b/x11-base/xfree-drm/xfree-drm-4.3.0-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r8.ebuild,v 1.4 2004/04/12 02:17:02 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r8.ebuild,v 1.5 2004/06/24 00:12:20 agriffis Exp $
 
 IUSE="gatos"
 IUSE_VIDEO_CARDS="3dfx gamma i810 i830 matrox rage128 radeon sis mach64"
@@ -61,7 +61,7 @@ pkg_setup() {
 	# gatos doesn't build on anything but radeon
 	if use gatos
 	then
-		if [ ! "`use video_cards_radeon`" -a ! "`use video_cards_rage128`" ]
+		if ! use video_cards_radeon -a ! use video_cards_rage128
 		then
 			die "Remove gatos from your USE flags. It does not build for cards other than radeon and rage128."
 		fi
@@ -122,7 +122,7 @@ src_compile() {
 
 	# Build dristat utility (bug #18799)
 	# But, don't do it if the GATOS drivers are being built, since it won't work
-	if [ ! "`use gatos`" ]
+	if ! use gatos
 	then
 		make dristat || die
 	fi
@@ -154,7 +154,7 @@ src_install() {
 			install || die "Install failed."
 	fi
 	dodoc README*
-	if [ ! "`use gatos`" ]
+	if ! use gatos
 	then
 		exeinto /usr/X11R6/bin
 		doexe dristat