depends on mpg123 or mpg321, bug #163026

Package-Manager: portage-2.1.2-r1

6 files changed, 36 insertions, 32 deletions

diff --git a/media-sound/dir2ogg/ChangeLog b/media-sound/dir2ogg/ChangeLog
index c060a0a4d167..660c2fe3fab9 100644
--- a/media-sound/dir2ogg/ChangeLog
+++ b/media-sound/dir2ogg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/dir2ogg
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/ChangeLog,v 1.11 2007/01/05 17:28:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/ChangeLog,v 1.12 2007/01/21 11:23:37 aballier Exp $
+
+  21 Jan 2007; Alexis Ballier <aballier@gentoo.org> dir2ogg-0.8.ebuild,
+  dir2ogg-0.9.1.ebuild, dir2ogg-0.9.2.ebuild, dir2ogg-0.9.3.ebuild:
+  depends on mpg123 or mpg321, bug #163026
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> dir2ogg-0.8.ebuild,
   dir2ogg-0.9.1.ebuild, dir2ogg-0.9.2.ebuild, dir2ogg-0.9.3.ebuild:
diff --git a/media-sound/dir2ogg/Manifest b/media-sound/dir2ogg/Manifest
index 9005c6595f78..b054365d274c 100644
--- a/media-sound/dir2ogg/Manifest
+++ b/media-sound/dir2ogg/Manifest
@@ -5,26 +5,26 @@ DIST dir2ogg-0.8.tar.gz 7845 RMD160 d2b1ddb8421aeb23d2d835ba37dbb79f99258cd1 SHA
 DIST dir2ogg-0.9.1.tar.gz 8113 RMD160 70576337c9a9019ee6f900e6a1e56c7e2b2d8b4e SHA1 557eaa166d1ac859d98f57346b251ccd9c19b0cd SHA256 4f63110b8f2de1de53ac8df5b7ca508e6d852a59eb466334f41aa7b839fde6b9
 DIST dir2ogg-0.9.2.tar.gz 9665 RMD160 b7cf4befa7a9b3d96f2a81d6846ff8385f38cd22 SHA1 af28019e061130b09c4de9015442f75efdd95983 SHA256 803899b1fe3a116a86e770549ad0d7f875501dc23794ac43bbe39d5ae85e9209
 DIST dir2ogg-0.9.3.tar.gz 10669 RMD160 a408d09d24ce1a5c58d98ade5dfd8c5aa4b1f800 SHA1 05fe540105e22968adcf7b01ec91f0d202a50675 SHA256 8f8b44a610aa4e631e1a846d7a6d47464bf9d9d8ed6f652d8918d667c5b90e52
