Respect LDFLAGS (bug #336155, and do not duplicate in the emake call what the patch was already trying to do). Do not set empty DEPEND. Merge cd into emake call.

(Portage version: 2.2_rc83/cvs/Linux i686)

3 files changed, 22 insertions, 18 deletions

diff --git a/app-text/expander/ChangeLog b/app-text/expander/ChangeLog
index 97895fe9059b..5a10d0edc762 100644
--- a/app-text/expander/ChangeLog
+++ b/app-text/expander/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/expander
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/expander/ChangeLog,v 1.10 2010/01/02 11:17:01 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/expander/ChangeLog,v 1.11 2010/09/18 21:14:47 jer Exp $
+
+*expander-2.0.5-r1 (18 Sep 2010)
+
+  18 Sep 2010; Jeroen Roovers <jer@gentoo.org> -expander-2.0.5.ebuild,
+  +expander-2.0.5-r1.ebuild, files/expander-2.0.5-gentoo.patch:
+  Respect LDFLAGS (bug #336155, and do not duplicate in the emake call what
+  the patch was already trying to do). Do not set empty DEPEND. Merge cd
+  into emake call.
 
   02 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   expander-2.0.5.ebuild:
diff --git a/app-text/expander/expander-2.0.5.ebuild b/app-text/expander/expander-2.0.5-r1.ebuild
index 6c6a2b701ac1..af604b8f823f 100644
--- a/app-text/expander/expander-2.0.5.ebuild
+++ b/app-text/expander/expander-2.0.5-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/expander/expander-2.0.5.ebuild,v 1.10 2010/01/02 11:17:00 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/expander/expander-2.0.5-r1.ebuild,v 1.1 2010/09/18 21:14:47 jer Exp $
+
+EAPI="2"
 
 inherit eutils toolchain-funcs
 
@@ -13,20 +15,15 @@ SLOT="0"
 KEYWORDS="~x86 ~x86-linux ~ppc-macos"
 IUSE=""
 
-DEPEND=""
-
 S=${WORKDIR}/${PN}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 
 }
 
 src_compile() {
-	cd src
-	emake compiler="$(tc-getCC) ${CFLAGS}" || die "make failed"
+	emake -C src CC=$(tc-getCC) || die "make failed"
 }
 
 src_install() {
diff --git a/app-text/expander/files/expander-2.0.5-gentoo.patch b/app-text/expander/files/expander-2.0.5-gentoo.patch
index e6c023834939..460a8164cee5 100644
--- a/app-text/expander/files/expander-2.0.5-gentoo.patch
+++ b/app-text/expander/files/expander-2.0.5-gentoo.patch
@@ -1,13 +1,12 @@
-diff -ur expander/src/Makefile expander-gentoo/src/Makefile
---- expander/src/Makefile	2003-10-30 14:52:00.000000000 +1300
-+++ expander-gentoo/src/Makefile	2003-10-30 15:50:02.000000000 +1300
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -3,15 +3,14 @@
  bindir = $(BINDIR)/
  
  copy     = ln -fs
 -CFLAGS  += -v -g # -DNEED_GETOPT_PROTO_TYPE
 -compiler = cc $(CFLAGS)
-+compiler = gcc $(CFLAGS)
++compiler = $(CC) $(CFLAGS)
  
  executables = expander boxcomment align_columns align_comments where_is
  
@@ -24,7 +23,7 @@ diff -ur expander/src/Makefile expander-gentoo/src/Makefile
  #-----------------------------------------------------------------------
  expander: expander.c             
 -	$(compiler) -o $(bindir)$@ $?  
-+	$(compiler) -o $@ $?
++	$(compiler) $(LDFLAGS) -o $@ $?
  
  #--------------------------------------------------------------------------
  # Surround given text with open ended box. (with NEdit, language sensitive)
@@ -32,28 +31,28 @@ diff -ur expander/src/Makefile expander-gentoo/src/Makefile
  boxcomment: boxcomment.c
 -	$(compiler) -o $(bindir)$@ $?
 -	@if [ ! -f $(bindir)un$@ ]; then $(copy) $(bindir)$@ $(bindir)un$@; fi
-+	$(compiler) -o $@ $?
++	$(compiler) $(LDFLAGS) -o $@ $?
  
  #-------------------------------------------------------------------------------
  # Align ragged looking 'C' style comments (good substitute for align_equals too)
  #-------------------------------------------------------------------------------
  align_comments: align_comments.c
 -	$(compiler) -o $(bindir)$@ $?
-+	$(compiler) -o $@ $?
++	$(compiler) $(LDFLAGS) -o $@ $?
  
  #----------------------------
  # Align given text in columns
  #----------------------------
  align_columns: align_columns.c
 -	$(compiler) -o $(bindir)$@ $?
-+	$(compiler) -o $@ $?
++	$(compiler) $(LDFLAGS) -o $@ $?
  
  #----------------------------------------------
  # File locator (substitute for which, where...)
  #----------------------------------------------
  where_is: where_is.c
 -	$(compiler) -o $(bindir)$@ $?
-+	$(compiler) -o $@ $?
++	$(compiler) $(LDFLAGS) -o $@ $?
  
  #------------------------------------------------
  # Here is how to uninstall the executables built.