From bec4e679facdb731b90fa17aa0ecb30898d46fab Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 22 Sep 2023 23:21:34 +0100 Subject: [PATCH] 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 --- dev-util/cmake/cmake-3.27.6-r1.ebuild | 13 +++++++++---- 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 ae44c2129a3da..b122058f45cde 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 e594109025d5a..f6edfcf418710 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 }