Add patch from Guilherme Amadio <amadio@cns.s.u-tokyo.ac.jp> to build with gmake 3.81. Also give the right compiler to make process.

(Portage version: 2.1_pre10-r5)

5 files changed, 218 insertions, 8 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index 08aef2841a34..2d3ca1725c2a 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpg123
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.93 2006/05/08 04:31:16 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.94 2006/05/11 12:30:33 flameeyes Exp $
+
+  11 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/mpg123-0.59s-gmake-3.81.patch, mpg123-0.59s-r10.ebuild:
+  Add patch from Guilherme Amadio <amadio@cns.s.u-tokyo.ac.jp> to build with
+  gmake 3.81. Also give the right compiler to make process.
 
   08 May 2006; <tcort@gentoo.org> mpg123-0.59s-r9.ebuild:
   Removed COPYING from dodoc.
diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r10 b/media-sound/mpg123/files/digest-mpg123-0.59s-r10
index 36b99f70c718..98b641bcd984 100644
--- a/media-sound/mpg123/files/digest-mpg123-0.59s-r10
+++ b/media-sound/mpg123/files/digest-mpg123-0.59s-r10
@@ -1,2 +1,6 @@
-MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899
 MD5 e7ec309a2108b53f03ef1c32f1111538 mpg123-0.59s-gentoo-1.5.tar.bz2 7207
+RMD160 75bc91d354e665c424afa1a3beab202f7a60441c mpg123-0.59s-gentoo-1.5.tar.bz2 7207
+SHA256 2c2495ce9bd029b01d94c4c4ca930653d174d4a3e6d11488e2e669692835b116 mpg123-0.59s-gentoo-1.5.tar.bz2 7207
+MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899
+RMD160 fdc6ba57c67dc890ef5d2f3a05ff9c520ccf407f mpg123-pre0.59s.tar.gz 244899
+SHA256 ba0c1db18ffc7ed2250d6718a23a62e0e98d77bbeedb83ca3993f6421b31256a mpg123-pre0.59s.tar.gz 244899
diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r9 b/media-sound/mpg123/files/digest-mpg123-0.59s-r9
index 36b99f70c718..98b641bcd984 100644
--- a/media-sound/mpg123/files/digest-mpg123-0.59s-r9
+++ b/media-sound/mpg123/files/digest-mpg123-0.59s-r9
@@ -1,2 +1,6 @@
-MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899
 MD5 e7ec309a2108b53f03ef1c32f1111538 mpg123-0.59s-gentoo-1.5.tar.bz2 7207
