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 7F6661396D0 for ; Thu, 28 Sep 2017 13:19:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E05A62BC007; Thu, 28 Sep 2017 13:19:16 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 BE7B92BC007 for ; Thu, 28 Sep 2017 13:19:15 +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 80690341706 for ; Thu, 28 Sep 2017 13:19:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E81099094 for ; Thu, 28 Sep 2017 13:19:12 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1506604515.0c906c66adb27ef11b507b96b66d3c11fe8e3116.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/mesa-9999.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0c906c66adb27ef11b507b96b66d3c11fe8e3116 X-VCS-Branch: master Date: Thu, 28 Sep 2017 13:19:12 +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: 80858d9e-ab69-4359-bf89-e72b09d6d796 X-Archives-Hash: 5b38440fe3d9c954721c64796ac8fe5a commit: 0c906c66adb27ef11b507b96b66d3c11fe8e3116 Author: Michał Górny gentoo org> AuthorDate: Sun Sep 17 09:07:25 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Sep 28 13:15:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c906c66 media-libs/mesa: Deduplicate [opencl] deps Since [opencl] requires [llvm], and additionally sys-devel/clang pulls sys-devel/llvm in, there is really no reason for a separate [opencl] block or a duplicate sys-devel/llvm dependency. media-libs/mesa/mesa-9999.ebuild | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 495b5a5e0b6..2a4e5faef0a 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -142,15 +142,14 @@ RDEPEND="${RDEPEND} # simultaneously. RDEPEND="${RDEPEND} llvm? ( + opencl? ( + >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP}] + ) video_cards_radeonsi? ( >=sys-devel/llvm-3.9.0[llvm_targets_AMDGPU(-)] ) >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] ) - opencl? ( - >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] - >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP}] - ) " DEPEND="${RDEPEND} @@ -198,7 +197,7 @@ pkg_setup() { ewarn "detected! This can cause problems. For details, see bug 459306." fi - if use llvm || use opencl; then + if use llvm; then llvm_pkg_setup fi python-any-r1_pkg_setup