This patch should modify the -r2 ebuild to check to see if:
a) we want motif
b) we have motif

If a and b are true then Has Motif is true.
If a or b is false then we disable Has Motif as X is required
to compile openmotif (so we can't depend on it: circular deps).


--- /usr/portage/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild	2004-07-16 15:36:00.000000000 -0400
+++ xorg-x11-6.7.0-r2.ebuild	2004-07-17 00:28:11.206096744 -0400
@@ -19,7 +19,7 @@
 RESTRICT="nostrip"
 
 # IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004)
-IUSE="3dfx 3dnow cjk debug dlloader doc ipv6 mmx nls pam sdk sse static"
+IUSE="3dfx 3dnow cjk debug dlloader doc ipv6 motif mmx nls pam sdk sse static"
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
 FILES_VER="0.2"
@@ -193,7 +193,14 @@
 
 		# 9385_all_6.7.0-motif-allow-fhs-and-default-off.patch from upstream
 		# turns off HasMotif YES default on Linux and BSDs, so we need this
-		echo "#define HasMotif YES" >> config/cf/host.def
+		# if we actually want motif Bug #57271
+		if use motif && [ "`best_version x11-libs/openmotif`" ]
+			then	
+				echo "#define HasMotif YES" >> config/cf/host.def
+			else
+				einfo "HasMotif Disabled"
+				echo "#define HasMotif NO" >> config/cf/host.def
+		fi
 
 		# Enable i810 on x86_64 (RH #126687)
 		echo "#define XF86ExtraCardDrivers i810" >> config/cf/host.def