Fix X/gtk USE flag stuff for bug 84885; also, don't install /usr/include/nessus/includes.h since it is provided by nessus-libraries.

(Portage version: 2.0.51.19)

3 files changed, 31 insertions, 35 deletions

diff --git a/net-analyzer/nessus-core/ChangeLog b/net-analyzer/nessus-core/ChangeLog
index d6e084a394d6..d29c3298f842 100644
--- a/net-analyzer/nessus-core/ChangeLog
+++ b/net-analyzer/nessus-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nessus-core
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.57 2005/02/26 03:27:24 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.58 2005/03/21 13:56:49 ka0ttic Exp $
+
+  21 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> nessus-core-2.3.0.ebuild:
+  Fix X/gtk USE flag stuff for bug 84885; also, don't install
+  /usr/include/nessus/includes.h since it is provided by nessus-libraries.
 
 *nessus-core-2.2.3 (26 Feb 2005)
 
diff --git a/net-analyzer/nessus-core/Manifest b/net-analyzer/nessus-core/Manifest
index 8864a0f7147b..a5d2f4dec5fc 100644
--- a/net-analyzer/nessus-core/Manifest
+++ b/net-analyzer/nessus-core/Manifest
@@ -1,26 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 89dcca197f70127c074adee07def88c6 ChangeLog 9217
-MD5 6c84d5c467762f4f981df4428ec8f544 nessus-core-2.2.0.ebuild 1763
-MD5 6f1e3f004c4b37d9db9e6e9989989b60 nessus-core-2.2.3.ebuild 1261
+MD5 02205f3e01eceaa0a955a58c126b04ff nessus-core-2.3.0.ebuild 1338
 MD5 808fa7dfade1c7a47ffe122719946abb nessus-core-2.2.2a.ebuild 1262
-MD5 8da16861b085ddda61a4f8f92f16aa01 nessus-core-2.3.0.ebuild 1261
-MD5 883d45d6092c114bdf3d35a3ce45161a metadata.xml 244
+MD5 6f1e3f004c4b37d9db9e6e9989989b60 nessus-core-2.2.3.ebuild 1261
+MD5 6c84d5c467762f4f981df4428ec8f544 nessus-core-2.2.0.ebuild 1763
 MD5 c6b343a132e20866fa266319988018dd nessus-core-2.0.12.ebuild 1747
+MD5 d8f49dfbcab6c230fd1e59363074ac79 ChangeLog 9430
+MD5 883d45d6092c114bdf3d35a3ce45161a metadata.xml 244
+MD5 16d08afb09cfc5710977cd1d01174398 files/digest-nessus-core-2.0.12 139
+MD5 b803eff9067d1d87598fc480ce7c0b3c files/digest-nessus-core-2.2.2a 70
 MD5 d523fcb11205cb895b8d8c1272c07d33 files/digest-nessus-core-2.2.0 138
+MD5 a78c42d997f9da52402e8a7e47294051 files/digest-nessus-core-2.2.3 69
 MD5 73b4eee37b18923b3b50cf550974c9a7 files/digest-nessus-core-2.3.0 70
-MD5 4a061378d54a0fa50ce43ca0975ac62b files/nessusd-r7 647
-MD5 b803eff9067d1d87598fc480ce7c0b3c files/digest-nessus-core-2.2.2a 70
-MD5 5c3b75512d095ff2ff65bbe535fe63b3 files/nessus-core-2.0.7.patch 448
 MD5 9a0fe4028467fdee9187dbcc20107278 files/nessusd-r6 486
+MD5 4a061378d54a0fa50ce43ca0975ac62b files/nessusd-r7 647
 MD5 02fce1d620b03f7d03f3ae84fdeea4d6 files/patch_1.nessus-core.2.0.7 787
-MD5 a78c42d997f9da52402e8a7e47294051 files/digest-nessus-core-2.2.3 69
-MD5 16d08afb09cfc5710977cd1d01174398 files/digest-nessus-core-2.0.12 139
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCH+yimdTrptrqvGERAnymAJ9NJ5zNBUx0v3ETUJPw9awxbc1DggCcCGWQ
-HbuoEmd6XIui3yQ4YxlwQ9o=
-=lvKq
------END PGP SIGNATURE-----
+MD5 5c3b75512d095ff2ff65bbe535fe63b3 files/nessus-core-2.0.7.patch 448
diff --git a/net-analyzer/nessus-core/nessus-core-2.3.0.ebuild b/net-analyzer/nessus-core/nessus-core-2.3.0.ebuild
index 73311ce64922..f80882eeaace 100644
--- a/net-analyzer/nessus-core/nessus-core-2.3.0.ebuild
+++ b/net-analyzer/nessus-core/nessus-core-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.3.0.ebuild,v 1.4 2005/01/28 02:03:55 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.3.0.ebuild,v 1.5 2005/03/21 13:56:49 ka0ttic Exp $
 
 inherit toolchain-funcs
 
@@ -11,38 +11,40 @@ SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64"
-IUSE="X tcpd gtk2 debug"
+IUSE="tcpd gtk gtk2 debug"
+
 DEPEND="=net-analyzer/nessus-libraries-${PV}
 	=net-analyzer/libnasl-${PV}
 	tcpd? ( sys-apps/tcp-wrappers )
-	X? ( virtual/x11
+	gtk? ( virtual/x11
 		!gtk2? ( =x11-libs/gtk+-1.2* )
 		gtk2? ( =x11-libs/gtk+-2* )
 	)
 	prelude? ( dev-libs/libprelude )"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_compile() {
-
 	export CC=$(tc-getCC)
-	econf `use_enable tcpd tcpwrappers` \
-		`use_enable debug` \
-		`use_enable X gtk` \
+	econf \
+		$(use_enable tcpd tcpwrappers) \
+		$(use_enable debug) \
+		$(use_enable gtk) \
 		|| die "configure failed"
 	emake || die "emake failed"
 
 }
 
 src_install() {
-	emake DESTDIR=${D} \
-		install || die "Install failed nessus-core"
-	cd ${S}
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# net-analyzer/nessus-libraries provides includes.h
+	rm ${D}/usr/include/nessus/includes.h
+
 	dodoc README* UPGRADE_README CHANGES
 	dodoc doc/*.txt doc/ntp/*
-	insinto /etc/init.d
-	insopts -m 755
-	newins ${FILESDIR}/nessusd-r7 nessusd
+
+	newinitd ${FILESDIR}/nessusd-r7 nessusd || die "newinitd failed"
 	keepdir /var/lib/nessus/logs
 	keepdir /var/lib/nessus/users
 }