diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
commit | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch) | |
tree | 326613a08f25851c388715e205576a2e7d25dc4f /dev-qt/qt-creator/qt-creator-9999.ebuild | |
parent | b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff) |
gentoo resync : 18.08.2019
Diffstat (limited to 'dev-qt/qt-creator/qt-creator-9999.ebuild')
-rw-r--r-- | dev-qt/qt-creator/qt-creator-9999.ebuild | 51 |
1 files changed, 32 insertions, 19 deletions
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 3a1250a63894..87ff878b2085 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW" inherit llvm qmake-utils virtualx xdg @@ -18,22 +18,27 @@ else MY_PV=${PV/_/-} MY_P=${PN}-opensource-src-${MY_PV} [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development - SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz" + SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz" KEYWORDS="~amd64 ~arm ~x86" S=${WORKDIR}/${MY_P} fi -# TODO: unbundle sqlite +# TODO: unbundle sqlite and KSyntaxHighlighting -QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar - '+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck - cvs +designer git glsl:glsleditor +help ios lsp:languageclient mercurial modeling:modeleditor - nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor serialterminal - silversearcher subversion valgrind winrt) +QTC_PLUGINS=(android +autotest baremetal bazaar beautifier + '+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase + cmake:cmakeprojectmanager cppcheck cvs +designer git glsl:glsleditor +help ios lsp:languageclient + mercurial modeling:modeleditor nim perforce perfprofiler python:pythoneditor qbs:qbsprojectmanager + +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion + valgrind winrt) IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}" +REQUIRED_USE=" + clang? ( test? ( qbs ) ) + qnx? ( remotelinux ) +" # minimum Qt version required -QT_PV="5.9.0:5" +QT_PV="5.12.3:5" CDEPEND=" >=dev-qt/qtconcurrent-${QT_PV} @@ -49,13 +54,14 @@ CDEPEND=" >=dev-qt/qtwidgets-${QT_PV} >=dev-qt/qtx11extras-${QT_PV} >=dev-qt/qtxml-${QT_PV} - clang? ( >=sys-devel/clang-6:= ) + clang? ( >=sys-devel/clang-8:= ) designer? ( >=dev-qt/designer-${QT_PV} ) help? ( >=dev-qt/qthelp-${QT_PV} webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] ) ) - qbs? ( >=dev-util/qbs-1.13.0 ) + perfprofiler? ( dev-libs/elfutils ) + qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-${QT_PV} ) systemd? ( sys-apps/systemd:= ) " @@ -65,17 +71,13 @@ DEPEND="${CDEPEND} doc? ( >=dev-qt/qdoc-${QT_PV} ) test? ( >=dev-qt/qtdeclarative-${QT_PV}[localstorage] - || ( - >=dev-qt/qtxmlpatterns-5.12.1-r1:5[qml(+)] - <dev-qt/qtdeclarative-5.12.0[xml] - ) >=dev-qt/qtquickcontrols2-${QT_PV} >=dev-qt/qttest-${QT_PV} + >=dev-qt/qtxmlpatterns-${QT_PV}[qml] ) " RDEPEND="${CDEPEND} sys-devel/gdb[client,python] - autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) cmake? ( dev-util/cmake[server(+)] ) cppcheck? ( dev-util/cppcheck ) @@ -104,7 +106,7 @@ src_prepare() { for plugin in "${QTC_PLUGINS[@]#[+-]}"; do if ! use ${plugin%:*}; then einfo "Disabling ${plugin%:*} plugin" - sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \ + sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \ src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin" fi done @@ -113,7 +115,7 @@ src_prepare() { # avoid building unused support libraries and tools if ! use clang; then sed -i -e '/clangsupport/d' src/libs/libs.pro || die - sed -i -e '/SUBDIRS += clangbackend/d' src/tools/tools.pro || die + sed -i -e '/clang\(\|pchmanager\|refactoring\)backend/d' src/tools/tools.pro || die fi if ! use glsl; then sed -i -e '/glsl/d' src/libs/libs.pro || die @@ -124,6 +126,16 @@ src_prepare() { if ! use modeling; then sed -i -e '/modelinglib/d' src/libs/libs.pro || die fi + if ! use perfprofiler; then + rm -rf src/tools/perfparser || die + if ! use qmlprofiler; then + sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die + fi + fi + if ! use qmldesigner; then + sed -i -e '/qml2puppet/d' src/tools/tools.pro || die + sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die + fi if ! use valgrind; then sed -i -e '/valgrindfake/d' src/tools/tools.pro || die sed -i -e '/valgrind/d' tests/auto/auto.pro || die @@ -138,6 +150,7 @@ src_prepare() { sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' tests/auto/debugger/debugger.pro || die sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die + sed -i -e 's/\<check\>//' tests/auto/qml/codemodel/codemodel.pro || die # do not install test binaries sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die @@ -172,7 +185,7 @@ src_test() { } src_install() { - emake INSTALL_ROOT="${ED}usr" install + emake INSTALL_ROOT="${ED}/usr" install dodoc dist/{changes-*,known-issues} |