Revbump to fix 64bit problem. See bugs #25587 and #69512.

5 files changed, 129 insertions, 16 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index f52f08584fb4..c98650e9fe75 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,10 @@
 # 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.69 2004/11/03 16:40:41 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.70 2004/11/03 22:25:06 eradicator Exp $
+
+  03 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/mpg123-0.59s-r6-ppc64.patch:
+  Revbump to fix 64bit problem.  See bugs #25587 and #69512.
 
   03 Nov 2004; Markus Rothe <corsair@gentoo.org>
   +files/mpg123-0.59s-r6-ppc64.patch, mpg123-0.59s-r6.ebuild:
diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r7 b/media-sound/mpg123/files/digest-mpg123-0.59s-r7
new file mode 100644
index 000000000000..1859b73a7914
--- /dev/null
+++ b/media-sound/mpg123/files/digest-mpg123-0.59s-r7
@@ -0,0 +1,2 @@
+MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899
+MD5 4a71f1ba41d6856eb1786176bea94de9 mpg123-0.59s-gentoo-1.2.tar.bz2 6763
diff --git a/media-sound/mpg123/files/mpg123-0.59s-r6-ppc64.patch b/media-sound/mpg123/files/mpg123-0.59s-r6-ppc64.patch
deleted file mode 100644
index 8cf9b1e6954d..000000000000
--- a/media-sound/mpg123/files/mpg123-0.59s-r6-ppc64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mpg123.epatched/layer3.c mpg123/layer3.c
---- mpg123.epatched/layer3.c	2004-11-03 16:18:15.016995488 +0900
-+++ mpg123/layer3.c	2004-11-03 16:18:38.618003240 +0900
-@@ -626,7 +626,7 @@
-   int *me;
- 
-   int num=getbitoffset(&bsi);
--  long mask;
-+  int mask;
-   /* we must split this, because for num==0 the shift is undefined if you do it in one step */
-   mask  = ((unsigned long) getbits(&bsi,num))<<BITSHIFT;
-   mask <<= 8-num;
diff --git a/media-sound/mpg123/mpg123-0.59s-r6.ebuild b/media-sound/mpg123/mpg123-0.59s-r6.ebuild
index 21de60e7cac9..3846b89777ea 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
 # 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.10 2004/11/03 16:40:41 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r6.ebuild,v 1.11 2004/11/03 22:25:06 eradicator Exp $
 
 IUSE="mmx 3dnow esd nas oss"
 
@@ -40,8 +40,6 @@ src_unpack() {
 	epatch ${PATCHDIR}
 
 	sed -i "s:${PV}-mh4:${PVR}:" version.h
-	#fixes bug #69512
-	use ppc64 && epatch ${FILESDIR}/${P}-ppc64.patch
 }
 
 src_compile() {
diff --git a/media-sound/mpg123/mpg123-0.59s-r7.ebuild b/media-sound/mpg123/mpg123-0.59s-r7.ebuild
new file mode 100644
index 000000000000..33ae4dbf4af7
--- /dev/null
+++ b/media-sound/mpg123/mpg123-0.59s-r7.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2004 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.1 2004/11/03 22:25:06 eradicator Exp $
+
+IUSE="mmx 3dnow esd nas oss"
+
+inherit eutils
+
+PATCH_VER=1.2
+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"
+
+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"
+			;;
+		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
+}