Fix "Not a GLOB reference" error wrt #328953 by Arne Babenhauserheide.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 63 insertions, 2 deletions

diff --git a/media-sound/mp32ogg/ChangeLog b/media-sound/mp32ogg/ChangeLog
index a200209c44f0..e509826ce163 100644
--- a/media-sound/mp32ogg/ChangeLog
+++ b/media-sound/mp32ogg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mp32ogg
-# Copyright 2003-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/ChangeLog,v 1.14 2008/09/14 10:59:36 bluebird Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/ChangeLog,v 1.15 2010/07/19 14:52:10 ssuominen Exp $
+
+*mp32ogg-0.11-r6 (19 Jul 2010)
+
+  19 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +mp32ogg-0.11-r6.ebuild,
+  +files/mp32ogg-0.11-r6-force-filename-stringification.patch:
+  Fix "Not a GLOB reference" error wrt #328953 by Arne Babenhauserheide.
 
   14 Sep 2008; Friedrich Oslage <bluebird@gentoo.org>
   mp32ogg-0.11-r5.ebuild:
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch
new file mode 100644
index 000000000000..65f7a83454fa
--- /dev/null
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/328953
+http://qa.mandriva.com/53477
+
+--- mp32ogg
++++ mp32ogg
+@@ -167,7 +167,9 @@
+ }
+ 
+ sub ConvertFile() {
+-	my $mp3file = shift(@_);
++    # force arg stringfication to get actual filename, not getopt::long
++    # callback
++	my $mp3file = "" . shift(@_);
+ 	my $delete = $opt_delete;
+ 	my $filename = $opt_rename;
+ 	my $lowercase = $opt_lowercase;
diff --git a/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild b/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
new file mode 100644
index 000000000000..22ed63c5f332
--- /dev/null
+++ b/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild,v 1.1 2010/07/19 14:52:10 ssuominen Exp $
+
+EAPI=2
+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="~amd64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="media-sound/mpg123
+	dev-perl/MP3-Info
+	dev-perl/String-ShellQuote
+	media-sound/vorbis-tools"
+DEPEND=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp -f "${DISTDIR}"/${PN} "${WORKDIR}" || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-r4-mpg321.patch \
+		"${FILESDIR}"/${P}-r4-quality.patch \
+		"${FILESDIR}"/${P}-r5-german_umlaut.patch \
+		"${FILESDIR}"/${P}-r6-force-filename-stringification.patch
+}
+
+src_install() {
+	dobin mp32ogg || die
+}