[gentoo-commits] repo/gentoo:master commit in: media-sound/qsynth/

["David Seifert" <soap@gentoo.org>]

commit:     8a8e943d74e36143c0d482a1a2c258003e79fb90
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Oct 20 15:37:25 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> 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 <soap <AT> 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 () {