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 E49AF15800D for ; Mon, 3 Jul 2023 08:44:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CE50E07D3; Mon, 3 Jul 2023 08:44:00 +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 E627CE07D3 for ; Mon, 3 Jul 2023 08:43:59 +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 08348340DEB for ; Mon, 3 Jul 2023 08:43:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98C448DC for ; Mon, 3 Jul 2023 08:43:57 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1688373835.20ccf80f7c32366e81945ae24298654345816b59.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/qsampler/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/qsampler/qsampler-0.9.10-r1.ebuild media-sound/qsampler/qsampler-0.9.10-r2.ebuild media-sound/qsampler/qsampler-9999.ebuild X-VCS-Directories: media-sound/qsampler/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 20ccf80f7c32366e81945ae24298654345816b59 X-VCS-Branch: master Date: Mon, 3 Jul 2023 08:43:57 +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: ef9d8675-f9c8-420e-b0c9-6e87cbbd745d X-Archives-Hash: 2f3499fba6dd2fc6f5a611a899f4a321 commit: 20ccf80f7c32366e81945ae24298654345816b59 Author: Miroslav Šulc gentoo org> AuthorDate: Mon Jul 3 08:43:28 2023 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Mon Jul 3 08:43:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ccf80f media-sound/qsampler: reintroduced support for qt5 Signed-off-by: Miroslav Šulc gentoo.org> ...-0.9.10-r1.ebuild => qsampler-0.9.10-r2.ebuild} | 21 +++++++++++++++------ media-sound/qsampler/qsampler-9999.ebuild | 22 ++++++++++++++++------ 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/media-sound/qsampler/qsampler-0.9.10-r1.ebuild b/media-sound/qsampler/qsampler-0.9.10-r2.ebuild similarity index 72% rename from media-sound/qsampler/qsampler-0.9.10-r1.ebuild rename to media-sound/qsampler/qsampler-0.9.10-r2.ebuild index 4210fdc8b8c7..697cc016c524 100644 --- a/media-sound/qsampler/qsampler-0.9.10-r1.ebuild +++ b/media-sound/qsampler/qsampler-0.9.10-r2.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Graphical frontend to the LinuxSampler engine" @@ -18,21 +18,30 @@ HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/" LICENSE="GPL-2" SLOT="0" -IUSE="debug +libgig" +IUSE="debug +libgig qt6" DEPEND=" - dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:6 media-libs/alsa-lib media-libs/liblscp:= x11-libs/libX11 libgig? ( media-libs/libgig:= ) + 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/qtwidgets:5 + ) " RDEPEND="${DEPEND} media-sound/linuxsampler " BDEPEND=" - dev-qt/qttools:6[linguist] + qt6? ( dev-qt/qttools:6[linguist] ) + !qt6? ( dev-qt/linguist-tools:5 ) " DOCS=( ChangeLog README TRANSLATORS ) @@ -41,7 +50,7 @@ src_configure() { local mycmakeargs=( -DCONFIG_DEBUG=$(usex debug 1 0) -DCONFIG_LIBGIG=$(usex libgig 1 0) - -DCONFIG_QT6=1 + -DCONFIG_QT6=$(usex qt6 1 0) ) cmake_src_configure } diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild index 4210fdc8b8c7..202520b3f67b 100644 --- a/media-sound/qsampler/qsampler-9999.ebuild +++ b/media-sound/qsampler/qsampler-9999.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Graphical frontend to the LinuxSampler engine" @@ -18,21 +18,31 @@ HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/" LICENSE="GPL-2" SLOT="0" -IUSE="debug +libgig" +IUSE="debug +libgig qt6" DEPEND=" - dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:6 media-libs/alsa-lib media-libs/liblscp:= x11-libs/libX11 libgig? ( media-libs/libgig:= ) + 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 + ) " RDEPEND="${DEPEND} media-sound/linuxsampler " BDEPEND=" - dev-qt/qttools:6[linguist] + qt6? ( dev-qt/qttools:6[linguist] ) + !qt6? ( dev-qt/linguist-tools:5 ) " DOCS=( ChangeLog README TRANSLATORS ) @@ -41,7 +51,7 @@ src_configure() { local mycmakeargs=( -DCONFIG_DEBUG=$(usex debug 1 0) -DCONFIG_LIBGIG=$(usex libgig 1 0) - -DCONFIG_QT6=1 + -DCONFIG_QT6=$(usex qt6 1 0) ) cmake_src_configure }