New version

Package-Manager: portage-2.1.1_pre2-r4

4 files changed, 113 insertions, 15 deletions

diff --git a/x11-apps/ati-drivers-extra/ChangeLog b/x11-apps/ati-drivers-extra/ChangeLog
index 8b4d740f8995..f59c40165273 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ChangeLog,v 1.11 2006/06/23 23:46:02 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ChangeLog,v 1.12 2006/07/06 13:22:30 lu_zero Exp $
+
+*ati-drivers-extra-8.26.18 (06 Jul 2006)
+
+  06 Jul 2006; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-extra-8.26.18.ebuild:
+  New version
 
   23 Jun 2006; Doug Goldstein <cardoe@gentoo.org>
   -ati-drivers-extra-8.21.7.ebuild, ati-drivers-extra-8.22.5.ebuild,
diff --git a/x11-apps/ati-drivers-extra/Manifest b/x11-apps/ati-drivers-extra/Manifest
index 7d9b90763279..ea9a1db25681 100644
--- a/x11-apps/ati-drivers-extra/Manifest
+++ b/x11-apps/ati-drivers-extra/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fglrx_pp_proto.h 4342 RMD160 416bc03daaf2b804891aab3658929109a1db33a9 SHA1 e788148d3eeab22c8fd7e60bbf8101b50ad78197 SHA256 317714d23c8941e087162948dddf860689db2000b36dbae14004adf3eb9d9a30
 MD5 965bb91f2860cd9b3518ef46ffbfbdcc files/fglrx_pp_proto.h 4342
 RMD160 416bc03daaf2b804891aab3658929109a1db33a9 files/fglrx_pp_proto.h 4342
@@ -13,6 +10,8 @@ DIST ati-driver-installer-8.22.5-i386.run 37222832 RMD160 57ad6f7dc118aa1e10f7a8
 DIST ati-driver-installer-8.22.5-x86_64.run 28274358 RMD160 baa9f546fb7e0f73d993e9fd2f9100aaf5df8a6e SHA256 a8a4d011dc31998aee43b535e1d1d2bfab37237a628e448801bcd61dd429c9f9
 DIST ati-driver-installer-8.23.7-i386.run 34448865 RMD160 f4f31ed77e84e9dc5a2885635488f3d582e1b474 SHA256 b7226f640d08b583f05fc95dea75238aeedcd13d1252d3911b40f6fd3a064c24
 DIST ati-driver-installer-8.23.7-x86_64.run 28293314 RMD160 97c7b027622c2382be39751ddb249840d8269243 SHA256 a28e01b46c7187cb9542754a1b9621e1ba7f86d8803e44fed1a8c773ecf4341d
+DIST ati-driver-installer-8.26.18-x86.run 23716730 RMD160 dc9ab7862e6c0a1872ba48ad08842fdbb10d1414 SHA1 5c84a8d3526accccb0154c9d701948629f7ae45d SHA256 3376608d7a0049c30c9497e2f326ad2afe6b3874777f36af33b09019cbe71c55
+DIST ati-driver-installer-8.26.18-x86_64.run 30927154 RMD160 d4cf53f10fd7ca66cd52577c7e5e9bc42502f59f SHA1 3004c7fe409293ac2882ee7ef80addb92706fc35 SHA256 390eb44786b72cb09c78a995163155739f21d6ad121d22a9e6a72a18d9b5496f
 DIST ati-drivers-extra-8.22.5-improvements.patch.bz2 10488 RMD160 ce131f4f82f71e7e4d4dfcc8c3c190bce668c120 SHA256 eabc5b7b76d0c4dce06976645595a2d0bf5b0b861274b8838dc879d38712b1c3
 EBUILD ati-drivers-extra-8.22.5.ebuild 2635 RMD160 5a0fedb4ef74ae2208a66d8f4994a4f62a9c97d8 SHA1 e6b9323073c6538dac1817cc94b22d14646a40c2 SHA256 721b68214098351ad90263ab628864e2e550582fc6e7a28d7f653fbd28974d88
 MD5 a9e294477538365153c55234c7ef713f ati-drivers-extra-8.22.5.ebuild 2635
@@ -22,10 +21,14 @@ EBUILD ati-drivers-extra-8.23.7.ebuild 2635 RMD160 8abf33e093333f6ef77ddbdce6995
 MD5 097b6bac2f00c280fe770195d33675de ati-drivers-extra-8.23.7.ebuild 2635
 RMD160 8abf33e093333f6ef77ddbdce69950dccfbf1c30 ati-drivers-extra-8.23.7.ebuild 2635
 SHA256 2680bc56235db738406734faebe36d2061f9f1f2605417d1e606f08e83328440 ati-drivers-extra-8.23.7.ebuild 2635
