commit: 1062ae41fc96744e09e9bae9ddbdbf40ac6a34e9 Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Sun Aug 18 12:50:07 2024 +0000 Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> CommitDate: Sun Aug 18 12:52:38 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1062ae41
app-editors/neovim-qt: fix Qt6 build Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> ...ovim-qt-0.2.18.ebuild => neovim-qt-0.2.18-r1.ebuild} | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/app-editors/neovim-qt/neovim-qt-0.2.18.ebuild b/app-editors/neovim-qt/neovim-qt-0.2.18-r1.ebuild similarity index 83% rename from app-editors/neovim-qt/neovim-qt-0.2.18.ebuild rename to app-editors/neovim-qt/neovim-qt-0.2.18-r1.ebuild index 1d896fd1a..9dbb3629b 100644 --- a/app-editors/neovim-qt/neovim-qt-0.2.18.ebuild +++ b/app-editors/neovim-qt/neovim-qt-0.2.18-r1.ebuild @@ -12,12 +12,11 @@ SRC_URI="https://github.com/equalsraf/neovim-qt/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="ISC" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="qt5 qt6 test" -REQUIRED_USE="|| ( qt5 qt6 )" +IUSE="qt6 test" COMMON_DEPEND=" - qt5? ( - dev-libs/msgpack:= + dev-libs/msgpack:= + !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 @@ -26,16 +25,14 @@ COMMON_DEPEND=" ) qt6? ( dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:5 + dev-qt/qtsvg:6 ) " # NOTE: see <https://github.com/equalsraf/neovim-qt/issues/1005> for dejavu dep DEPEND=" ${COMMON_DEPEND} - test? ( - qt5? ( dev-qt/qttest:5 ) - media-fonts/dejavu[X] - ) + !qt6? ( dev-qt/qttest:5 ) + test? ( media-fonts/dejavu[X] ) " RDEPEND=" ${COMMON_DEPEND} @@ -49,7 +46,7 @@ src_configure() { -DUSE_GCOV=OFF -DENABLE_TESTS=$(usex test) -DBUILD_SHARED_LIBS=OFF # upstream explicitly builds static lib - -DQT_VERSION_MAJOR=$(usex qt5 5 6) + -DWITH_QT=$(usex qt6 Qt6 Qt5) ) cmake_src_configure
