minor fixes

4 files changed, 44 insertions, 44 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index 4d3f318fe7ec..8eaafa56ce3f 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.19 2003/09/30 17:52:35 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.20 2003/10/01 22:51:32 lu_zero Exp $
+
+  02 Oct 2003; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.5-r1.ebuild,
+  ati-drivers-3.2.5-r1.ebuild:
+  Make direct use of the provided Makefile
 
 *ati-drivers-3.2.5-r1 (30 Sep 2003)
 
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index 4e84cfe3ccd9..eae8db17af2f 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,28 +1,28 @@
-MD5 76a5204e775bfa12f13f85bd26d163e6 ati-drivers-2.5.1-r1.ebuild 3714
-MD5 44e3741b17b89b914f1082b7d842841b ati-drivers-3.2.5.ebuild 4770
+MD5 bca4dd1758b390509e46f966d475006d metadata.xml 221
+MD5 8fa6d34e0c6145c5f93be82488f4a4b1 ati-drivers-2.9.13.ebuild 3637
 MD5 90845dc5cbdc627f4a5067f623d457b0 ati-drivers-3.2.0.ebuild 4521
 MD5 bd9fe6f01ec4d68241cf5c9ba51e907b ati-drivers-2.9.12.ebuild 3636
+MD5 473b66e0cdd6d232a2fe528f05ea3a1b ati-drivers-2.9.13-r1.ebuild 4273
+MD5 76a5204e775bfa12f13f85bd26d163e6 ati-drivers-2.5.1-r1.ebuild 3714
+MD5 5dbdb10b7886cfa15b78077c04e7c153 ati-drivers-3.2.5-r1.ebuild 4548
 MD5 20b39fca85cbd3239466ccf8f24fdfc2 ati-drivers-2.5.1.ebuild 3036
-MD5 62e68c7983d696f69bada561bedbe595 ati-drivers-3.2.5-r1.ebuild 4496
+MD5 2373ea7c43068a9dda3f6bc731952051 ati-drivers-3.2.5.ebuild 4547
+MD5 2f414136e3eba4f2ac13d15e92454181 ChangeLog 3912
 MD5 77684e92f813491b90e7bbe3ed6f5992 ati-drivers-3.2.4.ebuild 4712
-MD5 389f2f973070ea7af4ffde37306bb855 ChangeLog 3761
-MD5 473b66e0cdd6d232a2fe528f05ea3a1b ati-drivers-2.9.13-r1.ebuild 4273
-MD5 bca4dd1758b390509e46f966d475006d metadata.xml 221
-MD5 8fa6d34e0c6145c5f93be82488f4a4b1 ati-drivers-2.9.13.ebuild 3637
-MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
-MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5-r1 78
-MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1 78
-MD5 d7df82fba612188346e087bfc2a3a305 files/digest-ati-drivers-3.2.0 81
-MD5 0eca691de41a29813f6cd11a54b8a234 files/digest-ati-drivers-3.2.4 81
+MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
 MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5 78
-MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571
+MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5-r1 78
 MD5 caef37ecaa1695f1ffaaff60afb69b42 files/digest-ati-drivers-2.9.12 82
 MD5 bb9dee9498a1b6e5d14476ae7194afc3 files/digest-ati-drivers-2.9.13 82
-MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
-MD5 ca4e8654e3b880025b10ac15d2dbff41 files/fglrx-2.6-iminor.patch 847
+MD5 d7df82fba612188346e087bfc2a3a305 files/digest-ati-drivers-3.2.0 81
+MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
+MD5 b607b2eec7ace92eb7ca93240fe81a53 files/fglrx-2.6-fix-deprecated.patch 4370
+MD5 f21aff99b8b4d8a6134d44d5e00e649e files/ati-2.5.1.diff 660
 MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1-r1 78
+MD5 ca4e8654e3b880025b10ac15d2dbff41 files/fglrx-2.6-iminor.patch 847
+MD5 0eca691de41a29813f6cd11a54b8a234 files/digest-ati-drivers-3.2.4 81
+MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096
+MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1 78
 MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309
-MD5 f21aff99b8b4d8a6134d44d5e00e649e files/ati-2.5.1.diff 660
-MD5 b607b2eec7ace92eb7ca93240fe81a53 files/fglrx-2.6-fix-deprecated.patch 4370
+MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571
 MD5 170f6d7eb9dc2f6d299a28fb8d54e7e4 files/digest-ati-drivers-2.9.13-r1 151
-MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096
diff --git a/media-video/ati-drivers/ati-drivers-3.2.5-r1.ebuild b/media-video/ati-drivers/ati-drivers-3.2.5-r1.ebuild
index f5603140c513..7bf794f81c2f 100644
--- a/media-video/ati-drivers/ati-drivers-3.2.5-r1.ebuild
+++ b/media-video/ati-drivers/ati-drivers-3.2.5-r1.ebuild
@@ -1,12 +1,12 @@
 # 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-3.2.5-r1.ebuild,v 1.1 2003/09/30 17:52:35 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.5-r1.ebuild,v 1.2 2003/10/01 22:51:32 lu_zero Exp $
 
 IUSE="qt kde gnome"
 
 DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
 HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/firegl/fglrx-glc22-4.3.0-3.2.5.i586.rpm"
