commit: 2f9b36011ada0104883275fad335084922f5c9c6
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 9 14:40:56 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct 9 14:42:22 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f9b3601
media-sound/musique: version bump
Package-Manager: portage-2.2.20.1
media-sound/musique/Manifest | 1 +
.../musique-1.4-unbundle-qtsingleapplication.patch | 13 +++++++++++++
media-sound/musique/musique-1.3.ebuild | 6 ++----
.../musique/{musique-1.3.ebuild => musique-1.4.ebuild} | 18 ++++++++----------
4 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/media-sound/musique/Manifest b/media-sound/musique/Manifest
index e22fbb7..a5fe32a 100644
--- a/media-sound/musique/Manifest
+++ b/media-sound/musique/Manifest
@@ -1,2 +1,3 @@
DIST musique-1.2.1.tar.gz 374601 SHA256
cc0f626d7de981ff7fdd776fb9eab6a7750443ad55f6978132d9c9d11abd1f38 SHA512
b6d52d8345c69e5b4bfa6419cab4baeb5ed1c81106fbe98b74943cc4c6aa0712444e2189605132da2a2362d38de322926eb3f6ef0b8f25bb45e3e86e3b74cd33
WHIRLPOOL
775751a857dd2e4fbc1f9e50dea9ed0c9d40edd8af7c1bc0a9c7eb186aad39680760825b5c04bbc439d9ac98682952cf5fc2d8e8db595e0f0a99125e6112a078
DIST musique-1.3.tar.gz 399750 SHA256
401643ad9c750270a89d431806044c626dee3fe7ebc14d0ac72917197cdd0592 SHA512
eb197c315b77d4053960c8c18d012635f957eb9ae89bb8b576f938013db43f78ab0d5a0fe0d46fb32cc9f398f9d7f96a37cf975b2f192a6cbc3dd294c4cad279
WHIRLPOOL
b4a48d2e8d57d3cfb6cb3d705b4cccbbaf9ae642f16864bb9c61ece02e658b941472a2767d82218c5bf36031af52354fd2868014d8af0a4b2bb71abdf96f3e6e
+DIST musique-1.4.tar.gz 390031 SHA256
08dfb4201aa0edc4b3fe4ef7788e618f754c3921f3a7c1cdce40ef3999760670 SHA512
0ecc7cf1038880fc302602967cd7563641310cbe19fe2394e8ce2c03562f5e336bfc76e1ea18b026c2602b11cfe278a106bc9b3b2dd625d7e70db0da57985a68
WHIRLPOOL
8185dcbe0559b34d3f8e7b93498312c375412faa83eed01acccc1faaabfb979672cb78969d2965251aa63bd2e38477654575e52d8a760fe186e39398efc08e36
diff --git
a/media-sound/musique/files/musique-1.4-unbundle-qtsingleapplication.patch
b/media-sound/musique/files/musique-1.4-unbundle-qtsingleapplication.patch
new file mode 100644
index 0000000..ddd5242
--- /dev/null
+++ b/media-sound/musique/files/musique-1.4-unbundle-qtsingleapplication.patch
@@ -0,0 +1,13 @@
+Use system copy of qtsingleapplication.
+
+--- musique.pro
++++ musique.pro
+@@ -16,7 +16,7 @@
+ TARGET = $${APP_UNIX_NAME}
+
+ QT += network xml sql
+-include(src/qtsingleapplication/qtsingleapplication.pri)
++CONFIG += qtsingleapplication
+
+ HEADERS += src/mainwindow.h \
+ src/aboutview.h \
diff --git a/media-sound/musique/musique-1.3.ebuild
b/media-sound/musique/musique-1.3.ebuild
index 5cf7db1..a78c81b 100644
--- a/media-sound/musique/musique-1.3.ebuild
+++ b/media-sound/musique/musique-1.3.ebuild
@@ -17,8 +17,10 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="
+ dev-qt/qtcore:4
dev-qt/qtdbus:4
dev-qt/qtgui:4[gtkstyle]
+ dev-qt/qtsingleapplication[qt4]
dev-qt/qtsql:4[sqlite]
|| ( dev-qt/qtphonon:4 media-libs/phonon[qt4] )
media-libs/taglib
@@ -30,10 +32,6 @@ S="${WORKDIR}/${PN}"
DOCS="CHANGES TODO"
src_prepare () {
- # bug 422665. Upstream only cares about ubuntu
- # so this bug will be fixed once ubuntu moves
- # to gcc-4.7. No, I will not send this patch upstream
- # *again*
epatch "${FILESDIR}"/${PN}-1.1-gcc47.patch
qt4-r2_src_prepare
}
diff --git a/media-sound/musique/musique-1.3.ebuild
b/media-sound/musique/musique-1.4.ebuild
similarity index 58%
copy from media-sound/musique/musique-1.3.ebuild
copy to media-sound/musique/musique-1.4.ebuild
index 5cf7db1..6e40cbb 100644
--- a/media-sound/musique/musique-1.3.ebuild
+++ b/media-sound/musique/musique-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,8 +8,7 @@ inherit eutils qt4-r2
DESCRIPTION="Qt4 music player"
HOMEPAGE="http://flavio.tordini.org/musique";
-# Same tarball for every release. We repackage it
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz";
+SRC_URI="http://flavio.tordini.org/files/${PN}/${P}.tar.gz";
LICENSE="GPL-3"
SLOT="0"
@@ -17,8 +16,10 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="
+ dev-qt/qtcore:4
dev-qt/qtdbus:4
- dev-qt/qtgui:4[gtkstyle]
+ dev-qt/qtgui:4
+ dev-qt/qtsingleapplication[qt4,X]
dev-qt/qtsql:4[sqlite]
|| ( dev-qt/qtphonon:4 media-libs/phonon[qt4] )
media-libs/taglib
@@ -27,14 +28,11 @@ DEPEND="${RDEPEND}"
S="${WORKDIR}/${PN}"
-DOCS="CHANGES TODO"
+DOCS=( CHANGES TODO )
src_prepare () {
- # bug 422665. Upstream only cares about ubuntu
- # so this bug will be fixed once ubuntu moves
- # to gcc-4.7. No, I will not send this patch upstream
- # *again*
- epatch "${FILESDIR}"/${PN}-1.1-gcc47.patch
+ epatch "${FILESDIR}"/${P}-unbundle-qtsingleapplication.patch
+ rm -r src/qtsingleapplication || die
qt4-r2_src_prepare
}
