Properly fix qtgui/qtdbus deps wrt bug 484174. Prune 1.2 (old) and 9999 (broken).

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

4 files changed, 9 insertions, 77 deletions

diff --git a/media-sound/musique/ChangeLog b/media-sound/musique/ChangeLog
index 2a800396d175..15a427c53c42 100644
--- a/media-sound/musique/ChangeLog
+++ b/media-sound/musique/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/musique
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musique/ChangeLog,v 1.11 2013/07/10 04:51:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musique/ChangeLog,v 1.12 2013/10/01 21:24:22 pesa Exp $
+
+  01 Oct 2013; Davide Pesavento <pesa@gentoo.org> -musique-1.2.ebuild,
+  -musique-9999.ebuild, musique-1.2.1.ebuild:
+  Properly fix qtgui/qtdbus deps wrt bug 484174. Prune 1.2 (old) and 9999
+  (broken).
 
   10 Jul 2013; Patrick Lauer <patrick@gentoo.org> musique-1.2.1.ebuild,
   musique-1.2.ebuild, musique-9999.ebuild:
diff --git a/media-sound/musique/musique-1.2.1.ebuild b/media-sound/musique/musique-1.2.1.ebuild
index f316372e4281..f79544e45f9b 100644
--- a/media-sound/musique/musique-1.2.1.ebuild
+++ b/media-sound/musique/musique-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musique/musique-1.2.1.ebuild,v 1.3 2013/07/10 04:51:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musique/musique-1.2.1.ebuild,v 1.4 2013/10/01 21:24:22 pesa Exp $
 
 EAPI="5"
 
@@ -17,7 +17,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	dev-qt/qtgui:4[dbus(+),gtkstyle]
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4[gtkstyle]
 	dev-qt/qtsql:4[sqlite]
 	|| ( dev-qt/qtphonon:4 media-libs/phonon )
 	media-libs/taglib
diff --git a/media-sound/musique/musique-1.2.ebuild b/media-sound/musique/musique-1.2.ebuild
deleted file mode 100644
index de0e7bd39ef8..000000000000
--- a/media-sound/musique/musique-1.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musique/musique-1.2.ebuild,v 1.3 2013/07/10 04:51:35 patrick Exp $
-
-EAPI="4"
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Qt4 music player."
-HOMEPAGE="http://flavio.tordini.org/musique"
-# Same tarball for every release. We repackage it
-SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtgui:4[dbus(+)]
-	dev-qt/qtsql:4[sqlite]
-	|| ( dev-qt/qtphonon:4 media-libs/phonon )
-	media-libs/taglib
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-DOCS="CHANGES TODO"
-
-src_prepare () {
-	# bug 422665
-	epatch "${FILESDIR}"/${PN}-1.1-gcc47.patch
-	qt4-r2_src_prepare
-}
-
-src_configure() {
-	eqmake4 ${PN}.pro PREFIX="/usr"
-}
-
-src_install() {
-	qt4-r2_src_install
-	doicon data/${PN}.svg
-}
diff --git a/media-sound/musique/musique-9999.ebuild b/media-sound/musique/musique-9999.ebuild
deleted file mode 100644
index c643c6406ea2..000000000000
--- a/media-sound/musique/musique-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musique/musique-9999.ebuild,v 1.4 2013/07/10 04:51:35 patrick Exp $
-
-EAPI="4"
-
-inherit qt4-r2 git-2
-
-DESCRIPTION="Qt4 music player."
-HOMEPAGE="http://flavio.tordini.org/minitunes"
-EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtgui:4[dbus(+)]
-	dev-qt/qtsql:4[sqlite]
-	|| ( dev-qt/qtphonon:4 media-libs/phonon )
-	media-libs/taglib
-"
-DEPEND="${RDEPEND}"
-
-DOCS="CHANGES TODO"
-
-src_configure() {
-	eqmake4 ${PN}.pro PREFIX="/usr"
-}