Respecting CC and LDFLAGS per 247193

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 39 insertions, 13 deletions

diff --git a/app-admin/moodss/ChangeLog b/app-admin/moodss/ChangeLog
index bc72ad3b80d0..8a063c0e6800 100644
--- a/app-admin/moodss/ChangeLog
+++ b/app-admin/moodss/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/moodss
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/moodss/ChangeLog,v 1.14 2009/08/14 00:52:06 fauli Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/moodss/ChangeLog,v 1.15 2010/03/22 20:29:19 jlec Exp $
+
+  22 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +files/21.5-ldflags.patch, moodss-21.5.ebuild:
+  Respecting CC and LDFLAGS per 247193
 
   14 Aug 2009; Christian Faulhammer <fauli@gentoo.org> moodss-21.5.ebuild:
   port to EAPI 2
diff --git a/app-admin/moodss/Manifest b/app-admin/moodss/Manifest
index a38c20ee7289..0494f6ac6942 100644
--- a/app-admin/moodss/Manifest
+++ b/app-admin/moodss/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 21.5-ldflags.patch 880 RMD160 c6373a3fcd90ef869caaf984595d027519778121 SHA1 3957932f0f0a924540792223865117a63475458d SHA256 06e79cd4c1f4ca33e8de79be1ddf71eab15566954d719d0e27f207a89dd011e9
 DIST moodss-20.0.tar.bz2 1693533 RMD160 8e6337773f6ed663f527a6d04d81af9ab971a530 SHA1 c0d8995465ab72f6143a4dc44063341f44e0d676 SHA256 5b4d2517b36bf5c6c465786c6fd90d4b6bd825e76c47c2e024a5958fd659588d
 DIST moodss-20.2.tar.bz2 1697188 RMD160 7a525dbcfe2850e439a54cf00a6da1ffbd2988af SHA1 c052590997d6a6f67f8773f19aba959475f413b7 SHA256 aab0a71cc372ad50b15bf2f03db12a889a9d370316be8d55a069e292225405d8
 DIST moodss-21.5.tar.bz2 1963647 RMD160 d9478c6bbc3fd509fe898cf44f1efba62e7b51ba SHA1 debde88696c53ea79f2edfa8461de6951052906d SHA256 f44799ff6d485b332bb5b2c72413e3e8e8b79797eed4e5ffb9a1f3bcc436c6c7
 EBUILD moodss-20.0.ebuild 1467 RMD160 39f5ce5ba9f40a1141b0e4fd6f90e29c256cb781 SHA1 7e70fdb9938af37a0beb7b64e60888b743d8daac SHA256 7e373c4c79788b7136974eb0679f23e1cbb2c7104afadc25b969402f83c3024e
 EBUILD moodss-20.2.ebuild 1473 RMD160 d4ec52eac8dbfa8c9667618cdeb4b65f213a16f5 SHA1 1ff484343b37edf372002f90d9a7bab251b69f32 SHA256 ad3e2a8c516986e948cae4b91a325177a8439f9992575ff43eb474a950d32018
-EBUILD moodss-21.5.ebuild 1315 RMD160 86aa9c32bf5b20f50628cbe4ab937f4094bd6c8a SHA1 719d83693468381898b8fcc1579219ab288c0fb9 SHA256 cf7219d1d0ed499d6302edcbe702a2b88db3f714c373a156f2ef97f53eb2b61a
-MISC ChangeLog 1756 RMD160 3f646299a94c10352682938e79d5f67f27045b9c SHA1 8d83c205e52c9139801b4e9d2917a510957118df SHA256 535e14907612d232846a66b6b62075010e8b7a1855d4f62a35bc4165c58b1414
+EBUILD moodss-21.5.ebuild 1399 RMD160 b980826703467430946c05348b5dc63a34b55619 SHA1 5065fb34833e94505c31a1b62902434922df7508 SHA256 aacc9989a6e0eb20e04785779ae935efa5185663d1d7dd428741351d2937b9cb
+MISC ChangeLog 1898 RMD160 c354a721607d224830c8a8eb139e5399632c5c21 SHA1 8390302d69c9c3eb0c08e0789c06dc2597be410f SHA256 602ead2f6ee43e40b9685104fbed5f1b0f4db1e7548ea29dd715bca34a10bf7e
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkqEtTwACgkQNQqtfCuFneNvqQCgiX/Lwkzvi5Lo1a9/aZrEk6t3
-eQYAoIbOKs4g8c5uw5lbooKYjSHBFE1/
-=7nwZ
+iEYEARECAAYFAkun0yUACgkQgAnW8HDreRZK7gCgixvL5wBjtv5dFZP6pt0z56zK
+yDoAniX2nQSRWCxpK9UncpdI9iGPjent
+=m6Qw
 -----END PGP SIGNATURE-----
