gentoo resync : 25.11.2020

6 files changed, 20 insertions, 61 deletions

diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index fb32bb9bb155..b7fad2efc949 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -1,7 +1,6 @@
+AUX intel-neo-20.37.17906-no_Werror.patch 324 BLAKE2B 60fa6150f50986a12daf7a55b49cc7be6c8a6c314de750937f806ee0f057140a0d41630352914e529e79adf30ccea41bf0f3bae3cec68378ad3897e3047c7202 SHA512 74843a8a6114dc79d92906f957dcb1b411007ba4c27ebe1b46121acfd9dae34b122e711cfc290ecced7f5c622ee7340c8294fc7ef45b88dfdc6ac807cbac1785
 DIST intel-neo-20.16.16582.tar.gz 3042531 BLAKE2B adfc0aee2a315e67ccb3e4fe39ab09b618930607d3de931d1367881642d8e542385589299f593d3ab1cd6e16de7a8fce7b55fa1b4259097e15da7e55034d344b SHA512 700bee3ccf72c2bc89f5c8a75591de9dafbfe0a6480e3216258842c6b68ce1b527569d5fe1327a0a80cfbf79dca1d956820f060b602feefa83fc9b47cb46d7d0
-DIST intel-neo-20.36.17813.tar.gz 3459305 BLAKE2B 81996bb5946ff6334dc06aceed7e5f01f1ec1e417de7a600d41af43e0f74e3003b293f2981ad742e4f9df630aa81e9a21f6a0a04e9615ee4caa97fae4fe682bf SHA512 366120e785e068393bc0b1c2345eb3d2eca46d6c7485736d7e2aeece91d404f9b802230873b6f868fdd9d7a9852112a8aa216cde1210ab51d430dcef9601d968
 DIST intel-neo-20.37.17906.tar.gz 3492080 BLAKE2B e133dde18c67e5b50dc65372faeaf78ee2512adf80f6869e9a99ff18aba5463b2c47e62cac3122eb899c644f5bbea6dd3205d348d071ea8854e3271b9e25fb34 SHA512 3db9b05dbfc05de8e5aad4eac631320642ff03444ff3eafe0f9cf72897e2dfb723563ad9f953a900a19511cc8affd3832d3f3fa966d9388714c326c71180e8f6
