gentoo resync : 21.06.2020

4 files changed, 10 insertions, 90 deletions

diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index b80f1754b160..5348b03df305 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,9 +1,6 @@
-AUX intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch 1335 BLAKE2B 6b710f0f02f36bc795c407fd70e4f4ef6931794114f692b16ed48b98547345e60293c1d8d03bddff2db20722e362a4cc9493d36ceb2eb7f4fd8abdffd72b6144 SHA512 4af69610c65be18700f9d14f6d856ea8016fb5b9ed0aae6ad8ca0e0c663fd7ea30779f0b17c61a330edad2b550bea1b723a4a64f5807822252725fbc65adfb98
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
-DIST intel-graphics-compiler-1.0.3151.tar.gz 5950502 BLAKE2B 8ccbfc5d3cd6307eb5db602822d42e8744e6ca7696494a0dd349847aff0defde2434b9192f17645f1fcbf732ec98a66dbdcc7d03eed48702d90911f912135fc1 SHA512 a6e04a3a90aae9046f2698bf15d5f60862c93e7a87a6e4ae6b6c43c65490583608f201e94a2ef32fc2f72e9fa0da7d6c202f64ef610f03a81384ac537541df14
-DIST intel-graphics-compiler-1.0.3445.tar.gz 6026437 BLAKE2B 4a4708109d125891dfe967186efbc2ebe70ce59dc0302f534dad74c0b1f2af36de0d7ee7cb69059e776ab4669236f5d62750159a44d44a6444ab85a205273563 SHA512 044b941adb921b25a1ab6da3ebe0f7c4d67769b43e5b855ae94871281cf387ce45351b8b46a6e98e3bd573022d7cfd9316629d590327c8f4007e1b1ae9f7071e
 DIST intel-graphics-compiler-1.0.3826.tar.gz 6007014 BLAKE2B fc09d6443818403bca803f3f78fbb9ee9a25ab674372585b880e038227712f8114ca2b17d6b219149f54f9f5856b973d3500f6537027660d1c657d61992f9e9b SHA512 e4f06d6b8d2a7161f80956a8e9cbf23aa7293a31781405bc17ee512d27ca4114facc6bb0fa7f47fde3a37aa79ce288a98aef8b74c4e572e73d70bb50c21f6fbb
-EBUILD intel-graphics-compiler-1.0.3151.ebuild 895 BLAKE2B 9924a3f7db2a7a8e75bdbdbe3d50f42b60c5265ae6e2cb50df52ed860c2178f6a2f00bcac075d5914f47d5e2abd8b7f4fb8e7d2fd06a7aa6d3dcb5d90f91dd6f SHA512 e5d68db8303f165259c399e2d786991ace0628aac5667ac28200d9ba9952c16c23cfb872914cc6e6e4dc00cb9b7bd11b023627f62de5aca661d8bc3de8ecd782
-EBUILD intel-graphics-compiler-1.0.3445.ebuild 1448 BLAKE2B c8175562df6d37f1fddfa760b69fe20a5b1e35ee88493750e659bbdad83b6f4cb3edeadf8f94f0ec47b5f808a04a05f17711ea1ca410d6679dc087d4631b5918 SHA512 00db2187b0869417835a78aec5361df6cf3606ed952b3f3fc51b7a43d027548302723ab02bd613d0dd5f1632c5bd660f208d72b6eb7f1bc6abfffe8d584f646e
+DIST intel-graphics-compiler-1.0.4111.tar.gz 5781246 BLAKE2B 6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733 SHA512 8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110
 EBUILD intel-graphics-compiler-1.0.3826.ebuild 1594 BLAKE2B e3a96e480f23b0ce4761cae5734c22ba4e835d9cd6f4225ac0a7539a7038443e0b4d25f6b2eadb0b40de4d275bd03fe1d1945f9e591883f8a37ec6f72db457fc SHA512 1b132608d543afc632148941dce4e50f63ce86a558a798201b2cf5dca7fc1a9f5ba7c3ba8f5dab67d51c2c369f1d844eb10b4d76702f4b7ed4a2cf1cbea1468f
