gentoo resync : 11.07.2019

5 files changed, 21 insertions, 56 deletions

diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 46f1303a132f..70fc4d8eacdc 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,7 +1,6 @@
-DIST intel-graphics-compiler-1.0.3.tar.gz 6721202 BLAKE2B 2934778e931a4b38a239ede5944757cc42c0a965e700ba471272ba8e9ca08b1c1c790c920ed6896a870985b1d2819a182a9aaf5a5a8cbfc13038ecd7cf1def1e SHA512 c0c0cc21263b71bc57aed43a3e8bd641ea7853db0a574823a70abb592a69b7f8a9f426e88e7fddea4cf6a14de44e064f80abcfa3ea709701e5003e0d4b7adfb0
-DIST intel-graphics-compiler-1.0.4.tar.gz 6720515 BLAKE2B 2f9ac9a2435bac785b6a9f3cb8c63eb570ee1a87eca9682fa1c09363f5da3b258e22ad1c5b1628a1537b36afb7c6f6e66f2052b31ef7fdff0bc43cf67fad55ba SHA512 0b748b33c4c1822d8fb159dbbbeb35f0573d3eb464e3be0a94771069e47a019d6cbe878d2d2a1969ec87b051d62ff2f77db88b02238e9a74d8f62fc71f07e264
+AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
 DIST intel-graphics-compiler-1.0.8.tar.gz 6428984 BLAKE2B 1835f86da24162af0f568794fd084c12cf8950601a74d3aaef928739d7ef942a23b2309713976b2fd67684d7360706155610ee7a80db0dbc217ff5b502b254d2 SHA512 43c54858fcc5ec5941d79ed34774077bcd5ece80d6d2bb28526b15ffe5237dddbcef2c13e4cc21faf35851174ed5a5b1af65db9bdd3281657e1e09456b761c18