+SRC_URI="http://www2.ati.com/drivers/firegl/fglrx-glc22-4.3.0-${PV}.i586.rpm"
 SLOT="${KV}"
 LICENSE="ATI GPL-2 QPL-1.0"
 KEYWORDS="-* ~x86"
@@ -45,14 +45,14 @@ src_unpack() {
 	if [ "`echo ${KV}|grep 2.6`" ] ; then
 
 	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	einfo "creating Makefile for kernel 2.6"
-	patch -p1 < ${FILESDIR}/fglrx-2.6-makefile.patch
 	einfo "applying fglrx-2.6-amd-adv-spec-fix.patch"
 	patch -p1 < ${FILESDIR}/fglrx-2.6-amd-adv-spec-fix.patch
 	einfo "applying fglrx-2.6-vmalloc-vmaddr.patch"
 	patch -p1 < ${FILESDIR}/fglrx-2.6-vmalloc-vmaddr.patch
 	einfo "applying fglrx-2.6-iminor.patch"
 	patch -p1 < ${FILESDIR}/fglrx-2.6-iminor.patch
+	einfo "applying fglrx-2.6-tsk_euid.patch"
+	patch < ${FILESDIR}/3.2.5-linux-2.6.0-test6-mm.patch 
 	fi
 }
 
@@ -64,18 +64,20 @@ pkg_setup(){
 src_compile() {
 	einfo "building the glx module"
 	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	GENTOO_ARCH="${ARCH}"
-	unset ARCH
+	if [ "`echo ${KV}|grep 2.6`" ] ; then
+		GENTOO_ARCH=${ARCH} unset ARCH
+	    addwrite "/usr/src/${FK}"
+	    cp 2.6.x/Makefile .
+		make -C /usr/src/linux SUBDIRS="`pwd`" modules || \
+	    ewarn "glx module not built"
+	    ARCH=${GENTOO_ARCH}
+	else
 	#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
-	if [ "`echo ${KV}|grep '2\.6.*-mm'`" ] ; then
-		patch < ${FILESDIR}/3.2.5-linux-2.6.0-test6-mm.patch || die
-	fi
+	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
-	addwrite /usr/src/linux-${KV}/
 	./make.sh || ewarn "glx module not built"
-	ARCH="${GENTOO_ARCH}"
+	fi
 
 	einfo "building the fgl_glxgears sample"
 	cd ${WORKDIR}/fglrxgears
diff --git a/media-video/ati-drivers/ati-drivers-3.2.5.ebuild b/media-video/ati-drivers/ati-drivers-3.2.5.ebuild
index 5070665f0a7b..9894fcae2c07 100644
--- a/media-video/ati-drivers/ati-drivers-3.2.5.ebuild
+++ b/media-video/ati-drivers/ati-drivers-3.2.5.ebuild
@@ -1,12 +1,12 @@
 # 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-3.2.5.ebuild,v 1.7 2003/09/22 11:52:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.5.ebuild,v 1.8 2003/10/01 22:51:32 lu_zero Exp $
 
 IUSE="qt kde gnome"
 
 DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
 HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/firegl/fglrx-glc22-4.3.0-3.2.5.i586.rpm"
+SRC_URI="http://www2.ati.com/drivers/firegl/fglrx-glc22-4.3.0-${PV}.i586.rpm"
 SLOT="${KV}"
 LICENSE="ATI GPL-2 QPL-1.0"
 KEYWORDS="-* ~x86"
@@ -45,14 +45,14 @@ src_unpack() {
 	if [ "`echo ${KV}|grep 2.6`" ] ; then
 
 	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	einfo "creating Makefile for kernel 2.6"
-	patch -p1 < ${FILESDIR}/fglrx-2.6-makefile.patch
 	einfo "applying fglrx-2.6-amd-adv-spec-fix.patch"
 	patch -p1 < ${FILESDIR}/fglrx-2.6-amd-adv-spec-fix.patch
 	einfo "applying fglrx-2.6-vmalloc-vmaddr.patch"
 	patch -p1 < ${FILESDIR}/fglrx-2.6-vmalloc-vmaddr.patch
 	einfo "applying fglrx-2.6-iminor.patch"
 	patch -p1 < ${FILESDIR}/fglrx-2.6-iminor.patch
+#	einfo "applying fglrx-2.6-tsk_euid.patch"
+#	patch < ${FILESDIR}/3.2.5-linux-2.6.0-test6-mm.patch 
 	fi
 }
 
@@ -67,11 +67,11 @@ src_compile() {
 	if [ "`echo ${KV}|grep 2.6`" ] ; then
 		GENTOO_ARCH=${ARCH} unset ARCH
 	    addwrite "/usr/src/${FK}"
-	    make -C /usr/src/linux SUBDIRS="`pwd`" modules || \
+	    cp 2.6.x/Makefile .
+		make -C /usr/src/linux SUBDIRS="`pwd`" modules || \
 	    ewarn "glx module not built"
 	    ARCH=${GENTOO_ARCH}
 	else
-	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
@@ -79,12 +79,6 @@ src_compile() {
 	./make.sh || ewarn "glx module not built"
 	fi
 
-	#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"
 	cd ${WORKDIR}/fglrxgears
 	make -f Makefile.Linux || ewarn "fgl_glxgears sample not build"