Use bundled boost due to desloting. Fixes bug 440658 by Neil Dökkalfar <neil@next-touch.com>. Drop old

Package-Manager: portage-2.2.0_alpha138/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

4 files changed, 31 insertions, 82 deletions

diff --git a/dev-util/intel-ocl-sdk/ChangeLog b/dev-util/intel-ocl-sdk/ChangeLog
index 3e2f453d1689..4de14883e18f 100644
--- a/dev-util/intel-ocl-sdk/ChangeLog
+++ b/dev-util/intel-ocl-sdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/intel-ocl-sdk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/intel-ocl-sdk/ChangeLog,v 1.6 2012/10/03 19:17:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/intel-ocl-sdk/ChangeLog,v 1.7 2012/11/01 09:01:35 xarthisius Exp $
+
+  01 Nov 2012; Kacper Kowalik <xarthisius@gentoo.org> -intel-ocl-sdk-1.5.ebuild,
+  intel-ocl-sdk-2.0.31360.ebuild:
+  Use bundled boost due to desloting. Fixes bug 440658 by Neil Dökkalfar <neil
+  @next-touch.com>. Drop old
 
   03 Oct 2012; Agostino Sarubbo <ago@gentoo.org>
   intel-ocl-sdk-2.0.31360.ebuild:
diff --git a/dev-util/intel-ocl-sdk/Manifest b/dev-util/intel-ocl-sdk/Manifest
index a56fdda54b96..91f0b07a7399 100644
--- a/dev-util/intel-ocl-sdk/Manifest
+++ b/dev-util/intel-ocl-sdk/Manifest
@@ -1,6 +1,24 @@
-DIST intel_ocl_sdk_1.5_x64.tgz 27901208 SHA256 bfc3b45e833ad158266fd79fb9494b040a060d48e5880dbbf538eba167450810 SHA512 c2bed74169584f33d8b8b58f8564acc7bd61e320eb42600660a4007b828e819ad7ca0ff9ff78c930da06f9860618cc49ddbe2d4a04576a6eb33f69dbcbb23c3f WHIRLPOOL a9dbe72530535cb34b3302a3f9f5512a838d227a3d7849bbb99380176a4d9083751e99dcafb2b037696b159bb14cd6a395c40a44851a971dd664254506b61c48
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST intel_sdk_for_ocl_applications_2012_x64.tgz 28302946 SHA256 2044a9a62f40788b0dc4f4ea77a3d85df14e7909258e37eed3e63f7254a0bcc9 SHA512 6974dd67d8292400f1d0c80fd137f39290fe7dcab5146b9f0613ae48484f84e1b523f710dcc07c8600919ce01ab2dd91ab0e2d693e3723ffa9a744fcc52151dd WHIRLPOOL bf474c5959d9b19b40491a68355c2f36bdd0b98facae75aef4f488726b9589555d49f4bf8eb47f52524be6d354addbc945621a97b6f5412162e5b0c8aa03243e
-EBUILD intel-ocl-sdk-1.5.ebuild 1436 SHA256 af39c560c608607691c2aad2525f38a8776c4a8d773ed21693bde59ff7d4ebe3 SHA512 cfd6159a805d1c7ad64b69ba299972c551471bb162398b614039e3a54c40be704de88c8d8b27772b7fd811e1b03c1b29d23e014251a3938a4b191b8a3a6da3b5 WHIRLPOOL bce6bc6bc2e00e3050750fbf03e5dfc5a314b51962ca006e7524297df1021228afe7b130bcd82fead711ea5d93699626db4eba89f7e3e0a03e120a91e115a608
-EBUILD intel-ocl-sdk-2.0.31360.ebuild 1829 SHA256 d318041c87b47cf3f480caf14fd97a95eba612a824c1aab8cf2f2d221dcf88a2 SHA512 78ace233eb27f785912ec00fbea046dcd9185bf63dc3caedd59b00684b39af4ba61565dd17f17d018c51d393c1b962b2bd55983b83f17e31fc0f989b0dfc1b7e WHIRLPOOL 04913e1992aec2336533f609e17512af01b9a5804bd3b3b63023fe9d26f78dab2b2e1b13b5b82a9229f5dc9c2b28215fe58732b60b57bebc06d72ae23cc2e8d9
-MISC ChangeLog 1091 SHA256 422d84d9003d33161206834c3e3713c8d5b2cd07552e22c78a5f7a33ea10d626 SHA512 cc3e9671b03f44ac4b213921e09e7e87d555efa94f2dbbbfc0163ff143f2fb0942902e864f487b00e59b0acca52a9d586fe5f6e5f72dfe4f2fbcd17621efc20c WHIRLPOOL 9101b7734e0c5a68e4fc4002de5e7bf34cba10f6e9f1339f5c586ad80c0169fae2763d5ee5ead5f997badcaffff926e3c87b6907eae175d1632ff71b1906662e
+EBUILD intel-ocl-sdk-2.0.31360.ebuild 1575 SHA256 c230c0c8d2585f1a0a4aed46bc487b223cd40b37ae406c32e732ec8dcff11c74 SHA512 fc6e1686f2f2e0522428b10237dd183e365c4894446d3813998ae15f3b66aa5187cce604a73eaad5812447535bf3e8c2658815a1aa431bf48d25d060c7c21ba4 WHIRLPOOL d1fc1f0bde1c6f1cde9e7aa64857cfb8ca359f3ca8dc1020b3e03bd95a5059f86274a8c0fe5cc4416d43e12bfad66c11d33242fc4f3947c72313da60a0793298
+MISC ChangeLog 1323 SHA256 f9728384a655482ca9d048a0fcadb917c9123c2d6fa975c9b90aad2d381d8e7f SHA512 739f237fb437a534bb74ce71d852bf7372823998e900041f673abbb6ac3568ef8f3e834f85f7bafb7e6bee311a998d862c9e4ee467fceb766ec757de11fa8c7b WHIRLPOOL c39efeb2f358d153a29eb42e2e4e03ac43d46b9f46961ca782796a64c8a19de8654484315a4181b5e65fa03c00ae9ea52bc2849d3b9cb2ce4e6b761d985500c4
 MISC metadata.xml 311 SHA256 c020f9c9b50675d08b698ae01d1ad609bc5396b9c3f7a92c0cadd842405033aa SHA512 bb19e75a28ab80aaa0816b431a9afbfb0b959bc9c72cb37f722021fbcbfa5a53f2d550b8b1e67659353e590c25c19120a7d782cc2cdde6121fce8fd4f1ae7ec9 WHIRLPOOL 24b291964c84eedd6f0415e32fbec0c38d855452181bcd6796e6497145e75092c5f956f775bd22c8db6091e4d00cca3c63191a9b35487e8fe755652a85c2cf9d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQkjqRAAoJEF0huFKJUZL549QP/3meDpxMixKFdQxYX9vLHHAi
