New version

7 files changed, 30 insertions, 105 deletions

diff --git a/media-video/ati-drivers-extra/ChangeLog b/media-video/ati-drivers-extra/ChangeLog
index 59e3166040f7..6f0e19084d82 100644
--- a/media-video/ati-drivers-extra/ChangeLog
+++ b/media-video/ati-drivers-extra/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/ati-drivers-extra
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers-extra/ChangeLog,v 1.21 2005/01/04 20:54:51 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers-extra/ChangeLog,v 1.22 2005/01/18 22:16:33 lu_zero Exp $
+
+*ati-drivers-extra-8.8.25 (18 Jan 2005)
+
+  18 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
+  -ati-drivers-extra-3.2.8-r1.ebuild, -ati-drivers-extra-3.7.6.ebuild,
+  +ati-drivers-extra-8.8.25.ebuild:
+  New version
 
   04 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
   ati-drivers-extra-3.14.6.ebuild:
diff --git a/media-video/ati-drivers-extra/Manifest b/media-video/ati-drivers-extra/Manifest
index 1855881cc139..1409ef2f6be1 100644
--- a/media-video/ati-drivers-extra/Manifest
+++ b/media-video/ati-drivers-extra/Manifest
@@ -1,22 +1,20 @@
 MD5 7bc5e94bae4470ea423f62374068c63d ati-drivers-extra-3.14.1.ebuild 2699
-MD5 dea97f8bc96034b65fecb5336ef07762 ati-drivers-extra-3.7.6.ebuild 2683
+MD5 c264e6cdead31c7e8907e74593691b90 ati-drivers-extra-8.8.25.ebuild 2624
 MD5 7463d56273b0ee3fa3a378afc2b95ede ati-drivers-extra-3.14.6.ebuild 2622
-MD5 f2c85459ccdc422eb1f1145e392f4324 ChangeLog 3309
+MD5 361bc60ef31e2db0339da77932356752 ChangeLog 3521
 MD5 a2a9c4ddd4562efd9ca3b290459e7196 metadata.xml 219
 MD5 fe394d910f27cf3e186bfe0445bd46d3 ati-drivers-extra-3.14.1-r1.ebuild 2754
-MD5 5a0d102194b8ab6df1cb7dc6aea8c1df ati-drivers-extra-3.2.8-r1.ebuild 2034
 MD5 77711ea828f2dee9079aa42ee11acb1e ati-drivers-extra-3.9.0.ebuild 2682
 MD5 bbfd05ea0a331ee2740427690929a087 ati-drivers-extra-3.12.0.ebuild 2700
 MD5 63f9421aa3bba47064959f34f25cb9b0 ati-drivers-extra-3.11.1.ebuild 2700
 MD5 4765a7db326f308f862b1fe3e211ef0d files/fglrx-3.7.0-fix-fglrx_panel-includes.patch 2168
+MD5 f62d7815852919948deb06c864841953 files/digest-ati-drivers-extra-8.8.25 154
 MD5 54de36d07576ae34efa953192b450dd9 files/digest-ati-drivers-extra-3.11.1 73
 MD5 119541f0c7966bb5474cb42167103ded files/digest-ati-drivers-extra-3.14.1 73
 MD5 3aa542eecb0d477f099932d4340b7493 files/digest-ati-drivers-extra-3.14.6 73
 MD5 6d101e30f74b2208e76b3e8cb329d15d files/ati-drivers-extra-3.14.6-improvements.patch.bz2 10581
-MD5 aa891a7464224bd9a07fe0e96f40ef7b files/digest-ati-drivers-extra-3.7.6 72
 MD5 41782adae08060611f324e8c8ddf3de9 files/fireglcontrol.desktop 149
 MD5 119541f0c7966bb5474cb42167103ded files/digest-ati-drivers-extra-3.14.1-r1 73
 MD5 918b182a2d40bf073127838d769e1fa5 files/digest-ati-drivers-extra-3.9.0 72
 MD5 0332bde3220fd222a5b8742ba68abefc files/digest-ati-drivers-extra-3.12.0 73
 MD5 38ce0332762da1245665227bfca5b2c4 files/ati-drivers-extra-3.14.1-ui-improvements.patch 3493
-MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-extra-3.2.8-r1 78
diff --git a/media-video/ati-drivers-extra/ati-drivers-extra-3.2.8-r1.ebuild b/media-video/ati-drivers-extra/ati-drivers-extra-3.2.8-r1.ebuild
deleted file mode 100644
index d25f6fb132bc..000000000000
--- a/media-video/ati-drivers-extra/ati-drivers-extra-3.2.8-r1.ebuild
+++ /dev/null
@@ -1,77 +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-extra/ati-drivers-extra-3.2.8-r1.ebuild,v 1.7 2005/01/04 20:54:51 lu_zero Exp $
-
-IUSE="qt"
-
-DESCRIPTION="Ati precompiled drivers extra applications"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/linux/fglrx-glc22-4.3.0-${PV}.i586.rpm"
-SLOT="${KV}"
-LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="-* x86"
-
-DEPEND="app-arch/rpm2targz
-	>=x11-base/xfree-4.3.0
-	=media-video/ati-drivers-${PV}*
-	qt? ( >=x11-libs/qt-3.0 )"
-
-RDEPEND="=media-video/ati-drivers-${PV}*
-		qt? ( >=x11-libs/qt-3.0 )"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
-
-src_unpack() {
-	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/${A} ||die
-	tar zxf ${WORKDIR}/fglrx-glc22-4.3.0-${PV}.i586.tar.gz || die
-	mkdir ${WORKDIR}/fglrxgears
-	cd ${WORKDIR}/fglrxgears
-	tar zxf ${WORKDIR}/usr/src/ATI/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/ATI/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 fgl_glxgears sample"
-	cd ${WORKDIR}/fglrxgears
-	make -f Makefile.Linux || ewarn "fgl_glxgears sample not build"
-
-	if use qt
-	then
-	einfo "building the qt fglx panel"
-		cd ${WORKDIR}/fglrx_panel
-		emake || die
-	fi
-}
-
-
-src_install() {
-	local ATI_ROOT="/usr/lib/opengl/ati"
-	cd ${WORKDIR}
-	exeinto /opt/ati/bin
-	doexe fglrxgears/fgl_glxgears
-	rm usr/X11R6/bin/*
-
-	if use qt
-	then
-		doexe fglrx_panel/fireglcontrol
-	fi
-}
diff --git a/media-video/ati-drivers-extra/ati-drivers-extra-3.7.6.ebuild b/media-video/ati-drivers-extra/ati-drivers-extra-8.8.25.ebuild
index 03cc16a0f1dc..fd428c9b59f1 100644
--- a/media-video/ati-drivers-extra/ati-drivers-extra-3.7.6.ebuild
+++ b/media-video/ati-drivers-extra/ati-drivers-extra-8.8.25.ebuild
@@ -1,24 +1,21 @@
 # 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-extra/ati-drivers-extra-3.7.6.ebuild,v 1.8 2005/01/04 20:54:51 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers-extra/ati-drivers-extra-8.8.25.ebuild,v 1.1 2005/01/18 22:16:33 lu_zero Exp $
 
 IUSE="qt"
 
-inherit eutils rpm
+inherit eutils rpm linux-info
 
 DESCRIPTION="Ati precompiled drivers extra application"
 HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/linux/fglrx-4.3.0-${PV}.i386.rpm"
-SLOT="${KV}"
-LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="-* ~x86"
+SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm )
+		amd64?
+		( http://www2.ati.com/drivers/linux/fglrx64_6_8_0-${PV}-1.x86_64.rpm )"
 
-DEPEND=">=virtual/linux-sources-2.4
-	app-arch/rpm2targz
-	=media-video/ati-drivers-${PV}*
-	qt? ( >=x11-libs/qt-3.0 )"
+LICENSE="ATI GPL-2 QPL-1.0"
+KEYWORDS="-* ~x86"  # ~amd64" yet to be fixed
 
-RDEPEND="=media-video/ati-drivers-${PV}*
+DEPEND="=media-video/ati-drivers-${PV}*
 	qt? ( >=x11-libs/qt-3.0 )"
 
 ATIBIN="${D}/opt/ati/bin"
@@ -44,13 +41,12 @@ src_unpack() {
 	tar --no-same-owner -C ${WORKDIR}/extra/fglrx_panel/ -zxf \
 		${WORKDIR}/usr/src/ATI/fglrx_panel_sources.tgz \
 		|| die "Failed to unpack fglrx_panel_sources.tgz!"
+	cd ${WORKDIR}/extra/fglrx_panel
+#	epatch ${FILESDIR}/${P}-improvements.patch.bz2
 	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
 		-i ${WORKDIR}/extra/fglrx_panel/Makefile
 
-	# Messed up fglrx_panel headers
-	cd ${WORKDIR}/extra/fglrx_panel
-	epatch ${FILESDIR}/fglrx-3.7.0-fix-fglrx_panel-includes.patch
-}
+	}
 
 src_compile() {
 	einfo "Building the fgl_glxgears sample..."
@@ -80,16 +76,17 @@ src_install() {
 	then
 		doexe ${WORKDIR}/extra/fglrx_panel/fireglcontrol
 
-		# Fix the paths in these
-		sed -e 's|/usr/X11R6/|/opt/ati/|g' \
-			-i ${WORKDIR}/usr/share/applnk/fireglcontrol.kdelnk \
-			-i ${WORKDIR}/usr/share/gnome/apps/fireglcontrol.desktop
+		insinto /usr/share/applications/
+		doins ${FILESDIR}/fireglcontrol.desktop
+
+		insinto /usr/share/pixmaps/
+		doins ${WORKDIR}/extra/fglrx_panel/ati.xpm
 	else
 		# Removing unused stuff
 		rm -rf ${WORKDIR}/usr/share/{applnk,gnome,icons,pixmaps}
 	fi
 
-	dodoc ${WORKDIR}/usr/share/doc/fglrx/LICENSE.*
+	# not necessary dodoc ${WORKDIR}/usr/share/doc/fglrx/LICENSE.*
 
 	# Removing unused stuff
 	rm -rf ${WORKDIR}/usr/{src,share/doc}
diff --git a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.2.8-r1 b/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.2.8-r1
deleted file mode 100644
index 242816afc94c..000000000000
--- a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.2.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 824aaaafd4b4867c2456860ea5eff5ec fglrx-glc22-4.3.0-3.2.8.i586.rpm 4365039
diff --git a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.7.6 b/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.7.6
deleted file mode 100644
index 651bc6ac2468..000000000000
--- a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.7.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8538c3669fd6eab3d17c3669e2d88235 fglrx-4.3.0-3.7.6.i386.rpm 3380217
diff --git a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-8.8.25 b/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-8.8.25
new file mode 100644
index 000000000000..6cee20b67110
--- /dev/null
+++ b/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-8.8.25
@@ -0,0 +1,2 @@
+MD5 8245afc1a5f83634ab1b906b8107cd0c fglrx_6_8_0-8.8.25-1.i386.rpm 3744683
+MD5 4967e36a1bdf275a37251605b6a2356c fglrx64_6_8_0-8.8.25-1.x86_64.rpm 7275330