New version and fixes

Package-Manager: portage-2.0.53_rc7

10 files changed, 114 insertions, 164 deletions

diff --git a/x11-apps/ati-drivers-extra/.#ChangeLog.1.27 b/x11-apps/ati-drivers-extra/.#ChangeLog.1.27
deleted file mode 100644
index b1fab3b88a0d..000000000000
--- a/x11-apps/ati-drivers-extra/.#ChangeLog.1.27
+++ /dev/null
@@ -1,150 +0,0 @@
-# ChangeLog for media-video/ati-drivers-extra
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/.#ChangeLog.1.27,v 1.1 2005/11/12 22:30:20 lu_zero Exp $
-
-*ati-drivers-extra-8.13.3 (21 May 2005)
-
-  21 May 2005; Luca Barbato <lu_zero@gentoo.org>
-  +files/ati-drivers-extra-8.13.3-improvements.patch.bz2,
-  +ati-drivers-extra-8.13.3.ebuild:
-  New version, thanks to Erdroh Moshan <ErDroh@gmx.de> as usual for the
-  updates to the improvements patch
-
-*ati-drivers-extra-8.12.10 (11 Apr 2005)
-
-  11 Apr 2005; Luca Barbato <lu_zero@gentoo.org>
-  +files/ati-drivers-extra-8.12.10-improvements.patch.bz2,
-  +ati-drivers-extra-8.12.10.ebuild:
-  New version
-
-  18 Mar 2005; Luca Barbato <lu_zero@gentoo.org>
-  -files/fglrx-3.7.0-fix-fglrx_panel-includes.patch,
-  -files/ati-drivers-extra-3.14.1-ui-improvements.patch,
-  -files/ati-drivers-extra-3.14.6-improvements.patch.bz2,
-  -ati-drivers-extra-3.9.0.ebuild, -ati-drivers-extra-3.11.1.ebuild,
-  -ati-drivers-extra-3.12.0.ebuild, -ati-drivers-extra-3.14.1.ebuild,
-  -ati-drivers-extra-3.14.1-r1.ebuild, -ati-drivers-extra-3.14.6.ebuild:
-  Cleanup
-
-*ati-drivers-extra-8.10.19 (16 Feb 2005)
-
-  16 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
-  +files/ati-drivers-extra-8.10.19-improvements.patch.bz2,
-  +ati-drivers-extra-8.10.19.ebuild:
-  New version, thanks to Erdroh Moshan <ErDroh@gmx.de> for the updated patch
-
-  06 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
-  ati-drivers-extra-8.8.25.ebuild:
-  Marked x86
-
-  21 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
-  ati-drivers-extra-8.8.25.ebuild:
-  Minor QA fix, enhancements added back
-
-*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:
-  Marked x86
-
-*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:
-  Make sure the .desktop file got installed
-
-*ati-drivers-extra-3.14.1-r1 (20 Oct 2004)
-
-  20 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
-  +files/ati-drivers-extra-3.14.1-ui-improvements.patch,
-  +files/fireglcontrol.desktop, +ati-drivers-extra-3.14.1-r1.ebuild:
-  Improvements from Ernst Persson <ernstp@gmail.com>, see bug #66368
-
-  08 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
-  ati-drivers-extra-3.14.1.ebuild:
-  Marked stable
-
-*ati-drivers-extra-3.14.1 (04 Oct 2004)
-
-  04 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
-  +ati-drivers-extra-3.14.1.ebuild:
-  New version
-
-*ati-drivers-extra-3.12.0 (14 Sep 2004)
-
-  14 Sep 2004; Luca Barbato <lu_zero@gentoo.org>
-  +ati-drivers-extra-3.12.0.ebuild:
-  New version, thanks to Steve Bamber <bugzilla@thebambers.me.uk> for pointing it
-
-  30 Aug 2004; Luca Barbato <lu_zero@gentoo.org>
-  ati-drivers-extra-3.11.1.ebuild:
-  Generic tidy up, see bug #61921
-
-*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:
-  Marked stable
-
-  09 Jun 2004; Aron Griffis <agriffis@gentoo.org>
-  ati-drivers-extra-3.2.8-r1.ebuild, ati-drivers-extra-3.7.6.ebuild,
-  ati-drivers-extra-3.9.0.ebuild:
-  Fix use invocation
-
-  02 Jun 2004; Luca Barbato <lu_zero@gentoo.org>
-  ati-drivers-extra-3.2.8-r1.ebuild:
-  Removed an unnecessary dep
-
-  31 May 2004; Luca Barbato <lu_zero@gentoo.org>
-  ati-drivers-extra-3.2.8-r1.ebuild:
-  Minor fix, solution for bug #52519
-
-*ati-drivers-extra-3.9.0 (27 May 2004)
-
-  27 May 2004; Luca Barbato <lu_zero@gentoo.org>
-  +ati-drivers-extra-3.9.0.ebuild:
-  New version
-
-  16 Apr 2004; Luca Barbato <lu_zero@gentoo.org>
-  ati-drivers-extra-3.7.6.ebuild:
-  Eventually fixing the issue
-
-  11 Apr 2004; Luca Barbato <lu_zero@gentoo.org>
-  ati-drivers-extra-3.7.6.ebuild:
-  Workaround for ~cat/pkg-version not behaving
-
-  10 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
-  ati-drivers-extra-3.7.6.ebuild:
-  Change dep on ati-drivers to dep only on version, not Gentoo revision (#47401).
-
-  11 Mar 2004; Luca Barbato <lu_zero@gentoo.org>
-  files/fglrx-3.7.0-fix-fglrx_panel-includes.patch:
-  Missing patch added
-
-*ati-drivers-extra-3.7.6 (11 Mar 2004)
-
-  11 Mar 2004; Luca Barbato <lu_zero@gentoo.org>
-  ati-drivers-extra-3.7.6.ebuild:
-  New version, nwn players beware
-
-*ati-drivers-extra-3.2.8-r1 (24 Feb 2004)
-
-  24 Feb 2004; Luca Barbato <lu_zero@gentoo.org>
-  ati-drivers-extra-3.2.8-r1.ebuild, metadata.xml:
-  First import, split from ati-drivers
-
diff --git a/x11-apps/ati-drivers-extra/ChangeLog b/x11-apps/ati-drivers-extra/ChangeLog
index ee9a68ae96ac..2c21f7f9cb26 100644
--- a/x11-apps/ati-drivers-extra/ChangeLog
+++ b/x11-apps/ati-drivers-extra/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/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.1 2005/11/12 22:30:20 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ChangeLog,v 1.2 2005/11/12 23:20:12 lu_zero Exp $
+
+*ati-drivers-extra-8.19.10 (12 Nov 2005)
+
+  12 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/ati-drivers-extra-8.19.10-improvements.patch.bz2,
+  ati-drivers-extra-8.14.13.ebuild, ati-drivers-extra-8.16.20.ebuild,
+  ati-drivers-extra-8.18.6.ebuild, ati-drivers-extra-8.18.8.ebuild,
+  +ati-drivers-extra-8.19.10.ebuild:
+  New version
 
   12 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
   +files/ati-drivers-extra-8.14.13-improvements.patch.bz2,
diff --git a/x11-apps/ati-drivers-extra/Manifest b/x11-apps/ati-drivers-extra/Manifest
index fe0d9a4af49b..04c4d2611790 100644
--- a/x11-apps/ati-drivers-extra/Manifest
+++ b/x11-apps/ati-drivers-extra/Manifest
@@ -1,12 +1,15 @@
-MD5 e509f4251fdbe336d048d983975f85d5 ChangeLog 7169
-MD5 7a8f351ccbeb8d2dc197722085815098 ati-drivers-extra-8.14.13.ebuild 2653
-MD5 feb5d01221f05345a73a38693211cb4e ati-drivers-extra-8.16.20.ebuild 2681
-MD5 7090a1449c90728023e9b9010452fa63 ati-drivers-extra-8.18.6.ebuild 2677
-MD5 0ecc06d7ee2efb22b41c32ad12b4ef7c ati-drivers-extra-8.18.8.ebuild 2497
+MD5 9128864151d77a6baa633e9783433a7e ChangeLog 7509
+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 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
 MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-extra-8.16.20 158
 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 41782adae08060611f324e8c8ddf3de9 files/fireglcontrol.desktop 149
 MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.14.13.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.14.13.ebuild
index d0970186675b..96f73222114b 100644
--- a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.14.13.ebuild
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.14.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.14.13.ebuild,v 1.1 2005/11/12 22:30:21 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.14.13.ebuild,v 1.2 2005/11/12 23:20:12 lu_zero Exp $
 
 IUSE="qt"
 
@@ -15,7 +15,7 @@ SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm )
 LICENSE="ATI GPL-2 QPL-1.0"
 KEYWORDS="~amd64 x86"  # (~amd64 yet to be fixed)(see bug 95684)
 
