gentoo resync : 05.02.2020

3 files changed, 8 insertions, 64 deletions

diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index 22f9b48efd53..3ad0c4dff061 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -1,7 +1,5 @@
-DIST intel-neo-19.38.14237.tar.gz 2480609 BLAKE2B d44b00038009d6fc549f7cb17f248f83b6848d152cbb0a0815a5537b4e6131e5087ec231d777eb425b13aee27954c4526ede4859305e5312ad34cc7ec32b0897 SHA512 5886c1565405410da27fd3f2f38e78e9d7017968ec92a2819206e53eeeace3903c3d14fae9b5a5abf582cece5fe1d54bc1db18301846c668af768fcac5854c91
-DIST intel-neo-19.46.14807.tar.gz 2582591 BLAKE2B 07f65bf191e81a863e840a85c89d7632edfde814da0a00beaac0124293bf44a4d7bc45abdb0d8444dafcdaba24f83194d37df55297e0d0b32c91f622498e75c4 SHA512 fdf37bd51ffbf286d00ec395ba7f6bd53e0555610ed88ef201f2baaf1a03fb73137d0cd502119aba4cb6e146d2cd03c08bd20e004e6be3381104af9e24381820
 DIST intel-neo-19.48.14977.tar.gz 2633172 BLAKE2B 296c85c89833e49f66c428b62fda9753de260bfc819ee24846bc100021f103d2dcc432a9a8a60d310737470c7a4afece4fef557f72da40470ea950f8198bda0e SHA512 24a5f5306b90c763e803c34d3f20227ae0f22e6ff4192a0550e9e3050173b50f2b2e391250f1733676eca45002a061e2c753e7546db7dd21af7c1ed0857f329f
-EBUILD intel-neo-19.38.14237.ebuild 1265 BLAKE2B 6c2129e46819eb6e8f380e81a82728969b38743fe8ab2eb5840cb3c44927e64846f1c71da032fe3d56509721fddfba2609efb7789bba5c42181014abe3831f72 SHA512 06a356aa7aa56997c7cb4ce3d71eee2068819b1002d8de65bf0b5b8ff33c07539624a48e3ae82835d8bc2c4e02dbeea31a5ca17b724abeaee9c342fd80ad71ac
-EBUILD intel-neo-19.46.14807.ebuild 1267 BLAKE2B 5c39258b76a32e3ac770caf113fd457039cd255eac71494b3ca33076ab85232715f22ced75f20d08cc77bf6ac300e6d386dfe8065bb8248816f54d57227bfa86 SHA512 01ad25ca97b3a75495a73f6d46d0242aa8f805a17666fc0b444543e752da15c1b095b5dfdf5dd4c31383d0dbf6a93973d5fd4f4a45e6dd93ca9364efb690fd32
+DIST intel-neo-20.03.15346.tar.gz 2671869 BLAKE2B cf1e242563a377d533b1e5adc89257e3fdd879a0f275f069e9c1c3c8436e269a1ec57e951394d2a487148bfc5393fed0ce1f3feb6954c7ece9de59cccffd628c SHA512 4d2cc8fdcba714832306e6353e8688e12c44eb0f848aad981951ee092274ba8ae032db462b49e874b7ac72e1b8b2b9ba71a84b6715ca241c06a1c70e753e5ed3
 EBUILD intel-neo-19.48.14977.ebuild 1267 BLAKE2B ba1c0f82596ae418fdf8c38a61039fed601b28f81430b16b610eb2c3f45d8e6a0d2bed49fcffd7b87444b71d0d57e6b710b78d807d63600e165ec740d1386bfa SHA512 ba43a79823c69965de75dddac8e886399e60bcf5fcf282e032ebffff277702b918a8796d781abc3c5ff82c491b098a910074495b23bbed527493b4c727f198a4
+EBUILD intel-neo-20.03.15346.ebuild 1247 BLAKE2B 90cb6ad2d7f1086a0f35fdd64199a467183945f8e7101b77c66102ce547bf5ac2d10fdca2755e3917df7dbb8d7111bc41717c7fe1603c48f55e9679636f64e1c SHA512 1c4f838410125a06f929ed4f0c0b9d23b59f5b85e4318723cc28db89862b5e1af2dd0c316676b50e83f4528764fde17124f19232b381df9d2a29a659c90097b2
 MISC metadata.xml 871 BLAKE2B 2e394b97e0147760965e10f7d43f3b7f189a0f146df84adbcfd5adf22937587982b113fe4d7f07d436265746eb9339d5141dbe2655846a1b10ebcc0751f1a763 SHA512 1092d3b8c8dd26fac3822f0b4d25f19ea74726df3f3978a6d596a97b5019465a8a7a853fb98512a07f51c5b81ecc3a7fb9350fb796a2fb7fb27fd16b937eff93
diff --git a/dev-libs/intel-neo/intel-neo-19.46.14807.ebuild b/dev-libs/intel-neo/intel-neo-19.46.14807.ebuild
deleted file mode 100644
index 0209ef1590c5..000000000000
--- a/dev-libs/intel-neo/intel-neo-19.46.14807.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-MY_PN="compute-runtime"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Intel Graphics Compute Runtime for OpenCL, for Gen8 (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="vaapi"
-
-BDEPEND="virtual/pkgconfig"
-COMMON="dev-libs/ocl-icd
-	>=dev-util/intel-graphics-compiler-1.0.2878
-	>=media-libs/gmmlib-19.3.4
-	vaapi? (
-		x11-libs/libdrm[video_cards_intel]
-		>=x11-libs/libva-2.0.0
-	)"
-DEPEND="${COMMON}
-	media-libs/mesa"	# for Khronos OpenGL headers
-RDEPEND="${COMMON}"
-
-DOCS=(
-	README.md
-	documentation/FAQ.md
-	documentation/LIMITATIONS.md
-)
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
-		-DDISABLE_LIBVA=$(usex vaapi "OFF" "ON")
-		# 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-utils_src_configure
-}
-
-pkg_postinst() {
-	"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
-}
diff --git a/dev-libs/intel-neo/intel-neo-19.38.14237.ebuild b/dev-libs/intel-neo/intel-neo-20.03.15346.ebuild
index 843898c5f91f..4f3766cd2d6f 100644
--- a/dev-libs/intel-neo/intel-neo-19.38.14237.ebuild
+++ b/dev-libs/intel-neo/intel-neo-20.03.15346.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 MY_PN="compute-runtime"
 MY_P="${MY_PN}-${PV}"
@@ -19,11 +19,11 @@ IUSE="vaapi"
 
 BDEPEND="virtual/pkgconfig"
 COMMON="dev-libs/ocl-icd
-	>=dev-util/intel-graphics-compiler-1.0.11
-	>=media-libs/gmmlib-19.2.4
+	>=dev-util/intel-graphics-compiler-1.0.3151
+	>=media-libs/gmmlib-19.4.1
 	vaapi? (
 		x11-libs/libdrm[video_cards_intel]
-		>=x11-libs/libva-2.0.0
+		x11-libs/libva
 	)"
 DEPEND="${COMMON}
 	media-libs/mesa"	# for Khronos OpenGL headers
@@ -46,7 +46,7 @@ src_configure() {
 		# the hardware.
 		-DSKIP_UNIT_TESTS=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {