Drop opencl use flag and install OpenCL unconditionally

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

3 files changed, 32 insertions, 32 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index a37c39b14b5b..aa1ab0814df7 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.271 2012/02/04 11:15:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.272 2012/02/04 12:32:36 xarthisius Exp $
+
+  04 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  ati-drivers-12.1-r1.ebuild:
+  Drop opencl use flag and install OpenCL unconditionally
 
 *ati-drivers-12.1-r1 (04 Feb 2012)
 
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 529c815fb7a5..7e9ab65c872b 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -27,24 +27,24 @@ EBUILD ati-drivers-11.6.ebuild 18265 RMD160 d4d528340fd132a07f415e7c1397b1b3e162
 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
-EBUILD ati-drivers-12.1-r1.ebuild 19381 RMD160 43e266111365a32e70dd70a8ae4e3c88b1a5b5db SHA1 35ccb19ed5b72c499cb0b1fdbae3339a2bda2244 SHA256 98a483f96fe2448b973510e9d40e17a7d873622eabe0d524007c28dd73c6c674
+EBUILD ati-drivers-12.1-r1.ebuild 19299 RMD160 35bfc7484cbd80c05e49860c060c98b425a999e1 SHA1 4ec406858d82cca6bc0dbd2ca52009544bb6a956 SHA256 c17941a12893fd4fdacb2c9b04d940438c1ac16af89e8f1519cfa36f62e8d091
 EBUILD ati-drivers-12.1.ebuild 19525 RMD160 904acd77416affa3d44d1647691f5fad8d59db14 SHA1 0d6c447f9f893beb4afe91165b7e4a9e8518a119 SHA256 8f98eccd37226c063cba6ada0d8ad816a36130b38d9cb3d55783d86f524b4372
