gtk/gtk2 fix, does not work without gtk* and also tells this, now.

3 files changed, 9 insertions, 17 deletions

diff --git a/net-analyzer/nessus-core/ChangeLog b/net-analyzer/nessus-core/ChangeLog
index f0f86a730c12..7ade6e0e0e84 100644
--- a/net-analyzer/nessus-core/ChangeLog
+++ b/net-analyzer/nessus-core/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nessus-core
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.25 2003/11/19 08:54:23 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.26 2003/11/24 07:55:39 phosphan Exp $
+
+  24 Nov 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-core-2.0.9.ebuild:
+  While fixing a gtk/gtk2 problem I noticed that the GUI is not optional.
 
 *nessus-core-2.0.9 (19 Nov 2003)
 
diff --git a/net-analyzer/nessus-core/Manifest b/net-analyzer/nessus-core/Manifest
index b5cf09d2256f..8da1a9a4035f 100644
--- a/net-analyzer/nessus-core/Manifest
+++ b/net-analyzer/nessus-core/Manifest
@@ -1,8 +1,8 @@
 MD5 cd4a9e037af465522e589c9ab6304ba0 nessus-core-2.0.8a.ebuild 2055
 MD5 c543c8098fe41be92e923af6588ddf0d nessus-core-2.0.7.ebuild 1611
 MD5 834db601c98ee809f6f041e7ddc81343 nessus-core-2.0.7-r1.ebuild 2036
-MD5 f359ec944f4d6a8a878f285ee43c9a92 nessus-core-2.0.9.ebuild 2055
-MD5 9f5e56cd3b676c8a59cbaea64d2f984b ChangeLog 4341
+MD5 6b9f0d114b8533617d77d6141df08bc1 nessus-core-2.0.9.ebuild 1749
+MD5 9ffd5a4c5fd33d22caf05373eee3966b ChangeLog 4495
 MD5 23192ff5f68a5dcd5ac8483ee86a03eb files/digest-nessus-core-2.0.7-r1 138
 MD5 5c6426f630e46de4a016d442909c36bd files/digest-nessus-core-2.0.8a 139
 MD5 9679a5b09be067d39a0c15b4354fa1ab files/digest-nessus-core-2.0.7 69
diff --git a/net-analyzer/nessus-core/nessus-core-2.0.9.ebuild b/net-analyzer/nessus-core/nessus-core-2.0.9.ebuild
index 748588e1fa4a..0466a43af8c1 100644
--- a/net-analyzer/nessus-core/nessus-core-2.0.9.ebuild
+++ b/net-analyzer/nessus-core/nessus-core-2.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.0.9.ebuild,v 1.1 2003/11/19 08:54:23 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.0.9.ebuild,v 1.2 2003/11/24 07:55:39 phosphan Exp $
 
 DESCRIPTION="A remote security scanner for Linux (nessus-core)"
 HOMEPAGE="http://www.nessus.org/"
@@ -10,12 +10,12 @@ SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-IUSE="tcpd X gtk gtk2 debug prelude"
+IUSE="tcpd gtk2 debug prelude"
 
 DEPEND="=net-analyzer/libnasl-${PV}
 	tcpd? ( sys-apps/tcp-wrappers )
 	X? ( x11-base/xfree )
-	gtk? ( =x11-libs/gtk+-1.2* )
+	!gtk2? ( =x11-libs/gtk+-1.2* )
 	gtk2? ( =x11-libs/gtk+-2* )
 	prelude? ( dev-libs/libprelude )"
 
@@ -31,14 +31,6 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	use X && myconf="--with-x" || myconf="--without-x"
-	if [ `use gtk` ]; then
-		myconf="${myconf} --enable-gtk"
-	elif [ `use gtk2` ]; then
-		myconf="${myconf} --enable-gtk"
-	else
-		myconf="${myconf} --disable-gtk"
-	fi
 	# no use_enable because of bug 31670
 	if [ `use tcpd` ]; then
 		myconf="${myconf} --enable-tcpwrappers"
@@ -51,9 +43,6 @@ src_compile() {
 	if [ `use prelude` ]; then
 		export LIBPRELUDE_CONFIG=/usr/bin/libprelude-config
 	fi
-	if [ `use prelude` ]; then
-		export LIBPRELUDE_CONFIG=/usr/bin/libprelude-config
-	fi
 	econf ${myconf} || die "configure failed"
 	emake || die "emake failed"