summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound/mpg321')
-rw-r--r--media-sound/mpg321/ChangeLog9
-rw-r--r--media-sound/mpg321/Manifest7
-rw-r--r--media-sound/mpg321/files/mpg321-0.2.10-file-descriptors-leak.patch (renamed from media-sound/mpg321/files/mpg321-0.2.10.diff)0
-rw-r--r--media-sound/mpg321/mpg321-0.2.10-r2.ebuild51
-rw-r--r--media-sound/mpg321/mpg321-0.2.10-r3.ebuild28
5 files changed, 20 insertions, 75 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/Manifest b/media-sound/mpg321/Manifest
index b3eedc02b634..502c325eb435 100644
--- a/media-sound/mpg321/Manifest
+++ b/media-sound/mpg321/Manifest
@@ -1,7 +1,6 @@
+AUX mpg321-0.2.10-file-descriptors-leak.patch 1862 RMD160 b1054c796d086dba1b8d9c20cbe9eb7a3c43f7f9 SHA1 8314fcbe501123b3f1224ebdef3224d6a555c6fc SHA256 aeb47294ce947a36fdda6edeac4ffd42723e8ea0a66bf9a63404092f95bf3675
AUX mpg321-0.2.10-useragent.patch 629 RMD160 aec3587efdaa1ca88530092de97838de8a71908c SHA1 cb365307eed39e8f946f36899325d93262650067 SHA256 fe0cc6379006915a8f3b3b17dbdf75e41ebe5b79d9a2acbb526c49ee973e6a7b
-AUX mpg321-0.2.10.diff 1862 RMD160 b1054c796d086dba1b8d9c20cbe9eb7a3c43f7f9 SHA1 8314fcbe501123b3f1224ebdef3224d6a555c6fc SHA256 aeb47294ce947a36fdda6edeac4ffd42723e8ea0a66bf9a63404092f95bf3675
DIST mpg321-0.2.10.tar.gz 113449 RMD160 c0867e6ca7c0a5e2ff006e0c3aa866d2fde529ba SHA1 90268d0d187ddd7625d143b95791cb39a1630b79 SHA256 db0c299592b8f1f704f41bd3fc3a2bf138658108588d51af61638c551af1b0d4
-EBUILD mpg321-0.2.10-r2.ebuild 1444 RMD160 274b36f17b05fc08717f33618dede79273dbebf4 SHA1 01171ae52de9458d047f62bb8ab57441cc16faa2 SHA256 6dfa3c753ea01b1c4d6f25b30a7a16e0178cebc41d4585898610abe90fe47817
-EBUILD mpg321-0.2.10-r3.ebuild 1646 RMD160 577bcb718a59579f42267fd0ed1f878666107ec3 SHA1 acdac58bca2528ed2f36ebfc571530cbee95b3c9 SHA256 553d3223161b640dcf040e42819540bd5aada3e4855c3168575a6d5ff93a9819
-MISC ChangeLog 5606 RMD160 2d1c86bee0f073a474a0b3a17873b3095830f456 SHA1 ccf3be23d712dbbd9fe23b5036e9e48bb949a458 SHA256 e91e1c5ec3d97a22651e01d4cc0ac24cea2be64f9fb276ec20d30fa04f148198
+EBUILD mpg321-0.2.10-r3.ebuild 1660 RMD160 3fd47f46c176619af47c119c489a86a386a56ac8 SHA1 94be44cf33c4f5420278d634239e42c8bb770247 SHA256 63ede199a5dc5ec29a8fc06170ef6d4524915a39709e1c42796439aeb5013626
+MISC ChangeLog 5592 RMD160 d21f85216f31622fc3a71c0820217503e07ef7be SHA1 5473843ceea39d328cee2835c060cd8e060a40d5 SHA256 576c44545c1b1aec3f3c1be08003ffc19479189d0e140e94f75e65acc7b7b87e
MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
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
}