Allow mpg321 as alternative to mpg123. Thanks to James Rowe in bug #138416.

Package-Manager: portage-2.1.2_pre2-r3

3 files changed, 39 insertions, 25 deletions

diff --git a/media-sound/gqmpeg/ChangeLog b/media-sound/gqmpeg/ChangeLog
index 2261f3da9175..7d9b25ea9212 100644
--- a/media-sound/gqmpeg/ChangeLog
+++ b/media-sound/gqmpeg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/gqmpeg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gqmpeg/ChangeLog,v 1.17 2006/02/15 13:21:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gqmpeg/ChangeLog,v 1.18 2006/10/05 08:38:31 flameeyes Exp $
+
+  05 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> gqmpeg-0.91.1.ebuild:
+  Allow mpg321 as alternative to mpg123. Thanks to James Rowe in bug #138416.
 
   15 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> gqmpeg-0.17.0.ebuild,
   gqmpeg-0.19.0.ebuild, gqmpeg-0.20.0.ebuild, gqmpeg-0.91.1.ebuild:
diff --git a/media-sound/gqmpeg/Manifest b/media-sound/gqmpeg/Manifest
index 71c045edf648..8e805a0d5002 100644
--- a/media-sound/gqmpeg/Manifest
+++ b/media-sound/gqmpeg/Manifest
@@ -1,43 +1,54 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b3372d1854f4b3d9a69ad59088bad066 ChangeLog 2335
-RMD160 19e25f0b9b39a4c3b572969e0537c9a568b2a4b0 ChangeLog 2335
-SHA256 cc33e0e5127657594b95226a903fe2908cf86a21b453915ab5da25c21b00b275 ChangeLog 2335
-MD5 ff0bee6a22fe1bec9c30a5628821e89c files/digest-gqmpeg-0.17.0 65
-RMD160 a17b4829a4f492c2512cbd97f4e00f731e5b415a files/digest-gqmpeg-0.17.0 65
-SHA256 80ae76b0bf28059e778152e8ce3491fb7195fd4c837074dc375b77a2aa5e54f6 files/digest-gqmpeg-0.17.0 65
-MD5 be1b3faf99db9557e7027df5192256a8 files/digest-gqmpeg-0.19.0 65
-RMD160 b26e25756508d6b075ecb40d10585e9ff83e81df files/digest-gqmpeg-0.19.0 65
-SHA256 c539bee300e2c5a0d222524bb7cf420207bb6750f717b669a9539fe603ee9b03 files/digest-gqmpeg-0.19.0 65
-MD5 d026bbc7331c7e0dad3113596eb7f586 files/digest-gqmpeg-0.20.0 65
-RMD160 2934e7cc3eae91ceb3f90ec0737a06a9f6de43c7 files/digest-gqmpeg-0.20.0 65
-SHA256 343b4c1d72be3e362ab6a1fc0cf62222e1c0e93ef4217e31140e47957efc98ed files/digest-gqmpeg-0.20.0 65
-MD5 b094af61165ed9b9bfd70aa11e6535db files/digest-gqmpeg-0.91.1 66
-RMD160 0ce4be555e7ef60db3923f9faa3f70d149ad96f5 files/digest-gqmpeg-0.91.1 66
-SHA256 6ad57268c42315149c9d75f27b2e5b32960ec19c4efbf0b0ba483b99bbae7d00 files/digest-gqmpeg-0.91.1 66
+AUX gqmpeg.desktop 127 RMD160 db1e62168a979bf7e3397bb84ea3a9d5c78bd53f SHA1 086952d3ac63e06e09fea81859368b14baff172e SHA256 1a96574500a0491289db447cf2ff981148270e5d14aaa18a2b2e473d7734d420
 MD5 51b49ffafcd770b19ac5237f2796a17d files/gqmpeg.desktop 127
 RMD160 db1e62168a979bf7e3397bb84ea3a9d5c78bd53f files/gqmpeg.desktop 127
 SHA256 1a96574500a0491289db447cf2ff981148270e5d14aaa18a2b2e473d7734d420 files/gqmpeg.desktop 127
+DIST gqmpeg-0.17.0.tar.gz 930900
+DIST gqmpeg-0.19.0.tar.gz 961647
+DIST gqmpeg-0.20.0.tar.gz 966991
+DIST gqmpeg-0.91.1.tar.gz 1078478
+EBUILD gqmpeg-0.17.0.ebuild 853 RMD160 fb37f4159d62523e5ed4994de37574b99a4826ef SHA1 898042843331a4e172626f083ec07cb44a8f8f97 SHA256 748c6c080084f9f8bdd1afe7cfddf2b3f45ad562e8803f6bdab13fe6eeedde58
 MD5 b45ebb5cf198bb48771be3f376a0f170 gqmpeg-0.17.0.ebuild 853
 RMD160 fb37f4159d62523e5ed4994de37574b99a4826ef gqmpeg-0.17.0.ebuild 853
 SHA256 748c6c080084f9f8bdd1afe7cfddf2b3f45ad562e8803f6bdab13fe6eeedde58 gqmpeg-0.17.0.ebuild 853
+EBUILD gqmpeg-0.19.0.ebuild 853 RMD160 f922529088305689be9b34ceec2952684ef801ee SHA1 b1d43ef95fec1d664f9c1513783dad8109285988 SHA256 486847e42e8db127dc52dc8d0cd03e2c07247229896425e174cc653cc33ef336
 MD5 8f85894236bfee38c4f272d21f69dbfe gqmpeg-0.19.0.ebuild 853
 RMD160 f922529088305689be9b34ceec2952684ef801ee gqmpeg-0.19.0.ebuild 853
 SHA256 486847e42e8db127dc52dc8d0cd03e2c07247229896425e174cc653cc33ef336 gqmpeg-0.19.0.ebuild 853
