Version bump. Handle /usr/bin/mpg123 symlink inside CONTENTS again.

(Portage version: 2.2_rc33/cvs/Linux x86_64, RepoMan options: --force)

6 files changed, 115 insertions, 63 deletions

diff --git a/media-sound/mpg321/ChangeLog b/media-sound/mpg321/ChangeLog
index 91237fa17142..fe45a536b1af 100644
--- a/media-sound/mpg321/ChangeLog
+++ b/media-sound/mpg321/ChangeLog
@@ -1,6 +1,14 @@
 # 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.44 2008/07/15 19:50:51 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/ChangeLog,v 1.45 2009/06/21 07:31:59 ssuominen Exp $
+
+*mpg321-0.2.10.6 (21 Jun 2009)
+*mpg321-0.2.10-r4 (21 Jun 2009)
+
+  21 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -mpg321-0.2.10-r3.ebuild, +mpg321-0.2.10-r4.ebuild,
+  +mpg321-0.2.10.6.ebuild:
+  Version bump. Handle mpg123 symlink inside CONTENTS.
 
   15 Jul 2008; Jeroen Roovers <jer@gentoo.org> mpg321-0.2.10-r3.ebuild:
   Marked ~hppa too.
diff --git a/media-sound/mpg321/files/mpg321-0.2.10-file-descriptors-leak.patch b/media-sound/mpg321/files/mpg321-0.2.10-file-descriptors-leak.patch
index dace5b33dde9..04fc698e2e79 100644
--- a/media-sound/mpg321/files/mpg321-0.2.10-file-descriptors-leak.patch
+++ b/media-sound/mpg321/files/mpg321-0.2.10-file-descriptors-leak.patch
@@ -1,6 +1,8 @@
-diff -uNr mpg321-0.2.10/mpg321.c mpg321-0.2.10-new/mpg321.c
---- mpg321-0.2.10/mpg321.c	Sat Mar 23 23:49:20 2002
-+++ mpg321-0.2.10-new/mpg321.c	Sat Nov 13 00:50:25 2004
+From upstream (Debian in this case), should be fixed in >= 0.2.10.6.
+
+diff -ur mpg321-0.2.10.orig/mpg321.c mpg321-0.2.10/mpg321.c
+--- mpg321-0.2.10.orig/mpg321.c	Sat Mar 23 23:49:20 2002
++++ mpg321-0.2.10/mpg321.c	Sat Nov 13 00:50:25 2004
 @@ -188,7 +188,7 @@
              
              else
diff --git a/media-sound/mpg321/files/mpg321-0.2.10-useragent.patch b/media-sound/mpg321/files/mpg321-0.2.10-useragent.patch
index 756b1b9948d3..b6bac82dba1f 100644
--- a/media-sound/mpg321/files/mpg321-0.2.10-useragent.patch
+++ b/media-sound/mpg321/files/mpg321-0.2.10-useragent.patch
@@ -1,5 +1,4 @@
-
-$FreeBSD: /repoman/r/pcvs/ports/audio/mpg321/files/patch-network.c,v 1.3 2005/08/28 20:39:25 naddy Exp $
+Provide an User-Agent when requesting via HTTP by Frank Ruell. See, FreeBSD PR #84898.
 
 --- network.c.orig
 +++ network.c
diff --git a/media-sound/mpg321/mpg321-0.2.10-r3.ebuild b/media-sound/mpg321/mpg321-0.2.10-r3.ebuild
deleted file mode 100644
index e151c098a52e..000000000000
--- a/media-sound/mpg321/mpg321-0.2.10-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 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.13 2009/06/01 18:03:46 ssuominen Exp $
-
-inherit eutils
-
-DESCRIPTION="Free MP3 player, drop-in replacement for mpg123"
-HOMEPAGE="http://sourceforge.net/projects/mpg321"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa -mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="media-libs/libmad
-	media-libs/libid3tag
-	media-libs/libao"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# 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
-}
-
-src_compile() {
-	# disabling the symlink here and doing it in postinst is better for GRP
-	econf --disable-mpg123-symlink
-	emake || die "emake failed."
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	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-r4.ebuild b/media-sound/mpg321/mpg321-0.2.10-r4.ebuild
new file mode 100644
index 000000000000..15262c214102
--- /dev/null
+++ b/media-sound/mpg321/mpg321-0.2.10-r4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2009 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-r4.ebuild,v 1.1 2009/06/21 07:31:59 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="http://packages.debian.org/mpg321"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa -mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="+symlink"
+
+RDEPEND="sys-libs/zlib
+	media-libs/libmad
+	media-libs/libid3tag
+	media-libs/libao
+	!<media-sound/mpg321-0.2.10-r4
+	symlink? ( !media-sound/mpg123 )"
+DEPEND="${RDEPEND}"
+PDEPEND="symlink? ( virtual/mpg123 )"
+
+pkg_setup() {
+	local link="${ROOT}usr/bin/mpg123"
+	local msg="Removing invalid symlink ${link}"
+	if use symlink; then
+		if [ -L "${link}" ]; then
+			ebegin "${msg}"
+			rm -f "${link}" || die "${msg} failed, please open a bug."
+			eend $?
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-file-descriptors-leak.patch \
+		"${FILESDIR}"/${P}-useragent.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable symlink mpg123-symlink)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS BUGS HACKING NEWS README{,.remote} THANKS TODO
+}
diff --git a/media-sound/mpg321/mpg321-0.2.10.6.ebuild b/media-sound/mpg321/mpg321-0.2.10.6.ebuild
new file mode 100644
index 000000000000..611775160d9e
--- /dev/null
+++ b/media-sound/mpg321/mpg321-0.2.10.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2009 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.6.ebuild,v 1.1 2009/06/21 07:31:59 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="http://packages.debian.org/mpg321"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa -mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+symlink"
+
+RDEPEND="sys-libs/zlib
+	media-libs/libmad
+	media-libs/libid3tag
+	media-libs/libao
+	!<media-sound/mpg321-0.2.10-r4
+	symlink? ( !media-sound/mpg123 )"
+DEPEND="${RDEPEND}"
+PDEPEND="symlink? ( virtual/mpg123 )"
+
+pkg_setup() {
+	local link="${ROOT}usr/bin/mpg123"
+	local msg="Removing invalid symlink ${link}"
+	if use symlink; then
+		if [ -L "${link}" ]; then
+			ebegin "${msg}"
+			rm -f "${link}" || die "${msg} failed, please open a bug."
+			eend $?
+		fi
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable symlink mpg123-symlink)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newdoc debian/changelog ChangeLog.debian
+	dodoc AUTHORS BUGS HACKING NEWS README{,.remote} THANKS TODO
+}