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 8BFB2139085 for ; Wed, 25 Jan 2017 19:45:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 700D42340DC; Wed, 25 Jan 2017 19:45:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 472C42340DC for ; Wed, 25 Jan 2017 19:45:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 58F6B341026 for ; Wed, 25 Jan 2017 19:45:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5EE72F3C for ; Wed, 25 Jan 2017 19:45:49 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1485373541.db83c4e40554d0defc4165063bb20875eab98b4a.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/mesa-17.0.0_rc2.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: db83c4e40554d0defc4165063bb20875eab98b4a X-VCS-Branch: master Date: Wed, 25 Jan 2017 19:45:49 +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: 9f36e044-a3c6-4725-a8c6-271d3de409cd X-Archives-Hash: 9ff0aaf99b1d071c6223e26154756ff9 commit: db83c4e40554d0defc4165063bb20875eab98b4a Author: Matt Turner gentoo org> AuthorDate: Wed Jan 25 19:44:53 2017 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Jan 25 19:45:41 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db83c4e4 media-libs/mesa: Restore removal of vulkan headers. Hopefully the next rc will not require this. media-libs/mesa/mesa-17.0.0_rc2.ebuild | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/media-libs/mesa/mesa-17.0.0_rc2.ebuild b/media-libs/mesa/mesa-17.0.0_rc2.ebuild index 2268df1..735dd56 100644 --- a/media-libs/mesa/mesa-17.0.0_rc2.ebuild +++ b/media-libs/mesa/mesa-17.0.0_rc2.ebuild @@ -384,6 +384,11 @@ multilib_src_install_all() { # Install config file for eselect mesa insinto /usr/share/mesa newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf + + # Mesa should not install these + if use vulkan; then + rm "${ED}"/usr/include/vulkan/{vulkan.h,vk_platform.h} || die + fi } multilib_src_test() {