gentoo resync : 13.11.2021

3 files changed, 63 insertions, 8 deletions

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index c07ea6c149d0..3d636585a14b 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -2,6 +2,7 @@ DIST vulkan-layers-1.2.182.tar.gz 2791196 BLAKE2B e4c2a80708b7805425eb58bc360db8
 DIST vulkan-layers-1.2.189.tar.gz 2869378 BLAKE2B 54a610c95487873c470ea304f8bbf0160a9def6a06118baced0a1b14a847cc116f3a2377cf0a287b866dffe9ff9657133ba1fa7109e0c23380412ca4f389c6f1 SHA512 7fd688365cbe69d763bb233d7be2498bb5aa286ba26c4ca9d4bdeddc28cf3f69992a89d6276d3f943d198146dcc01eca36b1d8de5747ae0893244bdb15665855
 EBUILD vulkan-layers-1.2.182-r1.ebuild 1628 BLAKE2B 992c3a0140cbc51b98537a764144943184a5c7b1157279b24ae39c9827bc7ddedfa8bcb607d71ef670056f2102ee223f512a6d2bed215fe39c2f40daf9a3f4d5 SHA512 7f0ca45cd8635bd819e260ef17d2b832d241e676d5533a4008e775c7edd4481967e088bb09bbe4e7bc382fc1fcce6890b411abf78fbc53ea707840bae5b277cd
 EBUILD vulkan-layers-1.2.182.ebuild 1533 BLAKE2B 992ec98e7c6d6787254dc7ceb65dbf23bc1eec6035fd1ea70800d578f3b1d16997249482492c9af907a88287571725f3445bdd3ad3f9f1d7ed83fdd6cb6d1518 SHA512 828502e90aac0998009a8def204569b7b87a341656e8dfa353f6447f695b1552023d357223a7ef9834338d435e5a4113347de238137a9de14d1239b763fe28c4
+EBUILD vulkan-layers-1.2.189-r1.ebuild 1623 BLAKE2B 6ae0f9d895fb1f88f0de6149e3de890b4b04db2d3eea92e6b2aeefdde1e818296e17f7820a7cfd46e95f7378896431ae12292ab36e66f7e175422a27c2592755 SHA512 4234d7522b4673625e8faf2c6b57a3826ab35fbe863f4c23771a632e6a2ad70ffc6c658692bf1f4843d164de274b009384afcafc917fc80c28382b7ce3da6816
 EBUILD vulkan-layers-1.2.189.ebuild 1618 BLAKE2B 8c28c096372ea7190f52c566205ca86831ff4e01a753bdaf568b282055c315b920c5b3da237918557aad45cef4ea84d70d0c6d2be06d9efb2048996d17c34b3a SHA512 48b844b83d549fca92cd008d650895fe056d8bcdf036cc42336eb3a80c5e0b960556ee35fdf7beab3b4fa5cc03a13fa42628e72a025d3d805542f3c060b3bf40
-EBUILD vulkan-layers-9999.ebuild 1618 BLAKE2B 8c28c096372ea7190f52c566205ca86831ff4e01a753bdaf568b282055c315b920c5b3da237918557aad45cef4ea84d70d0c6d2be06d9efb2048996d17c34b3a SHA512 48b844b83d549fca92cd008d650895fe056d8bcdf036cc42336eb3a80c5e0b960556ee35fdf7beab3b4fa5cc03a13fa42628e72a025d3d805542f3c060b3bf40
+EBUILD vulkan-layers-9999.ebuild 1625 BLAKE2B baf32cefd70c89313f33c8e3b2591d1cc524fc7c644fb78ccf4b1940b7b6bb2d193d7ff8d9b956ab2701f0e5643ae9d4cfce27c59bfaf679c2ba002a9438e597 SHA512 f3c67e938aa6f279abfce8f0cdd42a5c51d18ebbb39d2e412cf49208c554cfcb56b0647c8dca24a167c4689de6c1bacec42b49e7cda8b126791f33583882403b
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild
new file mode 100644
index 000000000000..96afc66b53d7
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-ValidationLayers
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{8,9} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+RDEPEND=">=dev-util/spirv-tools-20210825:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-cpp/robin-hood-hashing
+	>=dev-util/glslang-11.6.0:=[${MULTILIB_USEDEP}]
+	>=dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+                -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_LAYER_SUPPORT_FILES=ON
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=OFF
+		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
+		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
+		-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index f53561f9c1fe..3e0893062695 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -4,8 +4,7 @@
 EAPI=7
 
 MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake-utils"
-CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{8,9} )
 inherit cmake-multilib python-any-r1
 
@@ -40,12 +39,10 @@ DEPEND="${RDEPEND}
 	)
 "
 
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
 multilib_src_configure() {
 	local mycmakeargs=(
+                -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
 		-DCMAKE_SKIP_RPATH=ON
 		-DBUILD_LAYER_SUPPORT_FILES=ON
 		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
@@ -56,5 +53,5 @@ multilib_src_configure() {
 		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
 		-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }