[gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-tools/

[gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-tools/

[Nick Sarnie]

commit:     5042169104a5e650053b8d7798be88fc3d17c6a9
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 23:24:08 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat May 26 23:26:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50421691

media-libs/vulkan-tools: Depend on media-libs/vulkan-loader

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild | 1 +
 media-libs/vulkan-tools/vulkan-tools-9999.ebuild        | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild b/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild
index 2e4086150cd..97eb0ccd27b 100644
--- a/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild
+++ b/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild
@@ -28,6 +28,7 @@ RDEPEND=""
 DEPEND="${PYTHON_DEPS}
 	dev-util/glslang:=[${MULTILIB_USEDEP}]
 	dev-util/vulkan-headers
+	media-libs/vulkan-loader:=[${MULTILIB_USEDEP}]
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]

diff --git a/media-libs/vulkan-tools/vulkan-tools-9999.ebuild b/media-libs/vulkan-tools/vulkan-tools-9999.ebuild
index d009fa4f314..97eb0ccd27b 100644
--- a/media-libs/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/media-libs/vulkan-tools/vulkan-tools-9999.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="51dfb7b8a19820d6716190dd7e45cd6e861e1f1a"
+	EGIT_COMMIT="5e1623ca6860f3e393b1dabbdd19ba216871fa61"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
@@ -28,6 +28,7 @@ RDEPEND=""
 DEPEND="${PYTHON_DEPS}
 	dev-util/glslang:=[${MULTILIB_USEDEP}]
 	dev-util/vulkan-headers
+	media-libs/vulkan-loader:=[${MULTILIB_USEDEP}]
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-tools/

[Nick Sarnie]

commit:     6d9abbc186bebdc5c2a00edc01082840bf740ce7
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 01:57:59 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun May 27 02:01:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d9abbc1

media-libs/vulkan-tools: Block against old vulkan-loader packaging

Reported-by: [Arfrever] on IRC

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild | 3 ++-
 media-libs/vulkan-tools/vulkan-tools-9999.ebuild        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild b/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild
index 97eb0ccd27b..143583c65a5 100644
--- a/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild
+++ b/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild
@@ -24,7 +24,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="X wayland"
 
-RDEPEND=""
+# Old packaging will cause file collisions
+RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
 DEPEND="${PYTHON_DEPS}
 	dev-util/glslang:=[${MULTILIB_USEDEP}]
 	dev-util/vulkan-headers

diff --git a/media-libs/vulkan-tools/vulkan-tools-9999.ebuild b/media-libs/vulkan-tools/vulkan-tools-9999.ebuild
index 97eb0ccd27b..143583c65a5 100644
--- a/media-libs/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/media-libs/vulkan-tools/vulkan-tools-9999.ebuild
@@ -24,7 +24,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="X wayland"
 
-RDEPEND=""
+# Old packaging will cause file collisions
+RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
 DEPEND="${PYTHON_DEPS}
 	dev-util/glslang:=[${MULTILIB_USEDEP}]
 	dev-util/vulkan-headers