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.

Package-Manager: portage-2.2_rc83/cvs/Linux i686

4 files changed, 25 insertions, 31 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/Manifest b/app-text/expander/Manifest
index 3a1605b42efd..4cea0d95156d 100644
--- a/app-text/expander/Manifest
+++ b/app-text/expander/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX expander-2.0.5-gentoo.patch 2067 RMD160 496b6e09328304e9d4ebce4bc12085656badd93a SHA1 479ed4faf294060320653805cf13b0772a607393 SHA256 5b545254559df274c43feefeeb74f1990430e4a64af643a0879acd27e461b2c6
+AUX expander-2.0.5-gentoo.patch 1971 RMD160 e5cde540c1f099fb92b416d6d12f1444bb188282 SHA1 42294f9cdb980c127053a8949a768f5cdec56047 SHA256 0b04f87fe812b9faff18675a5834dd17a5140133cb2ee6b008992ff99a5deb94
 DIST nedit_expander_kit_2.05.tar.gz 92571 RMD160 be9e3bdafceeda6fbc76f55a5a2bc1bf948e3b8b SHA1 43501d1a0d0a8d500b40944f6236c22757280f84 SHA256 6d2ebebfc50b277b375eba6325d8d9ef381a9a12d8e581c0b65ce28e1f0eff15
-EBUILD expander-2.0.5.ebuild 1278 RMD160 a2b6731da4339b6feaa7d611d7807f84c1d99682 SHA1 54d2ad0bcc9e56693da15c3dcb42ca106499bd16 SHA256 2597423008318c787a067f49d6759d358e17d7936cdb061a7c36babae17decfc
-MISC ChangeLog 1239 RMD160 eba2c9debb7d3c4800f73beb613b74e66bcac9f3 SHA1 ebd387efea3adb12ef1b5422567998aa03342e0b SHA256 34aa1be259fb1280e991757a65653da2d2685fbda42e282aeaab5d2175272321
+EBUILD expander-2.0.5-r1.ebuild 1235 RMD160 4116ddeb6704e9c77c5c78cc95775f18469a50d7 SHA1 84f8b30ed1fccaf0d79ed620c050cba5cd828264 SHA256 cbbe859f7d3a8cc4bea1ef67ff8dcb64fc2a950752081616c514ec86ddeb2f08
+MISC ChangeLog 1575 RMD160 abe170d37b3c0d7841b08f5a70163dee2259e41f SHA1 4ba5707245d3a2d2a69bfe1692efb20d53f684ca SHA256 d10d9c058c6a1ead4f8cdade571372da36e3580bd706b8cc21d2d86cc122bea9
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks/KzIACgkQNQqtfCuFneOHnwCfcNejGStYc+c7LC857cSUCzxw
-RxAAn2i5RlSBOi2nHTpA+2qxFYKGTGve
-=DaKr
------END PGP SIGNATURE-----
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.