Respect LDFLAGS, #343335

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

4 files changed, 116 insertions, 9 deletions

diff --git a/net-analyzer/nessus-plugins/ChangeLog b/net-analyzer/nessus-plugins/ChangeLog
index 3fc33feea180..e99db06e6a93 100644
--- a/net-analyzer/nessus-plugins/ChangeLog
+++ b/net-analyzer/nessus-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nessus-plugins
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-plugins/ChangeLog,v 1.78 2010/09/06 18:32:16 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-plugins/ChangeLog,v 1.79 2011/04/20 11:00:43 jlec Exp $
+
+*nessus-plugins-2.2.9-r1 (20 Apr 2011)
+
+  20 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/2.2.9-gentoo.patch,
+  nessus-plugins-2.2.9.ebuild, +nessus-plugins-2.2.9-r1.ebuild:
+  Respect LDFLAGS, #343335
 
   06 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
   -nessus-plugins-2.2.6.ebuild:
diff --git a/net-analyzer/nessus-plugins/files/2.2.9-gentoo.patch b/net-analyzer/nessus-plugins/files/2.2.9-gentoo.patch
new file mode 100644
index 000000000000..39366844382f
--- /dev/null
+++ b/net-analyzer/nessus-plugins/files/2.2.9-gentoo.patch
@@ -0,0 +1,58 @@
+ plugins/find_service/Makefile       |    2 +-
+ plugins/nessus_tcp_scanner/Makefile |    2 +-
+ plugins/ssl_ciphers/Makefile        |    2 +-
+ plugins/synscan/Makefile            |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/find_service/Makefile b/plugins/find_service/Makefile
+index f4fd8e3..12e62a3 100644
+--- a/plugins/find_service/Makefile
++++ b/plugins/find_service/Makefile
+@@ -5,7 +5,7 @@ PLUGNAME=find_service
+ all : $(PLUGNAME).nes
+ $(PLUGNAME).nes : $(PLUGNAME).c
+ 	$(LIBTOOL) $(CC) $(DEFS) $(include) -c  $(PLUGNAME).c
+-	$(LIBTOOL) $(CC) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
++	$(LIBTOOL) $(CC) $(LDFLAGS) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
+ 	-rpath $(rootdir)/bin/plugins
+ 	../install_plug $(PLUGNAME) $(rootdir)
+ clean :
+diff --git a/plugins/nessus_tcp_scanner/Makefile b/plugins/nessus_tcp_scanner/Makefile
+index 8cf6c6d..7a27495 100644
+--- a/plugins/nessus_tcp_scanner/Makefile
++++ b/plugins/nessus_tcp_scanner/Makefile
+@@ -8,7 +8,7 @@ PLUGNAME=nessus_tcp_scanner
+ all : $(PLUGNAME).nes
+ $(PLUGNAME).nes : $(PLUGNAME).c 
+ 	$(LIBTOOL) $(CC) $(DEFS) $(include) -c  $(PLUGNAME).c
+-	$(LIBTOOL) $(CC) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) -lm $(LIBUTIL) \
++	$(LIBTOOL) $(CC) $(LDFLAGS) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) -lm $(LIBUTIL) \
+ 	-rpath $(rootdir)/bin/plugins
+ 	../install_plug $(PLUGNAME) $(rootdir)
+ clean :
+diff --git a/plugins/ssl_ciphers/Makefile b/plugins/ssl_ciphers/Makefile
+index dc10e64..1747745 100644
+--- a/plugins/ssl_ciphers/Makefile
++++ b/plugins/ssl_ciphers/Makefile
+@@ -5,7 +5,7 @@ PLUGNAME=ssl_ciphers
+ all : $(PLUGNAME).nes
+ $(PLUGNAME).nes : $(PLUGNAME).c
+ 	$(LIBTOOL) $(CC) $(DEFS) $(include) -c  $(PLUGNAME).c
+-	$(LIBTOOL) $(CC) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
+ 	-rpath $(rootdir)/bin/plugins
+ 	../install_plug $(PLUGNAME) $(rootdir)
+ clean :
+diff --git a/plugins/synscan/Makefile b/plugins/synscan/Makefile
+index 16aefa1..c434b92 100644
+--- a/plugins/synscan/Makefile
++++ b/plugins/synscan/Makefile
+@@ -5,7 +5,7 @@ PLUGNAME=synscan
+ all : $(PLUGNAME).nes
+ $(PLUGNAME).nes : $(PLUGNAME).c
+ 	$(LIBTOOL) $(CC) $(DEFS) $(include) -c  $(PLUGNAME).c
+-	$(LIBTOOL) $(CC) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
++	$(LIBTOOL) $(CC) $(DEFS) $(LDFLAGS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
+ 	-rpath $(rootdir)/bin/plugins
+ 	../install_plug $(PLUGNAME) $(rootdir)
+ clean :
diff --git a/net-analyzer/nessus-plugins/nessus-plugins-2.2.9-r1.ebuild b/net-analyzer/nessus-plugins/nessus-plugins-2.2.9-r1.ebuild
new file mode 100644
index 000000000000..3d6ffc093698
--- /dev/null
+++ b/net-analyzer/nessus-plugins/nessus-plugins-2.2.9-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-plugins/nessus-plugins-2.2.9-r1.ebuild,v 1.1 2011/04/20 11:00:43 jlec Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A remote security scanner for Linux (nessus-plugins)"
+HOMEPAGE="http://www.nessus.org/"
+SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/nessus-plugins-GPL-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="
+	dev-libs/openssl:0
+	~net-analyzer/nessus-core-${PV}
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	tc-export CC
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
+}
+
+src_install() {
+	default
+	dodoc docs/*.txt
+}
diff --git a/net-analyzer/nessus-plugins/nessus-plugins-2.2.9.ebuild b/net-analyzer/nessus-plugins/nessus-plugins-2.2.9.ebuild
index 351ae9332edd..6fba5e796554 100644
--- a/net-analyzer/nessus-plugins/nessus-plugins-2.2.9.ebuild
+++ b/net-analyzer/nessus-plugins/nessus-plugins-2.2.9.ebuild
@@ -1,22 +1,31 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-plugins/nessus-plugins-2.2.9.ebuild,v 1.3 2007/07/11 23:49:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-plugins/nessus-plugins-2.2.9.ebuild,v 1.4 2011/04/20 11:00:43 jlec Exp $
+
+EAPI="1"
 
 inherit toolchain-funcs
 
-S="${WORKDIR}/${PN}"
 DESCRIPTION="A remote security scanner for Linux (nessus-plugins)"
 HOMEPAGE="http://www.nessus.org/"
 SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/nessus-plugins-GPL-${PV}.tar.gz"
-DEPEND=">=net-analyzer/nessus-core-${PV}"
+
 SLOT="0"
 IUSE=""
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
+DEPEND="
+	dev-libs/openssl:0
+	~net-analyzer/nessus-core-${PV}
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
 src_compile() {
-	export CC="$(tc-getCC)"
-	econf || die
+	tc-export CC
+	econf
 	emake || die
 }
 
@@ -24,5 +33,5 @@ src_install() {
 	emake \
 		DESTDIR="${D}" \
 		install || die "make install failed"
-	dodoc docs/*.txt plugins/accounts/accounts.txt
+	dodoc docs/*.txt
 }