creeping dependency on x11-drivers/xf86-video-ati in tier-2?

[Mark Linimon]

It looks like for !(i386/amd64) builds that an uncessary dependency on
the above has crept in.  In that driver's Makefile we see

  # No Radeon kernel driver on non-x86 and PC98.
  ONLY_FOR_ARCHS= i386 amd64

but it's still depended on by default in x11-drivers/xorg-drivers/Makefile .

I think the following fix is needed -- but is it complete?

Thanks.

mcl

Index: x11-drivers/xorg-drivers/Makefile
===================================================================
--- x11-drivers/xorg-drivers/Makefile	(revision 376802)
+++ x11-drivers/xorg-drivers/Makefile	(working copy)
@@ -30,8 +30,7 @@
 			void \
 			wacom
 
-VIDEO_DRIVERS=		ati \
-			mach64 \
+VIDEO_DRIVERS=		mach64 \
 			nv \
 			r128 \
 			vesa \
@@ -60,7 +59,6 @@
 
 OPTIONS_DEFAULT=	MOUSE \
 			KEYBOARD \
-			ATI \
 			MACH64 \
 			NV \
 			R128 \
@@ -73,8 +71,8 @@
 . endfor
 .endfor
 
-OPTIONS_DEFINE_i386=	INTEL OPENCHROME
-OPTIONS_DEFAULT_i386=	INTEL OPENCHROME
+OPTIONS_DEFINE_i386=	ATI INTEL OPENCHROME
+OPTIONS_DEFAULT_i386=	ATI INTEL OPENCHROME
 
 OPTIONS_DEFINE_amd64:=	${OPTIONS_DEFINE_i386}
 OPTIONS_DEFAULT_amd64:=	${OPTIONS_DEFAULT_i386}
@@ -85,6 +83,7 @@
 OPTIONS_DEFINE_ia64=	OPENCHROME
 OPTIONS_DEFAULT_ia64=	OPENCHROME
 
+ATI_DESC=		Install ati video driver
 INTEL_DESC=		Install intel video driver
 OPENCHROME_DESC=	Install openchrome video driver
 SUNFFB_DESC=		Install sunffb video driver
@@ -96,7 +95,7 @@
 
 # Manual add arch specific drivers so they be added to depend lines.
 .if ${ARCH}==i386 || ${ARCH}==amd64
-VIDEO_DRIVERS+=	intel openchrome
+VIDEO_DRIVERS+=	ati intel openchrome
 .endif
 
 .if ${ARCH}==sparc64