--- x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776.ebuild-	2007-02-12 16:22:34.000000000 +0100
+++ x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776.ebuild	2007-02-12 16:24:25.000000000 +0100
@@ -18,7 +18,7 @@
 LICENSE="NVIDIA"
 SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="dlloader"
+IUSE=""
 RESTRICT="nostrip multilib-pkg-force"
 
 DEPEND="kernel_linux? ( virtual/linux-sources )"
@@ -331,14 +331,8 @@
 
 	exeinto ${X11_LIB_DIR}/modules/drivers
 
-	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" ||
-		has_version "x11-base/xorg-server"; then
-		[[ -f ${drvdir}/nvidia_drv.so ]] && \
-			doexe ${drvdir}/nvidia_drv.so
-	else
-		[[ -f ${drvdir}/nvidia_drv.o ]] && \
-			doexe ${drvdir}/nvidia_drv.o
-	fi
+	[[ -f ${drvdir}/nvidia_drv.so ]] && \
+		doexe ${drvdir}/nvidia_drv.so
 
 	insinto /usr/${inslibdir}
 	[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
--- x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631.ebuild-	2007-02-12 16:22:40.000000000 +0100
+++ x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631.ebuild	2007-02-12 16:24:57.000000000 +0100
@@ -18,7 +18,7 @@
 LICENSE="NVIDIA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="dlloader"
+IUSE=""
 RESTRICT="nostrip multilib-pkg-force"
 
 DEPEND="kernel_linux? ( virtual/linux-sources )"
@@ -329,14 +329,8 @@
 
 	exeinto ${X11_LIB_DIR}/modules/drivers
 
-	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" ||
-		has_version "x11-base/xorg-server"; then
-		[[ -f ${drvdir}/nvidia_drv.so ]] && \
-			doexe ${drvdir}/nvidia_drv.so
-	else
-		[[ -f ${drvdir}/nvidia_drv.o ]] && \
-			doexe ${drvdir}/nvidia_drv.o
-	fi
+	[[ -f ${drvdir}/nvidia_drv.so ]] && \
+		doexe ${drvdir}/nvidia_drv.so
 
 	insinto /usr/${inslibdir}
 	[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
--- x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9746.ebuild-	2007-02-12 16:22:50.000000000 +0100
+++ x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9746.ebuild	2007-02-12 16:25:23.000000000 +0100
@@ -18,7 +18,7 @@
 LICENSE="NVIDIA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="dlloader"
+IUSE=""
 RESTRICT="strip multilib-pkg-force"
 
 DEPEND="kernel_linux? ( virtual/linux-sources )"
@@ -330,14 +330,8 @@
 
 	exeinto ${X11_LIB_DIR}/modules/drivers
 
-	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" ||
-		has_version "x11-base/xorg-server"; then
-		[[ -f ${drvdir}/nvidia_drv.so ]] && \
-			doexe ${drvdir}/nvidia_drv.so
-	else
-		[[ -f ${drvdir}/nvidia_drv.o ]] && \
-			doexe ${drvdir}/nvidia_drv.o
-	fi
+	[[ -f ${drvdir}/nvidia_drv.so ]] && \
+		doexe ${drvdir}/nvidia_drv.so
 
 	insinto /usr/${inslibdir}
 	[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
--- x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild-	2007-02-12 16:27:44.000000000 +0100
+++ x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild	2007-02-12 16:26:41.000000000 +0100
@@ -18,7 +18,7 @@
 LICENSE="NVIDIA"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="dlloader"
+IUSE=""
 RESTRICT="strip multilib-pkg-force"
 
 DEPEND="virtual/linux-sources"
@@ -265,14 +265,8 @@
 
 	exeinto ${X11_LIB_DIR}/modules/drivers
 
-	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" ||
-		has_version "x11-base/xorg-server"; then
-		[[ -f ${drvdir}/nvidia_drv.so ]] && \
-			doexe ${drvdir}/nvidia_drv.so
-	else
-		[[ -f ${drvdir}/nvidia_drv.o ]] && \
-			doexe ${drvdir}/nvidia_drv.o
-	fi
+	[[ -f ${drvdir}/nvidia_drv.so ]] && \
+		doexe ${drvdir}/nvidia_drv.so
 
 	insinto /usr/${inslibdir}
 	[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
--- x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild-	2006-10-27 08:36:27.000000000 +0200
+++ x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild	2007-02-12 16:30:12.000000000 +0100
@@ -4,7 +4,7 @@
 
 inherit toolchain-funcs eutils
 
-IUSE="dlloader"
+IUSE=""
 
 DESCRIPTION="Driver for Synaptics touchpads"
 HOMEPAGE="http://w1.894.telia.com/~u89404340/touchpad/"
@@ -22,10 +22,7 @@
 src_unpack() {
 	unpack ${A} ; cd ${S}
 
-	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" || has_version ">=x11-base/xorg-server-0.99"
-	then
-		epatch ${FILESDIR}/${P}-makefile-fpic.patch
-	fi
+	epatch ${FILESDIR}/${P}-makefile-fpic.patch
 
 	# Compilation fix for xorg-7.1
 	epatch ${FILESDIR}/${P}-xorg-7.1-compile-fix.patch
--- x11-drivers/synaptics/synaptics-0.14.6.ebuild-	2007-02-12 16:29:29.000000000 +0100
+++ x11-drivers/synaptics/synaptics-0.14.6.ebuild	2007-02-12 16:30:58.000000000 +0100
@@ -4,7 +4,7 @@
 
 inherit toolchain-funcs eutils
 
-IUSE="dlloader"
+IUSE=""
 
 DESCRIPTION="Driver for Synaptics touchpads"
 HOMEPAGE="http://w1.894.telia.com/~u89404340/touchpad/"
@@ -30,11 +30,6 @@
 }
 
 src_compile() {
-#	if use dlloader
-#	then
-#		PICFLAG="-fPic"
-#	fi
-
 	emake || die
 }