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

Package-Manager: portage-2.1.4.4

4 files changed, 111 insertions, 3 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/Manifest b/media-sound/mp32ogg/Manifest
index abcebc475945..9b3a0859d8ec 100644
--- a/media-sound/mp32ogg/Manifest
+++ b/media-sound/mp32ogg/Manifest
@@ -1,8 +1,10 @@
 AUX mp32ogg-0.11-r3-mpg321.patch 781 RMD160 3fcf13430e2254c771ea06037c27e53f4d1cda2e SHA1 c84855a368c1d1f054a2fbda0f466665bfd5dafb SHA256 44a427512c0eb67dae0a6c4e36f11b86308938a302a0757d7e6e9d095033801b
 AUX mp32ogg-0.11-r4-mpg321.patch 781 RMD160 3fcf13430e2254c771ea06037c27e53f4d1cda2e SHA1 c84855a368c1d1f054a2fbda0f466665bfd5dafb SHA256 44a427512c0eb67dae0a6c4e36f11b86308938a302a0757d7e6e9d095033801b
 AUX mp32ogg-0.11-r4-quality.patch 2749 RMD160 715e18a3a41b83895b076964c22fae0b720225cd SHA1 f29dd80baed1e0a2b53f728a02107c2046c645ad SHA256 2370a356974dfdbf2f11be99cc417be574f6b86a2bc1bc605f2b25bc82c9c4ea
+AUX mp32ogg-0.11-r5-german_umlaut.patch 1858 RMD160 9f0a1d314c0be722f4426e484c8affde8a66830d SHA1 265e7a07d65ac7d3a2d3aeb3f813c01a37cd5844 SHA256 741e9bc34c193dfdb561e2f905cec282da84590c99ff262f04e440e48f6d3dc2
 DIST mp32ogg 9216 RMD160 3ae39a86e662e37359d5041533413bd66ea27af4 SHA1 03ac3955b8ed79233d6f3952152535f6cff48ff5 SHA256 66d6276944e54e1ba15a4fc29b098baa9d1e5fcd29c57f1d77cd16c87ca302ce
 EBUILD mp32ogg-0.11-r3.ebuild 719 RMD160 f21d14136abd31a6e520c38c9b965b0dab492b11 SHA1 6439b00e19a5303099361cca8c3ed484ecfd302a SHA256 c8f6ad26e8f1c38bfb9f852cec6ab92b6fa211db1a269b073c958b6551b9a3e2
 EBUILD mp32ogg-0.11-r4.ebuild 762 RMD160 467bf50d99979f5d4d5d846d55c99368af5377c6 SHA1 fd39f19b97c3e0e17a088808e62df5de73cb99a8 SHA256 1d64cec395b72965ea048b46ee4f7a87bf1f136ef649bbc306a0edef569259a1
-MISC ChangeLog 1992 RMD160 2e44e982b2f9ebb3a2ea087b30473250982394c2 SHA1 333f2cfb4231e04d6fa2b9f7e3b7b90ed2152703 SHA256 db6fba32f62f54baf9086409d030929eab117227f89c3f5619b5b1d7b5573a6e
+EBUILD mp32ogg-0.11-r5.ebuild 817 RMD160 245b54cb6d5a553ca5dfbdc0222db8c91a3f1628 SHA1 43f9cfe8b3baf928dc8765636183bed9ca9e483b SHA256 a7cce9c1b5ae6fca7df24caae466ebc1fd044cfed4917b627b6b6a2dd1222590
+MISC ChangeLog 2242 RMD160 7f9fdebdcec961c045af3a0d252de6410fe5c671 SHA1 057f2e43b2a5df4ecca89e735c0733df7dbb856d SHA256 d9a2e95e5ea0189520c9ff5fcdf504ade09d33b4a97e1a2d443470315e999912
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
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
+}