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

[Matt Turner]

commit:     3bfdddc9600044f6214cd2acaf67ccb3d5f95775
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 01:20:09 2016 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 01:20:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bfdddc9

media-libs/mesa: Wrap vulkan header removal with check

 media-libs/mesa/mesa-13.0.1.ebuild | 4 +++-
 media-libs/mesa/mesa-9999.ebuild   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-13.0.1.ebuild 
b/media-libs/mesa/mesa-13.0.1.ebuild
index def17fd..5194e90 100644
--- a/media-libs/mesa/mesa-13.0.1.ebuild
+++ b/media-libs/mesa/mesa-13.0.1.ebuild
@@ -392,7 +392,9 @@ multilib_src_install_all() {
        newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
 
        # Mesa should not install these
-       rm "${ED}"/usr/include/vulkan/{vulkan.h,vk_platform.h}
+       if use vulkan; then
+               rm "${ED}"/usr/include/vulkan/{vulkan.h,vk_platform.h} || die
+       fi
 }
 
 multilib_src_test() {

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index def17fd..5194e90 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -392,7 +392,9 @@ multilib_src_install_all() {
        newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
 
        # Mesa should not install these
-       rm "${ED}"/usr/include/vulkan/{vulkan.h,vk_platform.h}
+       if use vulkan; then
+               rm "${ED}"/usr/include/vulkan/{vulkan.h,vk_platform.h} || die
+       fi
 }
 
 multilib_src_test() {