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 BD6C9138334 for ; Thu, 7 Jun 2018 03:13:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F41AE09E0; Thu, 7 Jun 2018 03:13:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E41D4E09E0 for ; Thu, 7 Jun 2018 03:13:48 +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 537CD335C8A for ; Thu, 7 Jun 2018 03:13:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 168FD2A2 for ; Thu, 7 Jun 2018 03:13:43 +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: <1528341209.5d036adfdf3b479be672002443b4cf4d2c2865cf.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-18.1.1-r1.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 5d036adfdf3b479be672002443b4cf4d2c2865cf X-VCS-Branch: master Date: Thu, 7 Jun 2018 03:13:43 +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: 6098be1a-7e3e-43a5-b0d8-390869882c55 X-Archives-Hash: e726d1a5d8ec4f7b1578f1f5fdfbe101 commit: 5d036adfdf3b479be672002443b4cf4d2c2865cf Author: Matt Turner gentoo org> AuthorDate: Thu Jun 7 03:08:19 2018 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Jun 7 03:13:29 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d036adf media-libs/mesa: Only remove files if there are files to remove Noticed by Arfrever. media-libs/mesa/mesa-18.1.1-r1.ebuild | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/media-libs/mesa/mesa-18.1.1-r1.ebuild b/media-libs/mesa/mesa-18.1.1-r1.ebuild index 46ce5dceeeb..8774521335b 100644 --- a/media-libs/mesa/mesa-18.1.1-r1.ebuild +++ b/media-libs/mesa/mesa-18.1.1-r1.ebuild @@ -401,11 +401,13 @@ multilib_src_configure() { multilib_src_install() { emake install DESTDIR="${D}" - # These files are now provided by >=dev-libs/wayland-1.15.0 - rm "${ED}/usr/$(get_libdir)/libwayland-egl.so" || die - rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1" || die - rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1.0.0" || die - rm "${ED}/usr/$(get_libdir)/pkgconfig/wayland-egl.pc" || die + if use wayland; then + # These files are now provided by >=dev-libs/wayland-1.15.0 + rm "${ED}/usr/$(get_libdir)/libwayland-egl.so" || die + rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1" || die + rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1.0.0" || die + rm "${ED}/usr/$(get_libdir)/pkgconfig/wayland-egl.pc" || die + fi if use opencl; then ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"