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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 52B8D15813A for ; Mon, 06 Jan 2025 22:58:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94CB5E081B; Mon, 06 Jan 2025 22:58:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 776E5E081B for ; Mon, 06 Jan 2025 22:58:18 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 92F4334106C for ; Mon, 06 Jan 2025 22:58:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C7C61D63 for ; Mon, 06 Jan 2025 22:58:15 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1736204105.0c1e80b46afe750dafbdbb0d423a8f76070ce4f5.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/qmmp/, media-sound/qmmp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch media-sound/qmmp/qmmp-9999.ebuild X-VCS-Directories: media-sound/qmmp/ media-sound/qmmp/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0c1e80b46afe750dafbdbb0d423a8f76070ce4f5 X-VCS-Branch: master Date: Mon, 06 Jan 2025 22:58: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: ae5f40a0-e5e7-4eec-8cca-19f08a78d984 X-Archives-Hash: 9dd19689308908391287402b096330b4 commit: 0c1e80b46afe750dafbdbb0d423a8f76070ce4f5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 6 22:32:39 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 6 22:55:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c1e80b4 media-sound/qmmp: Sync live ebuild Signed-off-by: Andreas Sturmlechner gentoo.org> .../qmmp/files/qmmp-1.6.0-udisks_plugin.patch | 11 ----------- media-sound/qmmp/qmmp-9999.ebuild | 20 +++++--------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch b/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch deleted file mode 100644 index 45512099ffeb..000000000000 --- a/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qmmp-1.6.0/src/plugins/General/CMakeLists.txt -+++ qmmp-1.6.0/src/plugins/General/CMakeLists.txt -@@ -51,7 +51,7 @@ - ENDIF(USE_HAL AND Qt5DBus_FOUND) - - IF(USE_UDISKS2 AND Qt5DBus_FOUND) --add_subdirectory(udisks2) -+add_subdirectory(udisks) - ENDIF(USE_UDISKS2 AND Qt5DBus_FOUND) - - IF(USE_HOTKEY AND Qt5X11Extras_FOUND) diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild index a8f1b4fc79ad..4628e3c5aa07 100644 --- a/media-sound/qmmp/qmmp-9999.ebuild +++ b/media-sound/qmmp/qmmp-9999.ebuild @@ -32,12 +32,7 @@ REQUIRED_USE=" " RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + dev-qt/qtbase:6[X,dbus,gui,network,sqlite,widgets] media-libs/taglib:= x11-libs/libX11 aac? ( media-libs/faad2 ) @@ -49,7 +44,7 @@ RDEPEND=" dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) - dbus? ( dev-qt/qtdbus:5 ) + dbus? ( dev-qt/qtbase:6[dbus] ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac:= ) @@ -71,12 +66,11 @@ RDEPEND=" opus? ( media-libs/opusfile ) pipewire? ( media-video/pipewire ) projectm? ( - dev-qt/qtgui:5[-gles2-only] - dev-qt/qtopengl:5 + dev-qt/qtbase:6[-gles2-only,opengl] media-libs/libprojectm:= ) pulseaudio? ( media-libs/libpulse ) - qtmedia? ( dev-qt/qtmultimedia:5 ) + qtmedia? ( dev-qt/qtmultimedia:6 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) @@ -90,14 +84,10 @@ RDEPEND=" wavpack? ( media-sound/wavpack ) " DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" +BDEPEND="dev-qt/qttools:6[linguist]" DOCS=( AUTHORS ChangeLog README ) -PATCHES=( - "${FILESDIR}/${PN}-1.6.0-udisks_plugin.patch" -) - src_prepare() { if has_version dev-libs/libcdio-paranoia ; then sed -i \