+EBUILD intel-graphics-compiler-1.0.4111.ebuild 1595 BLAKE2B f096bc2bde19be56e368a11e2174f9aef4a412595dd96fa7736ea67d1293aa5325f894c84eb3b12c93a8a9f96230f934f07750202dfdaac56bbcbb9b3bc4b3d8 SHA512 74a2e5639030e4dcd4601005be37846f289ba25c13bbb452769659660a73f36f1e6dfdcd1c432639383f15c9f33cb4990e3446d8b469a47363918cdc1f28e791
 MISC metadata.xml 340 BLAKE2B 6c0e5d932084dffd300a1dc70b29eb0871dfe2187ed8591a5a2f8cba001bf681e908c58a6f9471f7b08842ff538365258305da91004ed63ff97314a07fda529f SHA512 d24016b4ae0ffb05be475f86bb8d72ab4a85475655f409b8826dcd69726e048aa048e321f26ac36f2f52aec40abbfa66a95354a711332df94dc3e57e6c396a0c
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch
deleted file mode 100644
index 931ba4437b14..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 5a07111005b570875da8796f91b385edc483c0da Mon Sep 17 00:00:00 2001
-From: "Wesierski, Lukasz" <lukasz.wesierski@intel.com>
-Date: Mon, 24 Feb 2020 05:27:13 -0800
-Subject: [PATCH] Fix for building separated dynamic llvm libs
-
-Change-Id: I3796e7a925e32bfee2dfda60fbaa3f21122e62cb
----
- IGC/CMakeLists.txt | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/IGC/CMakeLists.txt b/IGC/CMakeLists.txt
-index 8634c456..891a3f5b 100644
---- a/IGC/CMakeLists.txt
-+++ b/IGC/CMakeLists.txt
-@@ -82,7 +82,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
- 
- # ================================================ Flags ===============================================
- 
--
- # Escapes text for regular expressions.
- #
- # @param retValName Name of variable placeholder where result will be returned.
-@@ -3309,12 +3308,18 @@ else()
-         "LLVMDemangle"
-         )
- 
--    if(LLVM_VERSION_MAJOR EQUAL 8)
-+    if(LLVM_VERSION_MAJOR GREATER_EQUAL 8)
-         list(APPEND IGC_BUILD__LLVM_LIBS_TO_LINK
-           "LLVMInstCombine"
-           )
-     endif()
- 
-+    if(LLVM_VERSION_MAJOR GREATER_EQUAL 9)
-+        list(APPEND IGC_BUILD__LLVM_LIBS_TO_LINK
-+          "LLVMBitstreamReader"
-+          )
-+    endif()
-+
- endif()
- 
- # ==================================== WrapperLLVM package =============================================
--- 
-2.24.1
-
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3151.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3151.ebuild
deleted file mode 100644
index b6771efb82c8..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3151.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib llvm
-
-DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]
-	dev-libs/opencl-clang:8=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-
-LLVM_MAX_SLOT=8
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
-)
-
-S="${WORKDIR}"/${PN}-igc-${PV}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)
-		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
-		-DIGC_PREFERRED_LLVM_VERSION=${LLVM_MAX_SLOT}
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3445.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
index 7076388bbd05..7c11b12c6397 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3445.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 CMAKE_ECLASS=cmake
-inherit cmake-multilib llvm
+
+inherit cmake-multilib flag-o-matic llvm
 
 DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
 HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
@@ -13,8 +14,9 @@ SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="debug"
 
-LLVM_MAX_SLOT=9
+LLVM_MAX_SLOT=10
 
 COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
 	<=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]"
@@ -23,7 +25,6 @@ RDEPEND="${COMMON}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
-	"${FILESDIR}"/${PN}-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch
 )
 
 S="${WORKDIR}"/${PN}-igc-${PV}
@@ -37,6 +38,10 @@ multilib_src_configure() {
 	has_version -d sys-devel/llvm:$llvm_slot || die "LLVM slot matching $ocl_clang_ver not found ($llvm_slot)"
 	einfo "Selecting LLVM SLOT $llvm_slot: $(best_version -d sys-devel/llvm:$llvm_slot)"
 
+	# Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
+	# IGC uses this definition causes problems for some users (see Bug #718824).
+	use debug || append-cppflags -DNDEBUG
+
 	local mycmakeargs=(
 		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${llvm_slot})/$(get_libdir)
 		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON