Removing version incompatible with remaining xorg-x11 and opengl-update versions.

Package-Manager: portage-2.0.51.19

4 files changed, 29 insertions, 210 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index 83eb8afad247..7c9dc9c03fdd 100644
--- a/media-video/ati-drivers/ChangeLog
+++ b/media-video/ati-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ati-drivers
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.84 2005/04/11 11:39:25 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.85 2005/04/17 22:18:38 eradicator Exp $
+
+  17 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -ati-drivers-8.8.25.ebuild:
+  Removing version incompatible with remaining xorg-x11 and opengl-update
+  versions.
 
   11 Apr 2005; Luca Barbato <lu_zero@gentoo.org> +files/8.8.25-smp.patch,
   ati-drivers-8.12.10.ebuild:
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index 16bd039abc33..703e3bd06824 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,23 +1,31 @@
-MD5 0948a24451d2e0a7fd7d893c7ff5b4e0 ati-drivers-8.8.25.ebuild 4924
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dc996bcdd611d39b66f73b90473b52d4 ChangeLog 14856
+MD5 6ba70f4634473ada8b39a4e0b3983597 ati-drivers-8.12.10.ebuild 6695
 MD5 a2a9c4ddd4562efd9ca3b290459e7196 metadata.xml 219
 MD5 3be35345fbc4005a932468eb839a64ff ati-drivers-8.10.19.ebuild 5968
-MD5 6ba70f4634473ada8b39a4e0b3983597 ati-drivers-8.12.10.ebuild 6695
-MD5 5556ad2e8fdd513e5ca017edaeb620b6 ChangeLog 14679
 MD5 3a2987cd761df4062f8427ae695f10db ati-drivers-8.8.25-r3.ebuild 5752
-MD5 9d38539efafca58aa483587b4a1636d4 files/fglrx-2.6.10-pci_get_class.patch 468
-MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376
-MD5 5349e88a1d5524007b97ead001558d0d files/digest-ati-drivers-8.12.10 156
-MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
-MD5 f62d7815852919948deb06c864841953 files/digest-ati-drivers-8.8.25-r3 154
-MD5 f2aad1d22d8cdb74d99b5efec9d02c2d files/digest-ati-drivers-8.10.19 156
-MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
+MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309
 MD5 7a1a2040181cf4d2d3b0e820da5a8576 files/8.08-kernel-2.6.10.patch 4492
