Update Makefile patch to respect CC and CFLAGS.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 45 insertions, 28 deletions

diff --git a/media-sound/ssrc/ChangeLog b/media-sound/ssrc/ChangeLog
index 0d3f2275d9de..f922e1766852 100644
--- a/media-sound/ssrc/ChangeLog
+++ b/media-sound/ssrc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/ssrc
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ssrc/ChangeLog,v 1.7 2007/01/06 21:19:56 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ssrc/ChangeLog,v 1.8 2009/06/19 14:04:15 ssuominen Exp $
+
+  19 Jun 2009; Samuli Suominen <ssuominen@gentoo.org> ssrc-1.30.ebuild,
+  files/ssrc-1.30-makefile.patch:
+  Update Makefile patch to respect CC and CFLAGS.
 
 *ssrc-1.30 (06 Jan 2007)
 
diff --git a/media-sound/ssrc/Manifest b/media-sound/ssrc/Manifest
index f1ce00d81479..645a704e0d8b 100644
--- a/media-sound/ssrc/Manifest
+++ b/media-sound/ssrc/Manifest
@@ -1,7 +1,7 @@
-AUX ssrc-1.30-makefile.patch 582 RMD160 e443c311d5b247fb453ecb899c28cd860fb96416 SHA1 dd9bf8798fd1da8f9bb8b2f8652e52d9713b1dae SHA256 32479ae339d2c63cc3d9220fc50f19889c0134fd13e648dba9b952675f4c3cab
+AUX ssrc-1.30-makefile.patch 1011 RMD160 683876f49f7d1c1b9adb096c57360c3b05e7c8a5 SHA1 c99763d1d6515507d7cc25a4214ac888bc09b5c0 SHA256 3236a346a46353d9b265d4372452c027809a833241ed190e3449d7e7324377f8
 DIST ssrc-1.29.zip 186187 RMD160 161fa68bbd9f10f328bb25cc98926d5a83826012 SHA1 8bd154e755fa275a1ff3a7caaf53445685ab836c SHA256 4a652abeef195d764b583b54efb6eb2da522dda4f14b6be960a9f4c95ecdb834
 DIST ssrc-1.30.tgz 140732 RMD160 ffc0e0e8d7edfd8e3761e8a7523ede9bb496b3ca SHA1 0bd83caf06b34a9aae6c0e576aadcb20e62e82e0 SHA256 088286a2806153c3360a84c160540405b4d07fa6af5991cde4d84e8566ee1faa
 EBUILD ssrc-1.29.ebuild 829 RMD160 81179304aff23116deba4b92efbab5d03c813df5 SHA1 93b3deef954b906f557a1b59aeeeb0278b5a5080 SHA256 3a1607ec7d358f9e06301d77e66003d2ff250cd96f334e612d3dd772e2331242
-EBUILD ssrc-1.30.ebuild 815 RMD160 4a3607bc629f21dcbc0117af5efc406f6895f053 SHA1 4b460de3123349ec9a6d175e68c499f0055a5df0 SHA256 55afe2892cbf18888bec43df2d1195a616e44529a6ba8e0d3245efa6541527a2
-MISC ChangeLog 1005 RMD160 f3c12f3986d4d5e9a244e4b305bac75d82e37d67 SHA1 e76f847ff8bfc1d01f92083fed9af2b033fa09c2 SHA256 5b1c9a761bb4db2d889efee79a26eda8faddfa34168497a0dcc6ab4f4cf7730d
+EBUILD ssrc-1.30.ebuild 778 RMD160 1cb361ce7b0bb79475010d816cc31e5b0d2d4e2a SHA1 166933eed17166bd714a1e28d3696b54d0ec4f41 SHA256 743c029055531c092904b1911d67ec3d90b531d42009704b7faaa0c6d5110132
+MISC ChangeLog 1163 RMD160 66647be12e8649fd42006d24259bde42dd33c05c SHA1 9cd0fe14cb29854bfd28c741684b9a86101fe6af SHA256 1c5b1b8c257e7f8efe4aa49e3f3111d0c52aae5e29a5f64f88fa29d2cd5bc65d
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/ssrc/files/ssrc-1.30-makefile.patch b/media-sound/ssrc/files/ssrc-1.30-makefile.patch
index ce77baf9c8a3..e6354a818235 100644
--- a/media-sound/ssrc/files/ssrc-1.30-makefile.patch
+++ b/media-sound/ssrc/files/ssrc-1.30-makefile.patch
@@ -1,17 +1,34 @@
---- Makefile.old	2007-01-06 22:10:22.000000000 +0100
-+++ Makefile	2007-01-06 22:11:17.000000000 +0100
-@@ -5,10 +5,10 @@
+diff -ur ssrc-1.30.orig/Makefile ssrc-1.30/Makefile
+--- ssrc-1.30.orig/Makefile	2005-06-28 11:10:07.000000000 +0300
++++ ssrc-1.30/Makefile	2009-06-19 17:03:01.000000000 +0300
+@@ -1,14 +1,13 @@
+-CC = gcc
+-CFLAGS = -O2 -lm 
++CC ?= gcc
+ #CFLAGS += -DBIGENDIAN
+ 
  all : ssrc ssrc_hp
  
  ssrc : ssrc.c fftsg_ld.c dbesi0.c
 -	$(CC) $(CFLAGS) ssrc.c fftsg_ld.c dbesi0.c -o ssrc
