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 A08EF138334 for ; Sat, 15 Jun 2019 21:43:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D607EE0866; Sat, 15 Jun 2019 21:43:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 9E7D4E0866 for ; Sat, 15 Jun 2019 21:43:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 600BE3461A5 for ; Sat, 15 Jun 2019 21:43:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 33C99618 for ; Sat, 15 Jun 2019 21:43:53 +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: <1560635002.0ec0e6c8507f3015935e9cb8b1a99eba4cf73d4c.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.106-r1.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: 0ec0e6c8507f3015935e9cb8b1a99eba4cf73d4c X-VCS-Branch: master Date: Sat, 15 Jun 2019 21:43:53 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 61b34b03-a511-47da-bf89-d4462ac9731c X-Archives-Hash: 2283edf22a3dfc6378bf5a705c20ac03 commit: 0ec0e6c8507f3015935e9cb8b1a99eba4cf73d4c Author: Nick Sarnie gentoo org> AuthorDate: Sat Jun 15 21:32:27 2019 +0000 Commit: Nick Sarnie gentoo 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 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 )