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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 903C91382C5 for ; Wed, 3 Feb 2021 08:30:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD0FBE0824; Wed, 3 Feb 2021 08:30:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7FCE4E0824 for ; Wed, 3 Feb 2021 08:30:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C995341D28 for ; Wed, 3 Feb 2021 08:30:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D4474AE for ; Wed, 3 Feb 2021 08:30:21 +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: <1612341013.d3ec41d7c27fff58da5317d3b45641f00d883f36.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/qjackctl/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/qjackctl/qjackctl-0.9.0.ebuild X-VCS-Directories: media-sound/qjackctl/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: d3ec41d7c27fff58da5317d3b45641f00d883f36 X-VCS-Branch: master Date: Wed, 3 Feb 2021 08:30:21 +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: aeb9f175-245c-48ed-82d8-7c4a6aa1e3ed X-Archives-Hash: 542847fd3fb1c29b25a3c5175bf47dde commit: d3ec41d7c27fff58da5317d3b45641f00d883f36 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Feb 3 08:27:03 2021 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Wed Feb 3 08:30:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3ec41d7 media-sound/qjackctl: ported changes from live to 0.9.0 Closes: https://bugs.gentoo.org/766300 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/qjackctl/qjackctl-0.9.0.ebuild | 42 ++++++++++++------------------ 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/media-sound/qjackctl/qjackctl-0.9.0.ebuild b/media-sound/qjackctl/qjackctl-0.9.0.ebuild index 1479ddaa98a..bb38a07a499 100644 --- a/media-sound/qjackctl/qjackctl-0.9.0.ebuild +++ b/media-sound/qjackctl/qjackctl-0.9.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic qmake-utils xdg +inherit xdg cmake DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections" HOMEPAGE="https://qjackctl.sourceforge.io/" @@ -11,43 +11,33 @@ SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="alsa dbus debug portaudio" BDEPEND="dev-qt/linguist-tools:5" -RDEPEND=" - app-arch/gzip +DEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 virtual/jack alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) - portaudio? ( media-libs/portaudio )" -DEPEND="${RDEPEND}" + portaudio? ( media-libs/portaudio ) +" +RDEPEND="${DEPEND} + dev-qt/qtsvg:5 +" src_configure() { - append-cxxflags -std=c++11 - local myeconfargs=( - $(use_enable alsa alsa-seq) - $(use_enable dbus) - $(use_enable debug) - $(use_enable portaudio) - --enable-jack-version + local mycmakeargs=( + -DCONFIG_ALSA_SEQ=$(usex alsa 1 0) + -DCONFIG_DBUS=$(usex dbus 1 0) + -DCONFIG_DEBUG=$(usex debug 1 0) + -DCONFIG_PORTAUDIO=$(usex portaudio 1 0) + -DCONFIG_JACK_VERSION=1 ) - econf "${myeconfargs[@]}" - eqmake5 ${PN}.pro -o ${PN}.mak -} - -src_compile() { - emake -f ${PN}.mak -} - -src_install() { - default - - gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die - gunzip "${D}/usr/share/man/fr/man1/qjackctl.1.gz" || die + cmake_src_configure }