commit: 465196e5b2851713af3ee0fc7e2698065a48ba76 Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> AuthorDate: Wed Jun 25 21:16:34 2025 +0000 Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> CommitDate: Wed Jun 25 21:16:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=465196e5
app-misc/doublecmd-bin: drop USE="qt5", revision bump Closes: https://bugs.gentoo.org/958937 Suggested-by: Lucio Sauer <watermanpaint <AT> posteo.net> Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> app-misc/doublecmd-bin/Manifest | 2 - ....1.26.ebuild => doublecmd-bin-1.1.26-r1.ebuild} | 44 +++++++++++----------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/app-misc/doublecmd-bin/Manifest b/app-misc/doublecmd-bin/Manifest index b61d52da8c..5f459e5968 100644 --- a/app-misc/doublecmd-bin/Manifest +++ b/app-misc/doublecmd-bin/Manifest @@ -1,5 +1,3 @@ DIST doublecmd-1.1.26.gtk2.i386.tar.xz 8406120 BLAKE2B 708029270eed7371dba6d41410861fe0c641bcfafe1ec72b87827aa0c52103aa1c7d9830352d8de93afcdbcadad2d469986c77db847894fe47975b959722a291 SHA512 54a3c57f3257aac8e244554afcfe9415b7f29cf779e023fd9c243538ec8f7e985ee6c3217921f240c72b503abfe52f61387f07b142be26a216745624ca5ce604 DIST doublecmd-1.1.26.gtk2.x86_64.tar.xz 9153932 BLAKE2B 96c255028221878540db244be1d0d86d5025389ebbb899be035f665ddcbb625e155edb97fe511afdb477b4258253aa1010e94e2eef1022274685fe7ac5dc5365 SHA512 4ba3d9fc7f1e322eea1f6ade91852744e8971c893cb746eab3f08a0e0046536edfa62e39f4fbd6a61b47d412916d51df29fa80a26a7054bd5e1a44a8c37f4ca0 -DIST doublecmd-1.1.26.qt.i386.tar.xz 8821652 BLAKE2B 466134f8232475f3944d80a736ea455b08390cdf662b0a42d361adb1450670689ef9e9bdd55fb3b7d53cce92bb0257ae6158f444a2034a91a8d6dad1f4e92648 SHA512 9e5b0794e28e2ea9b464b78fe386c235187f5645315296c810980ed170c22217b8274ebd05834ed67e0b2b6281648b85e54816e461bbac05018d42f8d1148407 -DIST doublecmd-1.1.26.qt.x86_64.tar.xz 9515584 BLAKE2B f6e0e1933c1b48e3dfc188e4f652b4edae7845b029534822ac8b919202f1421d688bf1a9d5f84f8cf6bc573b9109c6cab61ed7d84a632dbe448ddc3b4da91b27 SHA512 34f1b3ad0b87a0914235d5e2ebfa36381dba2ed796a9bb981a0ca194c76e99970521bf288a2cd4053667873259929940683553829efac28f1f35c29dccb67f6a DIST doublecmd-1.1.26.qt6.x86_64.tar.xz 9574828 BLAKE2B 5867e56473c043fdc0fc9e3105134c3ba49ef6054bd48ffbc0fef25dc835968329da89ff04d5a38a584cc9ea65f2b2fd51fdcb6646d995e03e64a7b88fc3ce99 SHA512 e992ef843fc0d12dcb9ffb0a19bf9901e8603b873b39c62ac318b0f7a6775cd3e97d26321c29a46667a1d91e2452761abaafe4161c9a0a2fdcce84ad973fb9d6 diff --git a/app-misc/doublecmd-bin/doublecmd-bin-1.1.26.ebuild b/app-misc/doublecmd-bin/doublecmd-bin-1.1.26-r1.ebuild similarity index 63% rename from app-misc/doublecmd-bin/doublecmd-bin-1.1.26.ebuild rename to app-misc/doublecmd-bin/doublecmd-bin-1.1.26-r1.ebuild index 28fbf36875..78224757de 100644 --- a/app-misc/doublecmd-bin/doublecmd-bin-1.1.26.ebuild +++ b/app-misc/doublecmd-bin/doublecmd-bin-1.1.26-r1.ebuild @@ -9,15 +9,13 @@ MY_PN="doublecmd" DESCRIPTION="Free cross platform open source file manager with two panels side by side." HOMEPAGE="https://doublecmd.sourceforge.io/"; -SRC_URI="amd64? ( - gtk? ( https://downloads.sourceforge.net/${MY_PN}/${MY_PN}-${PV}.gtk2.x86_64.tar.xz ) - qt5? ( https://downloads.sourceforge.net/${MY_PN}/${MY_PN}-${PV}.qt.x86_64.tar.xz ) +SRC_URI=" + amd64? ( + !qt6? ( https://downloads.sourceforge.net/${MY_PN}/${MY_PN}-${PV}.gtk2.x86_64.tar.xz ) qt6? ( https://downloads.sourceforge.net/${MY_PN}/${MY_PN}-${PV}.qt6.x86_64.tar.xz ) ) - x86? ( - gtk? ( https://downloads.sourceforge.net/${MY_PN}/${MY_PN}-${PV}.gtk2.i386.tar.xz ) - qt5? ( https://downloads.sourceforge.net/${MY_PN}/${MY_PN}-${PV}.qt.i386.tar.xz ) - )" + x86? ( https://downloads.sourceforge.net/${MY_PN}/${MY_PN}-${PV}.gtk2.i386.tar.xz ) +" S="${WORKDIR}/${MY_PN}" @@ -26,12 +24,10 @@ LICENSE="GPL-2+ LGPL-2-with-linking-exception LGPL-2.1+ LGPL-3 GPL-1 freedist" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="gtk qt5 qt6" -REQUIRED_USE=" ^^ ( gtk qt5 qt6 ) " +IUSE="qt6" QA_PREBUILT=" */doublecmd - */libQt5Pas.so.1 */libQt6Pas.so.6 */libunrar.so */plugins/.* @@ -39,23 +35,27 @@ QA_PREBUILT=" ## "ldd doublecmd" output show linking to some libraries provided by sys-libs/glibc:2.2 ## (maybe virtual/libc-1) and no libraries of sys-libs/ncurses (that removed here). -## x11-libs/X11 is optional dependency of dev-qt/qtgui:5 by [xcb] or [X] -## therefore it is mentioned here explicitly. +## Once per-profile USE masking works in overlays, mask the qt6 USE flag for x86 and +## revert RDEPEND hack. +GTK_DEPS=" + app-accessibility/at-spi2-core:2 + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/pango +" RDEPEND=" dev-libs/glib:2 sys-apps/dbus x11-libs/libX11 - virtual/libc - gtk? ( x11-libs/gtk+:2 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,widgets] + amd64? ( + !qt6? ( ${GTK_DEPS} ) + qt6? ( + dev-qt/qtbase:6[gui,widgets] + media-libs/libglvnd + ) ) + x86? ( ${GTK_DEPS} ) " src_install(){