+MD5 5349e88a1d5524007b97ead001558d0d files/digest-ati-drivers-8.12.10 156
+MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376
+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 6ef03b4b2627a76f3893ce9a94d1ce56 files/fglrx-2.6-get-page.patch 1172
-MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096
-MD5 28e1ac88033da1899a711d26c10d93b6 files/fglrx-2.6-pagetable.patch 5027
-MD5 3c7b079f100d7796b44af7288f044730 files/digest-ati-drivers-8.8.25 75
-MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309
+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 9d38539efafca58aa483587b4a1636d4 files/fglrx-2.6.10-pci_get_class.patch 468
+MD5 f62d7815852919948deb06c864841953 files/digest-ati-drivers-8.8.25-r3 154
+MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
+MD5 28e1ac88033da1899a711d26c10d93b6 files/fglrx-2.6-pagetable.patch 5027
+MD5 f2aad1d22d8cdb74d99b5efec9d02c2d files/digest-ati-drivers-8.10.19 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCYuDOArHZZzCEUG0RAju7AJ9rZ9zgOJwvrFbYpDHn8YGfAfmRGwCfXXTZ
+6Mawre6WfCEKlcNX8AyyvQs=
+=0hwT
+-----END PGP SIGNATURE-----
diff --git a/media-video/ati-drivers/ati-drivers-8.8.25.ebuild b/media-video/ati-drivers/ati-drivers-8.8.25.ebuild
deleted file mode 100644
index 0e4b09f29016..000000000000
--- a/media-video/ati-drivers/ati-drivers-8.8.25.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.8.25.ebuild,v 1.10 2005/02/06 16:42:18 lu_zero Exp $
-
-IUSE=""
-
-inherit eutils rpm linux-info linux-mod
-
-DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm"
-
-LICENSE="ATI"
-KEYWORDS="-* x86"
-
-RDEPEND=">=x11-base/xorg-x11-6.8.0
-		 >=x11-base/opengl-update-2.0_pre5"
-
-DEPEND=">=virtual/linux-sources-2.4
-	${RDEPEND}"
-
-PROVIDE="virtual/opengl"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
-
-pkg_setup(){
-	#check kernel and sets up KV_OBJ
-	linux-mod_pkg_setup
-	# Set up X11 implementation
-	X11_IMPLEM_P="$(best_version virtual/x11)"
-	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
-	X11_IMPLEM="${X11_IMPLEM##*\/}"
-	einfo "X11 implementation is ${X11_IMPLEM}."
-}
-
-src_unpack() {
-	local OLDBIN="/usr/X11R6/bin"
-
-	cd ${WORKDIR}
-	rpm_src_unpack
-
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-
-	#epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch
-
-	if kernel_is 2 6
-	then
-		#epatch ${FILESDIR}/fglrx-2.6.10-pci_get_class.patch
-		epatch ${FILESDIR}/8.08-kernel-2.6.10.patch
-	fi
-
-	rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
-}
-
-src_compile() {
-	einfo "Building the DRM module..."
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	if kernel_is 2 6
-	then
-		set_arch_to_kernel
-		addwrite "/usr/src/${FK}"
-		cp 2.6.x/Makefile .
-		export _POSIX2_VERSION="199209"
-		if use_m ;
-		then
-			make -C ${KV_DIR} M="`pwd`" modules || \
-				ewarn "DRM module not built"
-		else
-			make -C ${KV_DIR} SUBDIRS="`pwd`" modules || \
-				ewarn "DRM module not built"
-		fi
-		set_arch_to_portage
-	else
-		export _POSIX2_VERSION="199209"
-		# That is the dirty way to avoid the id -u check
-		sed -e 's:`id -u`:0:' \
-			-e "s:\`uname -r\`:${KV_FULL}:" \
-			-i make.sh
-		chmod +x make.sh
-		./make.sh || die "DRM module not built"
-	fi
-}
-
-pkg_preinst() {
-	# Clean the dinamic libGL stuff's home to ensure
-	# we don't 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_FULL}/video
-	# set_kvobj
-	doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ}
-
-	local native_dir
-	use x86 && native_dir="lib"
-
-	# Install the libs
-	src_install-libs
-
-	#apps
-	insinto /etc/env.d
-	doins ${FILESDIR}/09ati
-	exeinto /opt/ati/bin
-	doexe usr/X11R6/bin/*
-
-	#ati custom stuff
-	cp -a ${WORKDIR}/usr/include ${D}/usr/include
-}
-
-src_install-libs() {
-	local pkglibdir=lib
-	local inslibdir=$(get_libdir)
-
-	einfo "${pkglibdir} -> ${inslibdir}"
-
-	local ATI_ROOT="/usr/${inslibdir}/opengl/ati"
-
-	# The GLX libraries
-	exeinto ${ATI_ROOT}/lib
-	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/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
-
-	# Don't do this... see bug #47598
-	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-
-	# same as the xorg implementation
-	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
-	#Workaround for ancient opengl-config
-	#fixes celestia issues
-	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
-		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
-		> $D/${ATI_ROOT}/lib/libGL.la
-	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
-
-	# X and DRI driver
-	if has_version ">=x11-base/xorg-x11-6.8.0-r4"
-	then
-		local X11_DIR="/usr/"
-	else
-		local X11_DIR="/usr/X11R6/"
-	fi
-
-	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
-
-	exeinto ${X11_LIB_DIR}/modules/drivers
-	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o
-	exeinto ${X11_LIB_DIR}/modules/dri
-	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-	exeinto ${X11_LIB_DIR}/modules/linux
-	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
-	cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
-			${D}/${X11_LIB_DIR}
-
-	insinto ${X11_DIR}/include/X11/extensions
-	doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	exeinto ${X11_LIB_DIR}/modules/dri
-	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-}
-
-
-pkg_postinst() {
-# Ebuild shouldn't do this automatically, just tell the user to do it,
-# otherwise it messes up livecd/gamecd stuff ...  (drobbins, 1 May 2003)
-#	if [ "${ROOT}" = "/" ]
-#	then
-#		/usr/sbin/opengl-update ati
-#	fi
-
-	echo
-	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
-	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
-	echo
-	ewarn "***"
-	ewarn "If you are experiencing problems with memory allocation try to add"
-	ewarn "this line to in your X11 configuration file:"
-	ewarn "		Option \"KernelModuleParm\"  \"agplock=0\" "
-	ewarn "That should solve the hangups you could have with Neverwinter Nights"
-	ewarn "***"
-	# DRM module
-	update-modules
-}
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-8.8.25 b/media-video/ati-drivers/files/digest-ati-drivers-8.8.25
deleted file mode 100644
index d6a649879b1c..000000000000
--- a/media-video/ati-drivers/files/digest-ati-drivers-8.8.25
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8245afc1a5f83634ab1b906b8107cd0c fglrx_6_8_0-8.8.25-1.i386.rpm 3744683