amd64 stable wrt #222479

(Portage version: 2.1.5)

4 files changed, 17 insertions, 71 deletions

diff --git a/media-sound/mpg321/ChangeLog b/media-sound/mpg321/ChangeLog
index 08e10e0b3bae..1abbd751b218 100644
--- a/media-sound/mpg321/ChangeLog
+++ b/media-sound/mpg321/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/mpg321
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/ChangeLog,v 1.42 2008/05/18 14:33:48 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/ChangeLog,v 1.43 2008/05/18 14:51:36 drac Exp $
+
+  18 May 2008; Samuli Suominen <drac@gentoo.org> mpg321-0.2.10-r3.ebuild:
+  amd64 stable wrt #222479
 
   18 May 2008; Markus Rothe <corsair@gentoo.org> mpg321-0.2.10-r3.ebuild:
   Stable on ppc64; bug #222479
@@ -9,10 +12,6 @@
   mpg321-0.2.10-r3.ebuild:
   Stable on alpha, bug #222479
 
-  17 May 2008; Tobias Klausmann <klausman@gentoo.org>
-  mpg321-0.2.10-r2.ebuild:
-  Stable on alpha, bug #222479
-
   17 May 2008; Raúl Porcel <armin76@gentoo.org> mpg321-0.2.10-r3.ebuild:
   sparc/x86 stable wrt #222479
 
diff --git a/media-sound/mpg321/files/mpg321-0.2.10.diff b/media-sound/mpg321/files/mpg321-0.2.10-file-descriptors-leak.patch
index dace5b33dde9..dace5b33dde9 100644
--- a/media-sound/mpg321/files/mpg321-0.2.10.diff
+++ b/media-sound/mpg321/files/mpg321-0.2.10-file-descriptors-leak.patch
diff --git a/media-sound/mpg321/mpg321-0.2.10-r2.ebuild b/media-sound/mpg321/mpg321-0.2.10-r2.ebuild
deleted file mode 100644
index c934c3c4cd22..000000000000
--- a/media-sound/mpg321/mpg321-0.2.10-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.10-r2.ebuild,v 1.15 2008/05/17 13:19:32 klausman Exp $
-
-inherit eutils
-
-IUSE=""
-
-DESCRIPTION="Free MP3 player, drop-in replacement for mpg123"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://sourceforge.net/projects/mpg321/"
-
-DEPEND="media-libs/libmad
-	media-libs/libid3tag
-	>=media-libs/libao-0.8.0"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 -mips ppc ppc64 sparc x86"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}.diff
-}
-
-src_compile() {
-	# disabling the symlink here and doing it in postinst is better for GRP
-	econf --disable-mpg123-symlink || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS ChangeLog HACKING NEWS README README.remote THANKS TODO
-}
-
-pkg_postinst() {
-	# We create a symlink for /usr/bin/mpg123 if it doesn't already exist
-	if ! [ -f ${ROOT}/usr/bin/mpg123 ]; then
-		ln -s mpg321 ${ROOT}/usr/bin/mpg123
-	fi
-}
-
-pkg_postrm() {
-	# We delete the symlink if it's nolonger valid.
-	if [ -L "${ROOT}/usr/bin/mpg123" ] && [ ! -x "${ROOT}/usr/bin/mpg123" ]; then
-		elog "We are removing the ${ROOT}/usr/bin/mpg123 symlink since it is no longer valid."
-		elog "If you are using another virtual/mpg123 program, you should setup the appropriate symlink."
-		rm ${ROOT}/usr/bin/mpg123
-	fi
-}
diff --git a/media-sound/mpg321/mpg321-0.2.10-r3.ebuild b/media-sound/mpg321/mpg321-0.2.10-r3.ebuild
index 5345849accf5..18446d986e52 100644
--- a/media-sound/mpg321/mpg321-0.2.10-r3.ebuild
+++ b/media-sound/mpg321/mpg321-0.2.10-r3.ebuild
@@ -1,29 +1,27 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.10-r3.ebuild,v 1.10 2008/05/18 14:33:48 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.10-r3.ebuild,v 1.11 2008/05/18 14:51:36 drac Exp $
 
 inherit eutils
 
-IUSE=""
-
 DESCRIPTION="Free MP3 player, drop-in replacement for mpg123"
+HOMEPAGE="http://sourceforge.net/projects/mpg321"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://sourceforge.net/projects/mpg321/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 -mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
 
 DEPEND="media-libs/libmad
 	media-libs/libid3tag
-	>=media-libs/libao-0.8.0"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 -mips ppc ppc64 sparc x86 ~x86-fbsd"
+	media-libs/libao"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	# fix file descriptors leak (from Debian?)
-	epatch "${FILESDIR}"/${P}.diff
+	# from debian?
+	epatch "${FILESDIR}"/${P}-file-descriptors-leak.patch
 	# provide an User-Agent when requesting via HTTP
 	# By Frank Ruell, in FreeBSD PR 84898
 	epatch "${FILESDIR}"/${P}-useragent.patch
@@ -31,12 +29,12 @@ src_unpack() {
 
 src_compile() {
 	# disabling the symlink here and doing it in postinst is better for GRP
-	econf --disable-mpg123-symlink || die
-	emake || die
+	econf --disable-mpg123-symlink
+	emake || die "emake failed."
 }
 
 src_install () {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed."
 	dodoc AUTHORS BUGS ChangeLog HACKING NEWS README README.remote THANKS TODO
 }