Fix build for hppa. Added ~hppa to KEYWORDS.

4 files changed, 38 insertions, 6 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index e0833395f4d5..805f1c0ebb3c 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,6 @@
 # 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.11 2003/05/29 00:38:53 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.12 2003/06/23 13:05:38 gmsoft Exp $
 
   28 May 2003; Jason Wever <weeve@gentoo.org> mpg123-0.59r-r1.ebuild,
   mpg123-0.59r-r2.ebuild:
@@ -13,6 +13,10 @@
 
 *mpg123-0.59r-r2 (19 Mar 2003)
 
+  23 Jun 2003; Guy Martin <gmsoft@gentoo.org> mpg123-0.59r-r2.ebuild,
+  files/mpg123-0.59r-hppa.diff :
+  Fix build for hppa. Added ~hppa to KEYWORDS.
+
   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
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 53f33c43df90..67f4f5e5157c 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,8 +1,9 @@
-MD5 58f6f22700d71d6e9e2c71b65a4f9410 ChangeLog 1703
+MD5 13e5155dc17029bf2612d07505ad3898 ChangeLog 1855
 MD5 8905c48231e5ce22894c3ea16ec40623 mpg123-0.59r-r1.ebuild 1418
-MD5 dbe1889b7640c06ca6661f15d02dfd1b mpg123-0.59r-r2.ebuild 1461
+MD5 9e8afc27dfdd2f2f88c59a97dd365211 mpg123-0.59r-r2.ebuild 1554
 MD5 8936a4142ebda9826bda6818a51e1524 files/digest-mpg123-0.59r-r1 64
 MD5 8936a4142ebda9826bda6818a51e1524 files/digest-mpg123-0.59r-r2 64
 MD5 660470ffc0acfb171f08032a4d727cba files/mpg123-0.59r-alpha.diff 17451
 MD5 b8cddd1215747a09daf3476eb7290bc6 files/mpg123-0.59r-make-fix.diff 7832
 MD5 95c31be37fcef2c3d007c5ae0a069863 files/mpg123-0.59r-sparc.diff 405
+MD5 25074032444365516e00f7c2b9a7a736 files/mpg123-0.59r-hppa.diff 1121
diff --git a/media-sound/mpg123/files/mpg123-0.59r-hppa.diff b/media-sound/mpg123/files/mpg123-0.59r-hppa.diff
new file mode 100644
index 000000000000..b922332e2095
--- /dev/null
+++ b/media-sound/mpg123/files/mpg123-0.59r-hppa.diff
@@ -0,0 +1,24 @@
+--- Makefile.orig	2003-06-23 14:25:34.000000000 +0200
++++ Makefile	2003-06-23 14:28:09.000000000 +0200
+@@ -58,6 +58,7 @@
+ 	@echo "                    (ie with 'as' from binutils-2.9.1.0.19a or later)"
+ 	@echo "make linux-alpha    make with minor changes for ALPHA-Linux"
+ 	@echo "make linux-ppc      LinuxPPC or MkLinux for the PowerPC"
++	@echo "make linux-hppa     Linux/hppa HP-PARISC using OSS"
+ 	@echo "make linux-m68k     Linux/m68k (Amiga, Atari) using OSS"
+ 	@echo "make linux-nas      Linux, output to Network Audio System"
+ 	@echo "make linux-sparc    Linux/Sparc"
+@@ -237,6 +238,13 @@
+ 			-fomit-frame-pointer -funroll-all-loops \
+ 			-finline-functions -ffast-math' \
+ 		mpg123-make
++linux-hppa:                                                                                                                  
++	$(MAKE)   LDFLAGS= \
++		OBJECTS='decode.o dct64.o audio_oss.o' \
++		CFLAGS='-DREAL_IS_FLOAT -DUSE_MMAP -DLINUX -Wall -O2 \
++			-fomit-frame-pointer -funroll-all-loops \
++			-finline-functions -ffast-math' \
++		mpg123-make
+ 
+ linux-m68k:
+ 	$(MAKE)  LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
diff --git a/media-sound/mpg123/mpg123-0.59r-r2.ebuild b/media-sound/mpg123/mpg123-0.59r-r2.ebuild
index 672fbf94ff28..6a5db330adf3 100644
--- a/media-sound/mpg123/mpg123-0.59r-r2.ebuild
+++ b/media-sound/mpg123/mpg123-0.59r-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2003/05/29 00:38:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59r-r2.ebuild,v 1.4 2003/06/23 13:05:38 gmsoft Exp $
 
 S=${WORKDIR}/${P}
 
@@ -13,7 +13,7 @@ DEPEND="virtual/glibc
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 ppc sparc alpha ~hppa"
 
 src_unpack () {
 	unpack ${A}
@@ -21,6 +21,7 @@ src_unpack () {
 	patch -p1 < ${FILESDIR}/${P}-make-fix.diff
 	patch -p1 < ${FILESDIR}/${P}-sparc.diff
 	use alpha && patch -p1 < ${FILESDIR}/${P}-alpha.diff
+	use hppa && patch -p0 < ${FILESDIR}/${P}-hppa.diff
 	cp Makefile Makefile.orig
 	sed -e "s:-O2 -m486:${CFLAGS}:" \
 		-e "s:-O2 -mcpu=ppc:${CFLAGS}:g" \
@@ -51,8 +52,10 @@ src_compile() {
 	   MAKESTYLE="-i486";;
 	  sparc)
 	   MAKESTYLE="-sparc";;
-	 alpha)
+	  alpha)
 	   MAKESTYLE="-alpha";;
+	  hppa)
+	   MAKESTYLE="-hppa";;
 	  arm)
 	   ;; 
 	esac