-EBUILD dir2ogg-0.8.ebuild 680 RMD160 2b6bc6486937bd03e46b4274bc1c46cd1f3b3902 SHA1 be5c3c506f6bb5c69d283981bc6d5f3beeffda8c SHA256 d8fa102d98cae5c8b6c06b1cced5b7845f88e8bc077bee93f5369127651388b6
-MD5 1b7ad97de49ae338d0d65d675effc588 dir2ogg-0.8.ebuild 680
-RMD160 2b6bc6486937bd03e46b4274bc1c46cd1f3b3902 dir2ogg-0.8.ebuild 680
-SHA256 d8fa102d98cae5c8b6c06b1cced5b7845f88e8bc077bee93f5369127651388b6 dir2ogg-0.8.ebuild 680
-EBUILD dir2ogg-0.9.1.ebuild 652 RMD160 a6e5d6e99ea32539e4d3e084de64ef61beab5a47 SHA1 8a1458b1509c46794a1ee8d94debe2b7fcc15e37 SHA256 0dfc964bfef3db6f90e7c0f2066b5968130fae9ddb76d0138dae80e8a835da4a
-MD5 69314e9755e085eed2f5324fdfff4d1d dir2ogg-0.9.1.ebuild 652
-RMD160 a6e5d6e99ea32539e4d3e084de64ef61beab5a47 dir2ogg-0.9.1.ebuild 652
-SHA256 0dfc964bfef3db6f90e7c0f2066b5968130fae9ddb76d0138dae80e8a835da4a dir2ogg-0.9.1.ebuild 652
-EBUILD dir2ogg-0.9.2.ebuild 662 RMD160 1606ae5a607864339441bc249d73133eeb90a2c4 SHA1 b4bb7f5e7038f9573a36cedd2f49c84c6bfafd51 SHA256 e503f5de696ff445b582f2c984173b9f02ea6e3e2d1dea565d58d7556404f312
-MD5 e9c22776a88444fc8fe68501a2ee69d5 dir2ogg-0.9.2.ebuild 662
-RMD160 1606ae5a607864339441bc249d73133eeb90a2c4 dir2ogg-0.9.2.ebuild 662
-SHA256 e503f5de696ff445b582f2c984173b9f02ea6e3e2d1dea565d58d7556404f312 dir2ogg-0.9.2.ebuild 662
-EBUILD dir2ogg-0.9.3.ebuild 723 RMD160 c5e23652acdf8d560cc536b3ef28cc6c00150dd6 SHA1 e46e11a9deb0e01dd5e8591255e71cb6ff88df95 SHA256 935cacdbebc5266d104e9d3ee786526c93b9eead19a64e1134f29b628fe4b5ad
-MD5 0ee7ab4cdf7c8cc2a61185bf78b2b4f8 dir2ogg-0.9.3.ebuild 723
-RMD160 c5e23652acdf8d560cc536b3ef28cc6c00150dd6 dir2ogg-0.9.3.ebuild 723
-SHA256 935cacdbebc5266d104e9d3ee786526c93b9eead19a64e1134f29b628fe4b5ad dir2ogg-0.9.3.ebuild 723
-MISC ChangeLog 1815 RMD160 da9c5365695aaa6a046cce269c47d2120aa0d581 SHA1 82c855a4ad6bf6bdb12c4b8044d5d1beeb7b9ba8 SHA256 ace08f2398233201fb59959aba838a2cf800ab3c279f16e304f913ae92ceb5de
-MD5 5a58f72be7eb3a9c46c31b22b98e7363 ChangeLog 1815
-RMD160 da9c5365695aaa6a046cce269c47d2120aa0d581 ChangeLog 1815
-SHA256 ace08f2398233201fb59959aba838a2cf800ab3c279f16e304f913ae92ceb5de ChangeLog 1815
+EBUILD dir2ogg-0.8.ebuild 705 RMD160 e4ee80bca9dc4a99bef2de6f072dc6cc0a3839a4 SHA1 f6471cd7b0d30f51ec9f37f6890c7f2e6906fb0c SHA256 32f2821d4f7d4ede841db4b46a7316f7afb03af93334e179e47fef3c04ab0825
+MD5 70993e804f5fc55126fd8acba95eb579 dir2ogg-0.8.ebuild 705
+RMD160 e4ee80bca9dc4a99bef2de6f072dc6cc0a3839a4 dir2ogg-0.8.ebuild 705
+SHA256 32f2821d4f7d4ede841db4b46a7316f7afb03af93334e179e47fef3c04ab0825 dir2ogg-0.8.ebuild 705
+EBUILD dir2ogg-0.9.1.ebuild 677 RMD160 f370ff9d688c50c6c21c87569cb780af70e0e398 SHA1 8a53f9664f300bf67023d60dd7759baaf7643fcd SHA256 df09d3873616fc030c22226fc174ac8f59c824e179f6510f2279a16631dedcf5
+MD5 6fba679f662cf930498fd0a1bacd9579 dir2ogg-0.9.1.ebuild 677
+RMD160 f370ff9d688c50c6c21c87569cb780af70e0e398 dir2ogg-0.9.1.ebuild 677
+SHA256 df09d3873616fc030c22226fc174ac8f59c824e179f6510f2279a16631dedcf5 dir2ogg-0.9.1.ebuild 677
+EBUILD dir2ogg-0.9.2.ebuild 687 RMD160 164a25f443b6a9018f9f4c7f6da09645e516baeb SHA1 3bda8c0db2858c79031d95460ceb4f8e71acf42b SHA256 011b09a466957ba6641106c049798b63492833dab9d06a799782a625c0fdfda3
+MD5 ca41b5b16135add99bc962fa32fc59e1 dir2ogg-0.9.2.ebuild 687
+RMD160 164a25f443b6a9018f9f4c7f6da09645e516baeb dir2ogg-0.9.2.ebuild 687
+SHA256 011b09a466957ba6641106c049798b63492833dab9d06a799782a625c0fdfda3 dir2ogg-0.9.2.ebuild 687
+EBUILD dir2ogg-0.9.3.ebuild 748 RMD160 7be9d20cf2c151f81ef058e71f36eba52202a00f SHA1 02fc433cb908a9bd5ba13a8473622d644b1e7f35 SHA256 bab1b778ad550697a40ee1a9da79ed85f07382062cbe8a49e407529d0ca27c9c
+MD5 70c3c995ad2495deba27caf18c6644b5 dir2ogg-0.9.3.ebuild 748
+RMD160 7be9d20cf2c151f81ef058e71f36eba52202a00f dir2ogg-0.9.3.ebuild 748
+SHA256 bab1b778ad550697a40ee1a9da79ed85f07382062cbe8a49e407529d0ca27c9c dir2ogg-0.9.3.ebuild 748
+MISC ChangeLog 1998 RMD160 2b768451727cab1b0dd4dbcf62f637a971285529 SHA1 1e31227f1ae8e2a82cdb087bc6137ac2b5ffff60 SHA256 adc5d12c3ff013494624d03e80f1c8d625965ce29b9620c091061fee35f5f1dc
+MD5 70bd7e5b5dd9ff65343aeb4225f57556 ChangeLog 1998
+RMD160 2b768451727cab1b0dd4dbcf62f637a971285529 ChangeLog 1998
+SHA256 adc5d12c3ff013494624d03e80f1c8d625965ce29b9620c091061fee35f5f1dc ChangeLog 1998
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -44,7 +44,7 @@ SHA256 70eaf88b72b282e349523e68f19fa6d79f3d1c5f44776b830763fe17a04320c6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFnoq7AiZjviIA2XgRAhPaAJ9kpwwPrRuX93klYwZowDgz4gv30wCffTB5
-9QU/Do5Zd5zLkKUE7Iviz4c=
-=3hqN
+iD8DBQFFs01AvFcC4BYPU0oRAuG8AJwM6HFD5ILKF+Z03tv0hCG4IrSpwgCcCCcP
+mEHG62m7+DQ8qnW3Y5BunqU=
+=4XZj
 -----END PGP SIGNATURE-----
