summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2011-11-30 19:39:10 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2011-11-30 19:39:10 +0000
commit4d5e34a79c32d422b0b8ed2b2ad4838e22e5d953 (patch)
tree5ad6334ef6227c112985079f10935877b7f366ce /media-sound/qmmp
parent[bump] dev-perl/Debug-Client-0.160.0 (diff)
downloadgentoo-2-4d5e34a79c32d422b0b8ed2b2ad4838e22e5d953.tar.gz
gentoo-2-4d5e34a79c32d422b0b8ed2b2ad4838e22e5d953.tar.bz2
gentoo-2-4d5e34a79c32d422b0b8ed2b2ad4838e22e5d953.zip
allow media-video/mplayer2 for mplayer useflag
(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/qmmp')
-rw-r--r--media-sound/qmmp/ChangeLog6
-rw-r--r--media-sound/qmmp/qmmp-0.5.2.ebuild6
-rw-r--r--media-sound/qmmp/qmmp-9999.ebuild6
3 files changed, 13 insertions, 5 deletions
diff --git a/media-sound/qmmp/ChangeLog b/media-sound/qmmp/ChangeLog
index b55cf442af44..63a3a4fd93d7 100644
--- a/media-sound/qmmp/ChangeLog
+++ b/media-sound/qmmp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/qmmp
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.77 2011/11/04 21:00:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.78 2011/11/30 19:39:10 hwoarang Exp $
+
+ 30 Nov 2011; Markos Chandras <hwoarang@gentoo.org> qmmp-0.5.2.ebuild,
+ qmmp-9999.ebuild:
+ allow media-video/mplayer2 for mplayer useflag
04 Nov 2011; Markos Chandras <hwoarang@gentoo.org> metadata.xml,
qmmp-9999.ebuild, qmmp-0.5.2.ebuild:
diff --git a/media-sound/qmmp/qmmp-0.5.2.ebuild b/media-sound/qmmp/qmmp-0.5.2.ebuild
index 7a72aa3f94da..3b510e2022db 100644
--- a/media-sound/qmmp/qmmp-0.5.2.ebuild
+++ b/media-sound/qmmp/qmmp-0.5.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.5.2.ebuild,v 1.4 2011/11/04 21:00:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.5.2.ebuild,v 1.5 2011/11/30 19:39:10 hwoarang Exp $
EAPI="2"
@@ -40,7 +40,9 @@ RDEPEND="x11-libs/qt-qt3support:4
mad? ( media-libs/libmad )
midi? ( media-sound/wildmidi )
mms? ( media-libs/libmms )
- mplayer? ( media-video/mplayer )
+ mplayer? ( || ( media-video/mplayer
+ media-video/mplayer2 )
+ )
musepack? ( >=media-sound/musepack-tools-444 )
modplug? ( >=media-libs/libmodplug-0.8.4 )
vorbis? ( media-libs/libvorbis
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index b81e2a28a40a..db8bf5a46429 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-9999.ebuild,v 1.16 2011/11/04 21:00:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-9999.ebuild,v 1.17 2011/11/30 19:39:10 hwoarang Exp $
EAPI="2"
@@ -39,7 +39,9 @@ RDEPEND="x11-libs/qt-qt3support:4
libsamplerate? ( media-libs/libsamplerate )
mad? ( media-libs/libmad )
mms? ( media-libs/libmms )
- mplayer? ( media-video/mplayer )
+ mplayer? ( || ( media-video/mplayer
+ media-video/mplayer2 )
+ )
musepack? ( >=media-sound/musepack-tools-444 )
modplug? ( >=media-libs/libmodplug-0.8.4 )
vorbis? ( media-libs/libvorbis