summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Sarnie <sarnex@gentoo.org>2018-09-01 19:47:14 -0400
committerNick Sarnie <sarnex@gentoo.org>2018-09-01 19:47:14 -0400
commit6c296e5ea05304ef33ff4846c8f88cb459063e55 (patch)
tree1c2c6f57d442ccdc881280a030c8e94565d1d335 /dev-util
parentdev-util/vulkan-tools: Fix binary renaming with USE combinations (diff)
downloadgentoo-6c296e5ea05304ef33ff4846c8f88cb459063e55.tar.gz
gentoo-6c296e5ea05304ef33ff4846c8f88cb459063e55.tar.bz2
gentoo-6c296e5ea05304ef33ff4846c8f88cb459063e55.zip
dev-util/vulkan-tools: Move some logic to pkg_setup
Thanks [Arfrever] Package-Manager: Portage-2.3.48, Repoman-2.3.10
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild28
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-9999.ebuild28
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 1f2e8e2c1d4f..76c30998e49b 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 470ec645441c..3fce8b8e6862 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
}