gentoo resync : 02.06.2019

6 files changed, 157 insertions, 177 deletions

diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index 53664dc53feb..724524a852ff 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -3,13 +3,11 @@ AUX beignet-1.3.1-oclicd_no_upstream_icdfile.patch 564 BLAKE2B f90bdf1c1a795007e
 AUX beignet-1.3.2_cmake-llvm-config-multilib.patch 950 BLAKE2B 9028eede7ee68dfd539bb268914c354eeaac8a9d26647c6dfb030078199e749cf67d2c396305ccaa7a139f10fcc8eca7b36657d4425439137e7199a4e62c4d13 SHA512 9a9a0348b39f0f9d256166141b48e255ccbc03e4d5150e660cfad2c23af8ff67b75049361fa84f2c2c26be2be914ad07efeae5e150f4f390ec7d5503c49b1c74
 AUX beignet-1.3.2_disable-doNegAddOptimization.patch 2536 BLAKE2B c07e063686e80a0b3f461475345582616ee59b8e195f90a87c2338a856cb3ebb04f0dd70595d901f10ae3645b9c33cccd5c0fb9bfd60052f76067f415eafac64 SHA512 d1d4f7ba2a44ee2c6255190189d141fc8adadeb6f64935501d5ce41cff1eb31e64b32664aee3edb2203f0d267fc776fbe9ed761c344fb23d858d91d6690af086
 AUX beignet-1.3.2_llvm6.patch 1039 BLAKE2B 990a653b7ff52ec89ec1204cc5bae1d0b041ae51da4a16fd1a459abfe083be1e5647e9fdac3b336284fcdb6c460dbd9c151d5818c084d49c0c2d68fb56aed905 SHA512 634ddb79878b017be984c0327160affc06d7acaf17b1030e55542d2d2cc873bebd3808638f0966538b0dd7bca763eda2263f22f818dd0b73167a4ba3f5933aaa
-AUX beignet-1.4.0-oclicd_no_upstream_icdfile.patch 726 BLAKE2B 4d182497c099e174a95524b4bd7bda66c03e128cb089b7536716afda442d8959beab19f0e6015173fbe761f1f569ce065fd1701545ebfdd0680b070644a4d9c4 SHA512 3a77f85cb8f28096b21a77e70f901ccc64291e7439c5e4ae6d7259c30531ea550604f54d0cf910e4482089ab5782f50dcb1940e5df723b0457fdafd550b2b537
-AUX beignet-1.4.0_no-debian-multiarch.patch 862 BLAKE2B 54fb9124832e57b3466c11696cf311d32863bdc36d9f4f4e946958233884f95ad9c212bf63f598e52ad054da79f453fb5a3208958de48e45bd9f21a010309edf SHA512 6760b3b7038ba0dc125998de65ec688b5eb840d8a41543ab35f6d6b6084a877fe0e383bd44b6947695ff835b391794547d7eec21bf787548e6bb03ccf2b73587
+AUX beignet-1.3.2_llvm7.patch 4805 BLAKE2B df959c8e482e1810b2257419088a4cd283bfec8984a774865722de5fb21e8e29ea4d66b98ae535f4d5a7ccb0a6754a1c683709dd9f6f535c4747822fccea2ebc SHA512 0e72053db39fb06fd14b4660109702fc917493191dfad1c1fb4afe7e8533df371dd6a048833175de247ba33aab7ef56dc0cf6449f37b432cbf2e6086391da663
 AUX llvm-terminfo.patch 788 BLAKE2B cb652c28aac1cca566cb801b9e7f2b6ea8a9ff9457896a50b3323b41a009e039085d2d4aeff14d9d8cf35fca3e4a23bacb3078451c4981b6f806cec4146aec83 SHA512 63706376f086b02be067ab54e818afab55cddb34668bc67c2c3f546142e4ca50f5536be4c15f359b3c1c6f62f36b90b3e76d67095d4bba452cf5b5a2c8891312
 AUX no-debian-multiarch.patch 1652 BLAKE2B 4d112429412a7ada957228aa8e6beb145fbaf04065d6f816b0f13513631211894c57e9999157db5f22d7044f231be65396040efe450d090e3774bd24c9c93482 SHA512 c77dd485d22e61e558f002a18103bd8dd8091ac51e702335e8713fe7f8fef24e44607744165cf0997e10941b1044d96a4876f251e8e32ffd82781e5c303f0383
 DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a