diff --git a/media-sound/dir2ogg/dir2ogg-0.8.ebuild b/media-sound/dir2ogg/dir2ogg-0.8.ebuild
index b5807798210b..9bba46b9e7dd 100644
--- a/media-sound/dir2ogg/dir2ogg-0.8.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/dir2ogg-0.8.ebuild,v 1.6 2007/01/05 17:28:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/dir2ogg-0.8.ebuild,v 1.7 2007/01/21 11:23:37 aballier Exp $
 
 S=${WORKDIR}/${PN}
 
@@ -17,7 +17,7 @@ DEPEND=""
 RDEPEND="virtual/python
 	 dev-python/pyid3lib
 	 media-sound/vorbis-tools
-	 media-sound/mpg123
+	 || ( media-sound/mpg123 media-sound/mpg321 )
 	 media-libs/faad2"
 
 src_install() {
diff --git a/media-sound/dir2ogg/dir2ogg-0.9.1.ebuild b/media-sound/dir2ogg/dir2ogg-0.9.1.ebuild
index 9ab18e55d443..6856bd603f62 100644
--- a/media-sound/dir2ogg/dir2ogg-0.9.1.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/dir2ogg-0.9.1.ebuild,v 1.3 2007/01/05 17:28:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/dir2ogg-0.9.1.ebuild,v 1.4 2007/01/21 11:23:37 aballier Exp $
 
 
 DESCRIPTION="Converts MP3, M4A, and WAV files to OGG format."
@@ -16,7 +16,7 @@ DEPEND=""
 RDEPEND="virtual/python
 	 dev-python/pyid3lib
 	 media-sound/vorbis-tools
-	 media-sound/mpg123"
+	 || ( media-sound/mpg123 media-sound/mpg321 )"
 
 src_install() {
 	dobin dir2ogg
diff --git a/media-sound/dir2ogg/dir2ogg-0.9.2.ebuild b/media-sound/dir2ogg/dir2ogg-0.9.2.ebuild
index ca3288379887..2c17fc376c55 100644
--- a/media-sound/dir2ogg/dir2ogg-0.9.2.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/dir2ogg-0.9.2.ebuild,v 1.2 2007/01/05 17:28:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/dir2ogg-0.9.2.ebuild,v 1.3 2007/01/21 11:23:37 aballier Exp $
 
 
 DESCRIPTION="Converts MP3, M4A, and WAV files to OGG format."
@@ -17,7 +17,7 @@ RDEPEND="virtual/python
 	 dev-python/pyid3lib
 	 media-libs/faad2
 	 media-sound/vorbis-tools
-	 media-sound/mpg123"
+	 || ( media-sound/mpg123 media-sound/mpg321 )"
 
 src_install() {
 	dobin dir2ogg
diff --git a/media-sound/dir2ogg/dir2ogg-0.9.3.ebuild b/media-sound/dir2ogg/dir2ogg-0.9.3.ebuild
index d846303b2668..29b4cba4895a 100644
--- a/media-sound/dir2ogg/dir2ogg-0.9.3.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/dir2ogg-0.9.3.ebuild,v 1.2 2007/01/05 17:28:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/dir2ogg-0.9.3.ebuild,v 1.3 2007/01/21 11:23:37 aballier Exp $
 
 
 DESCRIPTION="Converts Mp3, M4a, Wma, and Wav files to Ogg Vorbis format."
@@ -16,7 +16,7 @@ DEPEND=""
 RDEPEND="virtual/python
 	dev-python/pyid3lib
 	media-sound/vorbis-tools
-	media-sound/mpg123
+	|| ( media-sound/mpg123 media-sound/mpg321 )
 	aac? ( media-libs/faad2 )
 	wma? ( media-video/mplayer )"