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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
RepoMan-Options: --force

8 files changed, 123 insertions, 68 deletions

diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 9be0145b9492..43c3c9783e92 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,4 +1,5 @@
 DIST mpg123-1.7.3.tar.bz2 1152707 RMD160 5ae91f57aa666336ed1b2c23d3b769e027a8e917 SHA1 9f0d288783da5539e67ca91ac12097ef088d5af3 SHA256 b8935a8f481d49b07d39fe0d3aa2eecbf7f631002b64d29e099de1b5be86e9da
+EBUILD mpg123-1.7.3-r1.ebuild 2146 RMD160 2a7073636936e328abc2bdc018dc4381439d758d SHA1 0c553c53368dc720817cb3d253a542a9fc211d50 SHA256 321c939d6bdc2c82a4e5df87501cb2a3a75a2f91ed1e253086fb537e1536c7f5
 EBUILD mpg123-1.7.3.ebuild 1790 RMD160 f82267e93cd59e1058b65b101b86e332e16ad43f SHA1 30a123e03dcee4cf91ed75a0247fcba42f0cfac0 SHA256 acb6359e6af632a025fd533f0a486989a89ee04a1784d2fd7215aa1c03a3fc2a
-MISC ChangeLog 26822 RMD160 cac7ff6934007971bc0bec4896219fa14413545a SHA1 1d7988c183086b9972a6b33c6e71395e5739dfcf SHA256 3b2bed2d7a815925d699c4d4120ba976c5e4936bf723bdcaef95fdbd41b1af95
+MISC ChangeLog 26985 RMD160 7080649e632e01e26f23878e9e591a8fe62baa5f SHA1 d58bddb98be9e2801fbf699429573574dce95339 SHA256 b88d03150ec0a54fab8ef2f90ba7956b672b9cad47dd2339203da43b904e829a
 MISC metadata.xml 324 RMD160 9a963eb8595a1ead893f4d4e376e84e8ff0cd9b8 SHA1 775f3832ff03ac2e6d037b5f1a6acceafc196fee SHA256 eb7ba00d13fe89820a740dfd2e729eb15c7d087cc0fb89064725cff9338d9b3d
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/Manifest b/media-sound/mpg321/Manifest
index 91c74fc3ff52..62ed57497fdf 100644
--- a/media-sound/mpg321/Manifest
+++ b/media-sound/mpg321/Manifest
@@ -1,6 +1,8 @@
-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-file-descriptors-leak.patch 1933 RMD160 f7dd5c7217a6d249f95b08645bf4f697df0a9df6 SHA1 656bbb6a4c51462974640f3e319799504e0ef1cd SHA256 6d963f8930eac4601424b200a15cbbeb273c8df92e36eda43c5b7be2d1d33e65
+AUX mpg321-0.2.10-useragent.patch 610 RMD160 3a6627d053536cbfa42a747a5435ffa4c492d411 SHA1 d0e8dd54f031a8e92c47b8a7badd9536d33046e4 SHA256 444714cfc74853e29c2a58682c208b47453f577d709f9f5bb030f2af39d04271
 DIST mpg321-0.2.10.tar.gz 113449 RMD160 c0867e6ca7c0a5e2ff006e0c3aa866d2fde529ba SHA1 90268d0d187ddd7625d143b95791cb39a1630b79 SHA256 db0c299592b8f1f704f41bd3fc3a2bf138658108588d51af61638c551af1b0d4
-EBUILD mpg321-0.2.10-r3.ebuild 1692 RMD160 55a4c71bea31af39aabb2074a56ff267867326e3 SHA1 45d41602fe87bbb873112ee4ad06b1938b024fb4 SHA256 52ab0ae233111fdc1e17612ff36597e7c429e5a1af3baf0cefbee3e28b74c502
-MISC ChangeLog 5684 RMD160 c635ce7451bc93c769602f400f3c80aece49723d SHA1 2c269fa1365d20e14d3417e0c467a0e80acd13b7 SHA256 8eae102641e42c647e599549a3f16898258faea5825fb4cd7c02b118c6f5e203
+DIST mpg321_0.2.10.6.tar.gz 146818 RMD160 1c962a9c21a29c6b5af24dbc539f67c11fc6ad38 SHA1 17da0b9f98380235d896295802b87ab775047da4 SHA256 3185746374713437ee1d6f101369e3009eff92a1b07909e87349cb7631398d5f
+EBUILD mpg321-0.2.10-r4.ebuild 1311 RMD160 17cc2db5795acaabb46467f4b2175ba793ed84c2 SHA1 435a66d99b3f0556603fe30f23a01a959a109f22 SHA256 a67f50ba2175e4df2f1fc9ab3a797f8b2d9240da5b305567e99e0fb98c541fe8
+EBUILD mpg321-0.2.10.6.ebuild 1301 RMD160 d2b8273f2cc5b62bb246c93bef3ad5f71d5848c0 SHA1 0b9d2612d11b13610e664ab90c29a895c3d58625 SHA256 3c3f2b88a9104383ef1c1abc787daabf06dee739f108e813ff154939c305d5c4
+MISC ChangeLog 5945 RMD160 03c8f9a5faee37e225f87760ead5ce1f861d1ffc SHA1 10101f1a8dc0daae4016d25af1d40d3b89d39939 SHA256 9678e0710c93fd3e669c767620308295dcb4c98abd0795a51cfc189eafc3911c
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
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
+}