Respect CC and LDFLAGS wrt bug 331103. Thanks to Olivier Huber <oli.huber@gmail.com> for patch.

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

4 files changed, 24 insertions, 19 deletions

diff --git a/net-misc/autossh/ChangeLog b/net-misc/autossh/ChangeLog
index 7f1d4e1b4b2b..52e844071f42 100644
--- a/net-misc/autossh/ChangeLog
+++ b/net-misc/autossh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/autossh
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/ChangeLog,v 1.25 2010/01/07 15:45:55 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/ChangeLog,v 1.26 2010/08/03 18:18:40 xarthisius Exp $
+
+  03 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> autossh-1.2g.ebuild,
+  autossh-1.4b.ebuild:
+  Respect CC and LDFLAGS wrt bug 331103. Thanks to Olivier Huber
+  <oli.huber@gmail.com> for patch.
 
   07 Jan 2010; Christian Faulhammer <fauli@gentoo.org> autossh-1.4b.ebuild:
   Transfer Prefix keywords
diff --git a/net-misc/autossh/Manifest b/net-misc/autossh/Manifest
index 933d57bc821b..995175388236 100644
--- a/net-misc/autossh/Manifest
+++ b/net-misc/autossh/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST autossh-1.2g.tgz 19528 RMD160 68da6df12c758bf64c214be886f00e6317c206d8 SHA1 f6997b6481192ff2fcac57419cb739fdb2dc253a SHA256 aa5b8dc99d39b04f0699f4f4bc441d693b7a528f6f19096db55e7791f3924ee1
 DIST autossh-1.4b.tgz 64337 RMD160 57accc6968ed0c654035feda8db2a11aa390ade3 SHA1 98fa61969b33fc1380c7e3b7b53ed35a13c1eeb4 SHA256 e77f518e1f3607aa55086c8969f72d1b44ef99402814a19fec213a6e0f06ef07
-EBUILD autossh-1.2g.ebuild 762 RMD160 07571ed54e2991e56768447938d748bdb9c55a9e SHA1 e0ecaaee2a5915377fe7157ea9d3beb2e1791305 SHA256 495e93a1ab297d270d3c9a94dbf02d56be0967ab1c22386495c717eec150798d
-EBUILD autossh-1.4b.ebuild 622 RMD160 5c1bdf4cce86976c92f96e2c2023cf1bae879609 SHA1 a4efcde06a398bad2f4faeaa8d3c8cc198ed7e1d SHA256 03b7f93385c7b258b13818f581c41d480eb638e3b6095d01e53f9da0da832782
-MISC ChangeLog 3468 RMD160 d4383446454d6695eb78dbfbb2d4f843dadecc94 SHA1 8ec222e7ebefa895b8893dfa35a50f0370fd34cb SHA256 a3d39c503e42b0b81d73467471e5743417870b3d6f111934ad5ea7467fd9af03
+EBUILD autossh-1.2g.ebuild 849 RMD160 a64d7e5e6ce24b6e8bc4a2312a1443c9c34e2e49 SHA1 83a9406d99544891e84f401780850051f6622c9d SHA256 48e0b4234c3615471b4e9fe76ba47e52bb414bebb8de98d786b00100c2f4e033
+EBUILD autossh-1.4b.ebuild 710 RMD160 59fa8c3cf49b8929ee7b16dc45b400bac6e6a11a SHA1 1271c981075a43dc287470cf0af23617b5a95e1e SHA256 3881a032f270e1aa3227dfeb05483a64bcdb347a262edb21e7c0bed6e54d418c
+MISC ChangeLog 3672 RMD160 d0158545f18ce2b802624bba22229d45434373f5 SHA1 995a9c0a559456111a39a5b4450f35a828cef765 SHA256 d7bd4c660405150060f64e05386ecc845b37a84264173b97389d34424bdfe7ea
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktGAbkACgkQNQqtfCuFneNE6ACeNwD+pETgf4hVKIIrkImV3lxV
-noAAoJoFQnWtJ93sTd3ODdyjSuhmWTLW
-=Gvg1
------END PGP SIGNATURE-----
diff --git a/net-misc/autossh/autossh-1.2g.ebuild b/net-misc/autossh/autossh-1.2g.ebuild
index ebdd789d79b6..3879927efcde 100644
--- a/net-misc/autossh/autossh-1.2g.ebuild
+++ b/net-misc/autossh/autossh-1.2g.ebuild
@@ -1,6 +1,8 @@
-# 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/net-misc/autossh/autossh-1.2g.ebuild,v 1.5 2009/09/23 19:34:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/autossh-1.2g.ebuild,v 1.6 2010/08/03 18:18:40 xarthisius Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="Automatically restart SSH sessions and tunnels"
 HOMEPAGE="http://www.harding.motd.ca/autossh/"
@@ -14,11 +16,13 @@ DEPEND="sys-apps/sed"
 RDEPEND="net-misc/openssh"
 
 src_unpack() {
-	unpack ${A} && cd ${S}
-	sed -i "s|CFLAGS=|CFLAGS=${CFLAGS}|g" Makefile.linux
+	unpack ${A} && cd "${S}"
+	sed -i -e "s|CFLAGS=|CFLAGS=${CFLAGS}|g" \
+		-e "s:\$(CC):& \$(LDFLAGS):" Makefile.linux || die
 }
 
 src_compile() {
+	tc-export CC
 	emake -f Makefile.linux || die "make failed"
 }
 
diff --git a/net-misc/autossh/autossh-1.4b.ebuild b/net-misc/autossh/autossh-1.4b.ebuild
index 6816fe938ebf..1a444c47400f 100644
--- a/net-misc/autossh/autossh-1.4b.ebuild
+++ b/net-misc/autossh/autossh-1.4b.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/autossh-1.4b.ebuild,v 1.2 2010/01/07 15:45:55 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/autossh-1.4b.ebuild,v 1.3 2010/08/03 18:18:40 xarthisius Exp $
+
+EAPI=2
 
 DESCRIPTION="Automatically restart SSH sessions and tunnels"
 HOMEPAGE="http://www.harding.motd.ca/autossh/"
@@ -13,6 +15,10 @@ IUSE=""
 
 RDEPEND="net-misc/openssh"
 
+src_prepare() {
+	sed -i -e "s:\$(CC):& \$(LDFLAGS):" Makefile.in || die
+}
+
 src_install() {
 	dobin autossh
 	dodoc CHANGES README autossh.host rscreen