[gentoo-commits] dev/xarthisius:master commit in: dev-util/intel-ocl-sdk/

[Kacper Kowalik]

commit:     788122f534b0b40f6345d3ff8007ec22b7aef8b4
Author:     Kacper Kowalik (Xarthisius) <xarthisius.kk <AT> gmail <DOT> com>
AuthorDate: Sun Dec 25 19:25:17 2011 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 19:25:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xarthisius.git;a=commit;h=788122f5

[dev-util/intel-ocl-sdk] fix paths

---
 dev-util/intel-ocl-sdk/Manifest                 |    2 +-
 dev-util/intel-ocl-sdk/intel-ocl-sdk-1.5.ebuild |   24 ++++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/dev-util/intel-ocl-sdk/Manifest b/dev-util/intel-ocl-sdk/Manifest
index cb914b0..4b2e5e8 100644
--- a/dev-util/intel-ocl-sdk/Manifest
+++ b/dev-util/intel-ocl-sdk/Manifest
@@ -1,3 +1,3 @@
 DIST intel_ocl_sdk_1.5_x64.tgz 27901208 RMD160 dbc9fe35080bec352fd1ba3c5be6fa4ec9f17e0f SHA1 752168236f05022369384964a05371718fd963aa SHA256 bfc3b45e833ad158266fd79fb9494b040a060d48e5880dbbf538eba167450810
-EBUILD intel-ocl-sdk-1.5.ebuild 1189 RMD160 10ad0d169f52327834a0f3708a278494b3f5e8ad SHA1 5dadae4c94f9851b8bdf44edab186b7a62ed8092 SHA256 d68b27425783edeb9c4aba846e98b733f1a3fc29874dffd11fe76ffe0cabfd4d
+EBUILD intel-ocl-sdk-1.5.ebuild 1238 RMD160 a403502db13aff8934d4046038974c7cda44b2e7 SHA1 4203098c04f4d88c5f7e04774baaf0190054fbf5 SHA256 e4e44f7d6dbcebffa8b358051c01a997b84c6347fe97ec357bc116f95cdacfb6
 MISC metadata.xml 237 RMD160 c1eff8035f69f2011d83fdee601d3131a88ea9bf SHA1 bbbe43f48a08f38c431e4f1aecd0210b8049798b SHA256 da0461f424a48f918d7233b1c957149d1bedcd5b81e63652176728af4e524c6f

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
index b3780d3..4836c31 100644
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-1.5.ebuild
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-1.5.ebuild
@@ -8,11 +8,13 @@ MY_PN=${PN//-/_}
 MY_P=${MY_PN}_${PV}_x64
 INTEL_SDK=/opt/intel/opencl-sdk/
 
-inherit rpm
+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/35820/${MY_P}.tgz" #BOGUS
+SRC_URI="http://software.intel.com/file/35734/${MY_P}.tgz"
 
 LICENSE="Intel-SDP"
 SLOT="0"
@@ -26,10 +28,10 @@ RDEPEND="dev-cpp/tbb
 DEPEND=""
 
 RESTRICT="mirror"
-QA_EXECSTACK="${INTEL_SDK/\//}lib/libcpu_device.so
-    ${INTEL_SDK/\//}lib/libOclCpuBackEnd.so
-	${INTEL_SDK/\//}lib/libtask_executor.so"
-QA_PREBUILT="${INTEL_SDK}lib/*"
+QA_EXECSTACK="${INTEL_CL/\//}libcpu_device.so
+    ${INTEL_CL/\//}libOclCpuBackEnd.so
+	${INTEL_CL/\//}libtask_executor.so"
+QA_PREBUILT="${INTEL_CL}*"
 
 S=${WORKDIR}
 
@@ -40,19 +42,19 @@ src_unpack() {
 
 src_prepare() {
 	cat <<- EOF > "${S}"/intelocl64.icd
-		${INTEL_SDK}/lib/libintelocl.so
+		${INTEL_CL}/libintelocl.so
 	EOF
 }
 
 src_install() {
 	insinto ${INTEL_SDK}
 	doins -r usr/include
+	# things that are left out: llc, ioc
 
-	insinto ${INTEL_SDK}/lib
+	insinto ${INTEL_CL}
 	doins usr/lib64/libOpenCL.so
-	pushd usr/lib64/OpenCL/vendors/intel
+	pushd usr/lib64/OpenCL/vendors/intel &> /dev/null
 	rm -f libboost* libtbb*
 	doins *.so *rtl *pch
-	popd
-	# things that are left out: llc, ioc
+	popd &> /dev/null
 }