+RMD160 75bc91d354e665c424afa1a3beab202f7a60441c mpg123-0.59s-gentoo-1.5.tar.bz2 7207
+SHA256 2c2495ce9bd029b01d94c4c4ca930653d174d4a3e6d11488e2e669692835b116 mpg123-0.59s-gentoo-1.5.tar.bz2 7207
+MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899
+RMD160 fdc6ba57c67dc890ef5d2f3a05ff9c520ccf407f mpg123-pre0.59s.tar.gz 244899
+SHA256 ba0c1db18ffc7ed2250d6718a23a62e0e98d77bbeedb83ca3993f6421b31256a mpg123-pre0.59s.tar.gz 244899
diff --git a/media-sound/mpg123/files/mpg123-0.59s-gmake-3.81.patch b/media-sound/mpg123/files/mpg123-0.59s-gmake-3.81.patch
new file mode 100644
index 000000000000..5056a1ab5d80
--- /dev/null
+++ b/media-sound/mpg123/files/mpg123-0.59s-gmake-3.81.patch
@@ -0,0 +1,196 @@
+--- Makefile.old	2006-05-11 14:52:27.000000000 +0900
++++ Makefile	2006-05-11 14:48:48.000000000 +0900
+@@ -167,10 +167,9 @@
+ 
+ linux:
+ 	$(MAKE)  LDFLAGS= \
+-		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+-			audio_oss.o term.o' \
++		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o audio_oss.o term.o' \
+ 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
+-			-DOSS -DTERM_CONTROL\
++			-DOSS -DTERM_CONTROL \
+ 			-Wall   \
+ 			-fomit-frame-pointer -funroll-all-loops \
+ 			-finline-functions -ffast-math' \
+@@ -187,10 +186,9 @@
+ 
+ linux-pentium:
+ 	$(MAKE)  LDFLAGS= \
+-		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+-			audio_oss.o term.o' \
++		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o audio_oss.o term.o' \
+ 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
+-			-DOSS -DTERM_CONTROL\
++			-DOSS -DTERM_CONTROL \
+ 			-Wall  -mpentium \
+ 			-fomit-frame-pointer -funroll-all-loops \
+ 			-finline-functions -ffast-math' \
+@@ -198,10 +196,9 @@
+ 
+ linux-mmx:
+ 	$(MAKE)  LDFLAGS= \
+-		OBJECTS='decode_i386.o dct64_MMX.o tabinit_MMX.o decode_MMX.o \
+-			audio_oss.o term.o' \
++		OBJECTS='decode_i386.o dct64_MMX.o tabinit_MMX.o decode_MMX.o audio_oss.o term.o' \
+ 		CFLAGS='-DUSE_MMX -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT \
+-			-DLINUX -DOSS -DTERM_CONTROL\
++			-DLINUX -DOSS -DTERM_CONTROL \
+ 			-Wall   \
+ 			-fomit-frame-pointer -funroll-all-loops \
+ 			-finline-functions -ffast-math' \
+@@ -209,11 +206,9 @@
+ 
+ linux-3dnow:
+ 	$(MAKE)  LDFLAGS= \
+-		OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o \
+-			dct64_i386.o dct36_3dnow.o getcpuflags.o \
+-			equalizer_3dnow.o decode_i586.o audio_oss.o term.o' \
++		OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o dct64_i386.o dct36_3dnow.o getcpuflags.o equalizer_3dnow.o decode_i586.o audio_oss.o term.o' \
+ 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
+-			-DUSE_3DNOW -DOSS -DTERM_CONTROL\
++			-DUSE_3DNOW -DOSS -DTERM_CONTROL \
+ 			-Wall   \
+ 			-fomit-frame-pointer -funroll-all-loops \
+ 			-finline-functions -ffast-math' \
+@@ -222,11 +217,9 @@
+ 
+ linux-i486:
+ 	$(MAKE)  LDFLAGS= \
+-		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+-			decode_i486.o audio_oss.o term.o \
+-			dct64_i486-a.o dct64_i486-b.o ' \
++		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o decode_i486.o audio_oss.o term.o dct64_i486-a.o dct64_i486-b.o ' \
+ 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DI486_OPT -DLINUX \
+-			-DOSS -DTERM_CONTROL\
++			-DOSS -DTERM_CONTROL \
+ 			-Wall   \
+ 			-fomit-frame-pointer -funroll-all-loops \
+ 			-finline-functions -ffast-math' \
+@@ -235,8 +228,7 @@
+ linux-esd:
+ 	$(MAKE)  LDFLAGS= \
+ 		AUDIO_LIB='-lesd -laudiofile' \
+-		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+-			audio_esd.o' \
++		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o audio_esd.o' \
+ 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
+ 			-DOSS -DUSE_ESD \
+ 			-Wall    \
+@@ -248,10 +240,9 @@
+ linux-alsa:
+ 	$(MAKE)  LDFLAGS= \
+ 		AUDIO_LIB='-lasound' \
+-		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+-			audio_alsa.o term.o' \
++		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o audio_alsa.o term.o' \
+ 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
+-			-DALSA -DTERM_CONTROL\
++			-DALSA -DTERM_CONTROL \
+ 			-Wall    \
+ 			-fomit-frame-pointer -funroll-all-loops \
+ 			-finline-functions -ffast-math \
+@@ -261,11 +252,9 @@
+ linux-3dnow-alsa:
+ 	$(MAKE)  LDFLAGS= \
+ 		AUDIO_LIB='-lasound' \
+-		OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o \
+-			dct64_i386.o dct36_3dnow.o getcpuflags.o \
+-			equalizer_3dnow.o decode_i586.o audio_alsa.o term.o' \
++		OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o	dct64_i386.o dct36_3dnow.o getcpuflags.o equalizer_3dnow.o decode_i586.o audio_alsa.o term.o' \
+ 		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
+-			-DUSE_3DNOW -DALSA -DTERM_CONTROL\
++			-DUSE_3DNOW -DALSA -DTERM_CONTROL \
+ 			-Wall   \
+ 			-fomit-frame-pointer -funroll-all-loops \
+ 			-finline-functions -ffast-math' \
+@@ -274,9 +263,7 @@
+ linux-3dnow-esd:
+ 	$(MAKE)  LDFLAGS= \
+ 		AUDIO_LIB='-lesd -laudiofile' \
+-		OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o \
+-			dct64_i386.o dct36_3dnow.o getcpuflags.o \
+-			equalizer_3dnow.o decode_i586.o audio_esd.o' \
++		OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o dct64_i386.o dct36_3dnow.o getcpuflags.o equalizer_3dnow.o decode_i586.o audio_esd.o' \
+ 		CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
+ 			-DUSE_3DNOW -DUSE_ESD \
+ 			-Wall   \
+@@ -309,7 +296,7 @@
+ 		AUDIO_LIB='-lasound' \
+ 		OBJECTS='decode.o dct64.o audio_alsa.o term.o' \
+ 		CFLAGS='-DLINUX \
+-			-DALSA -DTERM_CONTROL\
++			-DALSA -DTERM_CONTROL \
+ 			-DUSE_MMAP  -O6 \
+ 			-fomit-frame-pointer -funroll-all-loops \
+ 			-finline-functions -ffast-math \
+@@ -445,8 +432,7 @@
+ 
+ linux-frontend:
+ 	$(MAKE)  LDFLAGS= \
+-		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+-			control_sajber.o control_tk3play.o audio_oss.o' \
++		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o control_sajber.o control_tk3play.o audio_oss.o' \
+ 		CFLAGS='$(CFLAGS) -DFRONTEND -DOSS -DI386_ASSEM -DREAL_IS_FLOAT \
+ 			-DPENTIUM_OPT -DLINUX -Wall   \
+ 			-fomit-frame-pointer -funroll-all-loops \
+@@ -480,8 +466,7 @@
+ 
+ freebsd-i486:
+ 	$(MAKE) CC=cc LDFLAGS= \
+-		OBJECTS='decode_i386.o dct64_i386.o \
+-			decode_i486.o dct64_i486.o audio_oss.o' \
++		OBJECTS='decode_i386.o dct64_i386.o decode_i486.o dct64_i486.o audio_oss.o' \
+ 		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4  -fomit-frame-pointer \
+ 			-funroll-all-loops -ffast-math -DROT_I386 \
+ 			-DOPT_ARCH=i486 \
+@@ -512,8 +497,7 @@
+ 
+ freebsd-frontend:
+ 	$(MAKE) CC=cc LDFLAGS= \
+-		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o \
+-			control_sajber.o control_tk3play.o' \
++		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o control_sajber.o control_tk3play.o' \
+ 		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4  -fomit-frame-pointer \
+ 			-funroll-all-loops -ffast-math -DROT_I386 \
+ 			-DFRONTEND \
+@@ -587,8 +571,7 @@
+ 
+ solaris-x86-gcc-oss:
+ 	$(MAKE)  LDFLAGS='-lsocket -lnsl' \
+-		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+-			audio_oss.o' \
++		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o audio_oss.o' \
+ 		CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DUSE_MMAP \
+ 			-DOSS \
+ 			-Wall   \
+@@ -698,8 +681,7 @@
+ 	@ $(MAKE) FRONTEND=mpg123m-make aix-frontend
+ 
+ aix-frontend:
+-	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o \
+-			control_sajber.o control_tk3play.o' \
++	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o control_sajber.o control_tk3play.o' \
+ 		CFLAGS='$(CFLAGS) -DAIX -Wall -O6 -DUSE_MMAP -DFRONTEND \
+ 			-fomit-frame-pointer -funroll-all-loops \
+ 			-finline-functions -ffast-math' \
+@@ -732,8 +714,7 @@
+ 
+ bsdos:
+ 	$(MAKE) CC=shlicc2 LDFLAGS= \
+-		OBJECTS='decode_i386.o dct64_i386.o \
+-			 audio_oss.o' \
++		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
+ 		CFLAGS='$(CFLAGS) -Wall -O4  -fomit-frame-pointer \
+ 			-funroll-all-loops -ffast-math -DROT_I386 \
+ 			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
+@@ -752,8 +733,7 @@
+ bsdos-nas:
+ 	$(MAKE) CC=shlicc2 LDFLAGS= \
+ 		AUDIO_LIB='-laudio -lXau -L/usr/X11R6/lib' \
+-		OBJECTS='decode_i386.o dct64_i386.o \
+-			audio_nas.o' \
++		OBJECTS='decode_i386.o dct64_i386.o audio_nas.o' \
+ 		CFLAGS='$(CFLAGS) -Wall -O4  -fomit-frame-pointer \
+ 			-funroll-all-loops -ffast-math -DROT_I386 \
+ 			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
diff --git a/media-sound/mpg123/mpg123-0.59s-r10.ebuild b/media-sound/mpg123/mpg123-0.59s-r10.ebuild
index 2605df64cf62..d6023d8a010c 100644
--- a/media-sound/mpg123/mpg123-0.59s-r10.ebuild
+++ b/media-sound/mpg123/mpg123-0.59s-r10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r10.ebuild,v 1.4 2006/03/08 15:46:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r10.ebuild,v 1.5 2006/05/11 12:30:33 flameeyes Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 PATCH_VER=1.5
 S="${WORKDIR}/${PN}"
@@ -23,8 +23,7 @@ RDEPEND="esd? ( media-sound/esound )
 # alsa-1 b0rks and it's not a simple fix
 #	 alsa? ( media-libs/alsa-lib )"
 
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+DEPEND="${RDEPEND}"
 
 PROVIDE="virtual/mpg123"
 
@@ -51,6 +50,8 @@ src_unpack() {
 	fi
 
 	sed -i "s:${PV}-mh4:${PVR}:" version.h
+
+	epatch "${FILESDIR}/${P}-gmake-3.81.patch"
 }
 
 src_compile() {
@@ -123,7 +124,7 @@ src_compile() {
 
 	for style in ${styles};
 	do
-		make clean ${atype}${style} CFLAGS="${CFLAGS}" || die
+		emake -j1 clean ${atype}${style} CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
 		mv mpg123 gentoo-bin/mpg123${style}
 		[[ -L "gentoo-bin/mpg123" ]] && rm gentoo-bin/mpg123
 		ln -s mpg123${style} gentoo-bin/mpg123