-EBUILD beignet-1.3.2-r1.ebuild 2731 BLAKE2B 28cf32641aebc20518c7f1d9c7443a6d70df6586bef1d44f7412e9df9d385db05799ad4abf4f47777724e5627fc98becad0c0e9ca35996b3949fd30382b1e140 SHA512 2804dc211c9ac1b2ad59c0fcb94c0b254ab4cc38491f439f8113da9b0125edd008eafa598d1b03fce3bbc5294086254e31a121fa5485d55a064022e65b8d06a8
 EBUILD beignet-1.3.2-r2.ebuild 2959 BLAKE2B bd67d958a8ab72669c924c28fcd487d677098370c357045cad33b4fc627a182c41bc8037388255d16215a9ad7d73663f36d91bc4ad1bef32fffcdbce29de551a SHA512 64ebc3b96c4a9e41fa36f1c5260a9ef47779c11f9d8dac83deab2777ad8a9cdf5259348d67b2ce2fa8e41e2a093dac85b073580b70827729498fa4febcffd56c
+EBUILD beignet-1.3.2-r3.ebuild 2855 BLAKE2B 760d63a15608ea0ffcf78fa42db32d64ca690794ff5d0d7f79f7b70b10b1de4064f777ca8c3c9c3c29a0f03abcf38fb045983f28c140cd97407f985e9d1f2f70 SHA512 71dcea5162e2c039971959030a49c5e64dbf02524665bd63722cec4d79e03bb5f29ebca0a3a8012c0469ad2d49d768a8218f0fc5b1472321cb1cb8f76b58e6f5
 EBUILD beignet-1.3.2.ebuild 2673 BLAKE2B 8edf3cb1b0dfe6201405afe50117e79172e20f9d5aafdecaba72cd85301c01c472a9be024d0b3a8a2c723b84bfd4a72c631d76bec3f08dc8412aa9d6ebd8f2dc SHA512 bf959b3ce52019d83e4a8bd3871155386c2e3c5de4f241044d77a1282c56c9837be6f12a78ca648833b2e21b533f42ba85de31d16027cb66cb47d52a985ac8b2
-EBUILD beignet-9999.ebuild 2495 BLAKE2B 71c35c38df5b0c3492510bc19f79ecff277488e9be8ad2c8f08e36b9569de28e005172256984618417a9aecf78588766bc6aa7974fb7e458d3c71b15f5db007e SHA512 d60e4b39d4a078bf7ee0958536a37f734faa578884ca79b329496d852b28727961f9f20f272a6dbf47ff910e4eff677e1ed2701331184dfc1efe46a9bae925bd
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2-r1.ebuild b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
index c7cc20e5302c..820fc50e9a73 100644
--- a/dev-libs/beignet/beignet-1.3.2-r1.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
@@ -1,48 +1,42 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 CMAKE_BUILD_TYPE="Release"
 
-inherit python-any-r1 cmake-multilib flag-o-matic llvm toolchain-funcs
+inherit python-any-r1 cmake-multilib flag-o-matic llvm
 
-DESCRIPTION="OpenCL implementation for Intel GPUs"
+DESCRIPTION="OpenCL implementation for Intel Sandy Bridge, Ivy Bridge and Haswell GPUs"
 HOMEPAGE="https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet"
+SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE="ocl-icd ocl20"
 
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/beignet/beignet.git"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
-	S=${WORKDIR}/Beignet-${PV}-Source
-fi
-
-COMMON="media-libs/mesa[${MULTILIB_USEDEP}]
-	<sys-devel/clang-6.0.9999:=[${MULTILIB_USEDEP}]
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig"
+COMMON="app-eselect/eselect-opencl
+	media-libs/mesa[${MULTILIB_USEDEP}]
+	<sys-devel/clang-7.0.9999:=[${MULTILIB_USEDEP}]
 	>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]"
