depends on mpg123 or mpg321, bug #163026

(Portage version: 2.1.2-r1)

5 files changed, 13 insertions, 9 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/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 )"