-DEPEND="~media-video/ati-drivers-${PV}
+DEPEND="~x11-drivers/ati-drivers-${PV}
 	qt? ( =x11-libs/qt-3* )"
 
 ATIBIN="${D}/opt/ati/bin"
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.16.20.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.16.20.ebuild
index 043a0f65b39b..a9b63ee12387 100644
--- a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.16.20.ebuild
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.16.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.16.20.ebuild,v 1.1 2005/11/12 22:30:21 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.16.20.ebuild,v 1.2 2005/11/12 23:20:12 lu_zero Exp $
 
 IUSE="qt"
 
@@ -15,7 +15,7 @@ SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm )
 LICENSE="ATI GPL-2 QPL-1.0"
 KEYWORDS="-* -amd64 -x86"  # (~amd64 yet to be fixed)(see bug 95684)
 
-DEPEND="=media-video/ati-drivers-${PV}*
+DEPEND="=x11-drivers/ati-drivers-${PV}*
 	qt? ( >=x11-libs/qt-3.0 )"
 
 ATIBIN="${D}/opt/ati/bin"
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.6.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.6.ebuild
index 83437afc4407..cc722981a2e7 100644
--- a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.6.ebuild
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.18.6.ebuild,v 1.1 2005/11/12 22:30:21 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.6.ebuild,v 1.2 2005/11/12 23:20:12 lu_zero Exp $
 
 IUSE="qt"
 
