Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/
Date: Thu, 30 Jul 2020 22:11:37
Message-Id: 1596146991.842efe4025a43783b75b6750c715d4cc8f4b8293.mgorny@gentoo
1 commit: 842efe4025a43783b75b6750c715d4cc8f4b8293
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 29 11:42:13 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 30 22:09:51 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=842efe40
7
8 dev-qt/qt-creator: Remove redundant ver (LLVM 8)
9
10 Bug: https://bugs.gentoo.org/720240
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 dev-qt/qt-creator/Manifest | 1 -
14 dev-qt/qt-creator/qt-creator-4.10.1.ebuild | 201 -----------------------------
15 2 files changed, 202 deletions(-)
16
17 diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
18 index 98c7d26ee6f..b681d2bfa98 100644
19 --- a/dev-qt/qt-creator/Manifest
20 +++ b/dev-qt/qt-creator/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3
23 DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d SHA512 48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf
24 DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450
25
26 diff --git a/dev-qt/qt-creator/qt-creator-4.10.1.ebuild b/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
27 deleted file mode 100644
28 index dbf46966769..00000000000
29 --- a/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
30 +++ /dev/null
31 @@ -1,201 +0,0 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -LLVM_MAX_SLOT=8
37 -PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
38 -
39 -inherit llvm qmake-utils virtualx xdg
40 -
41 -DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
42 -HOMEPAGE="https://doc.qt.io/qtcreator/"
43 -LICENSE="GPL-3"
44 -SLOT="0"
45 -
46 -if [[ ${PV} == *9999 ]]; then
47 - inherit git-r3
48 - EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
49 -else
50 - MY_PV=${PV/_/-}
51 - MY_P=${PN}-opensource-src-${MY_PV}
52 - [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
53 - SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz"
54 - KEYWORDS="~amd64 ~arm ~x86"
55 - S=${WORKDIR}/${MY_P}
56 -fi
57 -
58 -# TODO: unbundle sqlite and KSyntaxHighlighting
59 -
60 -QTC_PLUGINS=(android +autotest baremetal beautifier
61 - '+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
62 - cmake:cmakeprojectmanager cppcheck cvs +designer git glsl:glsleditor +help ios lsp:languageclient
63 - mercurial modeling:modeleditor nim perforce perfprofiler python:pythoneditor qbs:qbsprojectmanager
64 - +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion
65 - valgrind winrt)
66 -IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
67 -RESTRICT="!test? ( test )"
68 -REQUIRED_USE="
69 - clang? ( test? ( qbs ) )
70 - qnx? ( remotelinux )
71 -"
72 -
73 -# minimum Qt version required
74 -QT_PV="5.12.3:5"
75 -
76 -CDEPEND="
77 - >=dev-qt/qtconcurrent-${QT_PV}
78 - >=dev-qt/qtcore-${QT_PV}
79 - >=dev-qt/qtdeclarative-${QT_PV}[widgets]
80 - >=dev-qt/qtgui-${QT_PV}
81 - >=dev-qt/qtnetwork-${QT_PV}[ssl]
82 - >=dev-qt/qtprintsupport-${QT_PV}
83 - >=dev-qt/qtquickcontrols-${QT_PV}
84 - >=dev-qt/qtscript-${QT_PV}
85 - >=dev-qt/qtsql-${QT_PV}[sqlite]
86 - >=dev-qt/qtsvg-${QT_PV}
87 - >=dev-qt/qtwidgets-${QT_PV}
88 - >=dev-qt/qtx11extras-${QT_PV}
89 - >=dev-qt/qtxml-${QT_PV}
90 - clang? ( sys-devel/clang:8= )
91 - designer? ( >=dev-qt/designer-${QT_PV} )
92 - help? (
93 - >=dev-qt/qthelp-${QT_PV}
94 - webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
95 - )
96 - perfprofiler? ( dev-libs/elfutils )
97 - qbs? ( >=dev-util/qbs-1.13.1 )
98 - serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
99 - systemd? ( sys-apps/systemd:= )
100 -"
101 -DEPEND="${CDEPEND}
102 - >=dev-qt/linguist-tools-${QT_PV}
103 - virtual/pkgconfig
104 - doc? ( >=dev-qt/qdoc-${QT_PV} )
105 - test? (
106 - >=dev-qt/qtdeclarative-${QT_PV}[localstorage]
107 - >=dev-qt/qtquickcontrols2-${QT_PV}
108 - >=dev-qt/qttest-${QT_PV}
109 - >=dev-qt/qtxmlpatterns-${QT_PV}[qml]
110 - )
111 -"
112 -RDEPEND="${CDEPEND}
113 - sys-devel/gdb[client,python]
114 - cmake? ( dev-util/cmake )
115 - cppcheck? ( dev-util/cppcheck )
116 - cvs? ( dev-vcs/cvs )
117 - git? ( dev-vcs/git )
118 - mercurial? ( dev-vcs/mercurial )
119 - silversearcher? ( sys-apps/the_silver_searcher )
120 - subversion? ( dev-vcs/subversion )
121 - valgrind? ( dev-util/valgrind )
122 -"
123 -# qt translations must also be installed or qt-creator translations won't be loaded
124 -for x in ${PLOCALES}; do
125 - IUSE+=" l10n_${x}"
126 - RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
127 -done
128 -unset x
129 -
130 -pkg_setup() {
131 - use clang && llvm_pkg_setup
132 -}
133 -
134 -src_prepare() {
135 - default
136 -
137 - # disable unwanted plugins
138 - for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
139 - if ! use ${plugin%:*}; then
140 - einfo "Disabling ${plugin%:*} plugin"
141 - sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \
142 - src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
143 - fi
144 - done
145 - sed -i -e '/updateinfo/d' src/plugins/plugins.pro || die
146 -
147 - # avoid building unused support libraries and tools
148 - if ! use clang; then
149 - sed -i -e '/clangsupport/d' src/libs/libs.pro || die
150 - sed -i -e '/clang\(\|pchmanager\|refactoring\)backend/d' src/tools/tools.pro || die
151 - fi
152 - if ! use glsl; then
153 - sed -i -e '/glsl/d' src/libs/libs.pro || die
154 - fi
155 - if ! use lsp; then
156 - sed -i -e '/languageserverprotocol/d' src/libs/libs.pro tests/auto/auto.pro || die
157 - fi
158 - if ! use modeling; then
159 - sed -i -e '/modelinglib/d' src/libs/libs.pro || die
160 - fi
161 - if ! use perfprofiler; then
162 - rm -rf src/tools/perfparser || die
163 - if ! use qmlprofiler; then
164 - sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
165 - fi
166 - fi
167 - if ! use qmldesigner; then
168 - sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
169 - sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
170 - fi
171 - if ! use valgrind; then
172 - sed -i -e '/valgrindfake/d' src/tools/tools.pro || die
173 - sed -i -e '/valgrind/d' tests/auto/auto.pro || die
174 - fi
175 -
176 - # automagic dep on qtwebengine
177 - if ! use webengine; then
178 - sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die
179 - fi
180 -
181 - # disable broken or unreliable tests
182 - sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
183 - sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' tests/auto/debugger/debugger.pro || die
184 - sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
185 - sed -i -e 's/\<check\>//' tests/auto/qml/codemodel/codemodel.pro || die
186 -
187 - # do not install test binaries
188 - sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die
189 -
190 - # fix path to some clang headers
191 - sed -i -e "/^CLANG_RESOURCE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
192 -
193 - # fix translations
194 - local lang languages=
195 - for lang in ${PLOCALES}; do
196 - use l10n_${lang} && languages+=" ${lang/-/_}"
197 - done
198 - sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
199 -
200 - # remove bundled qbs
201 - rm -rf src/shared/qbs || die
202 -}
203 -
204 -src_configure() {
205 - eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
206 - IDE_PACKAGE_MODE=1 \
207 - $(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
208 - $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
209 - CONFIG+=qbs_disable_rpath \
210 - CONFIG+=qbs_enable_project_file_updates \
211 - $(use systemd && echo CONFIG+=journald) \
212 - $(use test && echo BUILD_TESTS=1)
213 -}
214 -
215 -src_test() {
216 - cd tests/auto && virtx default
217 -}
218 -
219 -src_install() {
220 - emake INSTALL_ROOT="${ED}/usr" install
221 -
222 - dodoc dist/{changes-*,known-issues}
223 -
224 - # install documentation
225 - if use doc; then
226 - emake docs
227 - # don't use ${PF} or the doc will not be found
228 - insinto /usr/share/doc/qtcreator
229 - doins share/doc/qtcreator/qtcreator{,-dev}.qch
230 - docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
231 - fi
232 -}