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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 66 insertions, 3 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/Manifest b/media-sound/mp32ogg/Manifest
index 0a6ad6af9d6d..175049bf294b 100644
--- a/media-sound/mp32ogg/Manifest
+++ b/media-sound/mp32ogg/Manifest
@@ -1,7 +1,9 @@
 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
+AUX mp32ogg-0.11-r6-force-filename-stringification.patch 370 RMD160 9d3c7d9c908c083a1809447dd8cfd8f1799061a3 SHA1 a8026ead44b990f17501cdfff8aafac7b503ebcc SHA256 5a50042db60277e3eb20dd7ea6b3ae356e994f464f02b58ef6cbc0f2e96ac63c
 DIST mp32ogg 9216 RMD160 3ae39a86e662e37359d5041533413bd66ea27af4 SHA1 03ac3955b8ed79233d6f3952152535f6cff48ff5 SHA256 66d6276944e54e1ba15a4fc29b098baa9d1e5fcd29c57f1d77cd16c87ca302ce
 EBUILD mp32ogg-0.11-r5.ebuild 891 RMD160 ba7cf300c02a8a297aab7e68f0a3c2086d673902 SHA1 b90de2c456ec811249c8edf7410ec4254bfe174d SHA256 6a1b96dc95a5bc68ada382a945f9481a3021430d79467ad5379fa051fdf83108
-MISC ChangeLog 2459 RMD160 dea4adb53b8fde4b9390d2b154a281836d78f47b SHA1 9cf46aedb8b5b31341ab811caa9c4e9f43ee767e SHA256 023a35bb2585145f973b2a12ec072b7159044fd8f18a6898766877a02ab72815
+EBUILD mp32ogg-0.11-r6.ebuild 932 RMD160 cbc76881258dc994c299fecc3f509218d8fc1e3d SHA1 d9ae8eb301a7e402d7cf83dd17ef2ce3b8557cf9 SHA256 c47f7cf6c0bfa1a4c4ef0495c41364a0edcfcfecd8cfae7ef6f69cb8275ce807
+MISC ChangeLog 2710 RMD160 019f47d8f542e8a85459f5b483261c1083717ac5 SHA1 7ccdef106b720025a3d604a625a44d6bfd7f952d SHA256 35dc59cdce8c4f67ece60f97ef2eea87aab9e710f11b80a1eddbde3fdc76ce5e
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
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
+}