QA: Fixed compilation with --as-needed (bug 246951), respect CC (bug 243706), respect LDFLAGS

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 64 insertions, 13 deletions

diff --git a/app-shells/rrs/ChangeLog b/app-shells/rrs/ChangeLog
index eab1bd2c1f32..4fa820e28bee 100644
--- a/app-shells/rrs/ChangeLog
+++ b/app-shells/rrs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/rrs
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/rrs/ChangeLog,v 1.13 2008/08/23 18:30:46 maekke Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/rrs/ChangeLog,v 1.14 2009/01/03 14:07:29 angelos Exp $
+
+  03 Jan 2009; Christoph Mende <angelos@gentoo.org>
+  +files/rrs-1.70-asneeded.patch, rrs-1.70.ebuild:
+  QA: Fixed compilation with --as-needed (bug 246951), respect CC (bug
+  243706), respect LDFLAGS
 
   23 Aug 2008; Markus Meier <maekke@gentoo.org> rrs-1.70.ebuild:
   add ~amd64, bug #235414
diff --git a/app-shells/rrs/Manifest b/app-shells/rrs/Manifest
index ff0c0544f7a7..0321a6621a10 100644
--- a/app-shells/rrs/Manifest
+++ b/app-shells/rrs/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX rrs-1.70-asneeded.patch 1437 RMD160 9173108ca8d91c6d430d8995af51f6757decdef1 SHA1 89580c1f694afa94bc1449baede6fba19fb349bb SHA256 46020607ca66963afd1569c7cd2b0ad6c89659f2a33f426b88cd43c3666b23eb
 DIST rrs-1.70.tar.gz 49579 RMD160 f0c4e7a6b2c5c7cf8a9eef61c8e1f71d3c5c7c37 SHA1 0dc8ce0ccfae6ce70839addc30393c9f4e6a9ca8 SHA256 ffd9098cf93da5bda65150fe241ec51eb0eb0e37edca038e6a2216bc12546e85
-EBUILD rrs-1.70.ebuild 690 RMD160 09aaba7f08b432547a492f8b057af6b22c4d1291 SHA1 d0ffe39e9e9cf6541113ade3c9a39a02334e250f SHA256 462563d62c772a667ae6a3d048f2d3b7a176a66f70d732a6fd9886251fe734b2
-MISC ChangeLog 1613 RMD160 1123f96810435e433361df3541ba216de3ad2fba SHA1 6ee3abe1f7c2f16b5055d3cc5304c2069e6df100 SHA256 9bf8b2e3b586f104dcf5b42f76fefeb05b28144aa3f76b1e5097842a1db4eaad
+EBUILD rrs-1.70.ebuild 831 RMD160 f317807c1f67542cbd6a4113bb500e91faf29d23 SHA1 eb21c0f3b7423353962ba0d94b4363a4dfec6bdd SHA256 6b62b04356d311499980aff193089360f35e4f59b0357deb335168b247455831
+MISC ChangeLog 1816 RMD160 8df56596a6812bfb27161d5aa74916ad043ad12e SHA1 ab3d59e33201e0785490ad10bac77ed09e5761cd SHA256 fdc88e25dc882918acc47adc7df3f37a6fdb40127b6637921170151e4c4549e5
 MISC metadata.xml 403 RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 SHA1 ec604212b5eb7dde6256c827184a228eaa8161d5 SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiwV6gACgkQkKaRLQcq0GJLMwCfWDIryamILIMn5EK8x9Q/VPA3
-BgsAn1kHkkbGx+gHBGjejj3sVrJq5yyg
-=3PmC
+iEYEARECAAYFAklfcSkACgkQKhnDs22gwa+jZgCeNrga3xMHrmYyER+c+xKQV4Kf
+n5IAmwS6t3jveEfnCWkQMOF9okXPMSMt
+=Ts5f
 -----END PGP SIGNATURE-----
