Added patch for bug #208017 (thanks to Mathias Hablützel, patch originally from Ubuntu).

(Portage version: 2.1.4.4)

3 files changed, 108 insertions, 2 deletions

diff --git a/media-sound/mp32ogg/ChangeLog b/media-sound/mp32ogg/ChangeLog
index 2eeba2419ff8..d1bb2c727555 100644
--- a/media-sound/mp32ogg/ChangeLog
+++ b/media-sound/mp32ogg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mp32ogg
-# Copyright 2003-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/ChangeLog,v 1.11 2007/02/03 19:45:22 flameeyes Exp $
+# Copyright 2003-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/ChangeLog,v 1.12 2008/02/28 19:52:41 dev-zero Exp $
+
+*mp32ogg-0.11-r5 (28 Feb 2008)
+
+  28 Feb 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/mp32ogg-0.11-r5-german_umlaut.patch, +mp32ogg-0.11-r5.ebuild:
+  Added patch for bug #208017 (thanks to Mathias Hablützel, patch originally
+  from Ubuntu).
 
   03 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch
new file mode 100644
index 000000000000..20361f1b9835
--- /dev/null
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch
@@ -0,0 +1,66 @@
+--- mp32ogg_old	2008-01-29 10:45:06.000000000 +0100
++++ mp32ogg	2008-01-29 10:44:34.000000000 +0100
+@@ -6,6 +6,10 @@
+ # <http://www.opensource.org/licenses/artistic-license.html>
+ 
+ # ChangeLog
++# 0.11-gentoo-r2
++#     * Mathias Hablützel <mhk@mathiashabluetzel.ch>:
++#       Support for german umlaut
++#
+ # 0.11-gentoo
+ #     * Jeremy Huddleston <eradicator@gentoo.org>:
+ #       Added support for mpg321
+@@ -82,13 +86,18 @@
+ # 0.1
+ #     First Release
+ 
+-$version = "v0.11-gentoo";
++$version = "v0.11-gentoo-r2";
+ 
+ use MP3::Info;
+ use File::Find ();
+ use File::Basename;
+ use Getopt::Long;
+ use String::ShellQuote;
++use Encode;
++use POSIX qw/setlocale LC_CTYPE/;
++use I18N::Langinfo qw/langinfo CODESET/;
++
++setlocale(LC_CTYPE, '');
+ 
+ use_winamp_genres();
+ 
+@@ -111,6 +120,7 @@
+ 		"lowercase",
+ 		"no-replace",
+ 		"verbose",
++              "preserve-timestamp",
+ 		"<>", \&checkfile);
+ 
+ sub showhelp() {
+@@ -123,7 +133,7 @@
+ 	print "                         and %l with artist, title, and album name\n";
+ 	print "                         for the track\n";
+ 	print "--lowercase              Force lowercase filenames when using --rename\n";
+-	print "--verbose		Verbose output\n";
++	print "--verbose                Verbose output\n";
+ 	print "--help                   Display this help message\n";
+ 	exit;
+ 
+@@ -160,6 +170,15 @@
+ 
+ 	$info = get_mp3tag($mp3file);
+ 	$fileinfo = get_mp3info($mp3file);
++	# Sanity checking: Is this file really an MP3 file?
++	die "Could not determine MP3 version, aborting" if ($fileinfo->{VERSION}=="");
++
++        # get_mp3info returns magical Perl UTF-8 strings, but this script
++        # really wants to deal with plain old sequences-of-octets, so encode
++        # those strings.
++        for $key (keys %$info) {
++            $info->{$key} = encode(langinfo(CODESET), $info->{$key});
++        }
+ 
+ 	$_ = $filename;
+ 
diff --git a/media-sound/mp32ogg/mp32ogg-0.11-r5.ebuild b/media-sound/mp32ogg/mp32ogg-0.11-r5.ebuild
new file mode 100644
index 000000000000..a85f2ba31dfa
--- /dev/null
+++ b/media-sound/mp32ogg/mp32ogg-0.11-r5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/mp32ogg-0.11-r5.ebuild,v 1.1 2008/02/28 19:52:41 dev-zero Exp $
+
+inherit eutils
+
+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 ~sparc ~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/mpg123
+	dev-perl/MP3-Info
+	dev-perl/String-ShellQuote
+	media-sound/vorbis-tools"
+
+S="${WORKDIR}/"
+
+src_unpack(){
+	cp "${DISTDIR}/${A}" "${S}"
+	epatch \
+		"${FILESDIR}/${P}-r4-mpg321.patch" \
+		"${FILESDIR}/${P}-r4-quality.patch" \
+		"${FILESDIR}/${PF}-german_umlaut.patch"
+}
+
+src_install() {
+	dobin mp32ogg
+}