From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-946879-garchives=archives.gentoo.org@lists.gentoo.org>
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 B7ADD139694
for <garchives@archives.gentoo.org>; Sat, 29 Apr 2017 19:46:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E300EE0D1B;
Sat, 29 Apr 2017 19:46:26 +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 AB700E0D1B
for <gentoo-commits@lists.gentoo.org>; Sat, 29 Apr 2017 19:46:26 +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 719B63415B7
for <gentoo-commits@lists.gentoo.org>; Sat, 29 Apr 2017 19:46:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DBCB07444
for <gentoo-commits@lists.gentoo.org>; Sat, 29 Apr 2017 19:46:23 +0000 (UTC)
From: "Davide Pesavento" <pesa@gentoo.org>
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" <pesa@gentoo.org>
Message-ID: <1493495103.678983f0b0ea805d2f868c1edf0461cd2211f64a.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: 678983f0b0ea805d2f868c1edf0461cd2211f64a
X-VCS-Branch: master
Date: Sat, 29 Apr 2017 19:46:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: b9d0a3f7-ea5e-4e10-9fd9-92fe9aa2a686
X-Archives-Hash: fa664b0008ff5744f6de8d5fc6359650
commit: 678983f0b0ea805d2f868c1edf0461cd2211f64a
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 19:44:41 2017 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 19:45:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=678983f0
dev-qt/qt-creator: sync live ebuild
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qt-creator/qt-creator-9999.ebuild | 46 +++++++++++++++++---------------
1 file changed, 24 insertions(+), 22 deletions(-)
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index bbdb5126434..7cfd8374e2d 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
-inherit eutils l10n qmake-utils toolchain-funcs virtualx xdg
+inherit eutils l10n llvm qmake-utils toolchain-funcs virtualx xdg
DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
HOMEPAGE="http://doc.qt.io/qtcreator/"
@@ -29,17 +29,17 @@ fi
# TODO: unbundle sqlite
QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
- clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor
- ios mercurial modeling:modeleditor nim perforce python:pythoneditor qbs:qbsprojectmanager qnx
- scxml:scxmleditor subversion valgrind winrt)
+ 'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
+ cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
+ nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
+ winrt)
IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
# minimum Qt version required
QT_PV="5.6.0:5"
-RDEPEND="
+CDEPEND="
=dev-libs/botan-1.10*[-bindist,threads]
- >=dev-qt/designer-${QT_PV}
>=dev-qt/qtconcurrent-${QT_PV}
>=dev-qt/qtcore-${QT_PV}
>=dev-qt/qtdeclarative-${QT_PV}[widgets]
@@ -54,13 +54,13 @@ RDEPEND="
>=dev-qt/qtwidgets-${QT_PV}
>=dev-qt/qtx11extras-${QT_PV}
>=dev-qt/qtxml-${QT_PV}
- sys-devel/gdb[client,python]
clangcodemodel? ( >=sys-devel/clang-3.9:= )
+ designer? ( >=dev-qt/designer-${QT_PV} )
qbs? ( >=dev-util/qbs-1.7.0 )
systemd? ( sys-apps/systemd:= )
webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
>=dev-qt/linguist-tools-${QT_PV}
virtual/pkgconfig
doc? ( >=dev-qt/qdoc-${QT_PV} )
@@ -70,16 +70,11 @@ DEPEND="${RDEPEND}
>=dev-qt/qttest-${QT_PV}
)
"
-# qt translations must also be installed or qt-creator translations won't be loaded
-for x in ${PLOCALES}; do
- RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-PDEPEND="
+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:* )
cmake? ( dev-util/cmake )
cvs? ( dev-vcs/cvs )
git? ( dev-vcs/git )
@@ -87,13 +82,18 @@ PDEPEND="
subversion? ( dev-vcs/subversion )
valgrind? ( dev-util/valgrind )
"
+# qt translations must also be installed or qt-creator translations won't be loaded
+for x in ${PLOCALES}; do
+ RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
src_unpack() {
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"
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 9 ]]; then
+ eerror "GCC version 4.9 or later is required to build Qt Creator ${PV}"
+ die "GCC >= 4.9 required"
fi
fi
@@ -139,9 +139,11 @@ src_prepare() {
sed -i -e 's/\<timeline\(items\|notes\|selection\)renderpass\>//' tests/auto/timeline/timeline.pro || die
sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
+ # fix path to some clang headers
+ sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
+
# fix translations
- sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
- share/qtcreator/translations/translations.pro || die
+ sed -i -e "/^LANGUAGES\s*=/ s:=.*:= $(l10n_get_locales):" share/qtcreator/translations/translations.pro || die
# remove bundled qbs
rm -rf src/shared/qbs || die
@@ -150,7 +152,7 @@ src_prepare() {
src_configure() {
eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
IDE_PACKAGE_MODE=1 \
- $(use clangcodemodel && echo LLVM_INSTALL_DIR="$(llvm-config --prefix)") \
+ $(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
CONFIG+=qbs_disable_rpath \
CONFIG+=qbs_enable_project_file_updates \