commit: 0ec0e6c8507f3015935e9cb8b1a99eba4cf73d4c Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> AuthorDate: Sat Jun 15 21:32:27 2019 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Sat Jun 15 21:43:22 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ec0e6c8
dev-util/vulkan-tools: Fix dependencies Fixes: https://bugs.gentoo.org/688126 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> ...tools-9999.ebuild => vulkan-tools-1.1.106-r1.ebuild} | 17 +++++++++-------- dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 15 ++++++++------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild similarity index 89% copy from dev-util/vulkan-tools/vulkan-tools-9999.ebuild copy to dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild index 111b3d75d35..98cfd393194 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python3_{5,6} ) if [[ "${PV}" == "9999" ]]; then @@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then EGIT_SUBMODULES=() inherit git-r3 else - EGIT_COMMIT="9bbdd552f0fd62741aa1f1e02ab3eafc45cf3c1e" + EGIT_COMMIT="2abb69904b9ad017d39d3da1e7fc3dec1a584cd8" KEYWORDS="~amd64" SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}" @@ -23,16 +23,17 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"; LICENSE="Apache-2.0" SLOT="0" IUSE="+cube +vulkaninfo X wayland" - -DEPEND="${PYTHON_DEPS} - cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) - >=dev-util/vulkan-headers-1.1.106 - media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?] +COMMON_DEPEND="media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?] wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] x11-libs/libXrandr:=[${MULTILIB_USEDEP}] - )" + )" + +BDEPEND="cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )" +DEPEND="${PYTHON_DEPS} + ${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" # Vulkaninfo does not support wayland REQUIRED_USE="|| ( X wayland ) diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index 111b3d75d35..9cf16dafaf9 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python3_{5,6} ) if [[ "${PV}" == "9999" ]]; then @@ -23,16 +23,17 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"; LICENSE="Apache-2.0" SLOT="0" IUSE="+cube +vulkaninfo X wayland" - -DEPEND="${PYTHON_DEPS} - cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) - >=dev-util/vulkan-headers-1.1.106 - media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?] +COMMON_DEPEND="media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?] wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] x11-libs/libXrandr:=[${MULTILIB_USEDEP}] - )" + )" + +BDEPEND="cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )" +DEPEND="${PYTHON_DEPS} + ${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" # Vulkaninfo does not support wayland REQUIRED_USE="|| ( X wayland )
