[gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/

[Matt Turner]

commit:     fa9177c1ec4cdf2d456238706bcffb503fcde434
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 11 21:01:25 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 21:28:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa9177c1

media-libs/vulkan-layers: 9999 cleanup, cmake.eclass, >=cmake-3.10.2

Fix ebuild style (order, indentation)
Use upstream tarball instead of error-prone EGIT_COMMIT
Pin dev-util/vulkan-headers to >=${PV}, maintainability++

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 47 ++++++++++++----------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild 
b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 891fec0fb1c..eef88434414 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -2,48 +2,51 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+MY_PN=Vulkan-ValidationLayers
+CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{6,7} )
+inherit cmake-multilib python-any-r1
 
-if [[ "${PV}" == "9999" ]]; then
-       
EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git";
+if [[ ${PV} == *9999* ]]; then
+       EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git";
        EGIT_SUBMODULES=()
        inherit git-r3
 else
-       EGIT_COMMIT="237d818e81fbffa073d29d94f53a2cbac4f25b9f"
+       SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
        KEYWORDS="~amd64 ~ppc64 ~x86"
-       
SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz
 -> ${P}.tar.gz"
-       S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
+       S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
-inherit python-any-r1 cmake-multilib
-
 DESCRIPTION="Vulkan Validation Layers"
 HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers";
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="X wayland"
+IUSE="wayland X"
 
+BDEPEND=">=dev-util/cmake-3.10.2"
 DEPEND="${PYTHON_DEPS}
-               >=dev-util/glslang-7.12.3353_pre20191027:=[${MULTILIB_USEDEP}]
-               ~dev-util/spirv-tools-9999:=[${MULTILIB_USEDEP}]
-               >=dev-util/vulkan-headers-1.1.125
-               wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-               X? (
-                  x11-libs/libX11:=[${MULTILIB_USEDEP}]
-                  x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-                  )"
+       >=dev-util/glslang-7.12.3353_pre20191027:=[${MULTILIB_USEDEP}]
+       ~dev-util/spirv-tools-9999:=[${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_SKIP_RPATH=True
-               -DBUILD_LAYER_SUPPORT_FILES=True
+               -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=False
-               -DGLSLANG_INSTALL_DIR="/usr"
-               -DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
+               -DBUILD_TESTS=OFF
+               -DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
+               -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }