Fix Makefile to work with -Wl,--as-needed wrt #240484, thanks to Diego E. Pettenò.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 60 insertions, 33 deletions

diff --git a/media-sound/substract_wave/ChangeLog b/media-sound/substract_wave/ChangeLog
index 3719f9bc2ad7..205afb311fcc 100644
--- a/media-sound/substract_wave/ChangeLog
+++ b/media-sound/substract_wave/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/substract_wave
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/substract_wave/ChangeLog,v 1.2 2009/02/06 14:10:48 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/substract_wave/ChangeLog,v 1.3 2009/05/11 20:21:32 ssuominen Exp $
+
+  11 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  substract_wave-0.3.ebuild, +files/substract_wave-0.3-Makefile.patch,
+  -files/substract_wave-0.3.diff:
+  Fix Makefile to work with -Wl,--as-needed wrt #240484, thanks to Diego E.
+  Pettenò.
 
   06 Feb 2009; Stefan Briesenick <sbriesen@gentoo.org>
   substract_wave-0.3.ebuild:
diff --git a/media-sound/substract_wave/files/substract_wave-0.3-Makefile.patch b/media-sound/substract_wave/files/substract_wave-0.3-Makefile.patch
new file mode 100644
index 000000000000..db99dc1f5fe0
--- /dev/null
+++ b/media-sound/substract_wave/files/substract_wave-0.3-Makefile.patch
@@ -0,0 +1,42 @@
+diff -ur substract_wave-0.3.orig/Makefile substract_wave-0.3/Makefile
+--- substract_wave-0.3.orig/Makefile	2005-10-06 17:23:42.000000000 +0300
++++ substract_wave-0.3/Makefile	2009-05-11 23:19:30.000000000 +0300
+@@ -1,27 +1,22 @@
+-#CC=gcc
+-#CC=/usr/local/bin/gcc
+-
+-
+-CFLAGS = -O2 -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
++CC ?= gcc
++CFLAGS += -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
++LIBRARY = -lm
+ 
+ .c.o:
+-	gcc $(CFLAGS) -c $<
++	$(CC) $(CFLAGS) -c $<
+ 
+-OBJECT =\
+-substract_wave.o
++OBJECT = substract_wave.o
+ 
+ a.out : $(OBJECT)
+-	gcc -o substract_wave  $(OBJECT) $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(OBJECT) $(LIBRARY) -o substract_wave
+ 		
+-# DEPENDENCIES
+ substract_wave.o : substract_wave.c substract_wave.h wave_header.h
+ 
+-install: 
+-	cp substract_wave  /usr/local/bin/
+-
+-install.man:
+-	cp substract_wave.man /usr/local/man/man1/substract_wave.1
++install:
++	mkdir -p $(DESTDIR)/usr/bin
++	cp substract_wave $(DESTDIR)/usr/bin
++	mkdir -p $(DESTDIR)/usr/share/man/man1
++	cp substract_wave.man $(DESTDIR)/usr/share/man/man1/substract_wave.1
+ 
+ clean:
+ 	rm *.o
+-
diff --git a/media-sound/substract_wave/files/substract_wave-0.3.diff b/media-sound/substract_wave/files/substract_wave-0.3.diff
deleted file mode 100644
index b9afb0272462..000000000000
--- a/media-sound/substract_wave/files/substract_wave-0.3.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur substract_wave-0.3.orig/Makefile substract_wave-0.3/Makefile
---- substract_wave-0.3.orig/Makefile	2005-10-06 16:23:42.000000000 +0200
-+++ substract_wave-0.3/Makefile	2007-10-06 16:46:09.000000000 +0200
-@@ -5,13 +5,13 @@
- CFLAGS = -O2 -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
- 
- .c.o:
--	gcc $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) -c $<
- 
- OBJECT =\
- substract_wave.o
- 
- a.out : $(OBJECT)
--	gcc -o substract_wave  $(OBJECT) $(LIBRARY)
-+	$(CC) $(LDFLAGS) -o substract_wave  $(OBJECT) $(LIBRARY)
- 		
- # DEPENDENCIES
- substract_wave.o : substract_wave.c substract_wave.h wave_header.h
diff --git a/media-sound/substract_wave/substract_wave-0.3.ebuild b/media-sound/substract_wave/substract_wave-0.3.ebuild
index a6bd3fb13f5a..9b9e5ed71b16 100644
--- a/media-sound/substract_wave/substract_wave-0.3.ebuild
+++ b/media-sound/substract_wave/substract_wave-0.3.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/substract_wave/substract_wave-0.3.ebuild,v 1.2 2009/02/06 14:10:48 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/substract_wave/substract_wave-0.3.ebuild,v 1.3 2009/05/11 20:21:32 ssuominen Exp $
 
-inherit eutils toolchain-funcs flag-o-matic
-
-IUSE=""
+EAPI=2
+inherit eutils toolchain-funcs
 
 DESCRIPTION="substracts 2 mono wave files from each other by a factor specified on the command line"
 HOMEPAGE="http://panteltje.com/panteltje/dvd/"
@@ -12,20 +11,19 @@ SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}.diff"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
 }
 
 src_compile() {
-	append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE	-D_LARGEFILE64_SOURCE
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LIBRARY="-lm" || die "emake failed"
+	tc-export CC
+	emake || die "emake failed"
 }
 
 src_install() {
-	dobin substract_wave
-	dodoc CHANGES README mono-stereo.txt substract_wave.man
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc CHANGES mono-stereo.txt README
 }