diff --git a/app-shells/rrs/files/rrs-1.70-asneeded.patch b/app-shells/rrs/files/rrs-1.70-asneeded.patch
new file mode 100644
index 000000000000..9ed9ee16fbee
--- /dev/null
+++ b/app-shells/rrs/files/rrs-1.70-asneeded.patch
@@ -0,0 +1,38 @@
+--- Makefile.orig	2004-05-30 02:14:14.000000000 +0200
++++ Makefile	2009-01-03 15:02:19.253460887 +0100
+@@ -8,8 +8,8 @@
+ # if your system doesn't have GNU's getopt_long(), add -DWITHOUT_GNU_GETOPT
+ CFLAGS=-I/usr/local/include -Wall -O2
+ # openpty() is in libutil on most Unix-like operating systems
+-LDFLAGS=-L/usr/local/lib -s -lstdc++ -lm -lutil -lssl -lcrypto
+-LDFLAGSNOSSL=-s -lstdc++ -lm -lutil
++LDFLAGS=-L/usr/local/lib -lstdc++ -lm -lutil -lssl -lcrypto
++LDFLAGSNOSSL=-lstdc++ -lm -lutil
+ 
+ PREFIX=/usr/local
+ BINDIR=bin
+@@ -36,9 +36,9 @@
+ generic-nossl: clean compile-generic-nossl
+ 
+ qnx: clean
+-	$(MAKE) LDFLAGS="-L/usr/local/lib -s -lsocket -lssl -lcrypto" compile-qnx
++	$(MAKE) LDFLAGS="-L/usr/local/lib -lsocket -lssl -lcrypto" compile-qnx
+ qnx-nossl: clean
+-	$(MAKE) LDFLAGSNOSSL="-s -lsocket" compile-qnx-nossl
++	$(MAKE) LDFLAGSNOSSL="-lsocket" compile-qnx-nossl
+ 
+ distclean: clean
+ 
+@@ -47,10 +47,10 @@
+ 
+ ## generic
+ compile-generic:
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(LDEXTRA) -o $(out) rrs.c md5.c sha1.c farm9crypt.cc twofish2.cc
++	$(CC) $(CFLAGS) $(LDEXTRA) -o $(out) rrs.c md5.c sha1.c farm9crypt.cc twofish2.cc $(LDFLAGS)
+ 
+ compile-generic-nossl:
+-	$(CC) -DWITHOUT_SSL $(CFLAGS) $$CFLAGS $(LDFLAGSNOSSL) $(LDEXTRA) -o $(out) rrs.c md5.c sha1.c farm9crypt.cc twofish2.cc
++	$(CC) -DWITHOUT_SSL $(CFLAGS) $$CFLAGS $(LDEXTRA) -o $(out) rrs.c md5.c sha1.c farm9crypt.cc twofish2.cc $(LDFLAGSNOSSL)
+ 
+ ## qnx
+ compile-qnx:
diff --git a/app-shells/rrs/rrs-1.70.ebuild b/app-shells/rrs/rrs-1.70.ebuild
index cc13f9b44ae5..6fbbaf30b570 100644
--- a/app-shells/rrs/rrs-1.70.ebuild
+++ b/app-shells/rrs/rrs-1.70.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/rrs/rrs-1.70.ebuild,v 1.8 2008/08/23 18:30:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/rrs/rrs-1.70.ebuild,v 1.9 2009/01/03 14:07:29 angelos Exp $
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Reverse Remote Shell"
 HOMEPAGE="http://www.cycom.se/dl/rrs"
@@ -11,16 +13,21 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE="ssl"
 
-DEPEND="ssl? ( dev-libs/openssl )
-	virtual/libc"
+DEPEND="ssl? ( dev-libs/openssl )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+}
 
 src_compile() {
 	local target=""
 	use ssl || target="-nossl"
 
 	sed -i -e "s/-s //g" Makefile
-	emake generic${target} \
-		CFLAGS="${CFLAGS}" || die "emake failed"
+	emake generic${target} CFLAGS="${CFLAGS}" LDEXTRA="${LDFLAGS}" \
+		CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {