gentoo auto-resync : 21:11:2022 - 13:04:20

4 files changed, 56 insertions, 102 deletions

diff --git a/dev-util/intel-ocl-sdk/Manifest b/dev-util/intel-ocl-sdk/Manifest
index 174a7750be63..6aaefdbd40b0 100644
--- a/dev-util/intel-ocl-sdk/Manifest
+++ b/dev-util/intel-ocl-sdk/Manifest
@@ -1,3 +1,3 @@
-DIST intel_sdk_for_ocl_applications_2014_ubuntu_4.4.0.117_x64.tgz 105808431 BLAKE2B 58b9bdf1979c070757beff7abaa2b16d43993e7dd4aeda05843facd556f25f3c695a6b2de4745890ce6b7b1a5cee1113b62ffae4059aad49a462d28d6d3461c3 SHA512 c0f65bf4d9b894f11076995744d32aef983e01b40472028e411c7be6b9117ef8b260b9abe46d6e936333aca525f98f81aaca2ab3e093ccefb09f525a3646d7e9
-EBUILD intel-ocl-sdk-4.4.0.117-r3.ebuild 2558 BLAKE2B 15d0b2438ea0ab15e2fadd4e5504de122a2aa69ae50f61c5b8cd2c58bc19e175a9fae56b2ec4b6c944adb66736a5f844bb965c47dd60814e791d41453db3d5f2 SHA512 b6eaba7a79b29f8745821f567fb2de7d1aef9b0824f4b63fffee3d10f1c900d36243f3dfe0dce138826a152ca655f60615c6d6f306fbd86791302825dc117451
-MISC metadata.xml 541 BLAKE2B 98c1fe01a5bbe93404b5462a9de3375e5a9fb87ea5dfbe7331d36bb772e3b95d8e01160f231118e42b365bb86cd07d1adf4042f09a5d374747ca6719a1e1f114 SHA512 ac94902d5f82839e0c1dcb135a9bd558a17665e758ddc09ddc6b46d4415d060e5ccf1d90502e2166de6a070bf7fab6cab7cc5066bae559734117298f41c091e9
+DIST l_opencl_p_18.1.0.015.tgz 132125861 BLAKE2B 9fbfb0e221f40ec0930c7cdde2061df54ca790a450504b13a3e5deed7b135c2d293fd85b5e44f070fff23c428c381b7cb99664324f416c3d6e225a2661725b12 SHA512 8c00163df272fd6e93c249501b06e4c1de0c994c8e23426705a1c6dc4131fb06e691e98962455f386b26cbf3a21fff3042d6f1a783b97433aa5a7951c007bb36
+EBUILD intel-ocl-sdk-18.1.0.015.ebuild 1614 BLAKE2B a68b75749b549d20729d03b5900328da2e327b71cb95492512bf24719a2310c2a49c35b991b91e0943f49dcaa510d7ccd7671a6d3e546a4fe84bea3dac944774 SHA512 50fbc6deeae2667f7e418db5d1fa714e32429f701e29c54de78139a5006786d4f8281822350d9f47594a6a57997a756d8d2443847286304523dbc6b3572ebcbf
+MISC metadata.xml 248 BLAKE2B 289644a08c163016713ef605da208e5e305427bc7e76b65abc70af7167fdb4db34e89b0cfef631a702965e89e85058471b9dbab0abadb6d7bec3c8b2a72f3add SHA512 9030c9a82b92ffa1e5501c40175477a47e724fd841a78019a7a0a7e3bba91f19aaee02d286af9a1d71004f0003f6e2f04abd0f6799d830f76bf12bf67163e631
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-18.1.0.015.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-18.1.0.015.ebuild
new file mode 100644
index 000000000000..37e972739ef6
--- /dev/null
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-18.1.0.015.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit rpm
+
+DESCRIPTION="Intel's implementation of the OpenCL standard"
+HOMEPAGE="https://www.intel.com/content/www/us/en/developer/articles/tool/opencl-drivers.html#cpu-section"
+SRC_URI="https://registrationcenter-download.intel.com/akdlm/irc_nas/vcp/15532/l_opencl_p_${PV}.tgz"
+
+LICENSE="Intel-SDP"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror"
+
+RDEPEND="dev-libs/libxml2
+	sys-libs/ncurses-compat
+	sys-libs/zlib
+	sys-process/numactl
+	>=virtual/opencl-3"
+
+S="${WORKDIR}/l_opencl_p_${PV}"
+
+INTEL_CL="opt/intel/opencl_compilers_and_libraries_${PV}/linux"
+INTEL_INSTALL_PATH="/opt/intel/opencl-${PV}"
+INTEL_VENDOR_DIR=usr/lib/OpenCL/vendors/intel
+ALT_PV="${PV/.015/-015}"
+
+QA_PREBUILT="${INTEL_INSTALL_PATH}/*"
+
+src_unpack() {
+	default
+	rpm_unpack "${S}/rpm/intel-openclrt-${PV}-${ALT_PV}.x86_64.rpm"
+}
+
+src_install() {
+	echo "${EPREFIX}${INTEL_INSTALL_PATH}/lib64/libintelocl.so" > intel64.icd || die
+	insinto /etc/OpenCL/vendors/
+	doins intel64.icd
+
+	insinto "${INTEL_INSTALL_PATH}"
+	insopts -m 755
+	doins "${WORKDIR}/${INTEL_CL}/compiler/lib/clbltfnshared.rtl"
+	insinto "${INTEL_INSTALL_PATH}/lib64"
+	insopts -m 755
+	doins "${WORKDIR}/${INTEL_CL}/compiler/lib/intel64_lin/"*
+
+	dodir "${INTEL_VENDOR_DIR}"
+	dosym -r "${INTEL_INSTALL_PATH}/lib64/libOpenCL.so"     "${INTEL_VENDOR_DIR}/libOpenCL.so"
+	dosym -r "${INTEL_INSTALL_PATH}/lib64/libOpenCL.so.1"   "${INTEL_VENDOR_DIR}/libOpenCL.so.1"
+	dosym -r "${INTEL_INSTALL_PATH}/lib64/libOpenCL.so.2.0" "${INTEL_VENDOR_DIR}/libOpenCL.so.2.0"
+}
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r3.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r3.ebuild
deleted file mode 100644
index 8944aa60bd6f..000000000000
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm
-
-DESCRIPTION="Intel's implementation of the OpenCL standard"
-HOMEPAGE="https://software.intel.com/en-us/articles/opencl-sdk/"
-SRC_URI="https://registrationcenter.intel.com/irc_nas/4181/intel_sdk_for_ocl_applications_2014_ubuntu_${PV}_x64.tgz"
-
-LICENSE="Intel-SDP"
-SLOT="0"
-IUSE="android +system-tbb +system-boost"
-KEYWORDS="-* amd64"
-RESTRICT="bindist mirror"
-
-RDEPEND=">=virtual/opencl-3
-	sys-process/numactl
-	system-tbb? ( >=dev-cpp/tbb-4.2.20131118 )
-	system-boost? ( dev-libs/boost:= )
-"
-DEPEND=""
-PDEPEND="
-	dev-libs/glib
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	sys-libs/zlib
-"
-
-S=${WORKDIR}/intel_sdk_for_ocl_applications_2014_ubuntu_${PV}_x64/
-INTEL_CL=opt/intel/opencl-1.2-${PV}
-
-QA_PREBUILT="${INTEL_OCL}/*"
-
-src_unpack() {
-	default
-
-	PKGS="base devel intel-cpu intel-devel"
-
-	use android && PKGS="$PKGS intel-devel-android"
-
-	for PKG in ${PKGS}; do
-		FILENAME="opencl-1.2-${PKG}-4.4.0.117-1.x86_64.deb"
-		einfo "Extracting \"${FILENAME}\"..."
-		ar x "${S}/$FILENAME" || die
-		unpack ./data.tar.gz
-	done
-}
-
-src_prepare() {
-	# Remove bundled stuff
-	if use system-boost; then
-		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libboost*.so*
-	fi
-	if use system-tbb; then
-		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libtbb*
-	fi
-	# Prepend EPREFIX to library path in intel64.icd
-	if [[ -n ${EPREFIX} ]]; then
-		sed -i -e "s@^/opt@${EPREFIX}/opt@" "${WORKDIR}/${INTEL_CL}"/etc/intel64.icd
-	fi
-	default
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors/
-	doins "${WORKDIR}/${INTEL_CL}"/etc/intel64.icd
-
-	insinto /"${INTEL_CL}"/lib64
-	insopts -m 755
-	doins "${WORKDIR}/${INTEL_CL}"/lib64/*
-
-	insinto /"${INTEL_CL}"/bin
-	doins "${WORKDIR}"/"${INTEL_CL}"/bin/*
-
-	# fix symlinks for oclopt and clangSpir12 on prefix
-	dosym "../lib64/oclopt"      "opt/intel/opencl-1.2-${PV}/bin/oclopt"
-	dosym "../lib64/clangSpir12" "opt/intel/opencl-1.2-${PV}/bin/clangSpir12"
-
-	# TODO put this somewhere
-	# doins ${INTEL_CL}/eclipse-plug-in/OpenCL_SDK_0.1.0.jar
-
-	INTEL_VENDOR_DIR=usr/lib/OpenCL/vendors/intel/
-	dodir "${INTEL_VENDOR_DIR}"
-	dosym "../../../../../opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so"     "${INTEL_VENDOR_DIR}/libOpenCL.so"
-	dosym "../../../../../opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1"   "${INTEL_VENDOR_DIR}/libOpenCL.so.1"
-	dosym "../../../../../opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1.2" "${INTEL_VENDOR_DIR}/libOpenCL.so.1.2"
-}
diff --git a/dev-util/intel-ocl-sdk/metadata.xml b/dev-util/intel-ocl-sdk/metadata.xml
index cc893b2a0a6f..97eff4632a18 100644
--- a/dev-util/intel-ocl-sdk/metadata.xml
+++ b/dev-util/intel-ocl-sdk/metadata.xml
@@ -5,9 +5,4 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
-	<use>
-		<flag name="android">Install android related files</flag>
-		<flag name="system-boost">Use system boost (<pkg>dev-libs/boost</pkg>) instead of bundled one</flag>
-		<flag name="system-tbb">Use system Thread Building Blocks (<pkg>dev-cpp/tbb</pkg>) instead of bundled one</flag>
-	</use>
 </pkgmetadata>