New version

(Portage version: 2.1_pre3-r1)

4 files changed, 99 insertions, 3 deletions

diff --git a/x11-apps/ati-drivers-extra/ChangeLog b/x11-apps/ati-drivers-extra/ChangeLog
index 62cf6c64d2d7..93d3bb5f26c4 100644
--- a/x11-apps/ati-drivers-extra/ChangeLog
+++ b/x11-apps/ati-drivers-extra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/ati-drivers-extra
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ChangeLog,v 1.5 2005/12/13 06:50:43 lu_zero Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ChangeLog,v 1.6 2006/01/28 14:17:47 lu_zero Exp $
+
+*ati-drivers-extra-8.21.7 (28 Jan 2006)
+
+  28 Jan 2006; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-extra-8.21.7.ebuild:
+  New version
 
   13 Dec 2005; Luca Barbato <lu_zero@gentoo.org> +files/fglrx_pp_proto.h,
   ati-drivers-extra-8.20.8.ebuild:
diff --git a/x11-apps/ati-drivers-extra/Manifest b/x11-apps/ati-drivers-extra/Manifest
index c23c459ae5d7..e70cb151af40 100644
--- a/x11-apps/ati-drivers-extra/Manifest
+++ b/x11-apps/ati-drivers-extra/Manifest
@@ -1,10 +1,11 @@
-MD5 8ff37ab352fabbc649dc87e161adcf2b ChangeLog 7770
+MD5 2b52f3bf19f89feeca31cc666d7f1cf8 ChangeLog 7911
 MD5 9af1b3adb27c3b8ff5cf17092321f0e7 ati-drivers-extra-8.14.13.ebuild 2653
 MD5 580f105fba57af8e8893c1f07010dd11 ati-drivers-extra-8.16.20.ebuild 2681
 MD5 10b404a2ce677904315673a48b3b49a0 ati-drivers-extra-8.18.6.ebuild 2677
 MD5 b703301a587202549afb929c1b650261 ati-drivers-extra-8.18.8.ebuild 2497
 MD5 b4d8c79ec9e44ef62a0eb5d3ca14b106 ati-drivers-extra-8.19.10.ebuild 2498
 MD5 a3c707d235873ea3abf7477d7c2c2c2b ati-drivers-extra-8.20.8.ebuild 2571
+MD5 237f4664a817bd82dab249002f48f931 ati-drivers-extra-8.21.7.ebuild 2546
 MD5 071a3c5b95ac48e604a480f037b0e91e files/ati-drivers-extra-8.14.13-improvements.patch.bz2 10459
 MD5 e197888780e3fd826edea4c531493054 files/ati-drivers-extra-8.19.10-improvements.patch.bz2 10510
 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-extra-8.14.13 157
@@ -13,6 +14,7 @@ MD5 3e29001f6bcfcec91a4802e6c6e37fc1 files/digest-ati-drivers-extra-8.18.6 156
 MD5 b9b5079b56d44f5056ac6b7e846943be files/digest-ati-drivers-extra-8.18.8 168
 MD5 77910c352e4cc0789f1e084337fe75c4 files/digest-ati-drivers-extra-8.19.10 170
 MD5 296c8e8d4fe969297f60e5772ccf4058 files/digest-ati-drivers-extra-8.20.8 168
+MD5 6bcac6dced2d281f72772788a949b39e files/digest-ati-drivers-extra-8.21.7 260
 MD5 965bb91f2860cd9b3518ef46ffbfbdcc files/fglrx_pp_proto.h 4342
 MD5 41782adae08060611f324e8c8ddf3de9 files/fireglcontrol.desktop 149
 MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.21.7.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.21.7.ebuild
new file mode 100644
index 000000000000..acf694421a72
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.21.7.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.21.7.ebuild,v 1.1 2006/01/28 14:17:47 lu_zero Exp $
+
+IUSE="qt"
+
+inherit eutils rpm linux-info linux-mod
+
+DESCRIPTION="Ati precompiled drivers extra application"
+HOMEPAGE="http://www.ati.com"
+SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-i386.run )
+	 amd64? ( mirror://gentoo/ati-driver-installer-${PV}-x86_64.run )
+	 mirror://gentoo/ati-drivers-extra-8.19.10-improvements.patch.bz2"
+
+LICENSE="ATI GPL-2 QPL-1.0"
+KEYWORDS="-amd64 ~x86"  # (~amd64 yet to be fixed)(see bug 95684)
+
+DEPEND="=x11-drivers/ati-drivers-${PV}*
+	qt? ( >=x11-libs/qt-3.0 )"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip"
+
+src_unpack() {
+	local OLDBIN="/usr/X11R6/bin"
+
+	cd ${WORKDIR}
+
+	ebegin "Unpacking Ati drivers"
+	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
+	eend $? || die "unpack failed"
+
+	mkdir -p ${WORKDIR}/extra
+	einfo "Unpacking fglrx_sample_source.tgz..."
+	tar --no-same-owner -C ${WORKDIR}/extra/ -zxf \
+		${WORKDIR}/common/usr/src/ATI/fglrx_sample_source.tgz \
+		|| die "Failed to unpack fglrx_sample_source.tgz!"
+	# 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:" \
+		-i ${WORKDIR}/extra/fgl_glxgears/Makefile.Linux || die
+
+	mkdir -p ${WORKDIR}/extra/fglrx_panel
+	einfo "Unpacking fglrx_panel_sources.tgz..."
+	tar --no-same-owner -C ${WORKDIR}/extra/fglrx_panel/ -zxf \
+		${WORKDIR}/common/usr/src/ATI/fglrx_panel_sources.tgz \
+		|| die "Failed to unpack fglrx_panel_sources.tgz!"
+	cd ${WORKDIR}/extra/fglrx_panel
+	epatch ${DISTDIR}/ati-drivers-extra-8.19.10-improvements.patch.bz2
+	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
+		-i ${WORKDIR}/extra/fglrx_panel/Makefile
+	#workaround
+	cp ${FILESDIR}/fglrx_pp_proto.h ${WORKDIR}/extra/fglrx_panel
+	}
+
+src_compile() {
+	einfo "Building fgl_glxgears"
+	cd ${WORKDIR}/extra/fgl_glxgears
+	make -f Makefile.Linux || ewarn "fgl_glxgears not build!"
+
+	if use qt
+	then
+		einfo "Building the QT fglx panel..."
+		cd ${WORKDIR}/extra/fglrx_panel
+		emake || die
+	fi
+}
+
+src_install() {
+	local ATI_ROOT="/usr/lib/opengl/ati"
+
+	# Apps
+	exeinto /opt/ati/bin
+	doexe ${WORKDIR}/extra/fgl_glxgears/fgl_glxgears
+
+	if use qt
+	then
+		doexe ${WORKDIR}/extra/fglrx_panel/fireglcontrol
+
+		insinto /usr/share/applications/
+		doins ${FILESDIR}/fireglcontrol.desktop
+
+		insinto /usr/share/pixmaps/
+		doins ${WORKDIR}/extra/fglrx_panel/ati.xpm
+	fi
+}
diff --git a/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.21.7 b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.21.7
new file mode 100644
index 000000000000..7a005950db83
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.21.7
@@ -0,0 +1,3 @@
+MD5 d20ca4b2d9da8249461c4bb7c75333b6 ati-driver-installer-8.21.7-i386.run 37095872
+MD5 6895783811017aad8e1d9316641f2b65 ati-driver-installer-8.21.7-x86_64.run 28235137
+MD5 e197888780e3fd826edea4c531493054 ati-drivers-extra-8.19.10-improvements.patch.bz2 10510