old

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 10 insertions, 108 deletions

diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r3-mpg321.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r3-mpg321.patch
deleted file mode 100644
index b617584f94de..000000000000
--- a/media-sound/mp32ogg/files/mp32ogg-0.11-r3-mpg321.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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/mp32ogg-0.11-r3.ebuild b/media-sound/mp32ogg/mp32ogg-0.11-r3.ebuild
deleted file mode 100644
index 42c1111aef0d..000000000000
--- a/media-sound/mp32ogg/mp32ogg-0.11-r3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/mp32ogg-0.11-r3.ebuild,v 1.7 2005/01/01 15:59:45 chainsaw Exp $
-
-inherit eutils
-IUSE=""
-
-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"
-
-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}/${PF}-mpg321.patch
-}
-
-src_install() {
-	dobin mp32ogg
-}
diff --git a/media-sound/mp32ogg/mp32ogg-0.11-r4.ebuild b/media-sound/mp32ogg/mp32ogg-0.11-r4.ebuild
deleted file mode 100644
index 3012c645059d..000000000000
--- a/media-sound/mp32ogg/mp32ogg-0.11-r4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/mp32ogg-0.11-r4.ebuild,v 1.1 2005/01/01 15:59:45 chainsaw Exp $
-
-inherit eutils
-IUSE=""
-
-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"
-
-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}/${PF}-mpg321.patch
-	epatch ${FILESDIR}/${PF}-quality.patch
-}
-
-src_install() {
-	dobin mp32ogg
-}
diff --git a/media-sound/mp32ogg/mp32ogg-0.11-r5.ebuild b/media-sound/mp32ogg/mp32ogg-0.11-r5.ebuild
index 1fc3628e2d9c..ba502f587960 100644
--- a/media-sound/mp32ogg/mp32ogg-0.11-r5.ebuild
+++ b/media-sound/mp32ogg/mp32ogg-0.11-r5.ebuild
@@ -1,33 +1,34 @@
 # 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.3 2008/09/14 10:59:36 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/mp32ogg-0.11-r5.ebuild,v 1.4 2009/06/04 19:08:26 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=""
 
-DEPEND=""
 RDEPEND="virtual/mpg123
 	dev-perl/MP3-Info
 	dev-perl/String-ShellQuote
 	media-sound/vorbis-tools"
+DEPEND=""
 
-S="${WORKDIR}/"
+S=${WORKDIR}
 
-src_unpack(){
-	cp "${DISTDIR}/${A}" "${S}"
+src_prepare() {
 	epatch \
-		"${FILESDIR}/${P}-r4-mpg321.patch" \
-		"${FILESDIR}/${P}-r4-quality.patch" \
-		"${FILESDIR}/${PF}-german_umlaut.patch"
+		"${FILESDIR}"/${P}-r4-mpg321.patch \
+		"${FILESDIR}"/${P}-r4-quality.patch \
+		"${FILESDIR}"/${PF}-german_umlaut.patch
 }
 
 src_install() {
-	dobin mp32ogg
+	dobin mp32ogg || die "dobin failed"
 }