KV fix

4 files changed, 80 insertions, 80 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index 747a22132231..899fc3fb3993 100644
--- a/media-video/ati-drivers/ChangeLog
+++ b/media-video/ati-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ati-drivers
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.5 2003/04/06 02:26:25 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.6 2003/04/23 01:35:57 lu_zero Exp $
+
+  23 Apr 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.9.6.ebuild,
+    ati-drivers-2.5.1-r1,ChangeLog :
+    Fix some stuff
 
 *ati-drivers-2.9.6 (3 Feb 2003)
   3 Feb 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.9.6.ebuild,
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index b7ba66e7abcd..d67c242a720c 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,7 +1,7 @@
-MD5 6db969f97e91ece58001e94c4eae706d ChangeLog 1321
-MD5 9c73a4053630e28b39be38ad413744c1 ati-drivers-2.5.1-r1.ebuild 3515
+MD5 3a302dadff78de8f617aeea6f9342c8f ChangeLog 1452
+MD5 3ad88f17e7799066b5366eafedd86d43 ati-drivers-2.5.1-r1.ebuild 3552
 MD5 1526fb1161daa618507dc4a2e2cb6699 ati-drivers-2.5.1.ebuild 3230
-MD5 76027c85396b1be892b46b1710f83e4e ati-drivers-2.9.6.ebuild 3900
+MD5 2a7891c630babfa3aa53bd1346a0e555 ati-drivers-2.9.6.ebuild 3730
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
 MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1 78
 MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1-r1 78
diff --git a/media-video/ati-drivers/ati-drivers-2.5.1-r1.ebuild b/media-video/ati-drivers/ati-drivers-2.5.1-r1.ebuild
index 5a6485565765..9f4ac08d9b65 100644
--- a/media-video/ati-drivers/ati-drivers-2.5.1-r1.ebuild
+++ b/media-video/ati-drivers/ati-drivers-2.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-2.5.1-r1.ebuild,v 1.9 2003/03/27 02:12:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-2.5.1-r1.ebuild,v 1.10 2003/04/23 01:35:57 lu_zero Exp $
 
 IUSE="qt kde gnome"
 
