fix distcc compiles; see bug 16116

4 files changed, 350 insertions, 3 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index e2812d7412fd..9bc1cb98c9d0 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,11 +1,18 @@
 # ChangeLog for media-sound/mpg123
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.8 2003/02/12 07:31:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.9 2003/03/20 04:17:30 zwelch Exp $
+
+*mpg123-0.59r-r2 (19 Mar 2003)
+
+  19 Mar 2003; Zach Welch <zwelch@gentoo.org> mpg123-0.59r-r2.ebuild,
+  files/mpg123-0.59r-make-fix.diff:
+  fix distcc compiles; see bug 16116
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *mpg123-0.59r-r1 (27 Apr 2002)
 
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : 
+  changed sparc ~sparc keywords
+ 
   22 Nov 2002; Will Woods <wwoods@gentoo.org> mpg123-0.59r-r1.ebuild :
   Added alpha keyword and patch.
 
diff --git a/media-sound/mpg123/files/digest-mpg123-0.59r-r2 b/media-sound/mpg123/files/digest-mpg123-0.59r-r2
new file mode 100644
index 000000000000..d1abfcacbafc
--- /dev/null
+++ b/media-sound/mpg123/files/digest-mpg123-0.59r-r2
@@ -0,0 +1 @@
+MD5 95df59ad1651dd2346d49fafc83747e7 mpg123-0.59r.tar.gz 159028
diff --git a/media-sound/mpg123/files/mpg123-0.59r-make-fix.diff b/media-sound/mpg123/files/mpg123-0.59r-make-fix.diff
new file mode 100644
index 000000000000..fb85ef4989a3
--- /dev/null
+++ b/media-sound/mpg123/files/mpg123-0.59r-make-fix.diff
@@ -0,0 +1,272 @@
+diff -urN mpg123-0.59r-old/Makefile mpg123-0.59r/Makefile
+--- mpg123-0.59r-old/Makefile	2003-03-13 05:59:26.000000000 +0000
++++ mpg123-0.59r/Makefile	2003-03-13 05:59:58.000000000 +0000
+@@ -88,7 +88,7 @@
+ 
+ linux-devel:
+ 	$(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
+-        CC=gcc LDFLAGS= \
++         LDFLAGS= \
+         CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -g -m486 \
+ 		-DREAD_MMAP -DOSS -funroll-all-loops \
+ 		-finline-functions -ffast-math' \
+@@ -96,14 +96,14 @@
+ 
+ linux-profile:
+ 	$(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
+-        CC=gcc LDFLAGS='-pg' \
++         LDFLAGS='-pg' \
+         CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -pg -m486 \
+ 		-DREAD_MMAP -DOSS -funroll-all-loops \
+ 		-finline-functions -ffast-math' \
+         mpg123-make
+ 
+ linux:
+-	$(MAKE) CC=gcc LDFLAGS= \
++	$(MAKE)  LDFLAGS= \
+ 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+ 			audio_oss.o term.o' \
+ 		CFLAGS='-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
+@@ -114,7 +114,7 @@
+ 		mpg123-make
+ 
+ linux-3dnow:
+-	$(MAKE) CC=gcc LDFLAGS= \
++	$(MAKE)  LDFLAGS= \
+ 		OBJECTS='decode_i386.o dct64_3dnow.o \
+ 			decode_3dnow.o audio_oss.o term.o' \
+ 		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
+@@ -125,7 +125,7 @@
+ 		mpg123-make
+ 
+ linux-i486:
+-	$(MAKE) CC=gcc LDFLAGS= \
++	$(MAKE)  LDFLAGS= \
+ 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+ 			decode_i486.o dct64_i486.o audio_oss.o term.o' \
+ 		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DI486_OPT -DLINUX \
+@@ -136,7 +136,7 @@
+ 		mpg123-make
+ 
+ linux-esd:
+-	$(MAKE) CC=gcc LDFLAGS= \
++	$(MAKE)  LDFLAGS= \
+ 		AUDIO_LIB='-lesd -laudiofile' \
+ 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+ 			audio_esd.o' \
+@@ -149,7 +149,7 @@
+ 		mpg123-make
+ 
+ linux-alsa:
+-	$(MAKE) CC=gcc LDFLAGS= \
++	$(MAKE)  LDFLAGS= \
+ 		AUDIO_LIB='-lasound' \
+ 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+ 			audio_alsa.o term.o' \
+@@ -162,7 +162,7 @@
+ 		mpg123-make
+ 
+ linux-mips-alsa:
+-	$(MAKE) CC=gcc LDFLAGS= \
++	$(MAKE)  LDFLAGS= \
+ 		AUDIO_LIB='-lasound' \
+ 		OBJECTS='decode.o dct64.o audio_alsa.o term.o' \
+ 		CFLAGS='-DREAL_IS_FLOAT -DLINUX -DREAD_MMAP -DALSA \
+@@ -173,7 +173,7 @@
+ 		mpg123-make
+ 
+ linux-alpha:
+-	$(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
++	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
+ 		CFLAGS='-DLINUX -DOSS -Wall -O2 \
+ 			-fomit-frame-pointer -funroll-all-loops \
+ 			-finline-functions -ffast-math \
+@@ -182,7 +182,7 @@
+ 		mpg123-make
+ 
+ linux-alpha-esd:
+-	$(MAKE) CC=gcc LDFLAGS= \
++	$(MAKE)  LDFLAGS= \
+ 		AUDIO_LIB='-lesd -laudiofile' \
+ 		OBJECTS='decode.o dct64.o audio_esd.o' \
+ 		CFLAGS='-DLINUX -DOSS -Wall -O2 \
+@@ -193,7 +193,7 @@
+ 		mpg123-make
+ 
+ #linux-ppc:
+-#	$(MAKE) CC=gcc  LDFLAGS= \
++#	$(MAKE)   LDFLAGS= \
+ #		OBJECTS='decode.o dct64.o audio_oss.o' \
+ #		CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=ppc \
+ #			-DOSS -DPPC_ENDIAN \
+@@ -202,7 +202,7 @@
+ #		mpg123-make
+ 
+ #linux-ppc-esd:
+-#	$(MAKE) CC=gcc  LDFLAGS= \
++#	$(MAKE)   LDFLAGS= \
+ #		AUDIO_LIB='-lesd -laudiofile' \
+ #		OBJECTS='decode.o dct64.o audio_esd.o' \
+ #		CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=ppc \
+@@ -212,7 +212,7 @@
+ #		mpg123-make
+ 
+ linux-ppc:
+-	$(MAKE) CC=gcc  LDFLAGS= \
++	$(MAKE)   LDFLAGS= \
+ 		OBJECTS='decode.o dct64.o audio_oss.o' \
+ 		CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=ppc \
+ 			-DOSS \
+@@ -221,7 +221,7 @@
+ 		mpg123-make
+ 
+ linux-ppc-esd:
+-	$(MAKE) CC=gcc  LDFLAGS= \
++	$(MAKE)   LDFLAGS= \
+ 		AUDIO_LIB='-lesd -laudiofile' \
+ 		OBJECTS='decode.o dct64.o audio_esd.o' \
+ 		CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=ppc \
+@@ -231,7 +231,7 @@
+ 		mpg123-make
+ 
+ linux-sparc:
+-	$(MAKE) CC=gcc  LDFLAGS= \
++	$(MAKE)   LDFLAGS= \
+ 		OBJECTS='decode.o dct64.o audio_sun.o' \
+ 		CFLAGS='-DREAL_IS_FLOAT -DUSE_MMAP -DSPARCLINUX -Wall -O2 \
+ 			-fomit-frame-pointer -funroll-all-loops \
+@@ -239,7 +239,7 @@
+ 		mpg123-make
+ 
+ linux-m68k:
+-	$(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
++	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
+ 		CFLAGS='-DREAL_IS_FLOAT -DLINUX -DREAD_MMAP \
+ 			-DOSS -DOSS_BIG_ENDIAN -Wall -O2 -m68040 \
+ 			-fomit-frame-pointer -funroll-loops \
+@@ -259,7 +259,7 @@
+ 	@ $(MAKE) FRONTEND=mpg123m-make freebsd-frontend
+ 
+ linux-frontend:
+-	$(MAKE) CC=gcc LDFLAGS= \
++	$(MAKE)  LDFLAGS= \
+ 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+ 			control_sajber.o control_tk3play.o audio_oss.o' \
+ 		CFLAGS='-DFRONTEND -DOSS -DI386_ASSEM -DREAL_IS_FLOAT \
+@@ -269,7 +269,7 @@
+ 		$(FRONTEND)
+ 
+ linux-nas:
+-	$(MAKE) CC=gcc LDFLAGS='-L/usr/X11R6/lib' \
++	$(MAKE)  LDFLAGS='-L/usr/X11R6/lib' \
+ 		AUDIO_LIB='-laudio -lXau' \
+ 		OBJECTS='decode_i386.o dct64_i386.o audio_nas.o' \
+ 		CFLAGS='-I/usr/X11R6/include \
+@@ -354,7 +354,7 @@
+ 		mpg123-make
+ 
+ solaris-gcc:
+-	$(MAKE) CC=gcc \
++	$(MAKE)  \
+ 		LDFLAGS='-lsocket -lnsl' \
+ 		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
+ 		CFLAGS='-O2 -Wall -pedantic -DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \
+@@ -363,7 +363,7 @@
+ 		mpg123-make
+ 
+ solaris-gcc-esd:
+-	$(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \
++	$(MAKE)  LDFLAGS='-lsocket -lnsl' \
+ 		AUDIO_LIB='-lesd -lresolv' \
+ 		OBJECTS='decode.o dct64.o audio_esd.o' \
+ 		CFLAGS='-O2 -Wall -DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \
+@@ -372,7 +372,7 @@
+ 		mpg123-make
+ 
+ solaris-x86-gcc-oss:
+-	$(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \
++	$(MAKE)  LDFLAGS='-lsocket -lnsl' \
+ 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+ 			audio_oss.o' \
+ 		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DUSE_MMAP \
+@@ -382,7 +382,7 @@
+ 		mpg123-make
+ 
+ solaris-gcc-nas:
+-	$(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \
++	$(MAKE)  LDFLAGS='-lsocket -lnsl' \
+ 		AUDIO_LIB='-L/usr/openwin/lib -laudio -lXau'\
+ 		OBJECTS='decode.o dct64.o audio_nas.o' \
+ 		CFLAGS='-O2 -I/usr/openwin/include -Wall \
+@@ -392,7 +392,7 @@
+ 		mpg123-make
+ 
+ sunos:
+-	$(MAKE) CC=gcc LDFLAGS= \
++	$(MAKE)  LDFLAGS= \
+ 		OBJECTS='decode.o dct64.o audio_sun.o' \
+ 		CFLAGS='-O2 -DSUNOS -DREAL_IS_FLOAT -DUSE_MMAP \
+ 			-funroll-loops' \
+@@ -414,7 +414,7 @@
+ 		mpg123-make
+ 
+ hpux-gcc:
+-	$(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_hp.o' \
++	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_hp.o' \
+ 		CFLAGS='-DREAL_IS_FLOAT -O3 -D_HPUX_SOURCE -DHPUX' \
+ 		mpg123-make
+ sgi:
+@@ -424,7 +424,7 @@
+ 		mpg123-make
+ 
+ sgi-gcc:
+-	$(MAKE) CC=gcc LDFLAGS= \
++	$(MAKE)  LDFLAGS= \
+ 		OBJECTS='decode.o dct64.o audio_sgi.o' AUDIO_LIB=-laudio \
+ 		CFLAGS='-O2 -DSGI -DREAL_IS_FLOAT -DUSE_MMAP' \
+ 		mpg123-make
+@@ -447,7 +447,7 @@
+ 		mpg123-make
+ 
+ aix-gcc:
+-	$(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o' \
++	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o' \
+ 		CFLAGS='-DAIX -Wall -O6 -DUSE_MMAP -DREAD_MMAP -DREAL_IS_FLOAT \
+ 			-fomit-frame-pointer -funroll-all-loops \
+ 			-finline-functions -ffast-math' \
+@@ -471,7 +471,7 @@
+ 		$(FRONTEND)
+ 
+ os2:
+-	$(MAKE) CC=gcc LDFLAGS= \
++	$(MAKE)  LDFLAGS= \
+ 		OBJECTS='decode_i386.o dct64_i386.o audio_os2.o' \
+ 		CFLAGS='-DREAL_IS_FLOAT -DNOXFERMEM -DOS2 -Wall -O2 -m486 \
+ 		-fomit-frame-pointer -funroll-all-loops \
+@@ -506,7 +506,7 @@
+ 		mpg123-make
+ 
+ bsdos4:
+-	$(MAKE) CC=gcc LDFLAGS= \
++	$(MAKE)  LDFLAGS= \
+ 		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
+ 		CFLAGS='-Wall -O4 -m486 -fomit-frame-pointer \
+ 			-funroll-all-loops -ffast-math -DROT_I386 \
+@@ -526,7 +526,7 @@
+ 		mpg123-make
+ 
+ mint:
+-	$(MAKE) CC=gcc LDFLAGS= \
++	$(MAKE)  LDFLAGS= \
+ 		OBJECTS='decode.o dct64.o audio_mint.o' \
+ 		CFLAGS='-Wall -O2 -m68020-40 -m68881 \
+ 		-fomit-frame-pointer -funroll-all-loops \
+diff -urN mpg123-0.59r-old/mpglib/Makefile mpg123-0.59r/mpglib/Makefile
+--- mpg123-0.59r-old/mpglib/Makefile	2003-03-13 05:59:26.000000000 +0000
++++ mpg123-0.59r/mpglib/Makefile	2003-03-13 06:00:31.000000000 +0000
+@@ -1,5 +1,4 @@
+ 
+-CC=gcc
+ CFLAGS=-Wall -g
+ 
+ all: mpglib
diff --git a/media-sound/mpg123/mpg123-0.59r-r2.ebuild b/media-sound/mpg123/mpg123-0.59r-r2.ebuild
new file mode 100644
index 000000000000..3b1a6a35aac2
--- /dev/null
+++ b/media-sound/mpg123/mpg123-0.59r-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59r-r2.ebuild,v 1.1 2003/03/20 04:17:30 zwelch Exp $
+
+S=${WORKDIR}/${P}
+
+DESCRIPTION="Real Time mp3 player"
+SRC_URI="http://www.mpg123.de/mpg123/${P}.tar.gz"
+HOMEPAGE="http://www.mpg123.de/"
+
+DEPEND="virtual/glibc"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 ppc sparc alpha"
+
+src_unpack () {
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${P}-make-fix.diff
+	patch -p1 < ${FILESDIR}/${P}-sparc.diff
+	use alpha && patch -p1 < ${FILESDIR}/${P}-alpha.diff
+	cp Makefile Makefile.orig
+	sed -e "s:-O2 -m486:${CFLAGS}:" \
+		-e "s:-O2 -mcpu=ppc:${CFLAGS}:g" \
+		-e "s:-O6:${CFLAGS}:" \
+		Makefile.orig > Makefile
+}
+
+src_compile() {
+	local MAKEOPT=""
+	local MAKESTYLE=""
+
+	SYSTEM_ARCH=`echo $ARCH |\
+		sed -e s/[i]*.86/i386/ \
+			-e s/sun.*/sparc/ \
+			-e s/arm.*/arm/ \
+			-e s/sa110/arm/`
+
+	if [ -z "$SYSTEM_ARCH" ]
+	then
+		SYSTEM_ARCH=`uname -m |\
+		sed -e s/[i]*.86/i386/ -e s/arm.*/arm/ -e s/sa110/arm/`
+	fi 
+
+	case $SYSTEM_ARCH in 
+	  ppc) 
+	   MAKESTYLE="-ppc";;
+	  i386)
+	   MAKESTYLE="-i486";;
+	  sparc)
+	   MAKESTYLE="-sparc";;
+	 alpha)
+	   MAKESTYLE="-alpha";;
+	  arm)
+	   ;; 
+	esac
+
+	make linux${MAKESTYLE}${MAKEOPT} || die
+}
+
+src_install () {
+	into /usr
+	dobin mpg123
+	doman mpg123.1
+	dodoc BENCHMARKING BUGS CHANGES COPYING JUKEBOX README* TODO
+}