Respect LDFLAGS. Bug #337460

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 77 insertions, 8 deletions

diff --git a/games-mud/circlemud/ChangeLog b/games-mud/circlemud/ChangeLog
index 37bad33e9da0..01a51936f380 100644
--- a/games-mud/circlemud/ChangeLog
+++ b/games-mud/circlemud/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-mud/circlemud
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/circlemud/ChangeLog,v 1.8 2008/03/07 01:24:58 wolf31o2 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-mud/circlemud/ChangeLog,v 1.9 2010/09/16 10:34:53 tupone Exp $
+
+  16 Sep 2010; Alfredo Tupone <tupone@gentoo.org> circlemud-3.1.ebuild,
+  +files/circlemud-3.1-ldflags.patch:
+  Respect LDFLAGS. Bug #337460 by flameeyes@gentoo.org
 
   07 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> circlemud-3.1.ebuild:
   QA cleanup: Fix quoting.
diff --git a/games-mud/circlemud/circlemud-3.1.ebuild b/games-mud/circlemud/circlemud-3.1.ebuild
index 85f093a67c27..7dd365943233 100644
--- a/games-mud/circlemud/circlemud-3.1.ebuild
+++ b/games-mud/circlemud/circlemud-3.1.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/circlemud/circlemud-3.1.ebuild,v 1.11 2008/05/15 12:40:08 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/circlemud/circlemud-3.1.ebuild,v 1.12 2010/09/16 10:34:53 tupone Exp $
+EAPI="2"
 
 inherit games
 
@@ -17,9 +18,8 @@ DEPEND="dev-libs/openssl"
 
 S="${WORKDIR}/circle-${PV}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/src
+src_prepare() {
+	cd src
 	touch .accepted
 	sed -i \
 		-e 's:^read.*::' licheck || die
@@ -36,10 +36,10 @@ src_unpack() {
 	# now lets rename binaries (too many are very generic)
 	sed -i \
 		-e "s:\.\./bin/autowiz:${PN}-autowiz:" limits.c || die
+	epatch "${FILESDIR}"/${P}-ldflags.patch
 }
 
 src_compile() {
-	egamesconf || die
 	cd src
 	emake || die "emake failed"
 }
diff --git a/games-mud/circlemud/files/circlemud-3.1-ldflags.patch b/games-mud/circlemud/files/circlemud-3.1-ldflags.patch
new file mode 100644
index 000000000000..fc86e5e7056e
--- /dev/null
+++ b/games-mud/circlemud/files/circlemud-3.1-ldflags.patch
@@ -0,0 +1,65 @@
+--- src/Makefile.in.old	2010-09-16 12:19:26.000000000 +0200
++++ src/Makefile.in	2010-09-16 12:19:41.000000000 +0200
+@@ -54,7 +54,7 @@
+ 	$(MAKE) $(BINDIR)/circle
+ 
+ $(BINDIR)/circle : $(OBJFILES)
+-	$(CC) -o $(BINDIR)/circle $(PROFILE) $(OBJFILES) $(LIBS)
++	$(CC) $(LDFLAGS) -o $(BINDIR)/circle $(PROFILE) $(OBJFILES) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o
+--- src/util/Makefile.in.old	2010-09-16 12:31:01.000000000 +0200
++++ src/util/Makefile.in	2010-09-16 12:32:08.000000000 +0200
+@@ -52,40 +52,40 @@
+ 
+ $(BINDIR)/autowiz: autowiz.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h \
+ 	$(INCDIR)/structs.h $(INCDIR)/utils.h $(INCDIR)/db.h
+-	$(CC) $(CFLAGS) -o $(BINDIR)/autowiz autowiz.c
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/autowiz autowiz.c
+ 
+ $(BINDIR)/delobjs: delobjs.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h \
+ 	$(INCDIR)/structs.h $(INCDIR)/utils.h
+-	$(CC) $(CFLAGS) -o $(BINDIR)/delobjs delobjs.c
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/delobjs delobjs.c
+ 
+ $(BINDIR)/listrent: listrent.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h \
+ 	$(INCDIR)/structs.h
+-	$(CC) $(CFLAGS) -o $(BINDIR)/listrent listrent.c
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/listrent listrent.c
+ 
+ $(BINDIR)/mudpasswd: mudpasswd.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h \
+ 	$(INCDIR)/structs.h $(INCDIR)/utils.h
+-	$(CC) $(CFLAGS) -o $(BINDIR)/mudpasswd mudpasswd.c @CRYPTLIB@
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/mudpasswd mudpasswd.c @CRYPTLIB@
+ 
+ $(BINDIR)/play2to3: play2to3.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h
+-	$(CC) $(CFLAGS) -o $(BINDIR)/play2to3 play2to3.c
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/play2to3 play2to3.c
+ 
+ $(BINDIR)/purgeplay: purgeplay.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h \
+ 	$(INCDIR)/structs.h $(INCDIR)/utils.h
+-	$(CC) $(CFLAGS) -o $(BINDIR)/purgeplay purgeplay.c
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/purgeplay purgeplay.c
+ 
+ $(BINDIR)/shopconv: shopconv.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h \
+ 	$(INCDIR)/structs.h $(INCDIR)/db.h $(INCDIR)/utils.h $(INCDIR)/shop.h
+-	$(CC) $(CFLAGS) -o $(BINDIR)/shopconv shopconv.c
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/shopconv shopconv.c
+ 
+ $(BINDIR)/showplay: showplay.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h \
+ 	$(INCDIR)/structs.h
+-	$(CC) $(CFLAGS) -o $(BINDIR)/showplay showplay.c
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/showplay showplay.c
+ 
+ $(BINDIR)/sign: sign.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h
+-	$(CC) $(CFLAGS) -o $(BINDIR)/sign sign.c @NETLIB@
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/sign sign.c @NETLIB@
+ 
+ $(BINDIR)/split: split.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h
+-	$(CC) $(CFLAGS) -o $(BINDIR)/split split.c
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/split split.c
+ 
+ $(BINDIR)/wld2html: wld2html.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h
+-	$(CC) $(CFLAGS) -o $(BINDIR)/wld2html wld2html.c
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/wld2html wld2html.c