--- x11-drm-20060608.ebuild	2006-09-24 12:39:57.000000000 +0200
+++ x11-drm-20060608-r1.ebuild	2006-10-12 11:45:59.000000000 +0200
@@ -2,7 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608.ebuild,v 1.9 2006/09/24 10:14:22 blubb Exp $
 
-inherit eutils x11 linux-mod
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="1.7"
+
+inherit eutils x11 linux-mod autotools
 
 IUSE_VIDEO_CARDS="
 	video_cards_i810
@@ -36,38 +39,25 @@
 LICENSE="X11"
 KEYWORDS="~alpha amd64 ia64 ppc x86"
 
-DEPEND=">=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.59
-	>=sys-devel/libtool-1.5.14
+DEPEND=">=sys-devel/libtool-1.5.14
 	>=sys-devel/m4-1.4
-	virtual/linux-sources
-	>=sys-apps/portage-2.0.49-r13"
+	virtual/linux-sources"
+RDEPEND=""
 
 pkg_setup() {
-	get_version
-
-	if kernel_is 2 6
-	then
-		if linux_chkconfig_builtin "DRM"
-		then
+	if kernel_is 2 6 ; then
+		linux_chkconfig_builtin "DRM" && \
 			die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
-		fi
+		CONFIG_CHECK="AGP"
+		ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)"
 
-		if ! linux_chkconfig_present "AGP"
-		then
-			einfo "AGP support is not enabled in your kernel config. This may be needed for DRM to"
-			einfo "work, so you might want to double-check that setting. (CONFIG_AGP)"
-			echo
-		fi
-	elif kernel_is 2 4
-	then
-		if ! linux_chkconfig_present "DRM"
-		then
-			die "Please enable DRM support in your kernel configuration. (CONFIG_DRM = y or m)."
-			echo
-		fi
+	elif kernel_is 2 4 ; then
+		CONFIG_CHECK="DRM"
+		ERROR_DRM="Please enable DRM support in your kernel configuration. (CONFIG_DRM = y or m)."
 	fi
 
+	linux-mod_pkg_setup
+
 	# Set video cards to build for.
 	set_vidcards
 
@@ -96,7 +86,7 @@
 	cp ${S}/tests/*.c ${SRC_BUILD}
 
 	cd ${S}
-	WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.7" autoreconf -v --install
+	autoreconf -v --install
 }
 
 src_compile() {