From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1045005-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 140C5138334
for <garchives@archives.gentoo.org>; Sat, 1 Sep 2018 23:37:33 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E53EEE06CC;
Sat, 1 Sep 2018 23:37:31 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B977AE06CC
for <gentoo-commits@lists.gentoo.org>; Sat, 1 Sep 2018 23:37:31 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 8D4D6335C8D
for <gentoo-commits@lists.gentoo.org>; Sat, 1 Sep 2018 23:37:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C90AE398
for <gentoo-commits@lists.gentoo.org>; Sat, 1 Sep 2018 23:37:27 +0000 (UTC)
From: "Nick Sarnie" <sarnex@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" <sarnex@gentoo.org>
Message-ID: <1535844994.db0cf685e4d6baa058fab7410041af755baec059.sarnex@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-tools/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild dev-util/vulkan-tools/vulkan-tools-9999.ebuild
X-VCS-Directories: dev-util/vulkan-tools/
X-VCS-Committer: sarnex
X-VCS-Committer-Name: Nick Sarnie
X-VCS-Revision: db0cf685e4d6baa058fab7410041af755baec059
X-VCS-Branch: master
Date: Sat, 1 Sep 2018 23:37:27 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 8829915a-915b-44fd-980f-adbb9305ae30
X-Archives-Hash: 4a528b017ca1532b355a0bb9616e27cd
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
}