Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musique/
Date: Fri, 09 Oct 2015 14:45:29
Message-Id: 1444401915.22037fe3e2d894bc8e3113bb2ba67e484c53e490.kensington@gentoo
1 commit: 22037fe3e2d894bc8e3113bb2ba67e484c53e490
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 9 14:44:35 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 9 14:45:15 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22037fe3
7
8 media-sound/musique: revert accidental changes
9
10 Package-Manager: portage-2.2.20.1
11
12 media-sound/musique/musique-1.3.ebuild | 6 ++++--
13 1 file changed, 4 insertions(+), 2 deletions(-)
14
15 diff --git a/media-sound/musique/musique-1.3.ebuild b/media-sound/musique/musique-1.3.ebuild
16 index a78c81b..5cf7db1 100644
17 --- a/media-sound/musique/musique-1.3.ebuild
18 +++ b/media-sound/musique/musique-1.3.ebuild
19 @@ -17,10 +17,8 @@ KEYWORDS="~amd64 ~x86"
20 IUSE=""
21
22 RDEPEND="
23 - dev-qt/qtcore:4
24 dev-qt/qtdbus:4
25 dev-qt/qtgui:4[gtkstyle]
26 - dev-qt/qtsingleapplication[qt4]
27 dev-qt/qtsql:4[sqlite]
28 || ( dev-qt/qtphonon:4 media-libs/phonon[qt4] )
29 media-libs/taglib
30 @@ -32,6 +30,10 @@ S="${WORKDIR}/${PN}"
31 DOCS="CHANGES TODO"
32
33 src_prepare () {
34 + # bug 422665. Upstream only cares about ubuntu
35 + # so this bug will be fixed once ubuntu moves
36 + # to gcc-4.7. No, I will not send this patch upstream
37 + # *again*
38 epatch "${FILESDIR}"/${PN}-1.1-gcc47.patch
39 qt4-r2_src_prepare
40 }