commit:     c5d2ca1fbc24be0e5550a78a2eb32fd2d1f38b8a
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 03:41:02 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 03:50:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5d2ca1f

dev-qt/qt-creator: disable clangpchmanager and clangrefactoring

Upstream considers them "too unstable even for experimental status"
https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=8dff37f0d3ebcae0aa4f4839165fb70fa9cd965c

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/metadata.xml           |  2 +-
 dev-qt/qt-creator/qt-creator-9999.ebuild | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 6e40ad6ef7f..f1b1bb3d025 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -17,7 +17,7 @@
                <flag name="bazaar">Add support for GNU Bazaar version control 
system (requires manual installation of Bazaar client)</flag>
                <flag name="beautifier">Build the beautifier plugin (supports 
astyle, clang-format, and uncrustify)</flag>
                <flag name="boot2qt">Build plugin for Boot2Qt devices</flag>
-               <flag name="clang">Build clang-based plugins (code model, 
formatting, refactoring, static analysis)</flag>
+               <flag name="clang">Build clang-based plugins (code model, 
formatting, static analysis)</flag>
                <flag name="clearcase">Add support for IBM ClearCase version 
control system (requires manual installation of ClearCase client)</flag>
                <flag name="cmake">Build plugin for CMake-based projects</flag>
                <flag name="cppcheck">Enable integration with 
<pkg>dev-util/cppcheck</pkg></flag>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild 
b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 9ae9556b4db..957735a0949 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -27,11 +27,11 @@ fi
 # TODO: unbundle sqlite
 
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt
-       
'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' 
clearcase
-       cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git 
glsl:glsleditor +help
-       lsp:languageclient mcu:mcusupport mercurial modeling:modeleditor nim 
perforce perfprofiler python
-       qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor qmlprofiler qnx 
remotelinux scxml:scxmleditor
-       serialterminal silversearcher subversion valgrind webassembly)
+       '+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager cppcheck
+       ctfvisualizer cvs +designer git glsl:glsleditor +help 
lsp:languageclient mcu:mcusupport mercurial
+       modeling:modeleditor nim perforce perfprofiler python 
qbs:qbsprojectmanager +qmldesigner
+       +qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor 
serialterminal silversearcher
+       subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
@@ -139,12 +139,13 @@ src_prepare() {
                                src/plugins/plugins.pro || die "failed to 
disable ${plugin%:*} plugin"
                fi
        done
-       sed -i -re '/\<(ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || 
die
+       sed -i -re 
'/\<(clangpchmanager|clangrefactoring|ios|updateinfo|winrt)\>/d' 
src/plugins/plugins.pro || die
+       sed -i -re '/clang(pchmanager|refactoring)backend/d' 
src/tools/tools.pro || die
 
        # avoid building unused support libraries and tools
        if ! use clang; then
                sed -i -e '/clangsupport\|sqlite\|yaml-cpp/d' src/libs/libs.pro 
|| die
-               sed -i -e '/clang\(\|pchmanager\|refactoring\)backend/d' 
src/tools/tools.pro || die
+               sed -i -e '/clangbackend/d' src/tools/tools.pro || die
        fi
        if ! use glsl; then
                sed -i -e '/glsl/d' src/libs/libs.pro || die

Reply via email to