Revision bump for CAN-2004-0991.

7 files changed, 153 insertions, 13 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index 242cb32c729a..df1711ce9e14 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpg123
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.78 2004/12/30 08:42:51 hardave Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.79 2005/01/06 09:38:25 eradicator Exp $
+
+*mpg123-0.59s-r9 (06 Jan 2005)
+
+  06 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +mpg123-0.59s-r9.ebuild:
+  Revision bump for CAN-2004-0991.
 
   30 Dec 2004; Hardave Riar <hardave@gentoo.org> mpg123-0.59s-r8.ebuild:
   Stable on mips, bug #74692
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index f4801ba1bbfc..e2db2e9f204a 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,8 +1,20 @@
-MD5 dbf789b6af2a514be860a64a64ee1667 mpg123-0.59s-r6.ebuild 2871
-MD5 0eb5ad367ebfb5b7234b9036855673dc mpg123-0.59s-r8.ebuild 2874
-MD5 14be74134249c6913685c964bcb38265 mpg123-0.59s-r7.ebuild 2882
-MD5 9b5a5a2b34296c20b7f54995e4bcacfe ChangeLog 12115
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 74931951ba4ae7b21832368a59b19a51 ChangeLog 12270
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 792c4eea53fd8d57facf635a93c11d5d files/digest-mpg123-0.59s-r6 141
+MD5 318e86cc42ab954a63b7716bc5375055 mpg123-0.59s-r7.ebuild 2882
+MD5 a17bd7ebf2d98eff36b84be0fe1a8292 mpg123-0.59s-r6.ebuild 2871
+MD5 125d7ad49336252f01bea89794e0adc0 mpg123-0.59s-r8.ebuild 2877
+MD5 22bb8478a03e8c75658b235fe0ca161f mpg123-0.59s-r9.ebuild 2883
 MD5 3a48e002f75bdd43f080f34013db8517 files/digest-mpg123-0.59s-r7 141
 MD5 12a16d9aafab05a0ad9eace12cf3596a files/digest-mpg123-0.59s-r8 141
+MD5 792c4eea53fd8d57facf635a93c11d5d files/digest-mpg123-0.59s-r6 141
+MD5 e48d719ce128060016792fed8c38db07 files/digest-mpg123-0.59s-r9 141
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB3Qc9ArHZZzCEUG0RAgwZAJ45b7jm9G0Cc8c9PjirYKSpNm4fHwCeKdiB
+lpUBysXq0XOLhtZBGqF1hnE=
+=/7Nx
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r9 b/media-sound/mpg123/files/digest-mpg123-0.59s-r9
new file mode 100644
index 000000000000..e14c9f29b929
--- /dev/null
+++ b/media-sound/mpg123/files/digest-mpg123-0.59s-r9
@@ -0,0 +1,2 @@
+MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899
+MD5 52ee919909bbf24650b4be23734ab179 mpg123-0.59s-gentoo-1.4.tar.bz2 7190
diff --git a/media-sound/mpg123/mpg123-0.59s-r6.ebuild b/media-sound/mpg123/mpg123-0.59s-r6.ebuild
index 3846b89777ea..c7efcee89099 100644
--- a/media-sound/mpg123/mpg123-0.59s-r6.ebuild
+++ b/media-sound/mpg123/mpg123-0.59s-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r6.ebuild,v 1.11 2004/11/03 22:25:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r6.ebuild,v 1.12 2005/01/06 09:38:25 eradicator Exp $
 
 IUSE="mmx 3dnow esd nas oss"
 
diff --git a/media-sound/mpg123/mpg123-0.59s-r7.ebuild b/media-sound/mpg123/mpg123-0.59s-r7.ebuild
index 950af40ea4c4..5fee5b9f888e 100644
--- a/media-sound/mpg123/mpg123-0.59s-r7.ebuild
+++ b/media-sound/mpg123/mpg123-0.59s-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r7.ebuild,v 1.3 2004/11/23 11:02:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r7.ebuild,v 1.4 2005/01/06 09:38:25 eradicator Exp $
 
 inherit eutils
 
diff --git a/media-sound/mpg123/mpg123-0.59s-r8.ebuild b/media-sound/mpg123/mpg123-0.59s-r8.ebuild
index bc67fde3520c..056bf1a59682 100644
--- a/media-sound/mpg123/mpg123-0.59s-r8.ebuild
+++ b/media-sound/mpg123/mpg123-0.59s-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r8.ebuild,v 1.6 2004/12/30 08:42:51 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r8.ebuild,v 1.7 2005/01/06 09:38:25 eradicator Exp $
 
 inherit eutils
 
