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

(Portage version: 2.2.0_alpha138/cvs/Linux x86_64, signed Manifest commit with key 0x5D21B852895192F9)

3 files changed, 9 insertions, 78 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/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() {