-EBUILD intel-neo-20.16.16582.ebuild 1197 BLAKE2B 480adbc18a35ac51f842cb996f32abce6006a15907d96fc91c900a5acb053b105b8111c3bef818ca3f8d87822123fd703cf57b01fe8694706c01bbc873116441 SHA512 5eaf2f8757db684c8cc7eeca9de1446a3d15761c69cb58888ff46862d51204a5f5a8ff350a89bd80c3bcbcd969856f5d796081ca658b72b83bd821f0da63f299
-EBUILD intel-neo-20.36.17813.ebuild 1198 BLAKE2B 190a825c85eac774f52eed0205e6f758c4a071cfa19e39fa30a4569b046531481b07d1cf22d630e6c9af5c9fb133b6fdd106ae17f51987b2020b2c1a247cf00c SHA512 9876ce22eaa6685a9623e3653fde979f6450fdfe93b58e9c1dde104f64c182059c9ae9cbf52e7dc3951077030022b92f063afc0905ec265e15835bd9e96ebc8f
-EBUILD intel-neo-20.37.17906.ebuild 1198 BLAKE2B 60f0e920cb2b2f0f779726107d99ac7f2ea6720717093beb8d2f779794de35405e5aa514cb44492d27b3cee459c37bcfb6b70d7f7de219e241abb6eb3888c198 SHA512 e23cbc54ee00785599fc35375f44978e72a3d3deab9e264be68b7c29ccd4497aa00cd95802cb92362a505b5877719dd72f8d98c3224b3dd6e3b4bf3ba8b6f625
-MISC metadata.xml 1173 BLAKE2B 60913d5c1e3b546b4a9a8f35341761a89a4c8e1a7ed3c63ba992eabfc28c01f790f1eb006220ccb3c764a0b6325e6e8f56186a058ec9387226eb2a911c9b73c2 SHA512 f2b373b08f2b599a1dcaef3ea32157a7278c8088a247d8275f68a35730ee28d065acdf8e99287a853a0a761bc497a5e48c72c3352a8f8cdbc9828134bab6c602
+EBUILD intel-neo-20.16.16582.ebuild 1196 BLAKE2B adf17e562863b87567606424df2cd99bc033f558233010185dc62d1d3d6e75c21ae59a46a2da5428512d930491128c64aa51a660e7b4fee22d343822dff7c6d6 SHA512 2957c918f1ff3a84b020b92192eb84177b4002006675499fd9f53a67dd921bce96d8f4c2cad60117aebdde0e2b985c767228c8f8fe3dd1c68c3d91cbfa51e574
+EBUILD intel-neo-20.37.17906.ebuild 1260 BLAKE2B e440657f16549c85761afa6737523733b0b88cb350c49728df98de3da0a6a3149bbc08a4e5191c28462e351872f05fdfff1046322678601139a5aaa70c07b09f SHA512 c78b0525b5a17dc7353620ea3164b6674c1601d0873794fc75c82b8cfb97cf4699dffc37e5bc70f017ab9dd5df51887231999468d34ab886638edc4fa2f863b2
+MISC metadata.xml 1095 BLAKE2B 4669305d1799b9fde4b63f735593ad7e42d17b5ec65ef482a316c7347bdcd0c37b99700f4a29865352dc18e06ca8c38ddaeb650cc12793ecbca7ffbe6eec27cf SHA512 fe9a420c66ee8a86954f52d824a4f812667a5a84fc2fecdc286bd590413e0ac1ae55452dc736a4b315a0cbf15ac22f8a4b682226cac8b2377db9533bedb13fb2
diff --git a/dev-libs/intel-neo/files/intel-neo-20.37.17906-no_Werror.patch b/dev-libs/intel-neo/files/intel-neo-20.37.17906-no_Werror.patch
new file mode 100644
index 000000000000..aaa34012096d
--- /dev/null
+++ b/dev-libs/intel-neo/files/intel-neo-20.37.17906-no_Werror.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -801,7 +801,6 @@
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-noexcept-type") # Added for gtest
+     endif()
+   endif()
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+ endif()
+ 
+ # Compile code with defenses enabled (settings to be used for production release code)
diff --git a/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild b/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
index 96c7b18829cd..9c033bd1c114 100644
--- a/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
+++ b/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="l0 vaapi"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/intel-neo/intel-neo-20.36.17813.ebuild b/dev-libs/intel-neo/intel-neo-20.36.17813.ebuild
deleted file mode 100644
index 6f29828a72b3..000000000000
--- a/dev-libs/intel-neo/intel-neo-20.36.17813.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_PN="compute-runtime"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Intel Graphics Compute Runtime for L0 and OpenCL, for Broadwell and beyond"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="l0 vaapi"
-
-BDEPEND="virtual/pkgconfig"
-COMMON=">=virtual/opencl-3
-	>=dev-util/intel-graphics-compiler-1.0.3826
-	>=media-libs/gmmlib-20.2.5
-	l0? ( >=dev-libs/level-zero-1.0.0 )
-	vaapi? (
-		x11-libs/libdrm[video_cards_intel]
-		x11-libs/libva
-	)"
-DEPEND="${COMMON}
-	media-libs/mesa"	# for Khronos OpenGL headers
-RDEPEND="${COMMON}"
-
-DOCS=(
-	README.md
-	FAQ.md
-)
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
-		-DBUILD_WITH_L0=$(usex l0)
-		-DDISABLE_LIBVA=$(usex vaapi "no" "yes")
-		# If enabled, tests are automatically run during the compile phase
-		# - and we cannot run them because they require permissions to access
-		# the hardware.
-		-DSKIP_UNIT_TESTS=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-neo/intel-neo-20.37.17906.ebuild b/dev-libs/intel-neo/intel-neo-20.37.17906.ebuild
index d5b0ed670f89..73c9118afb5f 100644
--- a/dev-libs/intel-neo/intel-neo-20.37.17906.ebuild
+++ b/dev-libs/intel-neo/intel-neo-20.37.17906.ebuild
@@ -30,6 +30,10 @@ DEPEND="${COMMON}
 	media-libs/mesa"	# for Khronos OpenGL headers
 RDEPEND="${COMMON}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.37.17906-no_Werror.patch
+)
+
 DOCS=(
 	README.md
 	FAQ.md
diff --git a/dev-libs/intel-neo/metadata.xml b/dev-libs/intel-neo/metadata.xml
index 0cb86b121696..cae799d9f329 100644
--- a/dev-libs/intel-neo/metadata.xml
+++ b/dev-libs/intel-neo/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>The Intel Graphics Compute Runtime for for oneAPI Level Zero and
 		OpenCL Driver, informally known as NEO, is an open source project providing
 		compute API support (Level Zero, OpenCL) for Intel graphics hardware