These only work with xfree 4.2 or lower. Since that's not around anymore, these shouldn't be either. Reported by Michael Sterrett <mr_bones_@gentoo.org>.

7 files changed, 13 insertions, 312 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index dab357292439..841ff64417ae 100644
--- a/media-video/ati-drivers/ChangeLog
+++ b/media-video/ati-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ati-drivers
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.30 2004/03/11 21:26:31 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.31 2004/04/01 21:12:21 spyderous Exp $
+
+  01 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  ati-drivers-2.5.1-r1.ebuild, ati-drivers-2.5.1.ebuild, files/ati-2.5.1.diff:
+  These only work with xfree 4.2 or lower. Since that's not around anymore,
+  these shouldn't be either. Reported by Michael Sterrett
+  <mr_bones_@gentoo.org>.
 
   11 Mar 2004; Luca Barbato <lu_zero@gentoo.org> :
   Fixed executable perms
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index e930245c86b9..2cd13626b67e 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,36 +1,31 @@
-MD5 4148937e65f0d9917e8709e18dc67b26 ChangeLog 5350
-MD5 76a5204e775bfa12f13f85bd26d163e6 ati-drivers-2.5.1-r1.ebuild 3714
-MD5 20b39fca85cbd3239466ccf8f24fdfc2 ati-drivers-2.5.1.ebuild 3036
+MD5 28fb5cba53285970156eeb1f1d6f7c90 ChangeLog 5647
 MD5 bd9fe6f01ec4d68241cf5c9ba51e907b ati-drivers-2.9.12.ebuild 3636
 MD5 473b66e0cdd6d232a2fe528f05ea3a1b ati-drivers-2.9.13-r1.ebuild 4273
 MD5 8fa6d34e0c6145c5f93be82488f4a4b1 ati-drivers-2.9.13.ebuild 3637
 MD5 90845dc5cbdc627f4a5067f623d457b0 ati-drivers-3.2.0.ebuild 4521
 MD5 77684e92f813491b90e7bbe3ed6f5992 ati-drivers-3.2.4.ebuild 4712
-MD5 59a37b1c6f7cc09308773178c3d414b4 ati-drivers-3.2.5.ebuild 4583
-MD5 bca4dd1758b390509e46f966d475006d metadata.xml 221
 MD5 d2e36344a43730865709052aab657821 ati-drivers-3.2.5-r1.ebuild 4605
+MD5 59a37b1c6f7cc09308773178c3d414b4 ati-drivers-3.2.5.ebuild 4583
 MD5 d69ed290ce069cda9e8bf407f6be6a0a ati-drivers-3.2.8.ebuild 4587
+MD5 bca4dd1758b390509e46f966d475006d metadata.xml 221
 MD5 eaf89ed76e241aea437a72d0641175c8 ati-drivers-3.7.0.ebuild 5450
 MD5 bdeb8f920ed62f6b292633b575cc725c ati-drivers-3.2.8-r1.ebuild 3674
 MD5 c85b9fd4c5e51b20cf57017fb38e835e ati-drivers-3.7.6.ebuild 3676
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
-MD5 f21aff99b8b4d8a6134d44d5e00e649e files/ati-2.5.1.diff 660
-MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1 78
-MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1-r1 78
+MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309
 MD5 caef37ecaa1695f1ffaaff60afb69b42 files/digest-ati-drivers-2.9.12 82
 MD5 bb9dee9498a1b6e5d14476ae7194afc3 files/digest-ati-drivers-2.9.13 82
 MD5 170f6d7eb9dc2f6d299a28fb8d54e7e4 files/digest-ati-drivers-2.9.13-r1 151
 MD5 d7df82fba612188346e087bfc2a3a305 files/digest-ati-drivers-3.2.0 81
 MD5 0eca691de41a29813f6cd11a54b8a234 files/digest-ati-drivers-3.2.4 81
 MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5 78
+MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5-r1 78
+MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8 78
 MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096
 MD5 b607b2eec7ace92eb7ca93240fe81a53 files/fglrx-2.6-fix-deprecated.patch 4370
 MD5 ca4e8654e3b880025b10ac15d2dbff41 files/fglrx-2.6-iminor.patch 847
 MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571
 MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
-MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309
-MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5-r1 78
-MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8 78
 MD5 bdd76c908aa2a7bb1918b9a6955a0744 files/fglrx-3.2.8-fix-amd-adv-spec.patch 561
 MD5 a2a4f4788a7de4a9c7c0295a2804752f files/digest-ati-drivers-3.7.0 78
 MD5 4765a7db326f308f862b1fe3e211ef0d files/fglrx-3.7.0-fix-fglrx_panel-includes.patch 2168
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
deleted file mode 100644
index 1a75674d22fe..000000000000
--- a/media-video/ati-drivers/ati-drivers-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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.13 2003/09/08 11:47:36 msterret Exp $
-
-IUSE="qt kde gnome"
-
-DESCRIPTION="Ati precompiled drivers for r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="http://pdownload.mii.instacontent.net/ati/drivers/fglrx-glc22-4.2.0-${PV}.i586.rpm"
-SLOT="${KV}"
-LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="-* x86"
-
-DEPEND=">=virtual/linux-sources-2.4
-	app-arch/rpm2targz
-	<x11-base/xfree-4.2.99
-	qt? ( >=x11-libs/qt-3.0 )"
-
-RDEPEND="qt? ( >=x11-libs/qt-3.0 )"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
-
-src_unpack() {
-	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/${A} || die
-	tar zxf fglrx-glc22-4.2.0-${PV}.i586.tar.gz || die
-	epatch ${FILESDIR}/ati-2.5.1.diff
-	mkdir ${WORKDIR}/fglrxgears
-	cd ${WORKDIR}/fglrxgears
-	tar zxf ${WORKDIR}/usr/src/fglrx_sample_source.tgz || die
-	mv xc/programs/fgl_glxgears/* .
-	cp Makefile.Linux Makefile.Linux.orig || die
-	#defining USE_GLU allows this to compile with NVIDIA headers just fine
-	sed -e "s:-I/usr/X11R6/include:-D USE_GLU -I/usr/X11R6/include:" Makefile.Linux.orig > Makefile.Linux || die
-	cd ${WORKDIR}
-	local OLDBIN="/usr/X11R6/bin"
-	local ATIBIN="${D}/opt/ati/bin"
-	mkdir fglrx_panel
-	cd fglrx_panel
-	tar zxf ${WORKDIR}/usr/src/fglrx_panel_sources.tgz || die
-	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
-	Makefile >Makefile.new
-	mv Makefile.new Makefile
-}
-
-pkg_setup(){
-	check_KV || die "please ensure /usr/src/linux points to your kernel symlink"
-}
-
-
-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
-	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 || die
-
-	if [ "`use qt`" ]
-	then
-	einfo "building the qt fglx panel"
-		cd ${WORKDIR}/fglrx_panel
-		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
-}
-
-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 ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_ROOT="/usr/lib/opengl/ati"
-	cd ${WORKDIR}
-
-#drm module
-	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
-
-#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
-
-#apps
-	insinto /etc/env.d
-	doins ${FILESDIR}/09ati
-	exeinto /opt/ati/bin
-	doexe fglrxgears/fgl_glxgears
-	doexe usr/X11R6/bin/*
-	rm usr/X11R6/bin/*
-
-	if [ "`use qt`" ]
-	then
-		doexe fglrx_panel/fireglcontrol
-	fi
-	rm -f usr/src/*
-	cp -R usr ${D}
-}
-
-pkg_postinst() {
-	#Ebuild shouldn't do this automatically, just tell the user to do it: (drobbins, 1 May 2003)
-	#otherwise it messes up livecd/gamecd stuff
-	#if [ "${ROOT}" = "/" ]
-	#then
-	#	/usr/sbin/opengl-update ati
-	#fi
-
-	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
-	einfo "To chance your XF86Config you can use the bundled \"fglrxconfig\""
-#drm-module
-	update-modules
-
-}
diff --git a/media-video/ati-drivers/ati-drivers-2.5.1.ebuild b/media-video/ati-drivers/ati-drivers-2.5.1.ebuild
deleted file mode 100644
index 94c1f0e94819..000000000000
--- a/media-video/ati-drivers/ati-drivers-2.5.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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.ebuild,v 1.9 2003/09/08 11:47:36 msterret Exp $
-
-IUSE="qt kde gnome"
-
-SRC_URI="http://pdownload.mii.instacontent.net/ati/drivers/fglrx-glc22-4.2.0-${PV}.i586.rpm"
-HOMEPAGE="http://www.ati.com"
-DESCRIPTION="Ati precompiled drivers for r300, r250 and r200 chipsets"
-
-LICENSE="ATI GPL-2 QPL-1.0"
-SLOT="${KV}"
-KEYWORDS="-* x86"
-
-DEPEND=">=virtual/linux-sources-2.4
-	>=sys-libs/glibc-2.2.2
-	app-arch/rpm2targz
-	qt? ( >=x11-libs/qt-3.0 )"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
-
-src_unpack() {
-	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/${A}
-	tar zxf fglrx-glc22-4.2.0-${PV}.i586.tar.gz
-}
-
-src_compile() {
-	einfo "building the glx module"
-
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	./make.sh
-
-	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`" ]
-	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}":"\
-		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
-}
-
-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 ]
-	then
-	    rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_ROOT="/usr/lib/opengl/ati"
-
-	cd ${WORKDIR}
-
-#drm module
-	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
-
-#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
-
-#apps
-	insinto /etc/env.d
-	doins ${FILESDIR}/09ati
-	exeinto /opt/ati/bin
-	doexe fglrxgears/fgl_glxgears
-	doexe usr/X11R6/bin/*
-	rm usr/X11R6/bin/*
-
-	if [ "`use qt`" ]
-	then
-	    doexe fglrx_panel/fireglcontrol
-	fi
-
-	#if ["`use kde`"] then
-
-
-	#if ["`use gnome`"]
-	cp -R usr ${D}
-}
-
-pkg_postinst() {
-#switch to the ati implementation
-	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
-
-#drm-module
-	update-modules
-}
diff --git a/media-video/ati-drivers/files/ati-2.5.1.diff b/media-video/ati-drivers/files/ati-2.5.1.diff
deleted file mode 100644
index dd2eface57ab..000000000000
--- a/media-video/ati-drivers/files/ati-2.5.1.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- lib/modules/fglrx/build_mod/firegl_public.c~	2003-04-30 10:55:44.000000000 +0100
-+++ lib/modules/fglrx/build_mod/firegl_public.c	2003-04-30 10:57:08.000000000 +0100
-@@ -86,6 +86,19 @@
- #include "firegl_public.h"
- 
- // ============================================================
-+#ifdef CONFIG_HIGHPTE
-+    #ifdef pte_offset_map
-+//        #error Error: this code was never tested with CONFIG_HIGHPTE setting enabled
-+    #endif
-+#endif
-+
-+#ifndef pte_offset
-+    #ifdef pte_offset_map
-+        #define pte_offset  pte_offset_map
-+    #endif
-+#endif
-+
-+// ============================================================
- #ifndef TRUE
- #define TRUE 1
- #endif
-
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-2.5.1 b/media-video/ati-drivers/files/digest-ati-drivers-2.5.1
deleted file mode 100644
index 872b99adf142..000000000000
--- a/media-video/ati-drivers/files/digest-ati-drivers-2.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eef0d547931f8aefd3a19cf1ec09001a fglrx-glc22-4.2.0-2.5.1.i586.rpm 5118135
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-2.5.1-r1 b/media-video/ati-drivers/files/digest-ati-drivers-2.5.1-r1
deleted file mode 100644
index 872b99adf142..000000000000
--- a/media-video/ati-drivers/files/digest-ati-drivers-2.5.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eef0d547931f8aefd3a19cf1ec09001a fglrx-glc22-4.2.0-2.5.1.i586.rpm 5118135