+EBUILD gqmpeg-0.20.0.ebuild 882 RMD160 c54c50785d86962b00864f27f2f1e629e9b987a7 SHA1 cf56efbd6c98e7b38a65ee381227a83a8a50d13d SHA256 7452402142f7f15bf9e6a867cb39a3f1ac2ffb79a00d5d9e13cdba43f9c23e29
 MD5 8a695f785c5a3f28dc4c6e06b3f00145 gqmpeg-0.20.0.ebuild 882
 RMD160 c54c50785d86962b00864f27f2f1e629e9b987a7 gqmpeg-0.20.0.ebuild 882
 SHA256 7452402142f7f15bf9e6a867cb39a3f1ac2ffb79a00d5d9e13cdba43f9c23e29 gqmpeg-0.20.0.ebuild 882
-MD5 5c56ae04c8f810c1d69a71139fd7303c gqmpeg-0.91.1.ebuild 955
-RMD160 ab96275e09e5485a1083c218c58cb49cd46f0603 gqmpeg-0.91.1.ebuild 955
-SHA256 17151a9f7e61c5ae4088968b7b275d0449f44b51519622f732f233e818ee6c04 gqmpeg-0.91.1.ebuild 955
+EBUILD gqmpeg-0.91.1.ebuild 981 RMD160 d837d7c36fb802509f4a8c27f926540c8cd20635 SHA1 01d8c4b1dac65c519827288c2dc61f78bbcd841a SHA256 d661c40d1c72b4655ff56595f57677d764e1fb6f8425d0b245747337ff99f69e
+MD5 b4aee9aa1cfd5425ec349e9c3b492a2f gqmpeg-0.91.1.ebuild 981
+RMD160 d837d7c36fb802509f4a8c27f926540c8cd20635 gqmpeg-0.91.1.ebuild 981
+SHA256 d661c40d1c72b4655ff56595f57677d764e1fb6f8425d0b245747337ff99f69e gqmpeg-0.91.1.ebuild 981
+MISC ChangeLog 2489 RMD160 208f50c16c6447655a25e7cac9d56a42e0a20f84 SHA1 203a9add7f8564546e8c44f009289b662f43dac5 SHA256 d5602ba59051ca3577392d00d6f3e4dbe1c3d91708c8990c7b8782014f0d6efc
+MD5 9e08a49dfd4eacf4c03144c1c0ca4fa8 ChangeLog 2489
+RMD160 208f50c16c6447655a25e7cac9d56a42e0a20f84 ChangeLog 2489
+SHA256 d5602ba59051ca3577392d00d6f3e4dbe1c3d91708c8990c7b8782014f0d6efc ChangeLog 2489
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
+MD5 ff0bee6a22fe1bec9c30a5628821e89c files/digest-gqmpeg-0.17.0 65
+RMD160 a17b4829a4f492c2512cbd97f4e00f731e5b415a files/digest-gqmpeg-0.17.0 65
+SHA256 80ae76b0bf28059e778152e8ce3491fb7195fd4c837074dc375b77a2aa5e54f6 files/digest-gqmpeg-0.17.0 65
+MD5 be1b3faf99db9557e7027df5192256a8 files/digest-gqmpeg-0.19.0 65
+RMD160 b26e25756508d6b075ecb40d10585e9ff83e81df files/digest-gqmpeg-0.19.0 65
+SHA256 c539bee300e2c5a0d222524bb7cf420207bb6750f717b669a9539fe603ee9b03 files/digest-gqmpeg-0.19.0 65
+MD5 d026bbc7331c7e0dad3113596eb7f586 files/digest-gqmpeg-0.20.0 65
+RMD160 2934e7cc3eae91ceb3f90ec0737a06a9f6de43c7 files/digest-gqmpeg-0.20.0 65
+SHA256 343b4c1d72be3e362ab6a1fc0cf62222e1c0e93ef4217e31140e47957efc98ed files/digest-gqmpeg-0.20.0 65
+MD5 b094af61165ed9b9bfd70aa11e6535db files/digest-gqmpeg-0.91.1 66
+RMD160 0ce4be555e7ef60db3923f9faa3f70d149ad96f5 files/digest-gqmpeg-0.91.1 66
+SHA256 6ad57268c42315149c9d75f27b2e5b32960ec19c4efbf0b0ba483b99bbae7d00 files/digest-gqmpeg-0.91.1 66
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD4DBQFD8yrcAiZjviIA2XgRAtJYAKCo6JGanYXuWEpSmhaebIg8vsDmsACXTmEW
-KI7Sw/QCa6BoaeiTwsYPYg==
-=u1Vg
+iD8DBQFFJMSOAiZjviIA2XgRAkcIAKDGYrJrnEny3rKUn6dcnb79ntkTUgCeJN9Y
+A5Bz7UTY0VtIcxStpszBPQ4=
+=TH8k
 -----END PGP SIGNATURE-----
diff --git a/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild b/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild
index b59c43866f1e..e5586ec10c04 100644
--- a/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild
+++ b/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild,v 1.2 2006/02/15 13:21:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild,v 1.3 2006/10/05 08:38:31 flameeyes Exp $
 
 IUSE="nls gnome"
 
@@ -15,7 +15,7 @@ KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~ppc64"
 
 RDEPEND=">=x11-libs/gtk+-2.4
 	>=x11-libs/pango-1.2
-	>=media-sound/mpg123-0.59p
+	|| ( media-sound/mpg321 >=media-sound/mpg123-0.59p )
 	media-sound/vorbis-tools
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}