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 7DD0D1382FF for ; Sat, 9 Jul 2016 14:06:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E286021C084; Sat, 9 Jul 2016 14:06:38 +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 656E521C084 for ; Sat, 9 Jul 2016 14:06:38 +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 7D98A340FA7 for ; Sat, 9 Jul 2016 14:06:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B2B4B2447 for ; Sat, 9 Jul 2016 14:06:33 +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: <1468073164.8bb57e32cac5ae97d4cb720ba0690b2bb34873e5.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-9999.ebuild X-VCS-Directories: dev-qt/qt-creator/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 8bb57e32cac5ae97d4cb720ba0690b2bb34873e5 X-VCS-Branch: master Date: Sat, 9 Jul 2016 14:06:33 +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: 8072f968-d355-4563-ac1a-36c0350be145 X-Archives-Hash: 0e95476b690e859cca3962015376c615 commit: 8bb57e32cac5ae97d4cb720ba0690b2bb34873e5 Author: Davide Pesavento gentoo org> AuthorDate: Sat Jul 9 13:38:10 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Jul 9 14:06:04 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bb57e32 dev-qt/qt-creator: update build requirements for 9999 http://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=7812390b0bdb31aec113fef317e4e83c4f822872 Package-Manager: portage-2.3.0 dev-qt/qt-creator/qt-creator-9999.ebuild | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index d743d86..0a6f46b 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -5,7 +5,7 @@ EAPI=6 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW" -inherit eutils l10n qmake-utils virtualx +inherit eutils l10n qmake-utils toolchain-funcs virtualx DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" HOMEPAGE="http://doc.qt.io/qtcreator/" @@ -39,7 +39,7 @@ IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}" REQUIRED_USE="?? ( webengine webkit )" # minimum Qt version required -QT_PV="5.5.0:5" +QT_PV="5.6.0:5" RDEPEND=" =dev-libs/botan-1.10*[-bindist,threads] @@ -60,9 +60,9 @@ RDEPEND=" >=dev-qt/qtxml-${QT_PV} >=sys-devel/gdb-7.5[client,python] clangcodemodel? ( >=sys-devel/clang-3.6.2:= ) - qbs? ( >=dev-util/qbs-1.5.1 ) + qbs? ( >=dev-util/qbs-1.5.2 ) systemd? ( sys-apps/systemd:= ) - webengine? ( >=dev-qt/qtwebengine-5.6.0:5 ) + webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) webkit? ( >=dev-qt/qtwebkit-${QT_PV} ) " DEPEND="${RDEPEND} @@ -71,8 +71,8 @@ DEPEND="${RDEPEND} doc? ( >=dev-qt/qdoc-${QT_PV} ) test? ( >=dev-qt/qttest-${QT_PV} ) " +# qt translations must be installed for qt-creator translations to work for x in ${PLOCALES}; do - # qt translations must be installed for qt-creator translations to work RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )" done unset x @@ -90,9 +90,12 @@ PDEPEND=" " src_unpack() { - if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then - eerror "GCC version 4.7 or later is required to build Qt Creator ${PV}" - die "GCC >= 4.7 required" + if tc-is-gcc; then + if [[ $(gcc-major-version) -lt 4 ]] || \ + [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; then + eerror "GCC version 4.8 or later is required to build Qt Creator ${PV}" + die "GCC >= 4.8 required" + fi fi if [[ ${PV} == *9999 ]]; then