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

[Nick Sarnie]

commit:     6c296e5ea05304ef33ff4846c8f88cb459063e55
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  1 23:47:14 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> 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
 }