Apply fix to remove direct calls to $(LD) (bug #314913) and update to EAPI 4. Thanks to Nathan Phillip Brink (binki).

(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

3 files changed, 39 insertions, 17 deletions

diff --git a/media-libs/ladspa-sdk/ChangeLog b/media-libs/ladspa-sdk/ChangeLog
index 28e1129df496..ab17996b0e65 100644
--- a/media-libs/ladspa-sdk/ChangeLog
+++ b/media-libs/ladspa-sdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/ladspa-sdk
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-sdk/ChangeLog,v 1.51 2010/05/28 10:10:16 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-sdk/ChangeLog,v 1.52 2011/06/07 07:28:15 radhermit Exp $
+
+  07 Jun 2011; Tim Harder <radhermit@gentoo.org> ladspa-sdk-1.13-r1.ebuild,
+  +files/ladspa-sdk-1.13-no-LD.patch:
+  Apply fix to remove direct calls to $(LD) (bug #314913) and update to EAPI 4.
+  Thanks to Nathan Phillip Brink (binki).
 
   28 May 2010; Markus Meier <maekke@gentoo.org> ladspa-sdk-1.13-r1.ebuild:
   x86 stable, bug #304033
diff --git a/media-libs/ladspa-sdk/files/ladspa-sdk-1.13-no-LD.patch b/media-libs/ladspa-sdk/files/ladspa-sdk-1.13-no-LD.patch
new file mode 100644
index 000000000000..acc53abace75
--- /dev/null
+++ b/media-libs/ladspa-sdk/files/ladspa-sdk-1.13-no-LD.patch
@@ -0,0 +1,16 @@
+--- a/src/makefile
++++ b/src/makefile
+@@ -38,11 +38,11 @@
+ 
+ ../plugins/filter.so:	plugins/filter.c ladspa.h
+ 	$(CC) $(CFLAGS) $(INCLUDES) -fPIC -o plugins/filter.o -c plugins/filter.c
+-	$(LD) $(RAW_LDFLAGS) -o ../plugins/filter.so plugins/filter.o -shared -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ../plugins/filter.so plugins/filter.o -nostartfiles -shared -lm
+ 
+ ../plugins/%.so:	plugins/%.c ladspa.h
+ 	$(CC) $(CFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.c
+-	$(LD) $(RAW_LDFLAGS) -o ../plugins/$*.so plugins/$*.o -shared
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o -nostartfiles -shared
+ 
+ ../plugins/%.so:	plugins/%.cpp ladspa.h
+ 	$(CXX) $(CXXFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.cpp
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r1.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r1.ebuild
index 7b7d8f17792e..e6c80966f8f6 100644
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r1.ebuild
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-sdk/ladspa-sdk-1.13-r1.ebuild,v 1.8 2010/05/28 10:10:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-sdk/ladspa-sdk-1.13-r1.ebuild,v 1.9 2011/06/07 07:28:15 radhermit Exp $
+
+EAPI=4
 
 inherit eutils toolchain-funcs portability flag-o-matic
 
@@ -21,31 +23,30 @@ DEPEND=">=sys-apps/sed-4"
 
 S="${WORKDIR}/${MY_PN}/src"
 
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-properbuild.patch"
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-	epatch "${FILESDIR}/${P}-fbsd.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-properbuild.patch \
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-fbsd.patch \
+		"${FILESDIR}"/${P}-no-LD.patch
+
 	sed -i -e 's:-sndfile-play*:@echo Disabled \0:' \
-		"${S}/makefile" || die "sed makefile failed (sound playing tests)"
+		makefile || die "sed makefile failed (sound playing tests)"
 }
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-		RAW_LDFLAGS="$(raw-ldflags)" \
 		DYNAMIC_LD_LIBS="$(dlopen_lib)" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		targets || die
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+		targets
 }
 
 src_install() {
-	emake \
-		INSTALL_PLUGINS_DIR="/usr/$(get_libdir)/ladspa" \
+	emake INSTALL_PLUGINS_DIR="/usr/$(get_libdir)/ladspa" \
 		DESTDIR="${D}" \
 		MKDIR_P="mkdir -p" \
-		install || die "make install failed"
+		install
 
-	dohtml ../doc/*.html || die "dohtml failed"
+	dohtml ../doc/*.html
 
 	# Needed for apps like rezound
 	dodir /etc/env.d