-EBUILD intel-graphics-compiler-1.0.3.ebuild 919 BLAKE2B b6bb9e5f2c49b110bcf771e10ad4ecdf04156e6c9e4fe0cc0c979daa0ad1efff4f1bc54fd4940e3e4f9f67beba22f85fcff79873edbef858459b15846cec4899 SHA512 2fbbc2ab3a22a4fd8637278e4e16a2b4be3dfd77b11e687948dc18ecd1401163e3d5a94ffc24ae2a1a29d53f8774139d2914b6197da9277af8384395dd88ef96
-EBUILD intel-graphics-compiler-1.0.4.ebuild 1214 BLAKE2B 4543f3229f2a7abb992fa35a8a76780560cfb3e19d61e8612fc21866897b432cf650413ccf972115d2262b8ae58883a0de726f08018c42d55d0ab8245baf6682 SHA512 acda5f7466d703a6973d498a903c42ffa71f940eca0d127e13c96708d6051ba8423c6fbfa5ac9a97ad8c919eebdd29ea501ab1bd83fc3e371be242d54b5f4229
-EBUILD intel-graphics-compiler-1.0.8.ebuild 886 BLAKE2B eb79aab5eed4481c954d76f23174743f670f4f48d0e1b6a9b1b0d4d2ad80a0a3c6040d0cfe20a6a96d030d9322d351aeba92c14b003f9213fa6fd0573a7b9cb5 SHA512 181bb85717f5f18b4c187285e0b4bf59fc52ee3990107e57bc4062f766e2acb4d981d069d9d4678d7db45b0c956a0d0279c531ce90b457556279a49e4c947f32
+DIST intel-graphics-compiler-1.0.9.tar.gz 5684971 BLAKE2B c3a07773f1ee4ef53bae4af61a85e8ac60f3ddde3573fa853c12c887f94191b344b905bfb0d6ef7e489b2bbb05c01719981199fa85397c87f4ef74b0338bfffe SHA512 67c9efafab1cce4c34fb00cf9b20660c2107daeff27e3837a52c9f24405cb5c11c46366662692d47b4490584890cc5a5791de358196dcabc6e566e22b1aafd53
+EBUILD intel-graphics-compiler-1.0.8.ebuild 893 BLAKE2B fea45a9e25bdd28bdb4288a419f6db15d6afb41f369173b103b93cf8182f75e05bec4573bdfeae66ea0dca7cd5f77998fb1f6e057861ecf05884546f9ba78a78 SHA512 e29d150060a59fa88f3a0a52a40d6648cc30eb0ccdbd1d75440267f4895a7897ac9f3a66ae72b7e5ebcbad6fe3ba0d12c24609871e1ace692efdfcd92f22de97
+EBUILD intel-graphics-compiler-1.0.9.ebuild 858 BLAKE2B 2c7ec1b004ab7c42ba9454f673316c0ce9407a0609122b84fab1b0b7aca83c8a90d75595fb127d5a0965ce4e1111dbe80a84c38f38bc8754b1ec8b1174c0e726 SHA512 ce9900013a92232ee8794ce058a6e3e5fcdfc5e37eca22a69f38db25c6b661b634c5e259f8b21146406aa8a132e9ccc2d55d6cb37ed6ad6c7e16612ba06011ac
 MISC metadata.xml 340 BLAKE2B 6c0e5d932084dffd300a1dc70b29eb0871dfe2187ed8591a5a2f8cba001bf681e908c58a6f9471f7b08842ff538365258305da91004ed63ff97314a07fda529f SHA512 d24016b4ae0ffb05be475f86bb8d72ab4a85475655f409b8826dcd69726e048aa048e321f26ac36f2f52aec40abbfa66a95354a711332df94dc3e57e6c396a0c
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-no_Werror.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-no_Werror.patch
new file mode 100644
index 000000000000..433b0e9caaed
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-no_Werror.patch
@@ -0,0 +1,10 @@
+--- a/IGC/CMakeLists.txt
++++ b/IGC/CMakeLists.txt
+@@ -2769,7 +2769,6 @@
+           -march=corei7
+           -mstackrealign
+           -fms-extensions
+-          -Werror
+           -Wno-unused-parameter
+           -Wno-missing-field-initializers
+           -Wwrite-strings
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4.ebuild
deleted file mode 100644
index 2a30895b7689..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib llvm toolchain-funcs
-
-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
-
-S="${WORKDIR}"/${PN}-igc-${PV}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if tc-is-gcc && [[ $(gcc-major-version) -ge 9 ]]; then
-			# Bug #685790
-			eerror "Compilation with gcc-9+ is not supported yet. Switch to an older version and try again."
-			die "Tried to use too new gcc."
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCCLANG_BUILD_INTREE_LLVM=OFF
-		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix)/$(get_libdir)
-		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
-		-DIGC_PREFERRED_LLVM_VERSION=8
-		# Until a new official release of opencl-clang
-		-DCOMMON_CLANG_LIBRARY_NAME=common_clang
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8.ebuild
index e792758ac3dd..9ab4c6997620 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]
-	dev-libs/opencl-clang:8=[${MULTILIB_USEDEP}]"
+	<dev-libs/opencl-clang-8.0.1:8=[${MULTILIB_USEDEP}]"
 DEPEND="${COMMON}"
 RDEPEND="${COMMON}"
 
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild
index b15c94ceace5..54d2ad4034cd 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-multilib llvm
 
@@ -14,22 +14,23 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]
-	dev-libs/opencl-clang:8=[${MULTILIB_USEDEP}]"
+	>=dev-libs/opencl-clang-8.0.1: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=(
-		-DCCLANG_BUILD_INTREE_LLVM=OFF
 		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix)/$(get_libdir)
 		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
 		-DIGC_PREFERRED_LLVM_VERSION=8
-		# Until a new official release of opencl-clang
-		-DCOMMON_CLANG_LIBRARY_NAME=common_clang
 	)
 	cmake-utils_src_configure
 }