reinit the tree, so we can have metadata

7 files changed, 266 insertions, 0 deletions

diff --git a/media-sound/mp32ogg/Manifest b/media-sound/mp32ogg/Manifest
new file mode 100644
index 000000000000..c5d687243412
--- /dev/null
+++ b/media-sound/mp32ogg/Manifest
@@ -0,0 +1,9 @@
+AUX mp32ogg-0.11-r4-mpg321.patch 781 SHA256 44a427512c0eb67dae0a6c4e36f11b86308938a302a0757d7e6e9d095033801b SHA512 d4c93206c424358859dfd0e5474e8b9990458c239ab2f4b3fdf873c5808bdd278fb05355bd7e6c50b8ae40be26ff65b90efa83e19a18df8e84c0de7181fbb8fd WHIRLPOOL 98d226e7009647ed65250a621aa673c34962672beb2d7b3b139252a087772f507a979b39656ac9f67f3a7e094cd6b6deeab63dde08f3abbacdf68ae8c5bdca31
+AUX mp32ogg-0.11-r4-quality.patch 2749 SHA256 2370a356974dfdbf2f11be99cc417be574f6b86a2bc1bc605f2b25bc82c9c4ea SHA512 70ff58791c8704eb78016364f86669576c7101c4d4d34cd0a46e2c3abfaadffc817ae40f1192cc1b295a131d72da72cb1eedfff4032798b033b3e0ad656b0c44 WHIRLPOOL d79200660e3a6f7e578f6fc835a50bfb699db9f48b04c56fd35dce1e7761af37e6c6e0deb6c8c1027c33f715de39b08318d1671ef1eb23532a5124cb9206b6f1
+AUX mp32ogg-0.11-r5-german_umlaut.patch 1858 SHA256 741e9bc34c193dfdb561e2f905cec282da84590c99ff262f04e440e48f6d3dc2 SHA512 aef750075b8af19c1a88c0c78bf55653f91af815aa3ff723a6bb3a2961996f1ff65f29cc5d2f7027371a2b91e5dce6088a6c8582f5dafd8b6346ba129e770b8d WHIRLPOOL f6a4f5f275dcc2077d129fefbc03a1f9a5d2bea30d1a0dd5874727b0916efc4eab1332a1e3ea9b9e0513c92860cb53fc10cc086bb4c08a1581f4bf6af7733148
+AUX mp32ogg-0.11-r6-force-filename-stringification.patch 370 SHA256 5a50042db60277e3eb20dd7ea6b3ae356e994f464f02b58ef6cbc0f2e96ac63c SHA512 494d44a6265422270cad2cb81f99809760f1816584b6657e4e9c0d3a500ad6ee9d989277815ecaab613ee03a9d6571b7db06bca6430dcad208015ebbc27f6303 WHIRLPOOL e0c177b07aec03b048d666bf76d643704c824ad52ddaf3ed26b714513b019f7ee847082b19dd9a102072e7f0c5e5d75cccee98e250455fb1f1bfb8ff7bd160d4
+DIST mp32ogg 9216 SHA256 66d6276944e54e1ba15a4fc29b098baa9d1e5fcd29c57f1d77cd16c87ca302ce SHA512 342c3e0430d203fed8f793fb14fa532210cac616a0f48d243c9a14477d048bf9da3dbab5712cdf24cff2d98c6a5bc1edb43080f4ee05672fcf8f3e07fa667bd1 WHIRLPOOL 897e01749efa66ab666aa8796598df13abc4df33c947e0b82ac2c3d44103dbc9514a492cfc54f52d17cfa8a993aa3126a569fd402e475b4a24a051b162c4de77
+EBUILD mp32ogg-0.11-r6.ebuild 802 SHA256 29669925999b9a6ae633fe2defe6fca7ff3ceb3df4d15ee3aecbfa131a09b895 SHA512 2c88ab384fd4ebc4d6b4f625c4f80fe3876953d859dd748f23eb2da0d3503974ce757a866f5c13cc056b745730a8590edd2733e693e256d505d2fb25d4e0d749 WHIRLPOOL a08389f40580d6c30e2f0f69766c34a58a297f0172d7173cda696d0a429a8710302ddf765b4c96414edc4876bd584f2733d1b46aa8b127d9aa6c23f83f7cb056
+MISC ChangeLog 2620 SHA256 22652461c6baa9b26f0c8d3ff20bfb7f6fe28b22173c964a7e2611f21b7ceb64 SHA512 1237de4b7c4569077bb563ae407441ecc998a0901ea8918bb1ecf7ce100387d8707775328a53e8195c5a55616badd1721c9e8a5e81e41db24a6063dd9d0e8ea3 WHIRLPOOL b71a3efe43162bf6ebc5d23234c2d55d47d9f1cd2dcb8cb9b0a2232dd0c53c84e2c84152150e6092cfd22d22de828b4b5afdc9318def14c957ff8c1abe8ba8dc
+MISC ChangeLog-2015 3281 SHA256 fd40a45493575d65639ab818a685e0c315e96d7cde38aadc22b757c30eb11328 SHA512 ec659b07738cb636842865f550920cb1f8aeda902c1423f2ba8a92ac9795ea67cbe14e71d88865b1ef1bdfa66741132e76861f17e3f64ec1ed81078be3362eab WHIRLPOOL 2ad5a68ed710b822f0ade03af2b73eb6c9a104b618ccefb843673fd91f967310eae9c8395743b5b55108893b75e240bf7d7f768b0e940c7c9a64da86803213f8
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch
new file mode 100644
index 000000000000..b617584f94de
--- /dev/null
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-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/files/mp32ogg-0.11-r4-quality.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch
new file mode 100644
index 000000000000..38fad9bc9abc
--- /dev/null
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch
@@ -0,0 +1,98 @@
+--- mp32ogg.orig	2005-01-01 15:32:32.138906448 +0000
++++ mp32ogg	2005-01-01 15:52:33.061338488 +0000
+@@ -9,6 +9,8 @@
+ # 0.11-gentoo
+ #     * Jeremy Huddleston <eradicator@gentoo.org>:
+ #       Added support for mpg321
++#     * --quality option support (from Debian 0.11-r3 release)
++#     * Non-zero exit code on failure (from Debian 0.11-r3 release)
+ #
+ # 0.11
+ #     * Have output reflect change in license (doh)
+@@ -104,8 +106,10 @@
+ print "(c) 2000-2002 Nathan Walp\n";
+ print "Released without warranty under the terms of the Artistic License\n\n";
+ 
++my $userquality=-2.0;
+ 
+ GetOptions("help|?",\&showhelp,
++		"quality=f" => \$userquality,
+ 		"delete", 
+ 		"rename=s", 
+ 		"lowercase",
+@@ -116,6 +120,8 @@
+ sub showhelp() {
+ 	print "Usage: $0 [options] dir1 dir2 file1 file2 ...\n\n";
+ 	print "Options:\n";
++	print "--quality=[-1..10]       Set Ogg/Vorbis quality level\n";
++	print "                         Defaults to bitrate of original .mp3\n";
+ 	print "--delete                 Delete files after converting\n";
+ 	print "--rename=format          Instead of simply replacing the .mp3 with\n";
+ 	print "                         .ogg for the output file, produce output \n";
+@@ -174,20 +180,26 @@
+ 	}
+ 
+ 	$mp3bitrate = $fileinfo->{BITRATE};
+-	if($mp3bitrate ne "") {
+-	   if($mp3bitrate > 256) {
+-	      $quality = 8;
+-	   } elsif($mp3bitrate > 192) {
+-	      $quality = 7;
+-	   } elsif($mp3bitrate > 128) {
+-	      $quality = 6;
+-	   } else {
+-	      $quality = 5;
+-	   }
++	if (($userquality < -1) || ($userquality > 10)) {
++	    # Set quality adjacent to mp3 bitrate
++	    if($mp3bitrate ne "") {
++		if($mp3bitrate > 256) {
++		    $quality = 8;
++		} elsif($mp3bitrate > 192) {
++		    $quality = 7;
++		} elsif($mp3bitrate > 128) {
++		    $quality = 6;
++		} else {
++		    $quality = 5;
++		}
++	    }
+ 	} else {
+ 	   $quality = 5;
+ 	   print "MP3::Info didn't report the bitrate... weird. Corrupt MP3 file? Bug?\n";
++	   # User defined quality
++	   $quality = $userquality;
+ 	}
++
+ 	if($filename eq "" ||
+ 		((/\%a/) && $info->{ARTIST} eq "") ||
+ 		((/\%t/) && $info->{TITLE} eq "") ||
+@@ -276,19 +288,19 @@
+ 	      {
+ 		 warn "Conversion failed ($oggoutputfile truncated).\n";
+ 		 close CHECK;
+-		 return;
++		 exit 1;
+ 	      }
+ 	      elsif($_ eq "header_integrity=fail\n")
+ 	      {
+ 		 warn "Conversion failed ($oggoutputfile header integrity check failed).\n";
+ 		 close CHECK;
+-		 return;
++		 exit 1;
+ 	      }
+ 	      elsif($_ eq "stream_integrity=fail\n")
+ 	      {
+ 		 warn "Conversion failed ($oggoutputfile header integrity check failed).\n";
+ 		 close CHECK;
+-		 return;
++		 exit 1;
+ 	      }
+ 	   }
+ 	   close CHECK;
+@@ -300,5 +312,6 @@
+ 	}
+ 	else {
+ 	   warn "Conversion failed ($oggenc returned $result).\n";
++	   exit 1
+ 	}
+ }
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/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/metadata.xml b/media-sound/mp32ogg/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/mp32ogg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
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..72c5e39e14aa
--- /dev/null
+++ b/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 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
+}