Respect LDFLAGS. Bug #337460

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 80 insertions, 20 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/Manifest b/games-mud/circlemud/Manifest
index 0cfd24382480..57ccec4daf10 100644
--- a/games-mud/circlemud/Manifest
+++ b/games-mud/circlemud/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX circlemud-3.1-ldflags.patch 2808 RMD160 f9c8b6e0702ddeda88f2b72be8d07c7acf2e7d13 SHA1 c26b3f8bac9152a8ec26928c1828489ed5c88a72 SHA256 41fcac9e07a3629bda081592c6192f065ea6a9490d7fff2f0c37adcd02efd989
 DIST circle-3.1.tar.bz2 1176136 RMD160 15ef6467fe94820de3b6168f78cc5b5c063320e8 SHA1 3a898ed01779aea94ecb949062ec42545b293f81 SHA256 3813f6f903e958818afa5734403caa208d0a042ad1258f832d1ffc6923e098ea
-EBUILD circlemud-3.1.ebuild 1600 RMD160 437000189d90ff18a368ac38be422119f8426bb0 SHA1 77f499d0fa1a7c2b7279ded69a8d3a680fbdf854 SHA256 b9cd1491c08a20e981b1f47c18aad000ac1b1627554d6df0892cbccb4956734b
-MISC ChangeLog 974 RMD160 78ef1dbc51c7f3730d6eb93694e53cc48030f679 SHA1 869f4ddfcbb96bdddcf4b38d689280b7429679e8 SHA256 f64e38ff5dcd2e1668500f2315821ee5ef87c21c3feb7b5b6857f94a3e715807
+EBUILD circlemud-3.1.ebuild 1614 RMD160 64aeae9af2f0c2ab2cd6d52cd376bc8bc7eeb037 SHA1 f8dafe514b0861b230e50f07a14869ec42ef202c SHA256 ab54f9e26c1e9a5a5c427eba1dc8699d06cd995b2ccaf3179c0935772c1e3e93
+MISC ChangeLog 1138 RMD160 f312605cb1d3fd98aaf30266195eef8157f8f1d0 SHA1 5bf012c4873db239e9e81de1982cb76675b5fe78 SHA256 5202aa6888c86a85c5aabe0080832d80ba9e956e6bb907f0fb47d361278430de
 MISC metadata.xml 620 RMD160 ea15d258561f430a74f94a778e9d5fcc92560deb SHA1 2db81bc719f8b5b100ed7433f9ede2c3718e6fdb SHA256 9eeb1faf1aea8ec97f9fb5509d667df30e5507da3091febaecea5596b433a522
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgsLy4ACgkQdz7hIScOURE26wCeKkGmfVdbI7TO374v47lFXfSQ
-3cMAoOzKyvhSTewMjjYV2hDPbvsHijkp
-=1gtB
------END PGP SIGNATURE-----
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