Cleanup and New version

(Portage version: 2.1_pre4-r1)

9 files changed, 160 insertions, 23 deletions

diff --git a/x11-apps/ati-drivers-extra/ChangeLog b/x11-apps/ati-drivers-extra/ChangeLog
index fff876887101..722f67fc2422 100644
--- a/x11-apps/ati-drivers-extra/ChangeLog
+++ b/x11-apps/ati-drivers-extra/ChangeLog
@@ -1,6 +1,13 @@
 # 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.8 2006/01/30 10:13:29 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ChangeLog,v 1.9 2006/02/11 14:27:56 lu_zero Exp $
+
+*ati-drivers-extra-8.22.5 (11 Feb 2006)
+
+  11 Feb 2006; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-8.20.8.ebuild, ati-drivers-extra-8.21.7.ebuild,
+  +ati-drivers-extra-8.22.5.ebuild:
+  New version and cleanup
 
   30 Jan 2006; Luca Barbato <lu_zero@gentoo.org>
   ati-drivers-extra-8.21.7.ebuild:
diff --git a/x11-apps/ati-drivers-extra/Manifest b/x11-apps/ati-drivers-extra/Manifest
index 1e65ff2625ad..b24ac4d3d096 100644
--- a/x11-apps/ati-drivers-extra/Manifest
+++ b/x11-apps/ati-drivers-extra/Manifest
@@ -1,14 +1,48 @@
-MD5 7c5522924d8092e287abeb087727dbed ChangeLog 8434
-MD5 8913d88a13686a49557234a1c2d0ba03 ati-drivers-extra-8.18.6.ebuild 2675
-MD5 d7f3e1455c9f254add699d9d7a3ffeba ati-drivers-extra-8.18.8.ebuild 2561
-MD5 50c3cdaabb276c3690243c9a16721095 ati-drivers-extra-8.19.10.ebuild 2562
-MD5 a7e63e66ab7d86ac6b3903bc8f226b65 ati-drivers-extra-8.20.8.ebuild 2634
-MD5 db2c6767104cb146c51d1b68e18f2ee2 ati-drivers-extra-8.21.7.ebuild 2662
+MD5 63c77e3d29f405df1c3dca8ab9b57e20 ChangeLog 8655
+RMD160 1ca7443711164ab8da3afa65faf2c9eafe18b057 ChangeLog 8655
+SHA256 826484ecbd31b6287dc7605f9f48b16be6cd8b3bbf8d88c5a2efea1452324e8b ChangeLog 8655
+MD5 d0f8b06fd9bbcbdfd290627142f1486e ati-drivers-extra-8.18.6.ebuild 2644
+RMD160 74a9cef2de8155189ab97122d724f1e4886a33d1 ati-drivers-extra-8.18.6.ebuild 2644
+SHA256 ec45bd14e5db9ae7f84d225de9ffd67216d49c1e11b99c4edb135670a42760da ati-drivers-extra-8.18.6.ebuild 2644
+MD5 c19ae59a36e8a6888e312f7fbc2252ee ati-drivers-extra-8.18.8.ebuild 2530
+RMD160 b41a17080b122603ee9405263927d7993cb5c250 ati-drivers-extra-8.18.8.ebuild 2530
+SHA256 b07abe5f66140d86142704b9c06cd9f5edaf6c074ca957c6aa2ca9ff3fe17d8f ati-drivers-extra-8.18.8.ebuild 2530
+MD5 ea06cd0f8b9c4ca01068af8e93354ac1 ati-drivers-extra-8.19.10.ebuild 2531
+RMD160 8a0ad5eb6daa4a00bcc65e5942550d5dde6d5b26 ati-drivers-extra-8.19.10.ebuild 2531
+SHA256 67c546aac013ecec8e019b12b06a3f507654ac285860dbcfabce5193dc1e96b3 ati-drivers-extra-8.19.10.ebuild 2531
+MD5 a7a15a2dcb930d8a453da1a8a2155adb ati-drivers-extra-8.20.8.ebuild 2603
+RMD160 abad2851233ffe74d0a42c5ac46bf344bbe6189b ati-drivers-extra-8.20.8.ebuild 2603
+SHA256 1763698400c758eedb4483a582bebfd27896620905719fbf5976e9e5f6161a47 ati-drivers-extra-8.20.8.ebuild 2603
+MD5 ede7e5dc9504d89fd48dad73f250e1ea ati-drivers-extra-8.21.7.ebuild 2632
+RMD160 2d7ee3d6da1cd3f7b76c8364a330274f67eac672 ati-drivers-extra-8.21.7.ebuild 2632
+SHA256 9b094888af39a573bb2a37e98b4f7ab8012505438a60f905779a3d420d21b30d ati-drivers-extra-8.21.7.ebuild 2632
+MD5 4003b10446f31f64b10638ea64410192 ati-drivers-extra-8.22.5.ebuild 2632
+RMD160 d3e0eaaadfd9e6aeddcc6cde2ee6c3ea8fcc0147 ati-drivers-extra-8.22.5.ebuild 2632
+SHA256 852c0d10d0e94ecb42113467e2c0bd1f3adb6b41c23886795ec4bb469b39f383 ati-drivers-extra-8.22.5.ebuild 2632
 MD5 8a748797b3d76cd265e70a73f757e664 files/digest-ati-drivers-extra-8.18.6 156
