Added a patch to fallback on mpg321 if mpg123 is not installed.

4 files changed, 38 insertions, 10 deletions

diff --git a/media-sound/mp32ogg/Manifest b/media-sound/mp32ogg/Manifest
index db9e539b75e4..7681fc38a2a7 100644
--- a/media-sound/mp32ogg/Manifest
+++ b/media-sound/mp32ogg/Manifest
@@ -1,9 +1,7 @@
-MD5 c9b3e8a8144e5636ecd158175646b76e mp32ogg-0.11-r3.ebuild 616
+MD5 628e09135b9719afda3ecc980b11ca9b mp32ogg-0.11-r3.ebuild 725
 MD5 dffebd7eebeaee9a2df1ea104b45d84c mp32ogg-0.11-r2.ebuild 662
-MD5 3a3fdaf01a17f77882e2e76fae6d24ff mp32ogg-0.11-r1.ebuild 662
-MD5 7e147b267209cf4c3156468b29896f47 ChangeLog 794
+MD5 c0f344441dd695a03a09ec1956765714 ChangeLog 1038
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 4fcc8bfffdd7c8012b2eb9afeb2daa4a files/digest-mp32ogg-0.11-r1 50
 MD5 4fcc8bfffdd7c8012b2eb9afeb2daa4a files/digest-mp32ogg-0.11-r2 50
 MD5 4fcc8bfffdd7c8012b2eb9afeb2daa4a files/digest-mp32ogg-0.11-r3 50
 MD5 8a1a0f2baeac67e5e561aa9112aacf02 files/mp32ogg-0.11-r3-mpg321.patch 781
diff --git a/media-sound/mp32ogg/files/digest-mp32ogg-0.11-r1 b/media-sound/mp32ogg/files/digest-mp32ogg-0.11-r3
index 613f3644777b..613f3644777b 100644
--- a/media-sound/mp32ogg/files/digest-mp32ogg-0.11-r1
+++ b/media-sound/mp32ogg/files/digest-mp32ogg-0.11-r3
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r3-mpg321.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r3-mpg321.patch
new file mode 100644
index 000000000000..b617584f94de
--- /dev/null
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r3-mpg321.patch
@@ -0,0 +1,32 @@
+--- mp32ogg.orig	2004-02-03 01:09:20.000000000 -0800
++++ mp32ogg	2004-02-03 01:25:01.000000000 -0800
+@@ -6,6 +6,9 @@
+ # <http://www.opensource.org/licenses/artistic-license.html>
+ 
+ # ChangeLog
++# 0.11-gentoo
++#     * Jeremy Huddleston <eradicator@gentoo.org>:
++#       Added support for mpg321
+ #
+ # 0.11
+ #     * Have output reflect change in license (doh)
+@@ -79,7 +82,7 @@
+ # 0.1
+ #     First Release
+ 
+-$version = "v0.11";
++$version = "v0.11-gentoo";
+ 
+ use MP3::Info;
+ use File::Find ();
+@@ -93,6 +96,10 @@
+ $ogginfo = "/usr/bin/ogginfo";
+ $mpg123  = "/usr/bin/mpg123";
+ 
++if(! -x $mpg123) {
++	$mpg123 = "/usr/bin/mpg321";
++}
++
+ print "mp32ogg $version\n";
+ print "(c) 2000-2002 Nathan Walp\n";
+ print "Released without warranty under the terms of the Artistic License\n\n";
diff --git a/media-sound/mp32ogg/mp32ogg-0.11-r1.ebuild b/media-sound/mp32ogg/mp32ogg-0.11-r3.ebuild
index cc793f2888b1..895f62c8646a 100644
--- a/media-sound/mp32ogg/mp32ogg-0.11-r1.ebuild
+++ b/media-sound/mp32ogg/mp32ogg-0.11-r3.ebuild
@@ -1,22 +1,19 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/mp32ogg-0.11-r1.ebuild,v 1.3 2004/02/01 21:15:38 eradicator Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/mp32ogg-0.11-r3.ebuild,v 1.1 2004/02/03 09:34:12 eradicator Exp $
 
 DESCRIPTION="A perl script to convert MP3 files to Ogg Vorbis files."
 
 HOMEPAGE="http://faceprint.com/code/"
-
 SRC_URI="ftp://ftp.faceprint.com/pub/software/scripts/mp32ogg"
 
 LICENSE="Artistic"
 
 SLOT="0"
-
-KEYWORDS="x86"
+KEYWORDS="~x86"
 
 DEPEND=""
-RDEPEND="media-sound/mpg123
+RDEPEND="|| ( media-sound/mpg123 media-sound/mpg321 )
 	dev-perl/MP3-Info
 	dev-perl/String-ShellQuote
 	media-sound/vorbis-tools"
@@ -25,6 +22,7 @@ S=${WORKDIR}/
 
 src_unpack(){
 	cp ${DISTDIR}/${A} ${S}
+	epatch ${FILESDIR}/${PF}-mpg321.patch
 }
 
 src_install() {