Honor C[XX]FLAGS+LDFLAGS, many thanks to jakub in bug #211581

Package-Manager: portage-2.1.4.4

diff --git a/net-misc/freenet6/ChangeLog b/net-misc/freenet6/ChangeLog
index d584eeaee3a8c43260ef00f2a3cb8c2c81049255..718edf86ac0d932ef520dd1d5e01b79014354ec9 100644 (file)
--- a/net-misc/freenet6/ChangeLog
+++ b/net-misc/freenet6/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/freenet6
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.26 2008/02/26 19:40:43 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.27 2008/02/27 10:07:38 voyageur Exp $
+
+  27 Feb 2008; Bernard Cafarelli <voyageur@gentoo.org> freenet6-5.1.ebuild:
+  Honor C[XX]FLAGS+LDFLAGS, many thanks to jakub in bug #211581
 
 *freenet6-5.1 (26 Feb 2008)
 

diff --git a/net-misc/freenet6/Manifest b/net-misc/freenet6/Manifest
index 1a3e32cd51406de7748b9a98c3698b2e59b023ba..94b65d8b24b187b4adf613ac1a5c0708ba74f95e 100644 (file)
--- a/net-misc/freenet6/Manifest
+++ b/net-misc/freenet6/Manifest
@@ -6,6 +6,6 @@ DIST gw6c-5_1-RELEASE-src.tar.gz 1055230 RMD160 bb507ce6e56e9fd71363d2fdd27ba61c
 DIST gw6c4_2_2src.tar.gz 113738 RMD160 d918e08bf1670a2e875880bdef582ad2a971ed38 SHA1 9837e29d5ca4236f244d1507716c815728623026 SHA256 938021f16f88f984c33f714b3f7a75c54927e0d63f1a0bdfc723a03758e9ee73
 EBUILD freenet6-4.2.2.ebuild 1551 RMD160 14fb9719e10d249cec396d4622c01766817e6e23 SHA1 a8dbccbdddb94cac3801c3b3ad786adef98bf090 SHA256 bdcf6ee0b2e33220a361378cf86017b9d131754f5a99f61ce552fa88356cd67b
 EBUILD freenet6-5.0.ebuild 1569 RMD160 da66da26ec5ce61feea443482a4537aabb0f0c15 SHA1 41216c98a9603f8c754e933725d0be6250bf13a7 SHA256 4aa07737a5858bd9c517091e55eb1303a8f024bb8b58b62b99d24c757188cc17
-EBUILD freenet6-5.1.ebuild 1569 RMD160 6d1685a3adac9548465dd4c6fc7141abb5cc5d62 SHA1 c0f598a35428b0e592f46f7d4bd56f51de344972 SHA256 8261e1f7575747104fcd8fbb4bfd7b6f17355c8c5ee75ef8efdf9dc9d8fb8a83
-MISC ChangeLog 3562 RMD160 423e2e2925c20c21093eb6a54cd9bd52ff352225 SHA1 9ed0b0712a90de708cb0628b10cebbdec052b0b4 SHA256 d59653c6c8bda9be3d31492588fc53df18b5632b523f870ad020efbf6c5e91ba
+EBUILD freenet6-5.1.ebuild 2386 RMD160 80f747b2a5069bf9d3e2e9458eb672fee4bc1f1d SHA1 157c1a5a86d95ea6b9c773158b8c886e15c6ba52 SHA256 1b2f1e5f3096f0242d933ea97d1af6262f31738297c12a7b75bbbe1445ea3ef8
+MISC ChangeLog 3703 RMD160 42c26db31628f70a7ee90e5d78f4d90345e4f3ee SHA1 b3bf753ff3e1b7dcdf0929f3bca772b2b925d3e5 SHA256 1db9f4d90de6e3580b86aa2b5e413c53741afa22a84a9c7761e972e4fda7c683
 MISC metadata.xml 348 RMD160 831527825fdc6b58538bb671987c0a562e1559df SHA1 2517554158e3a9d0cd11e7a8ecbe4fa1843a170f SHA256 9a455a8b1ebafab91dcd8d5a1c0d3cc61fc75abc59ad2988d7118032f8309730

diff --git a/net-misc/freenet6/freenet6-5.1.ebuild b/net-misc/freenet6/freenet6-5.1.ebuild
index f15834c7a390a0f1c02c789c4e8f50f694fcf84a..5d7ab796c71292e587b1b63885e06cf663b620e1 100644 (file)
--- a/net-misc/freenet6/freenet6-5.1.ebuild
+++ b/net-misc/freenet6/freenet6-5.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-5.1.ebuild,v 1.1 2008/02/26 19:40:43 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-5.1.ebuild,v 1.2 2008/02/27 10:07:38 voyageur Exp $
 
-inherit eutils versionator
+inherit eutils versionator toolchain-funcs
 
 MY_PV=$(replace_all_version_separators "_")
 DESCRIPTION="Client to configure an IPv6 tunnel to freenet6"
@@ -19,6 +19,32 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/tspc-advanced"
 
+src_unpack() {
+       unpack ${A}
+       cd "${WORKDIR}"
+       for i in gw6c-config gw6c-messaging ; do
+               sed -i -e "/ARCHIVER=/s:ar:$(tc-getAR):" \
+                       -e "/COMPILER=/s:g++:$(tc-getCXX):" \
+                       -e "/C_COMPILER=/s:gcc:$(tc-getCC):" \
+                       -e "/CPP_FLAGS=/s:-I.:${CXXFLAGS} -I.:" \
+                       -e "/C_FLAGS=/s:-I.:${CFLAGS} -I.:" \
+                       -e "/C_LINKER=/s:gcc:$(tc-getCC):" \
+                       -e "/LD_FLAGS=/s:-O2::" \
+                       -e "/LD_FLAGS=/s:-L:${LDFLAGS} -L:" \
+                       -e "/LINKER=/s:g++:$(tc-getCXX):" \
+                       -e "/RANLIB=/s:ranlib:$(tc-getRANLIB):" \
+                       ${i}/Makefile || die "sed failed in ${i}"
+       done
+
+       cd "${S}"
+       for i in platform/linux platform/unix-common src/lib src/net src/tsp src/xml ; do
+               sed -i -e "/CC=/s:gcc:$(tc-getCC):" \
+                       -e "/CFLAGS=/s:-O2:${CFLAGS}:" \
+                       -e "/LDFLAGS=/s:-L..:${LDFLAGS} -L..:" \
+                       ${i}/Makefile || die "sed failed in ${i}"
+       done
+}
+
 src_compile() {
        emake all configdir=/etc/freenet6 target=linux || die "Build Failed"
        sed -i "s#tsp-#/tmp/tsp-#" bin/gw6c.conf.sample
@@ -31,7 +57,7 @@ src_install() {
        insinto /etc/freenet6
        newins bin/gw6c.conf.sample gw6c.conf
        exeinto /etc/freenet6/template
-       doexe template/{linux,checktunnel}.sh
+       doexe template/linux.sh
 
        newinitd "${FILESDIR}"/gw6c.rc gw6c