Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/
Date: Sat, 29 Apr 2017 19:46:28
Message-Id: 1493495103.678983f0b0ea805d2f868c1edf0461cd2211f64a.pesa@gentoo
1 commit: 678983f0b0ea805d2f868c1edf0461cd2211f64a
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 29 19:44:41 2017 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 29 19:45:03 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=678983f0
7
8 dev-qt/qt-creator: sync live ebuild
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 dev-qt/qt-creator/qt-creator-9999.ebuild | 46 +++++++++++++++++---------------
13 1 file changed, 24 insertions(+), 22 deletions(-)
14
15 diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
16 index bbdb5126434..7cfd8374e2d 100644
17 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild
18 +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
19 @@ -4,7 +4,7 @@
20 EAPI=6
21 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
22
23 -inherit eutils l10n qmake-utils toolchain-funcs virtualx xdg
24 +inherit eutils l10n llvm qmake-utils toolchain-funcs virtualx xdg
25
26 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
27 HOMEPAGE="http://doc.qt.io/qtcreator/"
28 @@ -29,17 +29,17 @@ fi
29 # TODO: unbundle sqlite
30
31 QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
32 - clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor
33 - ios mercurial modeling:modeleditor nim perforce python:pythoneditor qbs:qbsprojectmanager qnx
34 - scxml:scxmleditor subversion valgrind winrt)
35 + 'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
36 + cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
37 + nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
38 + winrt)
39 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
40
41 # minimum Qt version required
42 QT_PV="5.6.0:5"
43
44 -RDEPEND="
45 +CDEPEND="
46 =dev-libs/botan-1.10*[-bindist,threads]
47 - >=dev-qt/designer-${QT_PV}
48 >=dev-qt/qtconcurrent-${QT_PV}
49 >=dev-qt/qtcore-${QT_PV}
50 >=dev-qt/qtdeclarative-${QT_PV}[widgets]
51 @@ -54,13 +54,13 @@ RDEPEND="
52 >=dev-qt/qtwidgets-${QT_PV}
53 >=dev-qt/qtx11extras-${QT_PV}
54 >=dev-qt/qtxml-${QT_PV}
55 - sys-devel/gdb[client,python]
56 clangcodemodel? ( >=sys-devel/clang-3.9:= )
57 + designer? ( >=dev-qt/designer-${QT_PV} )
58 qbs? ( >=dev-util/qbs-1.7.0 )
59 systemd? ( sys-apps/systemd:= )
60 webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
61 "
62 -DEPEND="${RDEPEND}
63 +DEPEND="${CDEPEND}
64 >=dev-qt/linguist-tools-${QT_PV}
65 virtual/pkgconfig
66 doc? ( >=dev-qt/qdoc-${QT_PV} )
67 @@ -70,16 +70,11 @@ DEPEND="${RDEPEND}
68 >=dev-qt/qttest-${QT_PV}
69 )
70 "
71 -# qt translations must also be installed or qt-creator translations won't be loaded
72 -for x in ${PLOCALES}; do
73 - RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
74 -done
75 -unset x
76 -
77 -PDEPEND="
78 +RDEPEND="${CDEPEND}
79 + sys-devel/gdb[client,python]
80 autotools? ( sys-devel/autoconf )
81 bazaar? ( dev-vcs/bzr )
82 - clangstaticanalyzer? ( >=sys-devel/clang-3.9 )
83 + clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
84 cmake? ( dev-util/cmake )
85 cvs? ( dev-vcs/cvs )
86 git? ( dev-vcs/git )
87 @@ -87,13 +82,18 @@ PDEPEND="
88 subversion? ( dev-vcs/subversion )
89 valgrind? ( dev-util/valgrind )
90 "
91 +# qt translations must also be installed or qt-creator translations won't be loaded
92 +for x in ${PLOCALES}; do
93 + RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
94 +done
95 +unset x
96
97 src_unpack() {
98 if tc-is-gcc; then
99 if [[ $(gcc-major-version) -lt 4 ]] || \
100 - [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; then
101 - eerror "GCC version 4.8 or later is required to build Qt Creator ${PV}"
102 - die "GCC >= 4.8 required"
103 + [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 9 ]]; then
104 + eerror "GCC version 4.9 or later is required to build Qt Creator ${PV}"
105 + die "GCC >= 4.9 required"
106 fi
107 fi
108
109 @@ -139,9 +139,11 @@ src_prepare() {
110 sed -i -e 's/\<timeline\(items\|notes\|selection\)renderpass\>//' tests/auto/timeline/timeline.pro || die
111 sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
112
113 + # fix path to some clang headers
114 + sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
115 +
116 # fix translations
117 - sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
118 - share/qtcreator/translations/translations.pro || die
119 + sed -i -e "/^LANGUAGES\s*=/ s:=.*:= $(l10n_get_locales):" share/qtcreator/translations/translations.pro || die
120
121 # remove bundled qbs
122 rm -rf src/shared/qbs || die
123 @@ -150,7 +152,7 @@ src_prepare() {
124 src_configure() {
125 eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
126 IDE_PACKAGE_MODE=1 \
127 - $(use clangcodemodel && echo LLVM_INSTALL_DIR="$(llvm-config --prefix)") \
128 + $(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
129 $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
130 CONFIG+=qbs_disable_rpath \
131 CONFIG+=qbs_enable_project_file_updates \