Fix installation of OpenCL on x86, bug #391249.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

3 files changed, 21 insertions, 10 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index d20ab17f2dfe..c408521d230d 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.262 2011/11/20 02:01:26 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.263 2011/11/21 15:45:39 chithanh Exp $
+
+  21 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  ati-drivers-11.11.ebuild:
+  Fix installation of OpenCL on x86, bug #391249.
 
 *ati-drivers-11.11 (20 Nov 2011)
 
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index ec5cc15c2f96..cf064be0dd24 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -12,12 +12,12 @@ DIST ati-driver-installer-11-7-x86.x86_64.run 75416437 RMD160 7f693992598e58ecec
 DIST ati-driver-installer-11-8-x86.x86_64.run 75754239 RMD160 92e33779416228ef75fd8bc8790c5aebd2f3332f SHA1 807a5663b062a9cf6295ac8cf3dee7439aabda57 SHA256 71e0194daef7a50c6d0d3b5712b05375a003d452e39c754278336c3811a2acdf
 DIST ati-driver-installer-11-9-x86.x86_64.run 76564617 RMD160 8631c510ace5a7d73c97064f8ca16ee9a6fe94e4 SHA1 e01caf1211fd3f9602017a340921aa1b9c38b802 SHA256 d9ad9c8e0bd250ac41c39d9b8e9f77efc82631f4bebacb82ddde982a86530d56
 EBUILD ati-drivers-11.10.ebuild 18184 RMD160 b5424f2978fa918fae6d3b91e39fbd5ac73c5055 SHA1 75f9078ed0d9034e582e2ca211cb3626c3c28947 SHA256 5168f7a6f9c86dd0d41fdb2e2390524410c3d2e04d2961de1c8e2606de0beb01
-EBUILD ati-drivers-11.11.ebuild 18699 RMD160 020d07b1bb6a878cda26034058b757f013ee2b05 SHA1 b6d6db75164f93667ed3c2ea2e2bb633b5fb629d SHA256 e5bfc169fc0d3efa49c79648bb74e1913a0af0baade7230c652403085fd84b85
+EBUILD ati-drivers-11.11.ebuild 18859 RMD160 4c1e0433097103b651962c495569d510b3ddb8c5 SHA1 2d1b7eaa9c380232fabdf60662662e255f885c14 SHA256 1803965235235b78f7b123f5a774a0f93523948626ca5d925c979b221761a79a
 EBUILD ati-drivers-11.4.ebuild 17519 RMD160 91cc358252f88c4cfaec77384117907853a88791 SHA1 a262db426e121dc401588bb0b691fcf959162f54 SHA256 dc524e9832910ba6d8e75d4dfdcb3c7cf0dbdfe0fde8132f86a99726fe5e2c48
 EBUILD ati-drivers-11.5.ebuild 18366 RMD160 a2ebc6c386c8c92313fa225bb5e10870ba1e4a8e SHA1 e1db1a2241e4e7e7243f658a7d1c16cbeb4f43fd SHA256 9c02162b137b7fc230f0af100ab0c2e2fb53f23fcbe9e34c69589382c5921a2c
 EBUILD ati-drivers-11.6.ebuild 18265 RMD160 d4d528340fd132a07f415e7c1397b1b3e162f2d9 SHA1 927f46c7e994dd40334a5998a9802efdc0042fe5 SHA256 fec6e4cfdee67e42dbf55a31f1f2470d5227f86bdbcd6e433de32bdd0277d2da
 EBUILD ati-drivers-11.7.ebuild 18511 RMD160 b9f27982e72171c63044662562ccbce45e74d177 SHA1 0f43c043578f969475d423c11bcebd053d673b36 SHA256 54de74216f659cd5b1587134b7c0ba4a5b6255f39f63fefa55cfa21fe05b5b4d
 EBUILD ati-drivers-11.8.ebuild 18507 RMD160 424c99bc46a516acc32d0379da7f5fa4ba854646 SHA1 eaccbb3187a55423e5defa93660d595b22dd2c1e SHA256 648d539eae0d9f0c689d5398275d8bf0a777dfc6797eef130b13388da2728ab5
 EBUILD ati-drivers-11.9.ebuild 18169 RMD160 04b4aa7a666db3e0225c60e9272e6ced68bc7732 SHA1 6a5183cbf112c075ea09a3bd9c1840e6742304ae SHA256 dc52aeb4a5d1792ede7c301a3b7cb7159cf266cfe19ed9de5517223e496e84de
-MISC ChangeLog 72853 RMD160 3f2fbbe1ff514391b6775cccac60ebc02e34cc01 SHA1 fe453b6c8f87b2003f425c3a1e88e8d55b1cffe4 SHA256 305dd063e7db03c1d56b81cfd3b4c52c89bb5441c9375ce1ad5ad01c6f78c288
+MISC ChangeLog 73001 RMD160 20bbb2b9d7dbf2de1aa5d99c1e02f1870ae8bf3b SHA1 944c40974582e50cb003647a9a1f604e7a0b2a7b SHA256 16cba7c4d2eb6be8f98bf3c5ee9a6e880da55cc76e22805578331b265f17d267
 MISC metadata.xml 631 RMD160 4bb276f0a1146ca6da7d80034794c63af1678eb9 SHA1 3b1b9b59e82d5a994b5e225979ef46f668c57fef SHA256 8fccde1e9010a23c674139bfdb1b333d2d2341ea5286b2b8b2ce8a12d502da84
diff --git a/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild
index 4c2209fa8dd0..5a961bffcfd0 100644
--- a/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild,v 1.1 2011/11/20 02:01:26 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild,v 1.2 2011/11/21 15:45:39 chithanh Exp $
 
 EAPI=4
 
@@ -33,7 +33,10 @@ RDEPEND="
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
-	multilib? ( app-emulation/emul-linux-x86-opengl )
+	multilib? (
+			app-emulation/emul-linux-x86-opengl
+			app-emulation/emul-linux-x86-xlibs
+	)
 	qt4? (
 			x11-libs/libICE
 			x11-libs/libSM
@@ -46,7 +49,6 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}
-	app-portage/portage-utils
 	x11-proto/inputproto
 	x11-proto/xf86miscproto
 	x11-proto/xf86vidmodeproto
@@ -264,9 +266,7 @@ pkg_setup() {
 	elog "r600 chipset and newer."
 	elog "This represent the ATI Radeon HD series at this moment."
 	elog
-	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
-	elog "as replacement is highly recommended. Rather than staying with"
-	elog "old versions of this driver."
+	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
 	elog "For migration informations please reffer to:"
 	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
 	einfo
@@ -439,7 +439,11 @@ src_install() {
 	# OpenCL
 	if use opencl ; then
 		insinto /etc/OpenCL/vendors/
-		doins "${ARCH_DIR}"/etc/OpenCL/vendors/amdocl64.icd || die "doins failed"
+		if [[ "${ABI}" == "amd64" ]] ; then
+			doins "${ARCH_DIR}"/etc/OpenCL/vendors/amdocl64.icd || die "doins failed"
+		else
+			doins "${ARCH_DIR}"/etc/OpenCL/vendors/amdocl32.icd || die "doins failed"
+		fi
 	fi
 
 	# include.
@@ -569,6 +573,9 @@ pkg_postinst() {
 	elog "Fully rebooting the system after an ${PN} update is recommended"
 	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
 	elog "might not work"
+	elog
+	elog "Some cards need acpid running to handle events"
+	elog "Please add it to boot runlevel with rc-update add acpid boot"
 
 	use modules && linux-mod_pkg_postinst
 	"${ROOT}"/usr/bin/eselect opengl set --use-old ati