-MISC ChangeLog 9016 RMD160 341ffbd5a2c9433653f5430bacf431920fa61970 SHA1 e093a21f89558d65cf83ac05e6756930323652df SHA256 2e7d7a024a0aec4991f7aadc6a75f0066ba48536e43b8a06d59e2e1c1fb855f8
-MD5 1cece43a6174abe63f406e1bd51ff4bb ChangeLog 9016
-RMD160 341ffbd5a2c9433653f5430bacf431920fa61970 ChangeLog 9016
-SHA256 2e7d7a024a0aec4991f7aadc6a75f0066ba48536e43b8a06d59e2e1c1fb855f8 ChangeLog 9016
+EBUILD ati-drivers-extra-8.26.18.ebuild 2569 RMD160 1c0e30bb768780b53cc54a464a089d5429a32af6 SHA1 eb151a6218fead7958ee8e06bb67092fde8c39b1 SHA256 52ee46ae7fcca21a381805e903ef7be9cf9df6328132f968c9230e3d64bd77da
+MD5 c5ef8ba1561c0ea5419a3eaeecbb385e ati-drivers-extra-8.26.18.ebuild 2569
+RMD160 1c0e30bb768780b53cc54a464a089d5429a32af6 ati-drivers-extra-8.26.18.ebuild 2569
+SHA256 52ee46ae7fcca21a381805e903ef7be9cf9df6328132f968c9230e3d64bd77da ati-drivers-extra-8.26.18.ebuild 2569
+MISC ChangeLog 9160 RMD160 6d814fe1a86779c8f54ca025b03f6281ceb01c31 SHA1 0e07d3da08f27b8f40ba258bd881d40ec2478353 SHA256 6101ad08aeaa1123532c78b0df0875a2ae7e3bcccc2b21cb067e49c51e978c57
+MD5 20f46e7398aef6c5bcd6236a25f84db9 ChangeLog 9160
+RMD160 6d814fe1a86779c8f54ca025b03f6281ceb01c31 ChangeLog 9160
+SHA256 6101ad08aeaa1123532c78b0df0875a2ae7e3bcccc2b21cb067e49c51e978c57 ChangeLog 9160
 MISC metadata.xml 227 RMD160 e2ed1445a0405b39e40741d3d1f67746daab8fff SHA1 47e1824ff5e7e3789fcbb4ca5de9c3ccd9162b76 SHA256 4fbed7030b32bcdc95b70000adbbcb6f1d73092c4a2f20e6cfb737a1b44d6e07
 MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
 RMD160 e2ed1445a0405b39e40741d3d1f67746daab8fff metadata.xml 227
@@ -36,10 +39,6 @@ SHA256 016aea0153beb270378952ab3531404b09cc8caa1ee29396574bd742ba214166 files/di
 MD5 571d0ceb200a5eeeabf4de6dd8959d5d files/digest-ati-drivers-extra-8.23.7 915
 RMD160 089dc32463892653b328d89ee99b91fb7d18daab files/digest-ati-drivers-extra-8.23.7 915
 SHA256 acebf29d969a0c1d076191abaa557e1c003e0ab0ba336847e63ef152fa8884ec files/digest-ati-drivers-extra-8.23.7 915
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEnH1WoeSe8B0zEfwRAiZ+AJ4v3taomVZCMr8brw9rCZkFf4la8ACeOFMj
-K/0jg+R8EboQX7B6tSBhHK4=
-=0mbn
------END PGP SIGNATURE-----
+MD5 864cc020053f67a28c2399f0c5e830fa files/digest-ati-drivers-extra-8.26.18 599
+RMD160 9010de31d186da94f756eda0c6da2769d187283f files/digest-ati-drivers-extra-8.26.18 599
+SHA256 180ded06d335b8f8053b8a8587d1707fe650e4915e87a7ca7315326e8727939f files/digest-ati-drivers-extra-8.26.18 599
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.26.18.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.26.18.ebuild
new file mode 100644
index 000000000000..4f69d5e89d1e
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.26.18.ebuild
@@ -0,0 +1,87 @@
+# 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.26.18.ebuild,v 1.1 2006/07/06 13:22:30 lu_zero Exp $
+
+IUSE="qt3"
+
+inherit eutils rpm
+
+DESCRIPTION="Ati precompiled drivers extra application"
+HOMEPAGE="http://www.ati.com"
+SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-x86.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}*
+	qt3? ( >=x11-libs/qt-3.0 )"
+
+ATIBIN="${D}/opt/ati/bin"
+SLOT="0"
+
+src_unpack() {
+	local OLDBIN="/usr/X11R6/bin"
+
+	cd ${WORKDIR}
+	use x86 && MY_P="ati-driver-installer-${PV}-i386.run"
+	use amd64 && MY_P="ati-driver-installer-${PV}-x86_64.run"
+
+	ebegin "Unpacking Ati drivers"
+	sh ${DISTDIR}/${MY_P} --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/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.22.5-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 qt3
+	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 qt3
+	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.26.18 b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.26.18
new file mode 100644
index 000000000000..181d0151e3e9
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.26.18
@@ -0,0 +1,6 @@
+MD5 0cd66013e31fbaa6470f3dad3391cfd1 ati-driver-installer-8.26.18-x86.run 23716730
+RMD160 dc9ab7862e6c0a1872ba48ad08842fdbb10d1414 ati-driver-installer-8.26.18-x86.run 23716730
+SHA256 3376608d7a0049c30c9497e2f326ad2afe6b3874777f36af33b09019cbe71c55 ati-driver-installer-8.26.18-x86.run 23716730
+MD5 a755a02cd7bb71697ac4c249d0e32eb0 ati-driver-installer-8.26.18-x86_64.run 30927154
+RMD160 d4cf53f10fd7ca66cd52577c7e5e9bc42502f59f ati-driver-installer-8.26.18-x86_64.run 30927154
+SHA256 390eb44786b72cb09c78a995163155739f21d6ad121d22a9e6a72a18d9b5496f ati-driver-installer-8.26.18-x86_64.run 30927154