@@ -35,11 +35,11 @@ pkg_setup(){
 src_compile() {
 
 	einfo "building the glx module"
-
+	check_KV
     cd ${WORKDIR}/lib/modules/fglrx/build_mod
     #that is the dirty way to avoid the id -u check
     sed -e 's:`id -u`:0:' make.sh >make.sh.new
-    mv make.sh.new make.sh
+    sed -e 's:`uname -r`:${KV}:' make.sh.new >make.sh
     chmod +x make.sh
     ./make.sh || ewarn "glx module not built" 
 	
diff --git a/media-video/ati-drivers/ati-drivers-2.9.6.ebuild b/media-video/ati-drivers/ati-drivers-2.9.6.ebuild
index 5bdf58ab8edb..74fe76c42ad5 100644
--- a/media-video/ati-drivers/ati-drivers-2.9.6.ebuild
+++ b/media-video/ati-drivers/ati-drivers-2.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-2.9.6.ebuild,v 1.2 2003/04/20 01:15:52 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-2.9.6.ebuild,v 1.3 2003/04/23 01:35:57 lu_zero Exp $
 
 IUSE="qt kde gnome"
 
@@ -41,91 +41,87 @@ pkg_setup(){
 src_compile() {
 
 	einfo "building the glx module"
-
-    cd ${WORKDIR}/lib/modules/fglrx/build_mod
-    #that is the dirty way to avoid the id -u check
-    sed -e 's:`id -u`:0:' make.sh >make.sh.new
-    mv make.sh.new make.sh
-    chmod +x make.sh
-    ./make.sh || ewarn "glx module not built" 
-	
-
-    einfo "building the fgl_glxgears sample"
+	check_KV
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	#that is the dirty way to avoid the id -u check
+	sed -e 's:`id -u`:0:' make.sh >make.sh.new
+	sed -e 's:`uname -r`:${KV}:' make.sh.new >make.sh
+	chmod +x make.sh
+	./make.sh || ewarn "glx module not built" 
 	
+	einfo "building the fgl_glxgears sample"
 	mkdir ${WORKDIR}/fglrxgears
-    cd ${WORKDIR}/fglrxgears
-    tar -xzvf ${WORKDIR}/usr/src/fglrx_sample_source.tgz
-    mv xc/programs/fgl_glxgears/* .
-    make -f Makefile.Linux || die
-    
-    if [ "`use qt`" ]
+	cd ${WORKDIR}/fglrxgears
+	tar -xzvf ${WORKDIR}/usr/src/fglrx_sample_source.tgz
+	mv xc/programs/fgl_glxgears/* .
+	make -f Makefile.Linux || die
+	
+	if [ "`use qt`" ]
 	then 
-	    einfo "building the qt fglx panel"
-	    cd ${WORKDIR}
-	    local OLDBIN="/usr/X11R6/bin"
-	    local ATIBIN="${D}/opt/ati/bin"
-	    mkdir fglrx_panel
-	    cd  fglrx_panel
-	    tar -xzvf ${WORKDIR}/usr/src/fglrx_panel_sources.tgz
-	    sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
+	einfo "building the qt fglx panel"
+		cd ${WORKDIR}
+		local OLDBIN="/usr/X11R6/bin"
+		local ATIBIN="${D}/opt/ati/bin"
+		mkdir fglrx_panel
+		cd  fglrx_panel
+		tar -xzvf ${WORKDIR}/usr/src/fglrx_panel_sources.tgz
+		sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
 		Makefile >Makefile.new
 		mv Makefile.new Makefile
 	emake || die
-    fi
-    
-#removing stuff 
-    einfo "cleaning"
-    cd ${WORKDIR}
-    rm -fR usr/share
-    cd usr/X11R6/
-    rm -fR bin/firegl*.bz2 bin/LICENSE.* bin/fgl_glxgears src
+	fi
+	#removing stuff 
+	einfo "cleaning"
+	cd ${WORKDIR}
+	rm -fR usr/share
+	cd usr/X11R6/
+	rm -fR bin/firegl*.bz2 bin/LICENSE.* bin/fgl_glxgears src
 }
 
 pkg_preinst() {
 # clean the dinamic libGL stuff's home to ensure
 # we dont have stale libs floating around
-    if [ -d ${ROOT}/usr/lib/opengl/ati ]
+	if [ -d ${ROOT}/usr/lib/opengl/ati ]
 	then
-	    rm -rf ${ROOT}/usr/lib/opengl/ati/*
-    fi
-}			    
+		rm -rf ${ROOT}/usr/lib/opengl/ati/*
+	fi
+}		    
 
 src_install() {
-    local ATI_ROOT="/usr/lib/opengl/ati"
-    
-    cd ${WORKDIR}
+	local ATI_ROOT="/usr/lib/opengl/ati"
+	cd ${WORKDIR}
 
 #drm module 
-    insinto /lib/modules/${KV}/video
-    doins lib/modules/fglrx/build_mod/fglrx.o
+	insinto /lib/modules/${KV}/video
+	doins lib/modules/fglrx/build_mod/fglrx.o
 
 #dri driver
-    exeinto ${ATI_ROOT}/lib
-    doexe usr/X11R6/lib/libGL.so.1.2 
-    dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-    dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-    dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-    #that is the same as in the xfree
-    dosym ../../xfree/lib/libGL.la ${ATI_ROOT}/lib/libGL.la
+	exeinto ${ATI_ROOT}/lib
+	doexe usr/X11R6/lib/libGL.so.1.2 
+	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
+	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
+	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+	#that is the same as in the xfree
+	dosym ../../xfree/lib/libGL.la ${ATI_ROOT}/lib/libGL.la
 
 #same as in xfree
-    exeinto ${ATI_ROOT}/
-    dosym ../xfree/include ${ATI_ROOT}/include
-    dosym ../xfree/extensions ${ATI_ROOT}/extensions
-    rm usr/X11R6/lib/libGL.so.1.2
-
+	exeinto ${ATI_ROOT}/
+	dosym ../xfree/include ${ATI_ROOT}/include
+	dosym ../xfree/extensions ${ATI_ROOT}/extensions
+	rm usr/X11R6/lib/libGL.so.1.2
+	
 #apps
-    insinto /etc/env.d
-    doins ${FILESDIR}/09ati
-    exeinto /opt/ati/bin
-    doexe fglrxgears/fgl_glxgears
+	insinto /etc/env.d
+	doins ${FILESDIR}/09ati
+	exeinto /opt/ati/bin
+	doexe fglrxgears/fgl_glxgears
     doexe usr/X11R6/bin/*
-    rm usr/X11R6/bin/*
+	rm usr/X11R6/bin/*
 
-    if [ "`use qt`" ] 
+	if [ "`use qt`" ] 
 	then
-	    doexe fglrx_panel/fireglcontrol
-    fi
+		doexe fglrx_panel/fireglcontrol
+	fi
 
     #if ["`use kde`"] then
 
@@ -136,19 +132,19 @@ src_install() {
 
 pkg_postinst() {
 #switch to the ati implementation
-    if [ "${ROOT}" = "/" ]
+	if [ "${ROOT}" = "/" ]
 	then
-	    /usr/sbin/opengl-update ati
-    fi
-    
-    einfo
-    einfo "To use the xfree GLX, run \"opengl-update xfree\""
-    einfo
-    einfo
-    einfo "To chance your XF86Config you can use the bundled \"fglrxconfig\""
-    einfo
+		/usr/sbin/opengl-update ati
+	fi
+
+	einfo
+	einfo "To use the xfree GLX, run \"opengl-update xfree\""
+	einfo
+	einfo
+	einfo "To chance your XF86Config you can use the bundled \"fglrxconfig\""
+	einfo
 #drm-module
-    update-modules
+	update-modules
 
 }