diff --git a/app-admin/moodss/files/21.5-ldflags.patch b/app-admin/moodss/files/21.5-ldflags.patch
new file mode 100644
index 000000000000..cd18aabe162b
--- /dev/null
+++ b/app-admin/moodss/files/21.5-ldflags.patch
@@ -0,0 +1,18 @@
+diff --git a/Makefile b/Makefile
+index c0a2200..b058a68 100644
+--- a/Makefile
++++ b/Makefile
+@@ -167,10 +167,10 @@ libtclstub.a::
+ 		rm -f $@; test -f $$LIBRARY && ln -s $$LIBRARY $@ || ln -s $(TCLLIBDIR)/$@ $@
+ 
+ packlibs/libfilesystem.so.1.1: packlibs/filesystem.c libtclstub.a
+-	$(CC) -shared -fPIC -DUSE_TCL_STUBS $(CFLAGS) $(INCLUDES) -o $@ $?
++	$(CC) -shared $(LDFLAGS) -fPIC -DUSE_TCL_STUBS $(CFLAGS) $(INCLUDES) -o $@ $?
+ 
+ packlibs/libnetwork.so.1.23: packlibs/network.c libtclstub.a
+-	$(CC) -shared -fPIC -DUSE_TCL_STUBS $(CFLAGS) $(INCLUDES) -o $@ $? $(EXTRALIBS)
++	$(CC) -shared $(LDFLAGS) -fPIC -DUSE_TCL_STUBS $(CFLAGS) $(INCLUDES) -o $@ $? $(EXTRALIBS)
+ 
+ packlibs/liblogging.so.1.0: packlibs/logging.c libtclstub.a
+-	$(CC) -shared -fPIC -DUSE_TCL_STUBS $(CFLAGS) $(INCLUDES) -o $@ $?
++	$(CC) -shared $(LDFLAGS) -fPIC -DUSE_TCL_STUBS $(CFLAGS) $(INCLUDES) -o $@ $?
diff --git a/app-admin/moodss/moodss-21.5.ebuild b/app-admin/moodss/moodss-21.5.ebuild
index 47159c4dad52..ca2fbe65eea5 100644
--- a/app-admin/moodss/moodss-21.5.ebuild
+++ b/app-admin/moodss/moodss-21.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/moodss/moodss-21.5.ebuild,v 1.2 2009/08/14 00:52:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/moodss/moodss-21.5.ebuild,v 1.3 2010/03/22 20:29:19 jlec Exp $
 
-EAPI=2
+EAPI="3"
 
-inherit eutils multilib
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Modular Object Oriented Dynamic SpreadSheet"
 HOMEPAGE="http://moodss.sourceforge.net/"
@@ -37,10 +37,13 @@ src_prepare() {
 	sed -i -e 's:%_datadir:/usr/share:' \
 		-e 's:%_bindir:/usr/bin:' ${PN}.desktop || die
 	sed -i -e "s:/usr/lib:/usr/$(get_libdir):" Makefile || die
+	epatch "${FILESDIR}"/${PV}-ldflags.patch
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" || die
+	emake \
+		CFLAGS="${CFLAGS}" \
+		CC="$(tc-getCC)" || die
 }
 
 src_install() {