-+	$(CC) $(CFLAGS) $(LDFLAGS) ssrc.c fftsg_ld.c dbesi0.c -o ssrc -lm
++	$(CC) $(LDFLAGS) $(CFLAGS) ssrc.c fftsg_ld.c dbesi0.c -o ssrc -lm
  
  ssrc_hp : ssrc.c fftsg_ld.c dbesi0.c
 -	$(CC) $(CFLAGS) -DHIGHPREC ssrc.c fftsg_ld.c dbesi0.c -o ssrc_hp
-+	$(CC) $(CFLAGS) $(LDFLAGS) -DHIGHPREC ssrc.c fftsg_ld.c dbesi0.c -o ssrc_hp -lm
++	$(CC) $(LDFLAGS) $(CFLAGS) -DHIGHPREC ssrc.c fftsg_ld.c dbesi0.c -o ssrc_hp -lm
  
  clean :
 -	rm -f ssrc ssrc_hp *.o *~
 \ No newline at end of file
 +	rm -f ssrc ssrc_hp *.o *~
+diff -ur ssrc-1.30.orig/ssrc.c ssrc-1.30/ssrc.c
+--- ssrc-1.30.orig/ssrc.c	2005-06-28 02:51:11.000000000 +0300
++++ ssrc-1.30/ssrc.c	2009-06-19 17:04:29.000000000 +0300
+@@ -3,6 +3,7 @@
+ #include <math.h>

+ #include <assert.h>

+ #include <time.h>

++#include <string.h>

+ 

+ #define NDEBUG

+ 

diff --git a/media-sound/ssrc/ssrc-1.30.ebuild b/media-sound/ssrc/ssrc-1.30.ebuild
index 3fde4f0f8820..4644420c6a64 100644
--- a/media-sound/ssrc/ssrc-1.30.ebuild
+++ b/media-sound/ssrc/ssrc-1.30.ebuild
@@ -1,37 +1,33 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ssrc/ssrc-1.30.ebuild,v 1.2 2007/07/11 19:30:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ssrc/ssrc-1.30.ebuild,v 1.3 2009/06/19 14:04:15 ssuominen Exp $
 
-inherit eutils
+EAPI=2
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="A fast and high quality sampling rate converter"
 HOMEPAGE="http://shibatch.sourceforge.net"
 SRC_URI="http://shibatch.sf.net/download/${P}.tgz"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
-
-#-sparc: kde's pop.wav "Error: Only PCM is supported."
-
-KEYWORDS="~x86 ~amd64 -sparc"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND="virtual/libc"
+RDEPEND=""
 DEPEND="app-arch/unzip"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-makefile.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
 }
 
 src_compile() {
-	# Local CFLAGS should overwrite the ones in the Makefile
-	emake -e || die
+	use sparc && append-cflags -DBIGENDIAN
+	tc-export CC
+	emake || die "emake failed"
 }
 
 src_install() {
-	dobin ssrc
-	dobin ssrc_hp
-	dodoc ssrc.txt history.txt
+	dobin ssrc{,_hp} || die "dobin failed"
+	dodoc {history,ssrc}.txt
 }