From: Nick Sarnie <sarnex@gentoo.org>
Date: Sat, 1 Sep 2018 23:26:53 +0000 (-0400)
Subject: dev-util/vulkan-tools: Consider CHOST in multilib binary names
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=bf3057af25a62b4b4f266d2ab04faba3579b7b3f;p=gentoo.git

dev-util/vulkan-tools: Consider CHOST in multilib binary names

Bug: https://bugs.gentoo.org/660760
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 a31a4361ef6e..bba55150e159 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,6 +40,12 @@ 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
@@ -77,18 +83,9 @@ multilib_src_configure() {
 multilib_src_install() {
 	cmake-utils_src_install
 
-	if ! multilib_is_native_abi; then
-		mv "${ED%/}"/usr/bin/vulkaninfo "${ED%/}"/usr/bin/vulkaninfo32 || die
-	fi
-
 	if use cube; then
-		if multilib_is_native_abi; then
-			mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
-			mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
-		else
-			mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube32 || die
-			mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp32 || die
-		fi
+		mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
+		mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
 	fi
 }
 
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index a31a4361ef6e..bba55150e159 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -40,6 +40,12 @@ 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
@@ -77,18 +83,9 @@ multilib_src_configure() {
 multilib_src_install() {
 	cmake-utils_src_install
 
-	if ! multilib_is_native_abi; then
-		mv "${ED%/}"/usr/bin/vulkaninfo "${ED%/}"/usr/bin/vulkaninfo32 || die
-	fi
-
 	if use cube; then
-		if multilib_is_native_abi; then
-			mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
-			mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
-		else
-			mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube32 || die
-			mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp32 || die
-		fi
+		mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
+		mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
 	fi
 }