From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 945C9158083 for ; Wed, 25 Sep 2024 08:31:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF639E2BB0; Wed, 25 Sep 2024 08:31:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 56895E2BB0 for ; Wed, 25 Sep 2024 08:31:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A0975343199 for ; Wed, 25 Sep 2024 08:31:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 138A21A09 for ; Wed, 25 Sep 2024 08:31:15 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1727253045.1fa2b715d6f02e35bdb7104d8e40a7f96ff622df.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeciv/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/freeciv/freeciv-3.1.2.ebuild games-strategy/freeciv/freeciv-9999.ebuild X-VCS-Directories: games-strategy/freeciv/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 1fa2b715d6f02e35bdb7104d8e40a7f96ff622df X-VCS-Branch: master Date: Wed, 25 Sep 2024 08:31:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 84be4e9e-d382-4287-ad42-6930bf80c1e2 X-Archives-Hash: 9a3ecf1b7e1b699bb1c28f2d8fade261 commit: 1fa2b715d6f02e35bdb7104d8e40a7f96ff622df Author: Ionen Wolkens gentoo org> AuthorDate: Wed Sep 25 08:20:59 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Sep 25 08:30:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fa2b715 games-strategy/freeciv: remove USE=qt5 and default to qt6 Haven't looked at this ebuild/package too closely, just quickly done to avoid conflicts when qt5 and qt6 are set globally at same time. Should be no need for a revbump given keeping USE=qt6 to select between the multiple toolkits. Given both qt5 and qt6 call the binary "freeciv-qt", the change should be seamless for users. Signed-off-by: Ionen Wolkens gentoo.org> games-strategy/freeciv/freeciv-3.1.2.ebuild | 20 ++++---------------- games-strategy/freeciv/freeciv-9999.ebuild | 20 ++++---------------- 2 files changed, 8 insertions(+), 32 deletions(-) diff --git a/games-strategy/freeciv/freeciv-3.1.2.ebuild b/games-strategy/freeciv/freeciv-3.1.2.ebuild index eca61092a9e5..3409c6c89308 100644 --- a/games-strategy/freeciv/freeciv-3.1.2.ebuild +++ b/games-strategy/freeciv/freeciv-3.1.2.ebuild @@ -25,15 +25,12 @@ fi LICENSE="GPL-2+" SLOT="0" -IUSE="dedicated gtk3 gtk4 json mapimg modpack mysql nls +qt5 qt6 readline rule-editor sdl +server +sound +system-lua web-server" +IUSE="dedicated gtk3 gtk4 json mapimg modpack mysql nls +qt6 readline rule-editor sdl +server +sound +system-lua web-server" -# I'm pretty sure that you can't build both qt flavours at the same time REQUIRED_USE=" system-lua? ( ${LUA_REQUIRED_USE} ) - !dedicated? ( || ( gtk3 gtk4 qt5 qt6 sdl ) ) - dedicated? ( !gtk3 !gtk4 !mapimg !nls !qt5 !qt6 !sdl !sound ) - qt5? ( !qt6 ) - qt6? ( !qt5 ) + !dedicated? ( || ( gtk3 gtk4 qt6 sdl ) ) + dedicated? ( !gtk3 !gtk4 !mapimg !nls !qt6 !sdl !sound ) " RDEPEND=" @@ -51,14 +48,7 @@ RDEPEND=" gtk4? ( gui-libs/gtk:4 ) mapimg? ( media-gfx/imagemagick:= ) nls? ( virtual/libintl ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,widgets] - ) + qt6? ( dev-qt/qtbase:6[gui,widgets] ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx @@ -132,9 +122,7 @@ src_configure() { freeciv_enable_ui sdl sdl2 cli freeciv_enable_ui gtk3 gtk3.22 gtk3 freeciv_enable_ui gtk4 - freeciv_enable_ui qt5 qt freeciv_enable_ui qt6 qt - use qt5 && emesonargs+=( -Dqtver=qt5 ) use qt6 && emesonargs+=( -Dqtver=qt6 ) else if use modpack ; then diff --git a/games-strategy/freeciv/freeciv-9999.ebuild b/games-strategy/freeciv/freeciv-9999.ebuild index eca61092a9e5..3409c6c89308 100644 --- a/games-strategy/freeciv/freeciv-9999.ebuild +++ b/games-strategy/freeciv/freeciv-9999.ebuild @@ -25,15 +25,12 @@ fi LICENSE="GPL-2+" SLOT="0" -IUSE="dedicated gtk3 gtk4 json mapimg modpack mysql nls +qt5 qt6 readline rule-editor sdl +server +sound +system-lua web-server" +IUSE="dedicated gtk3 gtk4 json mapimg modpack mysql nls +qt6 readline rule-editor sdl +server +sound +system-lua web-server" -# I'm pretty sure that you can't build both qt flavours at the same time REQUIRED_USE=" system-lua? ( ${LUA_REQUIRED_USE} ) - !dedicated? ( || ( gtk3 gtk4 qt5 qt6 sdl ) ) - dedicated? ( !gtk3 !gtk4 !mapimg !nls !qt5 !qt6 !sdl !sound ) - qt5? ( !qt6 ) - qt6? ( !qt5 ) + !dedicated? ( || ( gtk3 gtk4 qt6 sdl ) ) + dedicated? ( !gtk3 !gtk4 !mapimg !nls !qt6 !sdl !sound ) " RDEPEND=" @@ -51,14 +48,7 @@ RDEPEND=" gtk4? ( gui-libs/gtk:4 ) mapimg? ( media-gfx/imagemagick:= ) nls? ( virtual/libintl ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,widgets] - ) + qt6? ( dev-qt/qtbase:6[gui,widgets] ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx @@ -132,9 +122,7 @@ src_configure() { freeciv_enable_ui sdl sdl2 cli freeciv_enable_ui gtk3 gtk3.22 gtk3 freeciv_enable_ui gtk4 - freeciv_enable_ui qt5 qt freeciv_enable_ui qt6 qt - use qt5 && emesonargs+=( -Dqtver=qt5 ) use qt6 && emesonargs+=( -Dqtver=qt6 ) else if use modpack ; then