From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 87A1C138334 for ; Sat, 1 Sep 2018 23:53:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C86EE07A7; Sat, 1 Sep 2018 23:53:00 +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 17A97E07A7 for ; Sat, 1 Sep 2018 23:52:59 +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 85117335C39 for ; Sat, 1 Sep 2018 23:52:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87CCC3A6 for ; Sat, 1 Sep 2018 23:52:55 +0000 (UTC) From: "Nick Sarnie" 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" Message-ID: <1535845634.6c296e5ea05304ef33ff4846c8f88cb459063e55.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: 6c296e5ea05304ef33ff4846c8f88cb459063e55 X-VCS-Branch: master Date: Sat, 1 Sep 2018 23:52:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1f2553cf-7fb4-4074-ade9-6bed47a33d13 X-Archives-Hash: d96740ba509601e5248ef20d29cf9940 commit: 6c296e5ea05304ef33ff4846c8f88cb459063e55 Author: Nick Sarnie gentoo org> AuthorDate: Sat Sep 1 23:47:14 2018 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Sat Sep 1 23:47:14 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c296e5e dev-util/vulkan-tools: Move some logic to pkg_setup Thanks [Arfrever] Package-Manager: Portage-2.3.48, Repoman-2.3.10 .../vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild | 28 +++++++++++++--------- dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 28 +++++++++++++--------- 2 files changed, 34 insertions(+), 22 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 1f2e8e2c1d4..76c30998e49 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,23 @@ DEPEND="${PYTHON_DEPS} REQUIRED_USE="|| ( X wayland ) vulkaninfo? ( X )" +pkg_setup() { + MULTILIB_CHOST_TOOLS=() + + if use vulkaninfo; then + MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo ) + fi + + if use cube; then + MULTILIB_CHOST_TOOLS+=( + /usr/bin/vulkancube + /usr/bin/vulkancubecpp + ) + fi + + python-any-r1_pkg_setup +} + multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=True @@ -77,20 +94,9 @@ 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 470ec645441..3fce8b8e686 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -46,6 +46,23 @@ MULTILIB_CHOST_TOOLS=( /usr/bin/vulkaninfo ) +pkg_setup() { + MULTILIB_CHOST_TOOLS=() + + if use vulkaninfo; then + MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo ) + fi + + if use cube; then + MULTILIB_CHOST_TOOLS+=( + /usr/bin/vulkancube + /usr/bin/vulkancubecpp + ) + fi + + python-any-r1_pkg_setup +} + multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=True @@ -83,20 +100,9 @@ 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 }