diff options
| author |   Sam James <sam@gentoo.org> | 2023-09-22 23:21:34 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-09-22 23:25:06 +0100 |
| commit | bec4e679facdb731b90fa17aa0ecb30898d46fab (patch) | |
| tree | cdef209e75a74fe1a715adf423c901b7dc251cb3 /dev-util | |
| parent | app-misc/asciinema: add 2.3.0 (diff) | |
| download | gentoo-bec4e679facdb731b90fa17aa0ecb30898d46fab.tar.gz gentoo-bec4e679facdb731b90fa17aa0ecb30898d46fab.tar.bz2 gentoo-bec4e679facdb731b90fa17aa0ecb30898d46fab.zip | |
dev-util/cmake: default to Qt 5 for now with USE=gui
Unfortunate, but I don't use the CMake GUI and the user has a reasonable
request here. Still make Qt 6 available w/ USE=qt6 though.
Revisit when Plasma 6 is out to avoid the referenced jarring issue wrt
text rendering.
Bug: https://bugs.gentoo.org/914489
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/cmake/cmake-3.27.6-r1.ebuild | 13 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-9999.ebuild | 13 |
2 files changed, 18 insertions, 8 deletions
diff --git a/dev-util/cmake/cmake-3.27.6-r1.ebuild b/dev-util/cmake/cmake-3.27.6-r1.ebuild index ae44c2129a3d..b122058f45cd 100644 --- a/dev-util/cmake/cmake-3.27.6-r1.ebuild +++ b/dev-util/cmake/cmake-3.27.6-r1.ebuild @@ -60,7 +60,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses test" +IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses qt6 test" RESTRICT="!test? ( test )" RDEPEND=" @@ -75,9 +75,14 @@ RDEPEND=" dap? ( dev-cpp/cppdap ) emacs? ( >=app-editors/emacs-23.1:* ) gui? ( - dev-qt/qtbase:6[gui,widgets] + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + qt6? ( dev-qt/qtbase:6[gui,widgets] ) ) - ncurses? ( sys-libs/ncurses:0= ) + ncurses? ( sys-libs/ncurses:= ) " DEPEND="${RDEPEND}" BDEPEND+=" @@ -205,7 +210,7 @@ src_configure() { -DBUILD_QtDialog=$(usex gui) ) - use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=6 ) + use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=$(usex qt6 6 5) ) cmake_src_configure } diff --git a/dev-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild index e594109025d5..f6edfcf41871 100644 --- a/dev-util/cmake/cmake-9999.ebuild +++ b/dev-util/cmake/cmake-9999.ebuild @@ -59,7 +59,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses test" +IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses qt6 test" RESTRICT="!test? ( test )" RDEPEND=" @@ -74,9 +74,14 @@ RDEPEND=" dap? ( dev-cpp/cppdap ) emacs? ( >=app-editors/emacs-23.1:* ) gui? ( - dev-qt/qtbase:6[gui,widgets] + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + qt6? ( dev-qt/qtbase:6[gui,widgets] ) ) - ncurses? ( sys-libs/ncurses:0= ) + ncurses? ( sys-libs/ncurses:= ) " DEPEND="${RDEPEND}" BDEPEND+=" @@ -201,7 +206,7 @@ src_configure() { -DBUILD_QtDialog=$(usex gui) ) - use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=6 ) + use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=$(usex qt6 6 5) ) cmake_src_configure } |