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 9525515812D for ; Wed, 01 Jan 2025 08:55:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6EFBCE0794; Wed, 01 Jan 2025 08:55:33 +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 1D536E0794 for ; Wed, 01 Jan 2025 08:55:33 +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 367FA33BE9F for ; Wed, 01 Jan 2025 08:55:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C8A51954 for ; Wed, 01 Jan 2025 08:55:29 +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: <1735721718.2b17103b23f4ae848d1ae15ba4392cc3110feed4.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/qsynth/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/qsynth/qsynth-1.0.2-r1.ebuild media-sound/qsynth/qsynth-9999.ebuild X-VCS-Directories: media-sound/qsynth/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2b17103b23f4ae848d1ae15ba4392cc3110feed4 X-VCS-Branch: master Date: Wed, 01 Jan 2025 08:55:29 +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: 099e1302-e2cd-45e8-ab6d-557334dc9b40 X-Archives-Hash: 13c57afb2cddc3378f69e24d7205538b commit: 2b17103b23f4ae848d1ae15ba4392cc3110feed4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Dec 31 20:42:18 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 1 08:55:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b17103b media-sound/qsynth: Drop IUSE qt6 (Qt5 build option) Signed-off-by: Andreas Sturmlechner gentoo.org> .../{qsynth-9999.ebuild => qsynth-1.0.2-r1.ebuild} | 24 ++++++---------------- media-sound/qsynth/qsynth-9999.ebuild | 22 +++++--------------- 2 files changed, 11 insertions(+), 35 deletions(-) diff --git a/media-sound/qsynth/qsynth-9999.ebuild b/media-sound/qsynth/qsynth-1.0.2-r1.ebuild similarity index 74% copy from media-sound/qsynth/qsynth-9999.ebuild copy to media-sound/qsynth/qsynth-1.0.2-r1.ebuild index 496e8129a1ca..e10bee8f4374 100644 --- a/media-sound/qsynth/qsynth-9999.ebuild +++ b/media-sound/qsynth/qsynth-1.0.2-r1.ebuild @@ -13,39 +13,27 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://downloads.sourceforge.net/qsynth/${P}.tar.gz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ppc ppc64 x86" fi LICENSE="GPL-2" SLOT="0" -IUSE="+alsa debug jack pulseaudio qt6" +IUSE="+alsa debug jack pulseaudio" REQUIRED_USE="|| ( alsa jack pulseaudio )" -BDEPEND=" - qt6? ( dev-qt/qttools:6[linguist] ) - !qt6? ( dev-qt/linguist-tools:5 ) -" DEPEND=" - qt6? ( - dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:6 - ) - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qtsvg:6 media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?] " RDEPEND="${DEPEND}" +BDEPEND="dev-qt/qttools:6[linguist]" src_configure() { local mycmakeargs=( -DCONFIG_DEBUG=$(usex debug 1 0) - -DCONFIG_QT6=$(usex qt6 1 0) + -DCONFIG_QT6=1 ) cmake_src_configure } diff --git a/media-sound/qsynth/qsynth-9999.ebuild b/media-sound/qsynth/qsynth-9999.ebuild index 496e8129a1ca..1a8dd2a8ac2b 100644 --- a/media-sound/qsynth/qsynth-9999.ebuild +++ b/media-sound/qsynth/qsynth-9999.ebuild @@ -18,34 +18,22 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+alsa debug jack pulseaudio qt6" +IUSE="+alsa debug jack pulseaudio" REQUIRED_USE="|| ( alsa jack pulseaudio )" -BDEPEND=" - qt6? ( dev-qt/qttools:6[linguist] ) - !qt6? ( dev-qt/linguist-tools:5 ) -" DEPEND=" - qt6? ( - dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:6 - ) - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qtsvg:6 media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?] " RDEPEND="${DEPEND}" +BDEPEND="dev-qt/qttools:6[linguist]" src_configure() { local mycmakeargs=( -DCONFIG_DEBUG=$(usex debug 1 0) - -DCONFIG_QT6=$(usex qt6 1 0) + -DCONFIG_QT6=1 ) cmake_src_configure }