--- /usr/portage/x11-base/xorg-server/xorg-server-1.9.1.ebuild	2010-10-26 08:55:12.000000000 +0100
+++ xorg-server-1.9.1.ebuild	2010-10-30 05:59:40.894331269 +0100
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.1.ebuild,v 1.1 2010/10/26 07:55:12 wired Exp $
+# $Header: $
 
 EAPI=3
+XORG_EAUTORECONF="yes"
 inherit xorg-2 multilib versionator
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
@@ -158,10 +159,6 @@
 		--with-os-vendor=Gentoo
 		${conf_opts}"
 
-	if use kdrive && use tslib; then
-		XORG_EAUTORECONF=yes
-	fi
-
 	# Xorg-server requires includes from OS mesa which are not visible for
 	# users of binary drivers.
 	# Due to the limitations of CONFIGURE_OPTIONS, we have to export this