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 4E9A9139696 for ; Wed, 15 Feb 2017 12:48:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3F19E0C9E; Wed, 15 Feb 2017 12:47:55 +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 6E749E0C9A for ; Wed, 15 Feb 2017 12:47:50 +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 86F98341653 for ; Wed, 15 Feb 2017 12:47:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE88248B8 for ; Wed, 15 Feb 2017 12:47:46 +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: <1487162844.5e17597e28426c21f051f449c7855c84a136c469.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-13.0.4.ebuild media-libs/mesa/mesa-17.0.0.ebuild 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: 5e17597e28426c21f051f449c7855c84a136c469 X-VCS-Branch: master Date: Wed, 15 Feb 2017 12:47:46 +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: 9dcb64b5-b29f-41ac-9d3d-867c671728a7 X-Archives-Hash: 7e6f0e615836d62977157fbaeb1c2486 commit: 5e17597e28426c21f051f449c7855c84a136c469 Author: Michał Górny gentoo org> AuthorDate: Sat Feb 4 12:47:34 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Feb 15 12:47:24 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e17597e media-libs/mesa: Update deps for slotted LLVM Support slotted LLVM versions correctly. Allow any version for 9999, limit to <5 for 17.0.0_rc2 as current git does not work anymore. For the older 13.0.4 branch, just force slot :0 since it does not support 4.0 (the oldest slotted version). media-libs/mesa/mesa-13.0.4.ebuild | 8 ++++---- media-libs/mesa/mesa-17.0.0.ebuild | 26 ++++++++++++++++++++------ media-libs/mesa/mesa-9999.ebuild | 7 ++++--- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/media-libs/mesa/mesa-13.0.4.ebuild b/media-libs/mesa/mesa-13.0.4.ebuild index 9948e24050..84081c5be9 100644 --- a/media-libs/mesa/mesa-13.0.4.ebuild +++ b/media-libs/mesa/mesa-13.0.4.ebuild @@ -99,9 +99,9 @@ RDEPEND=" llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] - vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] ) + vulkan? ( >=sys-devel/llvm-3.9.0:0=[${MULTILIB_USEDEP}] ) ) - >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] + >=sys-devel/llvm-3.6.0:0=[${MULTILIB_USEDEP}] ) nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] ) !nettle? ( @@ -151,8 +151,8 @@ DEPEND="${RDEPEND} ) ) ) opencl? ( - >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] - >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}] + >=sys-devel/llvm-3.4.2:0=[${MULTILIB_USEDEP}] + >=sys-devel/clang-3.4.2:0=[${MULTILIB_USEDEP}] >=sys-devel/gcc-4.6 ) sys-devel/gettext diff --git a/media-libs/mesa/mesa-17.0.0.ebuild b/media-libs/mesa/mesa-17.0.0.ebuild index 11b03e23a3..b35f0bc5ef 100644 --- a/media-libs/mesa/mesa-17.0.0.ebuild +++ b/media-libs/mesa/mesa-17.0.0.ebuild @@ -13,7 +13,7 @@ fi PYTHON_COMPAT=( python2_7 ) -inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS} +inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS} OPENGL_DIR="xorg-x11" @@ -99,9 +99,16 @@ RDEPEND=" llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] - vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] ) + vulkan? ( + || ( + sys-devel/llvm:4 + >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}] ) ) ) - >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] + || ( + sys-devel/llvm:4 + >=sys-devel/llvm-3.6.0:0[${MULTILIB_USEDEP}] + ) +