allow media-video/mplayer2 for mplayer useflag

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

4 files changed, 29 insertions, 21 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/Manifest b/media-sound/qmmp/Manifest
index 94dd80ec3fec..8ca58936c076 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -2,24 +2,24 @@
 Hash: SHA512
 
 DIST qmmp-0.5.2.tar.bz2 704517 RMD160 4546e4d882b9536e27c7b2a6d73ffcaa1d2c3930 SHA1 e43256fc7e3670e57a85eb07291128d78356e254 SHA256 6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec
-EBUILD qmmp-0.5.2.ebuild 3175 RMD160 27e44e197ad3b7b2336f50d040e022c821b80f48 SHA1 daa630a49b2ee11e9eb8277d969980733401af11 SHA256 a9e3d418fa402ceec127f6a795b80708087950b007941274038ea6a585a12ab4
-EBUILD qmmp-9999.ebuild 3007 RMD160 4d47f0845a37516b3d5fc0db2fd1cbca79d175ee SHA1 ca99d20339e6c7324892a3a38a9366e10ff16a94 SHA256 192a67fe183d8b3a0b8f68e7ccc25119c64f321ae5f476f95c08c0c920738141
-MISC ChangeLog 10456 RMD160 e1b46852442e271973c973925782356c7895a9ed SHA1 120e0186a1cc02821504ca070a07a25d4f70dad3 SHA256 1a312b56f13527f0a527dcfc33cbdfec2c1d885ad16fdf55fd2062fdaf1a5dac
+EBUILD qmmp-0.5.2.ebuild 3208 RMD160 4a8a6fb68b02d6804cbb125412ec5f7a0f488051 SHA1 97e499f789af92be82c7724b774a7c96f09824c2 SHA256 5b9f5bdeec17a5ca6feb432ea079bf791d49a90f63a8357afa172480e765015a
+EBUILD qmmp-9999.ebuild 3039 RMD160 6e4ed49e54bae4dbc7494ad88478d862fd33e59a SHA1 b5897487019371a8e5880eb64ddbf69147589b4d SHA256 8893aad2755cc06db69dea35313761e4a04862cac8137965611583eaf117a932
+MISC ChangeLog 10598 RMD160 6ee3eb9c45f1d0d3e76e0435d446b03b1b6134d6 SHA1 83f31eca2c799425478ef169863373a7764bd6e9 SHA256 c13381ebf4eb9fb853ecce33c6a8b9b866f60c32b5b5c08ae7888bbf01f10fa4
 MISC metadata.xml 1136 RMD160 b8ac9beb5163a7225db6d4fd66fc242fbb3ad70c SHA1 3f6de6583982c60645e5eec8a9e44a804e54c4fa SHA256 a377a91d1fc8233722ca0a95c3c81abd711e356c270cb8737829f2cc7021b575
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOtFJWAAoJEPqDWhW0r/LC1MMQAL9SyHzGIXh2cyMwq4ABrW3n
-QfLsF9woayRdwykEuIxiQBg7+SwnlzB0SfIgfVy2eNBd1Qftm9rMhqKAYb+3wAor
-4l2W5ZgUmmJeKjwOoHeayAVhZiE+fLo0x3PURXfaWMkNvAXE1oYCj0s4LZiIkHWY
-8uLPbZP+BdVN9foF2Vsq6XSMlvrPhxK1BNT33upLjMkTk6fLm3CZyUPtWdFc02rz
-tUP7uiHTFS70x1ZIeTVIO+lR5yU6tGVMFC8DUKKP3ZLqhckVg1yczrED/RlWuFWi
-jn2crGEWMdl3FZWQZEEw1OqmaFdOsr1UtwAFVwJ/DY9BDR8etXdebjhgToboVxdc
-5M1HAZx+mUYYxbhVmbgt3Yd7EK8c6SWKt9rC4Lq/JAjptitydLMk6r0lLXYwHVYV
-JH3DU8TiJLajLx952FuO+8ZQdFRtpSLuyDXDqSb1WOaybERyXNUEzV9lOOgJIzDK
-ArU+4hV0bsoZZ2kcee79DJ4jk1NJP4CbQllJSOiRWSAVuih/o8srX+pCtdaN0XsZ
-aJPwsuOYA1JBXNw2DtnhmIasfpvpcQjoWC+K3CgB98RfWBSDxdw5mVZG2wVHV/q3
-uyKQ/KwFDu2q6mwi8SxXK2AMWkmQKK7DvC+TXGZFCGawnS/D6O7QEHXSh/ZaGseR
-TQWwUdgcFnVTCMb9HYqo
-=4s38
+iQIcBAEBCgAGBQJO1pQZAAoJEPqDWhW0r/LCW2AP/3zw6ynwyqgOEXpZjvYlPThN
+mCcKQ3qxgMNByHJtlWFoh1+cwu7yVC+WYvm+Z//bY1d+1+Oq1uFGZ+yiEW6Ms9Vt
++5qPmA2/vgOZ14PuE+LCcbm7JQul2jUNbA8sACkyGSh2HmOxHU0wqYewe3z0xWR7
+rMNdzMfaA3ah2v1sHRwsFkA9/nKw77er2c3DDUkcxN+84y+IHNF4JIbCwJJQMsIe
+OsQWS6/rqlszPk8eCsHSCd8GuiLL3OkjqejwRuWXeDpKvwQ2CJkgFT5zigvonmEs
+ZSaw9Zo4HVQe/LmQMXPOm1QAeOmHG2iPt5uYabzzCC9fiFenPOoxgmcRIGilivGU
+PZa2e92AI9F7DFCD7PUX9Rb3/bjjAzeLjvAmGEndTHMFssIATcOSFd3cxW5kwfMG
+03VLCHbmSpQaVwkQQCzOoQ61OBbuffR183/V6ouVylamgxyDRaj+uA+SLSyyVgND
+c8nMVkwkC1PgSJqMB64bfUHRMg9xJTvSxxsl1948ZZZtASabmXNz4X1fawAkEuMx
+kHQQQO1keJvRjU+/EFfJi4CuDaXlGrSfMGadVLJsm+oaLvN+6UqGcxlJgPMZm0aE
+KijUXeXDXrKMnxU9RZpWu42S331bWnJDufpl/qR7MxNmukbWjxN8nzVU0xL9kMLc
+rOVESJ12F9XmXuLEoTBN
+=8yM0
 -----END PGP SIGNATURE-----
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