Respect LDFLAGS (bug #333799). Install documentation where it belongs. Fix parallel make.

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

4 files changed, 142 insertions, 2 deletions

diff --git a/net-analyzer/nessus-client/ChangeLog b/net-analyzer/nessus-client/ChangeLog
index bf13e8dd755f..dca52acf159d 100644
--- a/net-analyzer/nessus-client/ChangeLog
+++ b/net-analyzer/nessus-client/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nessus-client
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-client/ChangeLog,v 1.9 2010/08/07 15:51:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-client/ChangeLog,v 1.10 2010/08/22 23:19:39 jer Exp $
+
+*nessus-client-1.0.2-r1 (22 Aug 2010)
+
+  22 Aug 2010; Jeroen Roovers <jer@gentoo.org>
+  +nessus-client-1.0.2-r1.ebuild, +files/nessus-client-1.0.2-make.patch:
+  Respect LDFLAGS (bug #333799). Install documentation where it belongs. Fix
+  parallel make.
 
   07 Aug 2010; Jeroen Roovers <jer@gentoo.org> nessus-client-1.0.2.ebuild:
   Remove glitz dependency thanks to Matt Turner (bug #330949).
diff --git a/net-analyzer/nessus-client/Manifest b/net-analyzer/nessus-client/Manifest
index a61dbbdb334a..bb7d43332ebd 100644
--- a/net-analyzer/nessus-client/Manifest
+++ b/net-analyzer/nessus-client/Manifest
@@ -1,5 +1,7 @@
+AUX nessus-client-1.0.2-make.patch 2648 RMD160 79c682d3bf24e6a542152f1ce4fdd5448bfc1485 SHA1 91bffb5fe160ef05c5ded850e2bcadb137f171b2 SHA256 a9ec13f7aa3a7ef3f76a8bf469a18104f7a77e72c924081a470188c96e9e89dd
 DIST NessusClient-1.0.2.tar.gz 2058324 RMD160 e641d060fc1c4aaecdc75b3b18d8d6c3e4320c40 SHA1 bed8d5ac52f1e224cb41192a1a6b8cc568398bfb SHA256 e9c26c2cefce3e0e3eade69199272fcbf2e9c1bd19d51ae8f8d73b0e82aee1af
 DIST nessus-client.png.bz2 10043 RMD160 9d1af8ec4533da24e282ad3168fc29dd1fb9845c SHA1 71a09d8cc82336b0036dd318953a4d90e8d5b523 SHA256 857de50872354058de10fee0bd2bbc2a59e6ec56d75ccfd331847cf16142ce4c
+EBUILD nessus-client-1.0.2-r1.ebuild 1426 RMD160 20e1b34374e789218b19186f29a816ac269e2d40 SHA1 954c0b5ebb3f831c7222bb7621b177e07d415dce SHA256 df2c73729b8181d1656bca3a6157fd5ed73b2a84b269741d430184e5808e9a0f
 EBUILD nessus-client-1.0.2.ebuild 1224 RMD160 98b73d29d6fba8ba416fdec6ff01ea9dea9dc751 SHA1 ec3f6a7afb4e09f9eeb721ce84c8362c294fd6b5 SHA256 117ce094adc8229a72d9ccf71b00d5451816bfdf5b0d527ba4b3fe9efbad1da9
-MISC ChangeLog 1852 RMD160 e40539bd6b49dcf0be130144a710c36f7be4232d SHA1 cee30fc6982da1a4b5a9eeddab61d1c05148ac1f SHA256 6f25f51be3a27da6fc1fd96f84143c28994fe7146076b8c1fcb47644aee8a939
+MISC ChangeLog 2107 RMD160 98a71269096f7ec37fcf34bbb53ce310f2cd4350 SHA1 e6f8c357551526218c9cf7c31bbb21c170daf424 SHA256 3f9364fee08e819fb240716b62e91d6623f6e8701fe8b22dedc5c65c184082bf
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
diff --git a/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch b/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch
new file mode 100644
index 000000000000..d1900f1ec21b
--- /dev/null
+++ b/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch
@@ -0,0 +1,74 @@
+--- a/Makefile	2006-12-23 15:27:39.000000000 +0100
++++ b/Makefile	2010-08-23 01:12:51.000000000 +0200
+@@ -2,8 +2,10 @@
+ 
+ ALLDEPS = nessus.tmpl
+ 
+-all: libnessus-client client sslstuff
+-
++all:
++	$(MAKE) -C libnessus
++	$(MAKE) -C nessus
++	$(MAKE) -C ssl
+ 
+ nessus.tmpl: nessus.tmpl.in configure VERSION
+ 	$(SHELL) configure $(CONFIGURE_ARGS)
+@@ -21,20 +23,17 @@
+ 	$(INSTALL) -m $(CLIENTMODE) nessusclient-mkcert $(DESTDIR)${bindir}
+ 	$(INSTALL) -m $(CLIENTMODE) ssl/nessusclient-mkrand $(DESTDIR)${bindir}
+ 
+-sslstuff:
+-	cd ssl && $(MAKE)
+-
+ install-man:
+ 	@echo installing man pages ...
+ 	@test -d $(DESTDIR)${mandir}/man1 || $(INSTALL_DIR) $(DESTDIR)${mandir}/man1
+ 	@test -d $(DESTDIR)${mandir}/man8 || $(INSTALL_DIR) $(DESTDIR)${mandir}/man8
+ 	@test -d $(DESTDIR)${datadir}/doc/ || $(INSTALL_DIR) $(DESTDIR)${datadir}/doc/
+-	@test -d $(DESTDIR)${datadir}/doc/NessusClient || $(INSTALL_DIR) $(DESTDIR)${datadir}/doc/NessusClient
++	@test -d $(NESSUS_DOCDIR) || $(INSTALL_DIR) $(NESSUS_DOCDIR)
+ 
+ 	$(INSTALL) -c -m 0444 ${MAN_NESSUS_1} $(DESTDIR)${mandir}/man1/NessusClient.1
+ 	$(INSTALL) -c -m 0444 doc/nessusclient-mkcert.1 $(DESTDIR)${mandir}/man1/nessusclient-mkcert.1
+ 	$(INSTALL) -c -m 0444 doc/nessusclient-mkrand.1 $(DESTDIR)${mandir}/man1/nessusclient-mkrand.1
+-	$(INSTALL) -c -m 0444 doc/NessusClient_UserGuide.pdf $(DESTDIR)${datadir}/doc/NessusClient/NessusClient_UserGuide.pdf
++	$(INSTALL) -c -m 0444 doc/NessusClient_UserGuide.pdf $(NESSUS_DOCDIR)/NessusClient_UserGuide.pdf
+ 
+ win32: ${MAN_NESSUS_1}
+ 	$(MANROFF) ${MAN_NESSUS_1}  > doc/NessusClient.1.cat
+@@ -45,23 +44,15 @@
+ 	@echo ' --------------------------------------------------------------'
+ 	@echo
+ 
+-client-install : client
++client-install : nessus
+ 	test -d $(DESTDIR)${bindir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${bindir}
+ 	$(INSTALL) -m $(CLIENTMODE) ${make_bindir}/NessusClient $(DESTDIR)${bindir}
+ 
+-client : 
+-	cd nessus && $(MAKE)
+-
+-libnessus-client:
+-	cd libnessus && $(MAKE)
+-
+-
+ doc : $(MAN_NESSUS_1)
+ 
+ $(MAN_NESSUS_1) : $(MAN_NESSUS_1).in
+ 	@sed -e 's?@NESSUSD_CONFDIR@?${NESSUSD_CONFDIR}?g;s?@NESSUSD_DATADIR@?${NESSUSD_DATADIR}?g;s?@NESSUSD_PLUGINS@?${NESSUSD_PLUGINS}?g;' $(MAN_NESSUS_1).in  >$(MAN_NESSUS_1)
+ 
+-
+ clean:
+ 	cd nessus && $(MAKE) clean
+ 	cd libnessus && $(MAKE) clean
+--- ssl/Makefile.orig	2006-09-12 23:41:31.000000000 +0200
++++ ssl/Makefile	2010-08-23 01:16:51.000000000 +0200
+@@ -6,7 +6,7 @@
+ all : nessusclient-mkrand
+ 
+ nessusclient-mkrand: $(OBJS)
+-	$(CC) $(OBJS) -o nessusclient-mkrand -lm
++	$(CC) $(LDFLAGS) $(OBJS) -o nessusclient-mkrand -lm
+ 
+ nessusclient-mkrand.o: nessusclient-mkrand.c
+ 	$(CC) $(CFLAGS) -c nessusclient-mkrand.c 
diff --git a/net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild b/net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..c8eb8daa2166
--- /dev/null
+++ b/net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild,v 1.1 2010/08/22 23:19:39 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+MY_PN="NessusClient"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="A client for the Nessus vulnerability scanner"
+HOMEPAGE="http://www.nessus.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz
+	mirror://gentoo/nessus-client.png.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc"
+
+DEPEND="!net-analyzer/nessus-core
+	dev-libs/openssl
+	>=x11-libs/gtk+-2.8.8"
+RDEPEND="doc? ( app-text/htmldoc )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+cp -av Makefile{,.orig}
+	epatch "${FILESDIR}"/${P}-make.patch
+	sed \
+		-e "/NESSUS_DOCDIR/s|/doc/NessusClient|/doc/${PF}|g" \
+		-i nessus.tmpl.in \
+		|| die "sed failed"
+}
+
+src_configure() {
+	tc-export CC
+	econf || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc CHANGES README_SSL VERSION
+
+	doicon "${WORKDIR}"/${PN}.png
+	make_desktop_entry NessusClient "Nessus Client" nessus-client "Application;Network;"
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "If you do not have documentation installed, nessus-client"
+		elog "will complain. To install documentation, please emerge with"
+		elog "the doc useflag set. Beware that it will emerge app-text/htmldoc,"
+		elog "a big package."
+	fi
+}