Respect env LDFLAGS. Respect CC for everyone, not just cross-compilers #203911 by Davide Cendron.

Package-Manager: portage-2.1.4_rc14

3 files changed, 27 insertions, 21 deletions

diff --git a/net-misc/netkit-rsh/ChangeLog b/net-misc/netkit-rsh/ChangeLog
index 2cabf5275ee7..4f052340bf69 100644
--- a/net-misc/netkit-rsh/ChangeLog
+++ b/net-misc/netkit-rsh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/netkit-rsh
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/ChangeLog,v 1.46 2007/07/23 05:31:28 vapier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/ChangeLog,v 1.47 2008/01/02 13:47:59 vapier Exp $
+
+  02 Jan 2008; Mike Frysinger <vapier@gentoo.org> netkit-rsh-0.17-r8.ebuild:
+  Respect env LDFLAGS. Respect CC for everyone, not just cross-compilers
+  #203911 by Davide Cendron.
 
   23 Jul 2007; Mike Frysinger <vapier@gentoo.org> netkit-rsh-0.17-r8.ebuild:
   Punt bindnow-flags usage.
diff --git a/net-misc/netkit-rsh/Manifest b/net-misc/netkit-rsh/Manifest
index f662ccd4bd4a..60ba04b83ec6 100644
--- a/net-misc/netkit-rsh/Manifest
+++ b/net-misc/netkit-rsh/Manifest
@@ -40,14 +40,14 @@ SHA256 0b4ca94d07628a9096400846bae40c80c4ab92123bfd2722d07e364c48fa00dd files/rs
 DIST netkit-rsh-0.17-patches-1.0.tar.bz2 13612 RMD160 2f4f8913e4fd8b38dc4a0e8c0b7426ebd17fc61a SHA1 bea076c1262952d930b7352dc8e1d15f7314e85e SHA256 2b1281e8bfaa871de3e4ad26357cc04e4e0537dcb25b8b2cf87a9cdb630bf43d
 DIST netkit-rsh-0.17.tar.gz 58268 RMD160 288dd91c84fcebde8e401d3d0bf93d99c3bac73e SHA1 022185bf31af23abbb6d4f34621f94d9d0c4b6ea SHA256 edcac7fa18015f0bc04e573f3f54ae3b638d71335df1ad7dae692779914ad669
 DIST rexec-1.5.tar.gz 18469 RMD160 713ed4e6ec125f8f0b8056eb53b41e4e34e6c29b SHA1 cee670cccf50741022f453b9ae42f3823418b5d2 SHA256 9bcf9986eb9637d1b8e8ab62a61c80f3422d628e837e72c6ad8c2e38604ccaf4
