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 AFFEE138330 for ; Sun, 27 May 2018 02:02:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7C3EE0877; Sun, 27 May 2018 02:02:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 8293AE0877 for ; Sun, 27 May 2018 02:02:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 4A05E335CBA for ; Sun, 27 May 2018 02:02:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 770DD2B0 for ; Sun, 27 May 2018 02:02:48 +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: <1527386488.d88c0e6f257aae9a66f3bb7c0a243f82d43599bd.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild media-libs/vulkan-layers/vulkan-layers-9999.ebuild X-VCS-Directories: media-libs/vulkan-layers/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: d88c0e6f257aae9a66f3bb7c0a243f82d43599bd X-VCS-Branch: master Date: Sun, 27 May 2018 02:02:48 +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-Archives-Salt: ba6ad73a-1647-4cd4-a3aa-dbe15ec5c449 X-Archives-Hash: 1bf93478f30e36dae386b0ad9ca292dc commit: d88c0e6f257aae9a66f3bb7c0a243f82d43599bd Author: Nick Sarnie gentoo org> AuthorDate: Sun May 27 01:56:00 2018 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Sun May 27 02:01:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d88c0e6f 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 media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild | 3 ++- 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 3bc4cc8e175..ca8180bed03 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 22742bd2161..ca8180bed03 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}]