@@ -15,7 +15,7 @@ SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm )
 LICENSE="ATI GPL-2 QPL-1.0"
 KEYWORDS="-amd64 ~x86"  # (~amd64 yet to be fixed)(see bug 95684)
 
-DEPEND="=media-video/ati-drivers-${PV}*
+DEPEND="=x11-drivers/ati-drivers-${PV}*
 	qt? ( >=x11-libs/qt-3.0 )"
 
 ATIBIN="${D}/opt/ati/bin"
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.8.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.8.ebuild
index c01e8fe4178f..845123512712 100644
--- a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.8.ebuild
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.18.8.ebuild,v 1.1 2005/11/12 22:30:21 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.8.ebuild,v 1.2 2005/11/12 23:20:12 lu_zero Exp $
 
 IUSE="qt"
 
@@ -14,7 +14,7 @@ SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-i386.run )
 LICENSE="ATI GPL-2 QPL-1.0"
 KEYWORDS="-amd64 ~x86"  # (~amd64 yet to be fixed)(see bug 95684)
 
-DEPEND="=media-video/ati-drivers-${PV}*
+DEPEND="=x11-drivers/ati-drivers-${PV}*
 	qt? ( >=x11-libs/qt-3.0 )"
 
 ATIBIN="${D}/opt/ati/bin"
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.19.10.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.19.10.ebuild
new file mode 100644
index 000000000000..dc9c538ab8c1
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.19.10.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2005 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.19.10.ebuild,v 1.1 2005/11/12 23:20:12 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 )"
+
+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 ${FILESDIR}/ati-drivers-extra-8.19.10-improvements.patch.bz2
+	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
+		-i ${WORKDIR}/extra/fglrx_panel/Makefile
+
+	}
+
+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
+	else
+		# Removing unused stuff
+		rm -rf ${WORKDIR}/usr/share/{applnk,gnome,icons,pixmaps}
+	fi
+}
diff --git a/x11-apps/ati-drivers-extra/files/ati-drivers-extra-8.19.10-improvements.patch.bz2 b/x11-apps/ati-drivers-extra/files/ati-drivers-extra-8.19.10-improvements.patch.bz2
new file mode 100644
index 000000000000..6be62cf2b6c1
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/files/ati-drivers-extra-8.19.10-improvements.patch.bz2
diff --git a/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.19.10 b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.19.10
new file mode 100644
index 000000000000..fb430984c6c1
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.19.10
@@ -0,0 +1,2 @@
+MD5 e35876bafb54f23cebbaf822646646eb ati-driver-installer-8.19.10-i386.run 63744416
+MD5 6d14ff7c8a28d24a0ba0c55930d5fe6a ati-driver-installer-8.19.10-x86_64.run 54043719