dev-qt/qt-creator: merge qmldesigner and qmljs USE flags

And also put qmlpreview and qmlprojectmanager behind the new flag Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Davide Pesavento <[email protected]>
johu · Nov 23, 2021 · 9ba0be1 · 9ba0be1
1 parent 2c5e19c
commit 9ba0be1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git 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, static analysis)</flag>
+ <flag name="clang">Build clang-based plugins for C/C++ development (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="conan">Build plugin to integrate with the Conan package manager</flag>
@@ -27,7 +27,7 @@
  <flag name="docker">Build plugin for Docker support</flag>
  <flag name="glsl">Build the GLSL editor plugin</flag>
  <flag name="help">Enable the integrated documentation viewer</flag>
- <flag name="incredibuild">Enable integration with Incredibuild (requires manual installation of Incredibuild)</flag>
+ <flag name="incredibuild">Enable integration with Incredibuild</flag>
  <flag name="lsp">Add support for the Language Server Protocol (LSP)</flag>
  <flag name="mcu">Build plugin for MCU devices</flag>
  <flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
@@ -38,6 +38,7 @@
  <flag name="perfprofiler">Build the Linux Perf-based profiler plugin</flag>
  <flag name="python">Build plugin for Python language support</flag>
  <flag name="qbs">Build plugin for QBS-based projects</flag>
+ <flag name="qml">Build plugins for QML-based development (designer, editor, project manager)</flag>
  <flag name="qmldesigner">Enable designer for QML/QtQuick-based UIs</flag>
  <flag name="qmljs">Build the QML/JavaScript editor plugin</flag>
  <flag name="qmlprofiler">Build the QML profiler plugin</flag>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -28,8 +28,9 @@ QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaa
  '+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager conan cppcheck
  ctfvisualizer cvs +designer docker git glsl:glsleditor +help incredibuild lsp:languageclient
  mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler
- python qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor qmlprofiler qnx remotelinux
- scxml:scxmleditor serialterminal silversearcher subversion valgrind webassembly)
+ python qbs:qbsprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
+ qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion valgrind
+ webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
@@ -38,7 +39,6 @@ REQUIRED_USE="
  clang? ( test? ( qbs ) )
  mcu? ( baremetal cmake )
  python? ( lsp )
- qmldesigner? ( qmljs )
  qnx? ( remotelinux )
 "
 
@@ -97,7 +97,7 @@ RDEPEND="${CDEPEND}
  cvs? ( dev-vcs/cvs )
  git? ( dev-vcs/git )
  mercurial? ( dev-vcs/mercurial )
- qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+ qml? ( >=dev-qt/qtquicktimeline-${QT_PV} )
  silversearcher? ( sys-apps/the_silver_searcher )
  subversion? ( dev-vcs/subversion )
  valgrind? ( dev-util/valgrind )
@@ -123,7 +123,6 @@ src_prepare() {
  # disable unwanted plugins
  for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
  if ! use ${plugin%:*}; then
- einfo "Disabling ${plugin%:*} plugin"
  sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \
  src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
  fi
@@ -150,14 +149,11 @@ src_prepare() {
  sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
  fi
  fi
- if ! use qmldesigner; then
- sed -i -e '/advanceddockingsystem/d' src/libs/libs.pro || die
+ if ! use qml; then
+ sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' src/libs/libs.pro || die
  sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
  sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
  fi
- if ! use qmljs; then
- sed -i -e '/qmleditorwidgets/d' src/libs/libs.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