-RDEPEND="${COMMON}
-	app-eselect/eselect-opencl"
-DEPEND="${COMMON}
-	${PYTHON_DEPS}
-	ocl-icd? ( dev-libs/ocl-icd )
-	virtual/pkgconfig"
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	ocl-icd? ( dev-libs/ocl-icd )"
+RDEPEND="${COMMON}"
+DEPEND="${COMMON}"
 
-LLVM_MAX_SLOT=6
+LLVM_MAX_SLOT=7
 
 PATCHES=(
 	"${FILESDIR}"/no-debian-multiarch.patch
+	"${FILESDIR}"/${PN}-1.3.2_disable-doNegAddOptimization.patch
 	"${FILESDIR}"/${PN}-1.3.2_cmake-llvm-config-multilib.patch
 	"${FILESDIR}"/${PN}-1.3.2_llvm6.patch
+	"${FILESDIR}"/${PN}-1.3.2_llvm7.patch
 	"${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch
 	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
 	"${FILESDIR}"/llvm-terminfo.patch
@@ -52,16 +46,7 @@ DOCS=(
 	docs/.
 )
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if tc-is-gcc; then
-			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
-				eerror "Compilation with gcc older than 4.6 is not supported"
-				die "Too old gcc found."
-			fi
-		fi
-	fi
-}
+S="${WORKDIR}"/Beignet-${PV}-Source
 
 pkg_setup() {
 	llvm_pkg_setup
@@ -104,3 +89,16 @@ multilib_src_install() {
 	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
 	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
 }
+
+pkg_postinst() {
+	elog ""
+	elog "Please note that for Broadwell and newer architectures, Beignet has been deprecated upstream in favour of dev-libs/intel-neo."
+	elog "It remains the recommended solution for Sandy Bridge, Ivy Bridge and Haswell."
+	elog ""
+
+	if use ocl-icd; then
+		"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
+	else
+		"${ROOT}"/usr/bin/eselect opencl set --use-old beignet
+	fi
+}
diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-9999.ebuild
deleted file mode 100644
index 735edfd2e512..000000000000
--- a/dev-libs/beignet/beignet-9999.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-CMAKE_BUILD_TYPE="Release"
-
-inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="OpenCL implementation for Intel GPUs"
-HOMEPAGE="https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="ocl-icd ocl20"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/beignet/beignet.git"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
-	S=${WORKDIR}/Beignet-${PV}-Source
-fi
-
-COMMON="media-libs/mesa
-	sys-devel/clang:=
-	sys-devel/llvm:=
-	>=x11-libs/libdrm-2.4.70[video_cards_intel]
-	x11-libs/libXext
-	x11-libs/libXfixes"
-RDEPEND="${COMMON}
-	app-eselect/eselect-opencl"
-DEPEND="${COMMON}
-	${PYTHON_DEPS}
-	ocl-icd? ( dev-libs/ocl-icd )
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0_no-debian-multiarch.patch
-	"${FILESDIR}"/${PN}-1.4.0-oclicd_no_upstream_icdfile.patch
-	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
-	"${FILESDIR}"/llvm-terminfo.patch
-)
-
-DOCS=(
-	docs/.
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if tc-is-gcc; then
-			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
-				eerror "Compilation with gcc older than 4.6 is not supported"
-				die "Too old gcc found."
-			fi
-		fi
-	fi
-}
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	# See Bug #593968
-	append-flags -fPIC
-
-	cmake-utils_src_prepare
-	# We cannot run tests because they require permissions to access
-	# the hardware, and building them is very time-consuming.
-	cmake_comment_add_subdirectory utests
-}
-
-multilib_src_configure() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
-		-DOCLICD_COMPAT=$(usex ocl-icd)
-		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	cmake-utils_src_install
-
-	insinto /etc/OpenCL/vendors/
-	echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
-	doins "${PN}-${ABI}.icd"
-
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
-}
diff --git a/dev-libs/beignet/files/beignet-1.3.2_llvm7.patch b/dev-libs/beignet/files/beignet-1.3.2_llvm7.patch
new file mode 100644
index 000000000000..8990f0f0e48f
--- /dev/null
+++ b/dev-libs/beignet/files/beignet-1.3.2_llvm7.patch
@@ -0,0 +1,124 @@
+commit e1b2419a0008e38ef2d9d255d9e9c74e9fba084b
+Author: Rebecca N. Palmer <rebecca_palmer@zoho.com>
+Date:   Sat Jul 21 20:05:54 2018 +0100
+
+    Add preliminary LLVM 7 support
+    
+    This is preliminary because LLVM 7 has not been released yet:
+    it was tested with the snapshot from Debian experimental (svn336894).
+    
+    1.Change linking order, as clangCodeGen now links to clangFrontend
+    2.Pass references not pointers to WriteBitcodeToFile and CloneModule
+    3.Add the headers that LoopSimplifyID, LCSSAID and
+    some create*Pass have moved to
+    4.Define our DEBUG whether or not we just undefined LLVM's
+    (theirs is now LLVM_DEBUG, but we never actually use it)
+    
+    Signed-off-by: Rebecca N. Palmer <rebecca_palmer@zoho.com>
+    Reviewed-by: Yang Rong <rong.r.yang@intel.com>
+
+diff --git a/CMake/FindLLVM.cmake b/CMake/FindLLVM.cmake
+index 5457f248..f882589d 100644
+--- a/CMake/FindLLVM.cmake
++++ b/CMake/FindLLVM.cmake
+@@ -113,10 +113,10 @@ macro(add_one_lib name)
+ endmacro()
+ 
+ #Assume clang lib path same as llvm lib path
++add_one_lib("clangCodeGen")
+ add_one_lib("clangFrontend")
+ add_one_lib("clangSerialization")
+ add_one_lib("clangDriver")
+-add_one_lib("clangCodeGen")
+ add_one_lib("clangSema")
+ add_one_lib("clangStaticAnalyzerFrontend")
+ add_one_lib("clangStaticAnalyzerCheckers")
+diff --git a/backend/src/backend/gen_program.cpp b/backend/src/backend/gen_program.cpp
+index 274c99c7..41592349 100644
+--- a/backend/src/backend/gen_program.cpp
++++ b/backend/src/backend/gen_program.cpp
+@@ -454,7 +454,11 @@ namespace gbe {
+ #ifdef GBE_COMPILER_AVAILABLE
+       std::string str;
+       llvm::raw_string_ostream OS(str);
++#if LLVM_VERSION_MAJOR >= 7
++      llvm::WriteBitcodeToFile(*((llvm::Module*)prog->module), OS);
++#else
+       llvm::WriteBitcodeToFile((llvm::Module*)prog->module, OS);
++#endif
+       std::string& bin_str = OS.str();
+       int llsz = bin_str.size();
+       *binary = (char *)malloc(sizeof(char) * (llsz+1) );
+@@ -545,7 +549,11 @@ namespace gbe {
+                                     &modRef);
+         src = llvm::unwrap(modRef);
+       }
++#if LLVM_VERSION_MAJOR >= 7
++      llvm::Module* clone = llvm::CloneModule(*src).release();
++#else
+       llvm::Module* clone = llvm::CloneModule(src).release();
++#endif
+       if (LLVMLinkModules2(wrap(dst), wrap(clone))) {
+ #elif LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 37
+       if (LLVMLinkModules(wrap(dst), wrap(src), LLVMLinkerPreserveSource_Removed, &errMsg)) {
+diff --git a/backend/src/backend/program.cpp b/backend/src/backend/program.cpp
+index c37c5951..b36f7b4a 100644
+--- a/backend/src/backend/program.cpp
++++ b/backend/src/backend/program.cpp
+@@ -794,7 +794,11 @@ namespace gbe {
+       llvm::raw_fd_ostream ostream (dumpSPIRBinaryName.c_str(),
+                                     err, llvm::sys::fs::F_None);
+       if (!err)
++#if LLVM_VERSION_MAJOR<7
+         llvm::WriteBitcodeToFile(*out_module, ostream);
++#else
++        llvm::WriteBitcodeToFile(**out_module, ostream);
++#endif
+     }
+ #endif
+     return true;
+diff --git a/backend/src/llvm/ExpandLargeIntegers.cpp b/backend/src/llvm/ExpandLargeIntegers.cpp
+index 8515dc13..4aec44ee 100644
+--- a/backend/src/llvm/ExpandLargeIntegers.cpp
++++ b/backend/src/llvm/ExpandLargeIntegers.cpp
+@@ -99,8 +99,8 @@ using namespace llvm;
+ 
+ #ifdef DEBUG
+   #undef DEBUG
+-  #define DEBUG(...)
+ #endif
++#define DEBUG(...)
+ // Break instructions up into no larger than 64-bit chunks.
+ static const unsigned kChunkBits = 64;
+ static const unsigned kChunkBytes = kChunkBits / CHAR_BIT;
+diff --git a/backend/src/llvm/llvm_bitcode_link.cpp b/backend/src/llvm/llvm_bitcode_link.cpp
+index ef56e4c2..4c3e20e4 100644
+--- a/backend/src/llvm/llvm_bitcode_link.cpp
++++ b/backend/src/llvm/llvm_bitcode_link.cpp
+@@ -340,7 +340,11 @@ namespace gbe
+     /* We use beignet's bitcode as dst because it will have a lot of
+        lazy functions which will not be loaded. */
+ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 39
++#if LLVM_VERSION_MAJOR >= 7
++    llvm::Module * linked_module = llvm::CloneModule(*(llvm::Module*)mod).release();
++#else
+     llvm::Module * linked_module = llvm::CloneModule((llvm::Module*)mod).release();
++#endif
+     if(LLVMLinkModules2(wrap(clonedLib), wrap(linked_module))) {
+ #else
+     char* errorMsg;
+diff --git a/backend/src/llvm/llvm_includes.hpp b/backend/src/llvm/llvm_includes.hpp
+index 184553af..ffccf025 100644
+--- a/backend/src/llvm/llvm_includes.hpp
++++ b/backend/src/llvm/llvm_includes.hpp
+@@ -89,6 +89,10 @@
+ #include "llvm/CodeGen/IntrinsicLowering.h"
+ 
+ #include "llvm/Transforms/Scalar.h"
++#if LLVM_VERSION_MAJOR >= 7
++#include "llvm/Transforms/Utils.h"
++#include "llvm/Transforms/InstCombine/InstCombine.h"
++#endif
+ #include "llvm/MC/MCAsmInfo.h"
+ #include "llvm/MC/MCContext.h"
+ #include "llvm/MC/MCInstrInfo.h"
diff --git a/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch b/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch
deleted file mode 100644
index ddffcfc8aff4..000000000000
--- a/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -214,14 +214,6 @@
-   Find_Package(OCLIcd)
-   IF(OCLIcd_FOUND)
-     MESSAGE(STATUS "Looking for OCL ICD header file - found")
--    configure_file (
--      "intel-beignet.icd.in"
--      "${ICD_FILE_NAME}"
--      )
--    IF(NOT OCL_ICD_INSTALL_PREFIX)
--      set(OCL_ICD_INSTALL_PREFIX "/etc/OpenCL/vendors")
--    ENDIF(NOT OCL_ICD_INSTALL_PREFIX)
--    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${OCL_ICD_INSTALL_PREFIX})
-   ELSE(OCLIcd_FOUND)
-     MESSAGE(STATUS "Looking for OCL ICD header file - not found")
-     MESSAGE(FATAL_ERROR "OCL ICD loader miss. If you really want to disable OCL ICD support, please run cmake with option -DOCLICD_COMPAT=0.")
diff --git a/dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch b/dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch
deleted file mode 100644
index 983ba61ff38f..000000000000
--- a/dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,15 +33,9 @@
- 
- SET(CMAKE_VERBOSE_MAKEFILE "false")
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/")
--INCLUDE (GNUInstallDirs OPTIONAL)
--# support old CMake without GNUInstallDirs
--if (NOT CMAKE_INSTALL_FULL_LIBDIR)
--  set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
--  set (CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
--  set (BEIGNET_LIBRARY_ARCHITECTURE "")
--else (NOT CMAKE_INSTALL_FULL_LIBDIR)
--  set (BEIGNET_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")
--endif (NOT CMAKE_INSTALL_FULL_LIBDIR)
-+set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
-+set (CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
-+set (BEIGNET_LIBRARY_ARCHITECTURE "")
- 
- if (NOT LIB_INSTALL_DIR)
-   set (LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")