diff --git a/media-sound/mpg123/mpg123-0.59s-r9.ebuild b/media-sound/mpg123/mpg123-0.59s-r9.ebuild
new file mode 100644
index 000000000000..1b0b7200e0f5
--- /dev/null
+++ b/media-sound/mpg123/mpg123-0.59s-r9.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r9.ebuild,v 1.1 2005/01/06 09:38:25 eradicator Exp $
+
+inherit eutils
+
+PATCH_VER=1.4
+S="${WORKDIR}/${PN}"
+
+DESCRIPTION="Real Time mp3 player"
+HOMEPAGE="http://www.mpg123.de/"
+SRC_URI="http://www.mpg123.de/mpg123/${PN}-pre${PV}.tar.gz
+	 http://dev.gentoo.org/~eradicator/${PN}/${P}-gentoo-${PATCH_VER}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+IUSE="mmx 3dnow esd nas oss"
+
+RDEPEND="virtual/libc
+	 esd? ( media-sound/esound )
+	 nas? ( media-libs/nas )"
+
+# alsa-1 b0rks and it's not a simple fix
+#	 alsa? ( media-libs/alsa-lib )"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+PROVIDE="virtual/mpg123"
+
+PATCHDIR="${WORKDIR}/patches"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	EPATCH_SUFFIX="patch"
+	epatch ${PATCHDIR}
+
+	sed -i "s:${PV}-mh4:${PVR}:" version.h
+}
+
+src_compile() {
+	mkdir gentoo-bin
+
+	# The last one in $styles is the default
+	local styles
+
+	use nas && styles="${styles} -nas"
+	use oss && styles="${styles} -generic"
+
+	case $ARCH in
+		ppc64)
+			use esd && styles="${styles} -ppc64-esd"
+			use oss && styles="${styles} -ppc64"
+
+			[ -z "${styles}" ] && styles="-ppc64"
+			;;
+		ppc)
+			use esd && styles="${styles} -ppc-esd"
+			use oss && styles="${styles} -ppc"
+
+			[ -z "${styles}" ] && styles="-ppc"
+			;;
+		x86)
+			use esd && styles="${styles} -esd"
+			use esd && use 3dnow && styles="${styles} -3dnow-esd"
+			use oss && styles="${styles} -i486"
+			use oss && use mmx && styles="${styles} -mmx"
+			use oss && use 3dnow && styles="${styles} -3dnow"
+			# use alsa && styles="${styles} -alsa"
+			# use alsa && use 3dnow && styles="${styles} -3dnow-alsa"
+
+			[ -z "${styles}" ] && styles="-generic"
+			;;
+		sparc*)
+			use esd && styles="${styles} -sparc-esd"
+			styles="${styles} -sparc -generic"
+			;;
+		amd64)
+			use esd && styles="${styles} -x86_64-esd"
+			use oss && styles="${styles} -x86_64"
+			# use alsa && styles="${styles} -x86_64-alsa"
+
+			[ -z "${styles}" ] && styles="-x86_64"
+			;;
+		alpha)
+			use esd && styles="${styles} -alpha-esd"
+			use oss && styles="${styles} -alpha"
+			# use alsa && styles="${styles} -alpha-alsa"
+
+			[ -z "${styles}" ] && styles="-generic"
+			;;
+		mips|hppa|ia64)
+			# use alsa && styles="${styles} -mips-alsa"
+
+			[ -z "${styles}" ] && styles="-generic"
+			;;
+		*)
+			eerror "No support has been added for your architecture."
+			exit 1
+			;;
+	esac
+
+	for style in ${styles};
+	do
+		make clean linux${style} CFLAGS="${CFLAGS}" || die
+		mv mpg123 gentoo-bin/mpg123${style}
+		[ -L "gentoo-bin/mpg123" ] && rm gentoo-bin/mpg123
+		ln -s mpg123${style} gentoo-bin/mpg123
+	done
+}
+
+src_install() {
+	dodir /usr
+	cp -dR gentoo-bin ${D}/usr/bin
+	doman mpg123.1
+	dodoc BENCHMARKING BUGS CHANGES COPYING JUKEBOX README* TODO
+}