+syWIw+PHeM2eA8linit1PHhCUwTg9c1UVCBwLkSyypDqpUYSngHbXfYPa2uwi9q1
+A9KsfvwpUKzp2EXI+jvC7c3o/QVvR60FPUlpfgizoCCQZxj7gAt9txLp3nFC8gZy
+GzrSLZ/ASfFhOSuoBE81xEonxLUCtkSwkb9pTomaCHXx7kXYAuKmNvCJW4yCHc4k
+HRxiGuqhY9lRXoQ+RtsVHjAR6D85VI7869WIKVbvXE7+xsVrA3JtAw4k33t74Z2J
+V3fkX28QON+mtl3t5p7WDI8h1Ocqz/y4FIQk2DuFs46RZoT77zcaiGo6PKlyLv6q
+ljE04R9PuTXYnLwfhVjlOXQMcIsnuoKjJ35roc4LMGixj7b6SpqT/7X0NiXLdniv
+T48LXYk27+Ett6BGOfMCZuxg5ecFjkgU4/YyzqfFdC0Ta0IQoJpS72EJG1EKcTxz
+3IpUIE76A1fplB/kIGwCifb1s9EYWV+P8BUbWaNiBzuGAhV1ABhmxgZ4WczNCR1e
+lLkMc1+QfiCMJF1K0lGEvEEPkDH0WunyOxtWLbVaISiy17QbZ36+oSvZ0STMdh2L
+9jfhU+mODOSLIVGmH6+Xng20ozKMC1Ja53DDZZWKcTkEiT7SryNysmgPr6w76kKE
+rFnLzMTaB/+24DyQHWJZ
+=MNg6
+-----END PGP SIGNATURE-----
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-1.5.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-1.5.ebuild
deleted file mode 100644
index 49465f5b90fc..000000000000
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-1.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/intel-ocl-sdk/intel-ocl-sdk-1.5.ebuild,v 1.3 2012/03/20 16:42:31 ago Exp $
-
-EAPI=4
-
-MY_PN=${PN//-/_}
-MY_P=${MY_PN}_${PV}_x64
-
-inherit rpm multilib
-
-INTEL_CL=/usr/$(get_libdir)/OpenCL/vendors/intel/
-
-DESCRIPTION="Intel's implementation of the OpenCL standard optimized for Intel processors."
-HOMEPAGE="http://software.intel.com/en-us/articles/opencl-sdk/"
-SRC_URI="http://software.intel.com/file/38734/${MY_P}.tgz"
-
-LICENSE="Intel-SDP"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 -x86"
-
-#sys-devel/clang
-#dev-libs/boost:1.46
-RDEPEND="app-admin/eselect-opencl
-	dev-cpp/tbb
-	sys-process/numactl"
-DEPEND=""
-
-RESTRICT="mirror"
-QA_EXECSTACK="${INTEL_CL/\//}libcpu_device.so
-	${INTEL_CL/\//}libOclCpuBackEnd.so
-	${INTEL_CL/\//}libtask_executor.so"
-QA_PREBUILT="${INTEL_CL}*"
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	rpm_unpack ./${MY_P}.rpm
-}
-
-src_prepare() {
-	cat <<- EOF > "${S}"/intelocl64.icd
-		${INTEL_CL}/libintelocl.so
-	EOF
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors
-	doins intelocl64.icd
-	# things that are left out: llc, ioc
-	insinto ${INTEL_CL}
-	doins -r usr/include
-
-	insopts -m 755
-	doins usr/lib64/libOpenCL.so
-	pushd usr/lib64/OpenCL/vendors/intel &> /dev/null
-	rm -f libboost* libtbb*
-	doins *.so *rtl *pch
-	popd &> /dev/null
-}
-
-pkg_postinst() {
-	eselect opencl set --use-old intel
-}
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild
index dc7ec9aea9ee..aa02d3448d62 100644
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.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/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild,v 1.3 2012/10/03 19:17:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild,v 1.4 2012/11/01 09:01:35 xarthisius Exp $
 
 EAPI=4
 
@@ -23,7 +23,6 @@ RDEPEND="app-admin/eselect-opencl
 	dev-cpp/tbb
 	sys-process/numactl
 	tools? (
-		dev-libs/boost:1.46
 		sys-devel/llvm
 		>=virtual/jre-1.6
 	)"
@@ -45,11 +44,12 @@ src_unpack() {
 src_prepare() {
 	# Remove unnecessary and bundled stuff
 	rm -rf ${INTEL_CL}/{docs,version.txt,llc}
-	rm -f ${INTEL_CL}/libboost*
+	rm -f ${INTEL_CL}/libboost*.so
 	rm -f ${INTEL_CL}/libtbb*
 	if ! use tools; then
 		rm -rf usr/bin
 		rm -f ${INTEL_CL}/{ioc64,ioc.jar}
+		rm -f ${INTEL_CL}/libboost*
 	fi
 }
 
@@ -64,14 +64,6 @@ src_install() {
 	dosym libOpenCL.so.1 ${INTEL_CL}/libOpenCL.so
 
 	doins ${INTEL_CL}/*
-
-	# Think of better way to do that...
-	if use tools; then
-		dosym /usr/$(get_libdir)/libboost_filesystem-1_46.so.1.46.1 \
-			${INTEL_CL}/libboost_filesystem.so.1.46.1
-		dosym /usr/$(get_libdir)/libboost_system-1_46.so.1.46.1 \
-			${INTEL_CL}/libboost_system.so.1.46.1
-	fi
 }
 
 pkg_postinst() {