+RMD160 e99a974e62da2d6034cd5f11f1a921f60e1c329d files/digest-ati-drivers-extra-8.18.6 156
+SHA256 04eb7285668adff1b3a02a39862610205f3fea6e8729261b8b6aed34390b274d files/digest-ati-drivers-extra-8.18.6 156
 MD5 9445a9fca1fcb213c6b29479a3bbbb84 files/digest-ati-drivers-extra-8.18.8 260
+RMD160 cf5df3590651457e686cc92a4d6fa223a933c7d8 files/digest-ati-drivers-extra-8.18.8 260
+SHA256 904581cdfcd31522f5bdc86528a1a2ef14318d3e198ac4106739ffb89ded6bd8 files/digest-ati-drivers-extra-8.18.8 260
 MD5 2bcb0458b44921c7327e12400a2fb2bf files/digest-ati-drivers-extra-8.19.10 262
+RMD160 e1513a38ae87c6ca65688ea7079ff1a36cb24251 files/digest-ati-drivers-extra-8.19.10 262
+SHA256 ad4f4cc01a66877eb754d5b62d9553e0d288a891e82e38daa643fa83fb2bf4bc files/digest-ati-drivers-extra-8.19.10 262
 MD5 e1d04448f960def7ecf6fd142b5c2a7a files/digest-ati-drivers-extra-8.20.8 260
+RMD160 6206b682bdcf42f96296fc56ad9254a8e57aa6bb files/digest-ati-drivers-extra-8.20.8 260
+SHA256 5783bcb0b15983dc28cca76f6e78b77f64a32436ab3c8ae49b30037eaba7810c files/digest-ati-drivers-extra-8.20.8 260
 MD5 6bcac6dced2d281f72772788a949b39e files/digest-ati-drivers-extra-8.21.7 260
+RMD160 dcfb5e8ae0912057831a16d3ef5e055505010340 files/digest-ati-drivers-extra-8.21.7 260
+SHA256 34432a7ddc5e3b9851f7598af7fba143b64ef62b189c692576656016a119fa9b files/digest-ati-drivers-extra-8.21.7 260
+MD5 07ca38208f458bb19a92546ed6b26690 files/digest-ati-drivers-extra-8.22.5 915
+RMD160 7f11484fc07cd730f6b6e029fd22a3eb8c410360 files/digest-ati-drivers-extra-8.22.5 915
+SHA256 016aea0153beb270378952ab3531404b09cc8caa1ee29396574bd742ba214166 files/digest-ati-drivers-extra-8.22.5 915
 MD5 965bb91f2860cd9b3518ef46ffbfbdcc files/fglrx_pp_proto.h 4342
+RMD160 416bc03daaf2b804891aab3658929109a1db33a9 files/fglrx_pp_proto.h 4342
+SHA256 317714d23c8941e087162948dddf860689db2000b36dbae14004adf3eb9d9a30 files/fglrx_pp_proto.h 4342
 MD5 41782adae08060611f324e8c8ddf3de9 files/fireglcontrol.desktop 149
+RMD160 c76b19b8a14ae58b781479f5b135fbd76d36cdff files/fireglcontrol.desktop 149
+SHA256 d606a7359034d83acdfddd393631e64b6fa4f1a6c3b82e915aabcc5688c1ea55 files/fireglcontrol.desktop 149
 MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
+RMD160 e2ed1445a0405b39e40741d3d1f67746daab8fff metadata.xml 227
+SHA256 4fbed7030b32bcdc95b70000adbbcb6f1d73092c4a2f20e6cfb737a1b44d6e07 metadata.xml 227
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 fd0f18eadb65..fa89a5c05702 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,10 +1,10 @@
 # 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.18.6.ebuild,v 1.3 2006/01/28 14:51:19 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.6.ebuild,v 1.4 2006/02/11 14:27:56 lu_zero Exp $
 
 IUSE="qt"
 
-inherit eutils rpm linux-info linux-mod
+inherit eutils rpm
 
 DESCRIPTION="Ati precompiled drivers extra application"
 HOMEPAGE="http://www.ati.com"
@@ -19,7 +19,7 @@ DEPEND="=x11-drivers/ati-drivers-${PV}*
 	qt? ( >=x11-libs/qt-3.0 )"
 
 ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
