Sync xorg eclass with main Gentoo Portage tree

eclass/xorg-3.eclass

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# @ECLASS: xorg-kde-3.eclass
+# @ECLASS: xorg-3.eclass
 # @MAINTAINER:
 # x11@gentoo.org
 # @AUTHOR:
@@ -118,7 +118,7 @@ fi
 
 # Set up autotools shared dependencies
 # Remember that all versions here MUST be stable
-XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt"
+XORG_EAUTORECONF_ARCHES="ppc-aix x86-winnt"
 EAUTORECONF_DEPEND+="
 	>=sys-devel/libtool-2.2.6a
 	sys-devel/m4"
@@ -360,7 +360,7 @@ xorg-3_reconf_source() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	case ${CHOST} in
-		*-interix* | *-aix* | *-winnt*)
+		*-aix* | *-winnt*)
 			# some hosts need full eautoreconf
 			[[ -e "./configure.ac" || -e "./configure.in" ]] \
 				&& AUTOTOOLS_AUTORECONF=1
@@ -469,8 +469,14 @@ xorg-3_src_configure() {
 		local dep_track="--disable-dependency-tracking"
 	fi
 
+	# Check if package supports disabling of selective -Werror=...
+	if grep -q -s "disable-selective-werror" ${ECONF_SOURCE:-.}/configure; then
+		local selective_werror="--disable-selective-werror"
+	fi
+
 	local myeconfargs=(
 		${dep_track}
+		${selective_werror}
 		${FONT_OPTIONS}
 		"${xorgconfadd[@]}"
 	)