-EBUILD netkit-rsh-0.17-r8.ebuild 1866 RMD160 c2189a9c2bbd07aa1f7e1c184ce20eea46563e61 SHA1 f6dae7562a7ed91e69797286cfa5c322974706c2 SHA256 476c5358243386a517fb1176143fea0d04f3dd024985643814053ae1c1a9ff30
-MD5 0cb8d4d28e7b46dc9460d23054e8c1ee netkit-rsh-0.17-r8.ebuild 1866
-RMD160 c2189a9c2bbd07aa1f7e1c184ce20eea46563e61 netkit-rsh-0.17-r8.ebuild 1866
-SHA256 476c5358243386a517fb1176143fea0d04f3dd024985643814053ae1c1a9ff30 netkit-rsh-0.17-r8.ebuild 1866
-MISC ChangeLog 7426 RMD160 745c91c332d4fd0653d01efabccf45ad9d223848 SHA1 9eabbddf0e877c1a6211f11c0153363446b1e9a5 SHA256 4ba73dcc0afe9d868f6b717a2b600c0236b77ec5ec164e8165604b461a1e0de0
-MD5 9ddffcd897c0d546502f77c7fa85c7c7 ChangeLog 7426
-RMD160 745c91c332d4fd0653d01efabccf45ad9d223848 ChangeLog 7426
-SHA256 4ba73dcc0afe9d868f6b717a2b600c0236b77ec5ec164e8165604b461a1e0de0 ChangeLog 7426
+EBUILD netkit-rsh-0.17-r8.ebuild 1890 RMD160 fe4b323012e58a0b643d7302b6a1c563bf8f270b SHA1 38f8e54cf6defc254c7b83ad125e099bdf779bd0 SHA256 a76944b5d6ce2f3d386cb7aeccc8cd1f2734f6b494b2ae367c2fbecd491e2a5a
+MD5 8eb3e1e49998f050f62ac8cc5bb6d366 netkit-rsh-0.17-r8.ebuild 1890
+RMD160 fe4b323012e58a0b643d7302b6a1c563bf8f270b netkit-rsh-0.17-r8.ebuild 1890
+SHA256 a76944b5d6ce2f3d386cb7aeccc8cd1f2734f6b494b2ae367c2fbecd491e2a5a netkit-rsh-0.17-r8.ebuild 1890
+MISC ChangeLog 7606 RMD160 c9bc540ba7794cb9780519d217511a38cf7a8855 SHA1 238e2888cd93a8471ca26ee79f939a8d3fea2de3 SHA256 223b416f8a32a444bbf5b94960bf9dd571343912d4ebe70f61ab1bf767c7da44
+MD5 8fd2e8d7c918fc1aa0a163f3cefa2b42 ChangeLog 7606
+RMD160 c9bc540ba7794cb9780519d217511a38cf7a8855 ChangeLog 7606
+SHA256 223b416f8a32a444bbf5b94960bf9dd571343912d4ebe70f61ab1bf767c7da44 ChangeLog 7606
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -56,9 +56,9 @@ MD5 3d0947e1648043cf3b6b734f2fe9d809 files/digest-netkit-rsh-0.17-r8 753
 RMD160 f0f5bba14aa0ceb14c669d9e3162c30123b7238d files/digest-netkit-rsh-0.17-r8 753
 SHA256 df163232c819d79349d50079547e2b6f29069b6d2eb5af0c0802299cab4ad747 files/digest-netkit-rsh-0.17-r8 753
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFGpD1Zp/wUKkr7RBoRAspVAJ0T5mkE4dwgKe1NSdRKvK3htAlY4gCgwSwm
-UWWoJj8fIMq+naCOjScnwyw=
-=wkOq
+iEYEARECAAYFAkd7lhUACgkQj9hvisErhMI6swCdEehtI/oc82K6TGI0eqcG4/4q
+1GYAoJX8Oa0/rHUKZcMdEsE50K4Y3Uu2
+=S+lY
 -----END PGP SIGNATURE-----
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r8.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r8.ebuild
index fc22b9faaa65..d4c84cbe9100 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r8.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/netkit-rsh-0.17-r8.ebuild,v 1.10 2007/07/23 05:31:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/netkit-rsh-0.17-r8.ebuild,v 1.11 2008/01/02 13:47:59 vapier Exp $
 
 inherit eutils pam toolchain-funcs
 
@@ -30,20 +30,22 @@ src_unpack() {
 		EPATCH_SUFFIX="patch"
 		epatch "${WORKDIR}"/patch
 	fi
+
+	if tc-is-cross-compiler ; then
+		# Can't do runtime tests when cross-compiling
+		sed -i -e "s|./__conftest|: ./__conftest|" configure
+	fi
 }
 
 src_compile() {
 	local myconf
 	use pam || myconf="--without-pam"
-	if tc-is-cross-compiler; then
-		tc-export CC
-		# Can't do runtime tests when cross-compiling
-		sed -i -e "s|./__conftest|: ./__conftest|" configure
-	fi
+	tc-export CC
 	./configure ${myconf} || die
 
 	sed -i \
 		-e "s:-pipe -O2:${CFLAGS}:" \
+		-e "/^LDFLAGS=$/d" \
 		-e "s:-Wpointer-arith::" \
 		MCONFIG || die "could not sed MCONFIG"
 	emake || die