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 356AF1396D9 for ; Sat, 14 Oct 2017 12:23:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 529052BC014; Sat, 14 Oct 2017 12:23:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 2C9F12BC014 for ; Sat, 14 Oct 2017 12:23:32 +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 E078D33BEBE for ; Sat, 14 Oct 2017 12:23:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 82E14310 for ; Sat, 14 Oct 2017 12:23: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: <1507983783.bcf1d5102b2ad55fb6f2d39defc0b76bdf08e362.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/qtractor/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/qtractor/qtractor-0.8.4.ebuild X-VCS-Directories: media-sound/qtractor/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: bcf1d5102b2ad55fb6f2d39defc0b76bdf08e362 X-VCS-Branch: master Date: Sat, 14 Oct 2017 12:23: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-Archives-Salt: 67eeb5dc-def7-483d-b6d7-58e6196bab07 X-Archives-Hash: 161e5cb6c22fa44f4548cd2d136e6f56 commit: bcf1d5102b2ad55fb6f2d39defc0b76bdf08e362 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 14 12:19:06 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 14 12:23:03 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcf1d510 media-sound/qtractor: Drop USE=qt5 Build with Qt5 unconditionally. Gentoo-bug: 631914 Package-Manager: Portage-2.3.11, Repoman-2.3.3 media-sound/qtractor/qtractor-0.8.4.ebuild | 36 ++++++++++++------------------ 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/media-sound/qtractor/qtractor-0.8.4.ebuild b/media-sound/qtractor/qtractor-0.8.4.ebuild index 232c990cca3..b2605d9c00b 100644 --- a/media-sound/qtractor/qtractor-0.8.4.ebuild +++ b/media-sound/qtractor/qtractor-0.8.4.ebuild @@ -6,27 +6,21 @@ EAPI=6 inherit flag-o-matic qmake-utils DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework" -HOMEPAGE="http://qtractor.sourceforge.net/" +HOMEPAGE="https://qtractor.sourceforge.net/" SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="cpu_flags_x86_sse debug dssi libsamplerate mad osc +qt5 rubberband vorbis zlib" +IUSE="cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib" RDEPEND=" - !qt5? ( - >=dev-qt/qtcore-4.2:4 - >=dev-qt/qtgui-4.7:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-qt/qtx11extras:5 - ) + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/ladspa-sdk media-libs/libsndfile @@ -40,10 +34,12 @@ RDEPEND=" osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) - zlib? ( sys-libs/zlib )" + zlib? ( sys-libs/zlib ) +" DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 virtual/pkgconfig - qt5? ( dev-qt/linguist-tools:5 )" +" DOCS=( README ChangeLog TODO AUTHORS ) @@ -57,16 +53,12 @@ src_configure() { --enable-ladspa \ $(use_enable dssi) \ --enable-lilv \ - $(use_enable !qt5 qt4) \ - $(use_with qt5 qt5 "$(qt5_get_libdir)/qt5") \ + --disable-qt4 \ + --with-qt5=$(qt5_get_libdir)/qt5 \ $(use_enable rubberband librubberband) \ $(use_enable cpu_flags_x86_sse sse) \ $(use_enable zlib libz) \ $(use_enable debug) - if use qt5 ; then - eqmake5 ${PN}.pro -o ${PN}.mak - else - eqmake4 ${PN}.pro -o ${PN}.mak - fi + eqmake5 ${PN}.pro -o ${PN}.mak }