New version

4 files changed, 109 insertions, 4 deletions

diff --git a/media-video/ati-drivers-extra/ChangeLog b/media-video/ati-drivers-extra/ChangeLog
index 370d397abfe6..f6f755d8ac76 100644
--- a/media-video/ati-drivers-extra/ChangeLog
+++ b/media-video/ati-drivers-extra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ati-drivers-extra
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers-extra/ChangeLog,v 1.12 2004/06/25 00:36:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers-extra/ChangeLog,v 1.13 2004/08/09 21:18:58 lu_zero Exp $
+
+*ati-drivers-extra-3.11.1 (09 Aug 2004)
+
+  09 Aug 2004; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-extra-3.11.1.ebuild:
+  New version
 
   19 Jun 2004; Luca Barbato <lu_zero@gentoo.org>
   ati-drivers-extra-3.9.0.ebuild:
diff --git a/media-video/ati-drivers-extra/Manifest b/media-video/ati-drivers-extra/Manifest
index 2755fd68235f..41f48b6845de 100644
--- a/media-video/ati-drivers-extra/Manifest
+++ b/media-video/ati-drivers-extra/Manifest
@@ -1,9 +1,11 @@
-MD5 59e6e70ab8c8098ef07bcb90270c4060 ati-drivers-extra-3.9.0.ebuild 2683
 MD5 036128e0098c209af7334ffa7899c7ca ati-drivers-extra-3.7.6.ebuild 2684
-MD5 c28c5867bdc7da77868abe2913ced125 ati-drivers-extra-3.2.8-r1.ebuild 2035
-MD5 3ac048a51c8c7892a3d5340d50a2aa2f ChangeLog 1770
+MD5 b2ba89f084a911a224b5aaacdc0b82f2 ChangeLog 1910
 MD5 bca4dd1758b390509e46f966d475006d metadata.xml 221
+MD5 c28c5867bdc7da77868abe2913ced125 ati-drivers-extra-3.2.8-r1.ebuild 2035
+MD5 59e6e70ab8c8098ef07bcb90270c4060 ati-drivers-extra-3.9.0.ebuild 2683
+MD5 c07d8ec13bde6b8919bb7a83306617c1 ati-drivers-extra-3.11.1.ebuild 2684
 MD5 4765a7db326f308f862b1fe3e211ef0d files/fglrx-3.7.0-fix-fglrx_panel-includes.patch 2168
+MD5 54de36d07576ae34efa953192b450dd9 files/digest-ati-drivers-extra-3.11.1 73
 MD5 aa891a7464224bd9a07fe0e96f40ef7b files/digest-ati-drivers-extra-3.7.6 72
 MD5 918b182a2d40bf073127838d769e1fa5 files/digest-ati-drivers-extra-3.9.0 72
 MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-extra-3.2.8-r1 78
diff --git a/media-video/ati-drivers-extra/ati-drivers-extra-3.11.1.ebuild b/media-video/ati-drivers-extra/ati-drivers-extra-3.11.1.ebuild
new file mode 100644
index 000000000000..6dd042b882af
--- /dev/null
+++ b/media-video/ati-drivers-extra/ati-drivers-extra-3.11.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2004 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.11.1.ebuild,v 1.1 2004/08/09 21:18:58 lu_zero Exp $
+
+IUSE="qt"
+
+inherit eutils rpm
+
+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"
+
+DEPEND=">=virtual/linux-sources-2.4
+	app-arch/rpm2targz
+	=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() {
+	local OLDBIN="/usr/X11R6/bin"
+
+	cd ${WORKDIR}
+	rpm_src_unpack
+
+	mkdir -p ${WORKDIR}/extra
+	einfo "Unpacking fglrx_sample_source.tgz..."
+	tar --no-same-owner -C ${WORKDIR}/extra/ -zxf \
+		${WORKDIR}/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}/usr/src/ATI/fglrx_panel_sources.tgz \
+		|| die "Failed to unpack fglrx_panel_sources.tgz!"
+	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..."
+	cd ${WORKDIR}/extra/fgl_glxgears
+	make -f Makefile.Linux || ewarn "fgl_glxgears sample not build!"
+
+	if use qt
+	then
+		einfo "Building the QT fglx panel..."
+		cd ${WORKDIR}/extra/fglrx_panel
+		emake || die
+	fi
+
+	# Removing unused stuff
+	rm -rf ${WORKDIR}/usr/X11R6/bin/{*.bz2,fgl_glxgears}
+}
+
+src_install() {
+	local ATI_ROOT="/usr/lib/opengl/ati"
+
+	# Apps
+	exeinto /opt/ati/bin
+	doexe ${WORKDIR}/extra/fgl_glxgears/fgl_glxgears
+	rm -f ${WORKDIR}/usr/X11R6/bin/*
+
+	if use qt
+	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
+	else
+		# Removing unused stuff
+		rm -rf ${WORKDIR}/usr/share/{applnk,gnome,icons,pixmaps}
+	fi
+
+	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.11.1 b/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.11.1
new file mode 100644
index 000000000000..ee4d9195febb
--- /dev/null
+++ b/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.11.1
@@ -0,0 +1 @@
+MD5 59a9b2446abb5d1adac8bafd7d11e083 fglrx-4.3.0-3.11.1.i386.rpm 3872130