dev-util/vulkan-tools: Fix binary renaming with USE combinations

Package-Manager: Portage-2.3.48, Repoman-2.3.10

diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild
index bba55150e159078ea9dfc20e11a150c511737339..1f2e8e2c1d4fb0262a9fa63f424e618eddf867e1 100644 (file)
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild
@@ -40,12 +40,6 @@ DEPEND="${PYTHON_DEPS}
 REQUIRED_USE="|| ( X wayland )
                          vulkaninfo? ( X )"
 
-MULTILIB_CHOST_TOOLS=(
-       /usr/bin/vulkancube
-       /usr/bin/vulkancubecpp
-       /usr/bin/vulkaninfo
-)
-
 multilib_src_configure() {
        local mycmakeargs=(
                -DCMAKE_SKIP_RPATH=True
@@ -83,9 +77,20 @@ multilib_src_configure() {
 multilib_src_install() {
        cmake-utils_src_install
 
+       MULTILIB_CHOST_TOOLS=()
+
+       if use vulkaninfo; then
+               MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
+       fi
+
        if use cube; then
                mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
                mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
+
+               MULTILIB_CHOST_TOOLS+=(
+                       /usr/bin/vulkancube
+                       /usr/bin/vulkancubecpp
+               )
        fi
 }
 

diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index bba55150e159078ea9dfc20e11a150c511737339..470ec645441c87be89df2f41ef3b117e426e7027 100644 (file)
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -83,9 +83,20 @@ multilib_src_configure() {
 multilib_src_install() {
        cmake-utils_src_install
 
+       MULTILIB_CHOST_TOOLS=()
+
+       if use vulkaninfo; then
+               MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
+       fi
+
        if use cube; then
                mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
                mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
+
+               MULTILIB_CHOST_TOOLS+=(
+                       /usr/bin/vulkancube
+                       /usr/bin/vulkancubecpp
+               )
        fi
 }