New version

5 files changed, 110 insertions, 2 deletions

diff --git a/media-video/ati-drivers-extra/ChangeLog b/media-video/ati-drivers-extra/ChangeLog
index fc7eab93700e..5a29419cfdec 100644
--- a/media-video/ati-drivers-extra/ChangeLog
+++ b/media-video/ati-drivers-extra/ChangeLog
@@ -1,6 +1,14 @@
 # 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.19 2004/10/20 12:21:33 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers-extra/ChangeLog,v 1.20 2004/11/12 00:35:35 lu_zero Exp $
+
+*ati-drivers-extra-3.14.6 (12 Nov 2004)
+
+  12 Nov 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/ati-drivers-extra-3.14.6-improvements.patch.bz2,
+  +ati-drivers-extra-3.14.6.ebuild:
+  New version, thanks to Erdroh Moshan <ErDroh@gmx.de> and Ernst Persson
+  <ernstp@gmail.com> for the notice and the patches
 
   20 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
   ati-drivers-extra-3.14.1-r1.ebuild:
diff --git a/media-video/ati-drivers-extra/Manifest b/media-video/ati-drivers-extra/Manifest
index 1db6bff0e1d4..6c626d1ba4c1 100644
--- a/media-video/ati-drivers-extra/Manifest
+++ b/media-video/ati-drivers-extra/Manifest
@@ -1,6 +1,7 @@
 MD5 1b650ba446c0a79c2b564f1bb0680781 ati-drivers-extra-3.14.1.ebuild 2699
 MD5 036128e0098c209af7334ffa7899c7ca ati-drivers-extra-3.7.6.ebuild 2684
-MD5 8d49fbac99422b66eb1c679f1c1b851e ChangeLog 2901
+MD5 10342d1ff749a9717610387089d229d3 ati-drivers-extra-3.14.6.ebuild 2626
+MD5 421738d6c4a86c6aaae65de6e859c0ac ChangeLog 3211
 MD5 a2a9c4ddd4562efd9ca3b290459e7196 metadata.xml 219
 MD5 762af86e7dc081ecafe97307c76124b3 ati-drivers-extra-3.14.1-r1.ebuild 2754
 MD5 c28c5867bdc7da77868abe2913ced125 ati-drivers-extra-3.2.8-r1.ebuild 2035
@@ -10,6 +11,8 @@ MD5 ee52c59e510dcdaae1d959daf92f162c ati-drivers-extra-3.11.1.ebuild 2700
 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 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
diff --git a/media-video/ati-drivers-extra/ati-drivers-extra-3.14.6.ebuild b/media-video/ati-drivers-extra/ati-drivers-extra-3.14.6.ebuild
new file mode 100644
index 000000000000..844991c3c359
--- /dev/null
+++ b/media-video/ati-drivers-extra/ati-drivers-extra-3.14.6.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.14.6.ebuild,v 1.1 2004/11/12 00:35:35 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!"
+	cd ${WORKDIR}/extra/fglrx_panel
+	epatch ${FILESDIR}/${P}-improvements.patch.bz2
+	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
+		-i ${WORKDIR}/extra/fglrx_panel/Makefile
+
+	}
+
+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
+
+		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
+
+	# 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/ati-drivers-extra-3.14.6-improvements.patch.bz2 b/media-video/ati-drivers-extra/files/ati-drivers-extra-3.14.6-improvements.patch.bz2
new file mode 100644
index 000000000000..2cae545c0a96
--- /dev/null
+++ b/media-video/ati-drivers-extra/files/ati-drivers-extra-3.14.6-improvements.patch.bz2
diff --git a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.14.6 b/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.14.6
new file mode 100644
index 000000000000..0e70fb357b26
--- /dev/null
+++ b/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.14.6
@@ -0,0 +1 @@
+MD5 cd364b6fd6d7b23b3becfe78aab0f98b fglrx-4.3.0-3.14.6.i386.rpm 4223256