xorg-server: changed X11R6 parse-config hackery to only apply for flagged packages

xorg/xorg-server/parse-config

@@ -2,6 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../xorg-server/parse-config
+# Copyright (C) 2009 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -12,10 +13,9 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-# slash-hammer for now ... - generic fixing because our time is precious ,-) We
-# can relax waiting for upstream to fix and remove those in, let's say one year
-var_append CPP_WRAPPER_INSERT ' ' '*/X11R6/include?-I/usr/X11/include'
-var_append GCC_WRAPPER_INSERT ' ' '*/X11R6/include?-I/usr/X11/include'
-var_append GCC_WRAPPER_INSERT ' ' '*/X11R6/lib?-L/usr/X11/lib'
-var_append GCC_WRAPPER_INSERT ' ' '*/X11R6/lib64?-L/usr/X11/lib64'
-
+if hasflag X11R6; then
+	var_append CPP_WRAPPER_INSERT ' ' '*/X11R6/include?-I/usr/X11/include'
+	var_append GCC_WRAPPER_INSERT ' ' '*/X11R6/include?-I/usr/X11/include'
+	var_append GCC_WRAPPER_INSERT ' ' '*/X11R6/lib?-L/usr/X11/lib'
+	var_append GCC_WRAPPER_INSERT ' ' '*/X11R6/lib64?-L/usr/X11/lib64'
+fi