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

["Nick Sarnie" <sarnex@gentoo.org>]

commit:     3f0f865797bbc1caaa7f94d65f2d2a7eaffd9cfd
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  1 22:03:48 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat Sep  1 22:56:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f0f8657

dev-util/vulkan-tools: Also install 32-bit binaries in multiabi case

Closes: https://bugs.gentoo.org/660760
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 ...an-tools-9999.ebuild => vulkan-tools-1.1.77.0-r2.ebuild} | 13 +++++++++++--
 dev-util/vulkan-tools/vulkan-tools-9999.ebuild              | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild
similarity index 84%
copy from dev-util/vulkan-tools/vulkan-tools-9999.ebuild
copy to dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild
index 6fa37cabccc..a31a4361ef6 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild
@@ -77,9 +77,18 @@ 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
-		mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
-		mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
+		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
 	fi
 }
 

diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 6fa37cabccc..a31a4361ef6 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -77,9 +77,18 @@ 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
-		mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
-		mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
+		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
 	fi
 }