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 E209D138331 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 B78F9E0882; 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 91F62E0882 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 35EBF335CB6 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 62E712AD 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: <1527386487.7e6676a6b59fa281f7e2ddf4d16f67b33250f92b.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-headers/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild dev-util/vulkan-headers/vulkan-headers-9999.ebuild X-VCS-Directories: dev-util/vulkan-headers/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 7e6676a6b59fa281f7e2ddf4d16f67b33250f92b 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: 1f7f9320-e6dc-4309-94d6-8cbad0c37b5d X-Archives-Hash: b4909cbcfa48e9799bc9661e95f1875c commit: 7e6676a6b59fa281f7e2ddf4d16f67b33250f92b Author: Nick Sarnie gentoo org> AuthorDate: Sun May 27 01:53:00 2018 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Sun May 27 02:01:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e6676a6 dev-util/vulkan-headers: Block against old vulkan-loader packaging Reported-by: [Arfrever] on IRC Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild | 3 +++ dev-util/vulkan-headers/vulkan-headers-9999.ebuild | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild b/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild index 6ee6d098e65..531392083df 100644 --- a/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild +++ b/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild @@ -19,6 +19,9 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers" LICENSE="Apache-2.0" SLOT="0" +# Old packaging will cause file collisions +RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" + src_install() { mkdir "include/vulkan/registry" || die mv "registry/" "include/vulkan/" || die diff --git a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild index 6ee6d098e65..531392083df 100644 --- a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild +++ b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild @@ -19,6 +19,9 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers" LICENSE="Apache-2.0" SLOT="0" +# Old packaging will cause file collisions +RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" + src_install() { mkdir "include/vulkan/registry" || die mv "registry/" "include/vulkan/" || die