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 DFD481386E3 for ; Fri, 21 Oct 2016 22:19:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C34E8E083C; Fri, 21 Oct 2016 22:19:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AA6F4E083C for ; Fri, 21 Oct 2016 22:19:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B5A8634167E for ; Fri, 21 Oct 2016 22:19:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B883248D for ; Fri, 21 Oct 2016 22:19:38 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1477088364.8a8e943d74e36143c0d482a1a2c258003e79fb90.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/qsynth/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/qsynth/qsynth-0.4.2-r1.ebuild X-VCS-Directories: media-sound/qsynth/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 8a8e943d74e36143c0d482a1a2c258003e79fb90 X-VCS-Branch: master Date: Fri, 21 Oct 2016 22:19:38 +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: 7b93c7c6-908e-49e6-94a2-c110a094b8fd X-Archives-Hash: df44dc2361d1936ad0da09be591c1d16 commit: 8a8e943d74e36143c0d482a1a2c258003e79fb90 Author: Andreas Sturmlechner gmail com> AuthorDate: Thu Oct 20 15:37:25 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Fri Oct 21 22:19:24 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a8e943d media-sound/qsynth: Drop USE=qt5 Default upstream, make it unconditional. Package-Manager: portage-2.3.0 Closes: https://github.com/gentoo/gentoo/pull/2606 Signed-off-by: David Seifert gentoo.org> media-sound/qsynth/qsynth-0.4.2-r1.ebuild | 34 ++++++++----------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/media-sound/qsynth/qsynth-0.4.2-r1.ebuild b/media-sound/qsynth/qsynth-0.4.2-r1.ebuild index 3d69625..7ec6da4 100644 --- a/media-sound/qsynth/qsynth-0.4.2-r1.ebuild +++ b/media-sound/qsynth/qsynth-0.4.2-r1.ebuild @@ -12,46 +12,30 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -IUSE="debug jack alsa pulseaudio +qt5" +IUSE="debug jack alsa pulseaudio" KEYWORDS="~amd64 ~ppc ~x86" RDEPEND=" - qt5? ( - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtcore:5 - ) - !qt5? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) + dev-qt/qtcore:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 media-sound/fluidsynth[jack?,alsa?,pulseaudio?] x11-libs/libX11" DEPEND="${RDEPEND} - qt5? ( dev-qt/linguist-tools:5 ) + dev-qt/linguist-tools:5 " REQUIRED_USE="|| ( alsa jack pulseaudio )" -src_prepare() { - default - use qt5 && eapply "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" -} +PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" ) src_configure() { - use qt5 && append-cxxflags -std=c++11 + append-cxxflags -std=c++11 econf \ $(use_enable debug) \ - $(use_enable !qt5 qt4) \ - --with-qt"$(usex qt5 "5=$(qt5_get_bindir)/.." "4=$(qt4_get_bindir)/..")" + --with-qt5=$(qt5_get_bindir)/.. - # Emulate what the Makefile does, so that we can get the correct - # compiler used. - if use qt5 ; then - eqmake5 ${PN}.pro -o ${PN}.mak - else - eqmake4 ${PN}.pro -o ${PN}.mak - fi + eqmake5 ${PN}.pro -o ${PN}.mak } src_install () {