+SLOT="0"
 
 src_unpack() {
 	local OLDBIN="/usr/X11R6/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 4f1e4e2aab53..0f57e72327f9 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,10 +1,10 @@
 # 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.18.8.ebuild,v 1.3 2006/01/28 14:51:19 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.8.ebuild,v 1.4 2006/02/11 14:27:56 lu_zero Exp $
 
 IUSE="qt"
 
-inherit eutils rpm linux-info linux-mod
+inherit eutils rpm
 
 DESCRIPTION="Ati precompiled drivers extra application"
 HOMEPAGE="http://www.ati.com"
@@ -19,7 +19,7 @@ DEPEND="=x11-drivers/ati-drivers-${PV}*
 	qt? ( >=x11-libs/qt-3.0 )"
 
 ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
+SLOT="0"
 
 src_unpack() {
 	local OLDBIN="/usr/X11R6/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
index 9604cb45b091..547bc44e99ae 100644
--- 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
@@ -1,10 +1,10 @@
 # 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.19.10.ebuild,v 1.2 2006/01/28 14:51:19 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.19.10.ebuild,v 1.3 2006/02/11 14:27:56 lu_zero Exp $
 
 IUSE="qt"
 
-inherit eutils rpm linux-info linux-mod
+inherit eutils rpm
 
 DESCRIPTION="Ati precompiled drivers extra application"
 HOMEPAGE="http://www.ati.com"
@@ -19,7 +19,7 @@ DEPEND="=x11-drivers/ati-drivers-${PV}*
 	qt? ( >=x11-libs/qt-3.0 )"
 
 ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
+SLOT="0"
 
 src_unpack() {
 	local OLDBIN="/usr/X11R6/bin"
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.20.8.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.20.8.ebuild
index 84e7502cbb38..a711b4ad65aa 100644
--- a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.20.8.ebuild
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.20.8.ebuild
@@ -1,10 +1,10 @@
 # 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.20.8.ebuild,v 1.3 2006/01/28 14:51:19 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.20.8.ebuild,v 1.4 2006/02/11 14:27:56 lu_zero Exp $
 
 IUSE="qt"
 
-inherit eutils rpm linux-info linux-mod
+inherit eutils rpm
 
 DESCRIPTION="Ati precompiled drivers extra application"
 HOMEPAGE="http://www.ati.com"
@@ -19,7 +19,7 @@ DEPEND="=x11-drivers/ati-drivers-${PV}*
 	qt? ( >=x11-libs/qt-3.0 )"
 
 ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
+SLOT="0"
 
 src_unpack() {
 	local OLDBIN="/usr/X11R6/bin"
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
index e4d02321f4fe..1b07d49fa0e6 100644
--- 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
@@ -1,10 +1,10 @@
 # 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.3 2006/01/30 10:13:29 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.21.7.ebuild,v 1.4 2006/02/11 14:27:56 lu_zero Exp $
 
 IUSE="qt"
 
-inherit eutils rpm linux-info linux-mod
+inherit eutils rpm
 
 DESCRIPTION="Ati precompiled drivers extra application"
 HOMEPAGE="http://www.ati.com"
@@ -19,7 +19,7 @@ DEPEND="=x11-drivers/ati-drivers-${PV}*
 	qt? ( >=x11-libs/qt-3.0 )"
 
 ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
+SLOT="0"
 
 src_unpack() {
 	local OLDBIN="/usr/X11R6/bin"
@@ -79,7 +79,7 @@ src_install() {
 		doexe ${WORKDIR}/extra/fglrx_panel/fireglcontrol
 
 		insinto /usr/share/applications/
-		doins ${DISTDIR}/fireglcontrol.desktop
+		doins ${FILESDIR}/fireglcontrol.desktop
 
 		insinto /usr/share/pixmaps/
 		doins ${WORKDIR}/extra/fglrx_panel/ati.xpm
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.22.5.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.22.5.ebuild
new file mode 100644
index 000000000000..6c34f928f4bd
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.22.5.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.22.5.ebuild,v 1.1 2006/02/11 14:27:56 lu_zero Exp $
+
+IUSE="qt"
+
+inherit eutils rpm
+
+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.22.5-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"
+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/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.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 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.22.5 b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.22.5
new file mode 100644
index 000000000000..fcf059e124e0
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.22.5
@@ -0,0 +1,9 @@
+MD5 283eb8b53dbd0887fff3277d4bf0b3f9 ati-driver-installer-8.22.5-i386.run 37222832
+RMD160 57ad6f7dc118aa1e10f7a83548a49501964fc219 ati-driver-installer-8.22.5-i386.run 37222832
+SHA256 347b36e3ece945f7d635f2b8d4b6a94010c7049ededa697d89c2839500f4d014 ati-driver-installer-8.22.5-i386.run 37222832
+MD5 a24571ecb45b2a26092ef103d8eecefd ati-driver-installer-8.22.5-x86_64.run 28274358
+RMD160 baa9f546fb7e0f73d993e9fd2f9100aaf5df8a6e ati-driver-installer-8.22.5-x86_64.run 28274358
+SHA256 a8a4d011dc31998aee43b535e1d1d2bfab37237a628e448801bcd61dd429c9f9 ati-driver-installer-8.22.5-x86_64.run 28274358
+MD5 24b8a6e0532fc20424a89948117c0a6e ati-drivers-extra-8.22.5-improvements.patch.bz2 10488
+RMD160 ce131f4f82f71e7e4d4dfcc8c3c190bce668c120 ati-drivers-extra-8.22.5-improvements.patch.bz2 10488
+SHA256 eabc5b7b76d0c4dce06976645595a2d0bf5b0b861274b8838dc879d38712b1c3 ati-drivers-extra-8.22.5-improvements.patch.bz2 10488