-MISC ChangeLog 74613 RMD160 ea228f12f7c440b40c20b95e2520d47c03141d6f SHA1 95bf919c0478d6e1bada2fcd539e70c507492e3b SHA256 08b3a5dee97ff2c2875d2cf59a7044119dedc801c9bfc66e9ec40cd94193065b
+MISC ChangeLog 74756 RMD160 b45e05dd6e0903ff09199e103c24ccaf99d6120f SHA1 83e3677dcf12faba937e277f394c55cde9aee826 SHA256 6bad68f1a4cbef52d734c5b4196773c677d19f8cc0b46efbeb8792ebfcf06d02
 MISC metadata.xml 789 RMD160 9a234fedd78ca28474f9f4bbdc52376838ed2dd9 SHA1 c07d53d61792d5a030b8bcabc4b55533ddb43778 SHA256 cc4c8b40b8c174fe8424badcd59ae5974b95c283a4c3dc59d1138b80dd010263
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPLRNhAAoJEF0huFKJUZL5S4EP/jiRRvF6hDKzzej/dIo/9udu
-KfWeFIKC+kBGn0UMkyqJ9ybws+48CX5envmhDN53/DEwyPvWdRYInAtMfDRwxEYg
-QCRO+9ISqNwqKpAIfaKIIao4QD91Jp98rp0lfa5Nbdp6PZNu5d3PVAXfLAhVD3PI
-Sb3EkBkr3C4C/fLknn1YsBlzcjRsdxUF0zHnk7YO25t8FtDerAwekvxyY6fUK5FK
-sj6oRYZfCThYlzbkiPagOJ1yyvldjLFghkZdB+QNjQY585aCSFs/9K+WWvQf1hRK
-P9LvVzRwT3F/vbJHrMnN+qufyKWL/sfDUbQazTFewmIfibDDB6iShWN6FRY7U1WN
-MgXVbQt3QN7Muol6SvVhYDdTEiAu3yEshr34w0TRJUc8Jbda+DlvjK5Y552sEAaS
-cC5C5fPOplCuUyApVjuW20P7/HHdRaudv4WfN6cgL5xeEQ3O1V/tlCiQsGM+nDeF
-/JAAyOUpiyd5WzzwNccgWvqRRzedm2lpib0l/LS5PTn22AACE0FuWca1ozvjI4O7
-ZPp8HJrF5ITsqVMMAuSMP89GRKCZn/4QbQoXeS7pnDMaJxUg4N65tI+u8u+FleFc
-nH9L89slb6JvP23aYg8BeiGrxCHUWHg/U36dIhSWsqJ6NbzW8DXtDGmG6fIZidIf
-Geqv8DCz2Qo5k6EYpaNP
-=lNTP
+iQIcBAEBCAAGBQJPLSVtAAoJEF0huFKJUZL5NcsQAJUVOvJHImNTDgVfw1eOd16y
+Nb89NBgeC2hGkKL9L1EaVK92EXhFZk+bhlZUr3hVyq8hwnLybVRaelmzlnwupFQB
+XoVxLWhYV0Plo+ERzhqS5UnMf79zUai2trRIinCQF/voOul1fbCURQKkYvf5d2w1
+C+jfFQfvLA52/X2W2iLxwYYnUfFpbExVcuEdjAritRvc/qbScNPWxBwqU4Q1t3Ud
+rRd8NwWXR+cuLRvLVavEvECvD6NTQbNoLYxUwh4kvzP5Ul1x9SvsbpQqqA1R/nR/
+uHskjJgFsoTN8vRgb7HWpyqMtsRz65CgjxqjyIzBn07kdB9pBAtY3YZvUuhhDSlC
+qg7xEychoK9aFVElReK2W2UDPcBSdqImigmgxg9EwCFvsE/cWJIxEoHoXCEk/ep4
+UvETzEiBXq3QZOM7MQ0xC+eGOu6o330HR2Gdk4I9MWxSVj+I/nRP/V8PBeUZnX6N
+zGIqUEAojOMWGmTn2FhYKojWT1rYe5Tx5XIs2B5EsGv6u/YOuW1gFnQaegxiJqna
+Z83jxT7zgppl2EV57aTQwy1hauvKQzlPlqYrj7ZHYJXZy99r8aEQQk2hDKcF/Caz
+TAVq8Cxf9bwMavwdV3M+gtjagpuzP+RbkWcKetg0SEZGVdStWYD27DPo+wD6vBzX
+C0lv/bvUSxdxFk3um85u
+=X64g
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild
index ac03276ad7a8..92675b5553c4 100644
--- a/x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild,v 1.1 2012/02/04 11:15:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild,v 1.2 2012/02/04 12:32:36 xarthisius Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
 	FOLDER_PREFIX=""
 fi
-IUSE="debug +modules multilib opencl pax_kernel qt4"
+IUSE="debug +modules multilib pax_kernel qt4"
 
 LICENSE="AMD GPL-2 QPL-1.0 as-is"
 KEYWORDS="~amd64 ~x86"
@@ -428,7 +428,7 @@ src_install() {
 	into /opt
 	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
 	use qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui
-	use opencl && dobin "${ARCH_DIR}"/usr/bin/clinfo
+	dobin "${ARCH_DIR}"/usr/bin/clinfo
 	# We cleaned out the compilable stuff in src_unpack
 	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
 
@@ -534,23 +534,19 @@ src_install-libs() {
 	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
 
 	# AMD Cal and OpenCL libraries
-	if use opencl ; then
-		exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-		doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-		doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-		dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-	fi
+	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
+	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
 	exeinto /usr/$(get_libdir)
 	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
 
 	# OpenCL vendor files
-	if use opencl ; then
-		insinto /etc/OpenCL/vendors/
-		cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
-			/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
-		EOF
-		doins "${T}"/amdocl${oclsuffix}.icd
-	fi
+	insinto /etc/OpenCL/vendors/
+	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
+		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
+	EOF
+	doins "${T}"/amdocl${oclsuffix}.icd
 
 	local envname="${T}"/04ati-dri-path
 	if [[ -n ${ABI} ]]; then