Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/qtractor/
Date: Sat, 14 Oct 2017 12:23:34
Message-Id: 1507983783.bcf1d5102b2ad55fb6f2d39defc0b76bdf08e362.asturm@gentoo
1 commit: bcf1d5102b2ad55fb6f2d39defc0b76bdf08e362
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 14 12:19:06 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 14 12:23:03 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcf1d510
7
8 media-sound/qtractor: Drop USE=qt5
9
10 Build with Qt5 unconditionally.
11
12 Gentoo-bug: 631914
13 Package-Manager: Portage-2.3.11, Repoman-2.3.3
14
15 media-sound/qtractor/qtractor-0.8.4.ebuild | 36 ++++++++++++------------------
16 1 file changed, 14 insertions(+), 22 deletions(-)
17
18 diff --git a/media-sound/qtractor/qtractor-0.8.4.ebuild b/media-sound/qtractor/qtractor-0.8.4.ebuild
19 index 232c990cca3..b2605d9c00b 100644
20 --- a/media-sound/qtractor/qtractor-0.8.4.ebuild
21 +++ b/media-sound/qtractor/qtractor-0.8.4.ebuild
22 @@ -6,27 +6,21 @@ EAPI=6
23 inherit flag-o-matic qmake-utils
24
25 DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
26 -HOMEPAGE="http://qtractor.sourceforge.net/"
27 +HOMEPAGE="https://qtractor.sourceforge.net/"
28 SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
29
30 LICENSE="GPL-2"
31 SLOT="0"
32 KEYWORDS="~amd64 ~x86"
33
34 -IUSE="cpu_flags_x86_sse debug dssi libsamplerate mad osc +qt5 rubberband vorbis zlib"
35 +IUSE="cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
36
37 RDEPEND="
38 - !qt5? (
39 - >=dev-qt/qtcore-4.2:4
40 - >=dev-qt/qtgui-4.7:4
41 - )
42 - qt5? (
43 - dev-qt/qtcore:5
44 - dev-qt/qtgui:5
45 - dev-qt/qtwidgets:5
46 - dev-qt/qtxml:5
47 - dev-qt/qtx11extras:5
48 - )
49 + dev-qt/qtcore:5
50 + dev-qt/qtgui:5
51 + dev-qt/qtwidgets:5
52 + dev-qt/qtxml:5
53 + dev-qt/qtx11extras:5
54 media-libs/alsa-lib
55 media-libs/ladspa-sdk
56 media-libs/libsndfile
57 @@ -40,10 +34,12 @@ RDEPEND="
58 osc? ( media-libs/liblo )
59 rubberband? ( media-libs/rubberband )
60 vorbis? ( media-libs/libvorbis )
61 - zlib? ( sys-libs/zlib )"
62 + zlib? ( sys-libs/zlib )
63 +"
64 DEPEND="${RDEPEND}
65 + dev-qt/linguist-tools:5
66 virtual/pkgconfig
67 - qt5? ( dev-qt/linguist-tools:5 )"
68 +"
69
70 DOCS=( README ChangeLog TODO AUTHORS )
71
72 @@ -57,16 +53,12 @@ src_configure() {
73 --enable-ladspa \
74 $(use_enable dssi) \
75 --enable-lilv \
76 - $(use_enable !qt5 qt4) \
77 - $(use_with qt5 qt5 "$(qt5_get_libdir)/qt5") \
78 + --disable-qt4 \
79 + --with-qt5=$(qt5_get_libdir)/qt5 \
80 $(use_enable rubberband librubberband) \
81 $(use_enable cpu_flags_x86_sse sse) \
82 $(use_enable zlib libz) \
83 $(use_enable debug)
84
85 - if use qt5 ; then
86 - eqmake5 ${PN}.pro -o ${PN}.mak
87 - else
88 - eqmake4 ${PN}.pro -o ${PN}.mak
89 - fi
90 + eqmake5 ${PN}.pro -o ${PN}.mak
91 }