--- /usr/portage/media-tv/linuxtv-dvb/linuxtv-dvb-1.1.1.ebuild	2004-08-07 20:36:03.000000000 +0200
+++ linuxtv-dvb-1.1.1.ebuild	2004-10-20 19:42:26.099492312 +0200
@@ -12,7 +12,7 @@
 DEPEND="virtual/linux-sources"
 #RDEPEND=""
 
-inherit eutils kmod
+inherit eutils kernel-mod
 
 pkg_setup() {
 	einfo ""
@@ -27,22 +27,18 @@
 	# don't interfere with the kernel arch variables
 	unset ARCH
 
-	#until kmod can be fudged for 
-	#this to not have to be included
-	addwrite /usr/src/linux
-
-	emake
+	emake || die "emake failed"
 }
 
 src_install() {
 	# see what kernel directory we need to
 	# go to
-	get_kernel_info
-	if is_kernel 2 6
-	then
+	if kernel-mod_is_2_6_kernel; then
 		cd ${S}/build-2.6
+		KV_OBJ="ko"
 	else
 		cd ${S}/build-2.4
+		KV_OBJ="o"
 	fi
 
 	#copy over the insmod.sh script
@@ -80,15 +76,14 @@
 }
 
 pkg_postinst() {
-	depmod -a
-	einfo ""
 	einfo "If you don't use devfs, execute MAKEDEV-DVB.sh to create"
 	einfo "the device nodes. The file is in /usr/share/doc/${PF}/"
 	einfo ""
 	einfo "A file called dvb-module-load has been created to simplify loading all modules."
 	einfo "Call it using 'dvb-module-load {load|debug|unload}'."
-}
-
-pkg_postrm() {
-	depmod -a
+	einfo ""
+	
+	einfo "Checking kernel module dependencies"
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
 }