diff options
| author |   Nick Sarnie <sarnex@gentoo.org> | 2018-05-26 21:56:00 -0400 |
|---|---|---|
| committer | Nick Sarnie <sarnex@gentoo.org> | 2018-05-26 22:01:28 -0400 |
| commit | d88c0e6f257aae9a66f3bb7c0a243f82d43599bd (patch) | |
| tree | 02dacb3b3b94cf33c462a0f72f662dcc62bf2eec /media-libs/vulkan-layers | |
| parent | dev-util/vulkan-headers: Block against old vulkan-loader packaging (diff) | |
| download | gentoo-d88c0e6f257aae9a66f3bb7c0a243f82d43599bd.tar.gz gentoo-d88c0e6f257aae9a66f3bb7c0a243f82d43599bd.tar.bz2 gentoo-d88c0e6f257aae9a66f3bb7c0a243f82d43599bd.zip | |
media-libs/vulkan-layers: Block against old vulkan-loader packaging
Reported-by: [Arfrever] on IRC
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'media-libs/vulkan-layers')
| -rw-r--r-- | media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild | 3 | ||||
| -rw-r--r-- | media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild b/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild index 3bc4cc8e1751..ca8180bed039 100644 --- a/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.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/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild index 22742bd21619..ca8180bed039 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild @@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then EGIT_SUBMODULES=() inherit git-r3 else - EGIT_COMMIT="0759b0fd2cd4d1db9b3968cb2684872c1fb11628" + EGIT_COMMIT="6a354a5200df761a7a7fabc338e9c1b81961919b" KEYWORDS="~amd64" SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}" @@ -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/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] |