[gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-tools/

[Nick Sarnie]

commit:     db0cf685e4d6baa058fab7410041af755baec059
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  1 23:36:34 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat Sep  1 23:36:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db0cf685

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

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild | 17 +++++++++++------
 dev-util/vulkan-tools/vulkan-tools-9999.ebuild        | 11 +++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)

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 bba55150e15..1f2e8e2c1d4 100644
--- 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 bba55150e15..470ec645441 100644
--- 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
 }