--- /usr/portage/local/layman/x11/media-libs/mesa/mesa-9999.ebuild	2010-02-04 15:47:30.000000000 -0500
+++ mesa-9999.ebuild	2010-03-08 13:43:46.000000000 -0500
@@ -33,7 +33,7 @@
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 
-VIDEO_CARDS="intel mach64 mga none nouveau r128 radeon radeonhd savage sis sunffb svga tdfx via"
+VIDEO_CARDS="intel mach64 mga none nouveau r100 r128 r200 r300 r600 radeon radeonhd savage sis sunffb svga tdfx via"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
@@ -117,8 +117,15 @@
 	driver_enable video_cards_mga mga
 	driver_enable video_cards_r128 r128
 	# ATI has two implementations as video_cards
-	driver_enable video_cards_radeon radeon r200 r300 r600
-	driver_enable video_cards_radeonhd r300 r600
+	driver_enable video_cards_r100 radeon
+	driver_enable video_cards_r200 r200
+	driver_enable video_cards_r300 r300
+	driver_enable video_cards_r600 r600
+	if !use video_cards_r100 && !use video_cards_r200 && !use video_cards_r300
+	then
+		driver_enable video_cards_radeon radeon r200 r300 r600
+		driver_enable video_cards_radeonhd r300 r600
+	fi
 	driver_enable video_cards_savage savage
 	driver_enable video_cards_sis sis
 	driver_enable video_cards_sunffb ffb
@@ -139,7 +146,7 @@
 			$(use_enable video_cards_svga gallium-svga)
 			$(use_enable video_cards_nouveau gallium-nouveau)
 			$(use_enable video_cards_intel gallium-intel)"
-		if use video_cards_radeon || use video_cards_radeonhd; then
+		if use video_cards_r300 || use video_cards_radeon || use video_cards_radeonhd; then
 			myconf="${myconf} --enable-gallium-radeon"
 		else
 			myconf="${myconf} --disable-gallium-radeon"