Converted to kernel-mod eclass. Thanks to Stefan Schweizer for his help with that. Closes bug #68444.

3 files changed, 10 insertions, 21 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 97f028bfba9a..22e70426314c 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.223 2004/10/24 14:12:51 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.224 2004/10/24 14:56:29 chriswhite Exp $
 
   24 Oct 2004; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre5-r3.ebuild,
   mplayer-1.0_pre5-r4.ebuild:
   Minor cleanup
 
+  24 Oct 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r4.ebuild:
+  Converted to kernel-mod eclass. Thanks to Stefan Schweizer
+  <sschweizer@gmail.com> for helping out with that in bug #68444.
+
   24 Oct 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild:
   Bad bash logic... [ v. ).
 
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
index c5101d183891..cd9c28c14eb2 100644
--- a/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild,v 1.20 2004/10/24 13:56:09 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild,v 1.21 2004/10/24 14:56:29 chriswhite Exp $
 
-inherit eutils flag-o-matic kmod
+inherit eutils flag-o-matic kernel-mod
 
 IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk ipv6 joystick jpeg libcaca lirc live lzo mad  matroska matrox mmx mmx2 mpeg mythtv nas network nls oggvorbis opengl oss png real rtc samba sdl sse svga tga theora truetype v4l v4l2 xinerama X xmms xv xvid gnome"
 
@@ -134,12 +134,7 @@ src_unpack() {
 
 	#Setup the matrox makefile
 	if use matrox; then
-		get_kernel_info
 		epatch ${DISTDIR}/${P}-mga-kernel2.6.patch.tar.bz2
-		sed -i -e \
-		"s:^#KERNEL_OUTPUT_PATH=: \
-		KERNEL_OUTPUT_PATH =${KV_OUTPUT}:" \
-		${S}/Makefile || die "failed to sed ${S}/Makefile"
 	fi # end of matrox related stuff
 
 	# Fix hppa compilation
@@ -241,10 +236,7 @@ src_compile() {
 	# That way the configure script sees it and builds the support
 	#build the matrox driver before the 
 	if use matrox && use x86; then
-		check_KV
 		cd ${S}/drivers
-		# bad hack, will be fixed later
-		addwrite ${ROOT}/usr/src/linux/
 		unset ARCH
 		make all || die "Matrox build failed!  Your kernel may need to have `make mrproper` run on it before trying to use matrox support in this ebuild again."
 		cd ${S}
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
index e13a9bea8e2f..fc2242e757c7 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild,v 1.14 2004/10/24 14:12:51 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild,v 1.15 2004/10/24 14:56:29 chriswhite Exp $
 
-inherit eutils flag-o-matic kmod
+inherit eutils flag-o-matic kernel-mod
 
 IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux doc dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmx2 mythtv nas network nls nvidia oggvorbis opengl oss png real rtc samba sdl sse svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
 
@@ -142,12 +142,7 @@ src_unpack() {
 
 	#Setup the matrox makefile
 	if use matrox; then
-		get_kernel_info
 		epatch ${FILESDIR}/${P}-mga-kernel-2.6.patch
-		sed -i -e \
-		"s:^#KERNEL_OUTPUT_PATH=: \
-		KERNEL_OUTPUT_PATH =${KV_OUTPUT}:" \
-		${S}/Makefile
 	fi # end of matrox related stuff
 
 	# Fix hppa compilation
@@ -350,10 +345,7 @@ src_compile() {
 	#build the matrox driver before the 
 	if use matrox ; then
 		if use x86 ; then
-			check_KV
 			cd ${S}/drivers
-			# bad hack, will be fixed later
-			addwrite /usr/src/linux/
 			unset ARCH
 			make all || die "Matrox build failed!  Your kernel may need to have `make mrproper` run on it before trying to use matrox support in this ebuild again."
 			cd ${S}