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 2475F1396D0 for ; Sun, 8 Oct 2017 23:49:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 548DBE0C48; Sun, 8 Oct 2017 23:48:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 26CF7E0C56 for ; Sun, 8 Oct 2017 23:48:58 +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 A99FA33BF44 for ; Sun, 8 Oct 2017 23:48:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 16E2983F7 for ; Sun, 8 Oct 2017 23:48:56 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1507506511.58641f1052356f3da0fec847a6ce33c40995832b.pesa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qt-creator/qt-creator-4.3.1.ebuild X-VCS-Directories: dev-qt/qt-creator/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 58641f1052356f3da0fec847a6ce33c40995832b X-VCS-Branch: master Date: Sun, 8 Oct 2017 23:48:56 +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: 9bed2116-3a29-4647-9fd1-15db3b51fe44 X-Archives-Hash: 6e97dbb9f92762c30210e6b4051d2580 commit: 58641f1052356f3da0fec847a6ce33c40995832b Author: Davide Pesavento gentoo org> AuthorDate: Sun Oct 8 23:48:31 2017 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Oct 8 23:48:31 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58641f10 dev-qt/qt-creator: restrict max clang version Closes: https://bugs.gentoo.org/631194 Package-Manager: Portage-2.3.11, Repoman-2.3.3 dev-qt/qt-creator/qt-creator-4.3.1.ebuild | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild index fbfc4412faa..5be7d95dd51 100644 --- a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild +++ b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 +LLVM_MAX_SLOT=4 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW" inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg @@ -51,7 +52,10 @@ CDEPEND=" >=dev-qt/qtwidgets-${QT_PV} >=dev-qt/qtx11extras-${QT_PV} >=dev-qt/qtxml-${QT_PV} - clangcodemodel? ( >=sys-devel/clang-3.9:= ) + clangcodemodel? ( + =sys-devel/clang-3.9:0 ) + ) designer? ( >=dev-qt/designer-${QT_PV} ) qbs? ( >=dev-util/qbs-1.8.1-r1 ) systemd? ( sys-apps/systemd:= ) @@ -71,7 +75,10 @@ RDEPEND="${CDEPEND} sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) - clangstaticanalyzer? ( >=sys-devel/clang-3.9:* ) + clangstaticanalyzer? ( + =sys-devel/clang-3.9:0 ) + ) cmake? ( dev-util/cmake[server(+)] ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) @@ -153,7 +160,7 @@ src_prepare() { src_configure() { eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \ IDE_PACKAGE_MODE=1 \ - $(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \ + $(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \ $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \ CONFIG+=qbs_disable_rpath \ CONFIG+=qbs_enable_project_file_updates \