openvas-server bump

(Portage version: 2.2_rc33/cvs/Linux x86_64)

5 files changed, 12 insertions, 86 deletions

diff --git a/net-analyzer/openvas-server/ChangeLog b/net-analyzer/openvas-server/ChangeLog
index 69aefb567cbd..6146bf20f119 100644
--- a/net-analyzer/openvas-server/ChangeLog
+++ b/net-analyzer/openvas-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/openvas-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-server/ChangeLog,v 1.9 2009/03/13 19:29:30 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-server/ChangeLog,v 1.10 2009/07/24 19:32:56 hanno Exp $
+
+*openvas-server-2.0.2 (24 Jul 2009)
+
+  24 Jul 2009; Hanno Boeck <hanno@gentoo.org> +openvas-server-2.0.2.ebuild:
+  Version bump.
 
 *openvas-server-2.0.1-r1 (13 Mar 2009)
 
diff --git a/net-analyzer/openvas-server/files/openvas-server-2.0.0-ldflags.diff b/net-analyzer/openvas-server/files/openvas-server-2.0.0-ldflags.diff
deleted file mode 100644
index d5e63ca2a317..000000000000
--- a/net-analyzer/openvas-server/files/openvas-server-2.0.0-ldflags.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur openvas-server-2.0.0/openvas.tmpl.in openvas-server-2.0.0-1/openvas.tmpl.in
---- openvas-server-2.0.0/openvas.tmpl.in	2008-12-16 14:03:12.000000000 +0100
-+++ openvas-server-2.0.0-1/openvas.tmpl.in	2008-12-20 23:32:16.000000000 +0100
-@@ -103,7 +103,7 @@
- # Some defines you may want to modify
- OPENVAS_DEFS=@DEFS@ $(USE_PTHREADS) $(DEBUG) $(USE_LIBWRAP)
- DEFS=  
--LDFLAGS=
-+LDFLAGS=@LDFLAGS@
- 
- # Your C compiler
- CC=@CC@
-diff -Naur openvas-server-2.0.0/ssl/Makefile openvas-server-2.0.0-1/ssl/Makefile
---- openvas-server-2.0.0/ssl/Makefile	2008-12-16 14:03:12.000000000 +0100
-+++ openvas-server-2.0.0-1/ssl/Makefile	2008-12-20 23:34:18.000000000 +0100
-@@ -36,7 +36,7 @@
- all : openvas-mkrand
- 
- openvas-mkrand: $(OBJS)
--	$(CC) $(OBJS) -o openvas-mkrand -lm
-+	$(CC) $(LDFLAGS) $(OBJS) -o openvas-mkrand -lm
- 
- openvas-mkrand.o: openvas-mkrand.c
- 	$(CC) $(CFLAGS) -c openvas-mkrand.c 
diff --git a/net-analyzer/openvas-server/files/openvas-server-2.0.0-remove-useless-gpgme.diff b/net-analyzer/openvas-server/files/openvas-server-2.0.0-remove-useless-gpgme.diff
deleted file mode 100644
index 2784838df7bb..000000000000
--- a/net-analyzer/openvas-server/files/openvas-server-2.0.0-remove-useless-gpgme.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- openvas-server-2.0.0/openvasd/otp_1_0.c.1	2008-12-20 23:26:48.000000000 +0100
-+++ openvas-server-2.0.0/openvasd/otp_1_0.c	2008-12-20 23:26:53.000000000 +0100
-@@ -34,7 +34,6 @@
- 
- #include "otp_1_0.h"
- 
--#include <gpgme.h>
- #include <glib.h>
- 
- /* Find the enum identifier for the client request which is given
diff --git a/net-analyzer/openvas-server/openvas-server-2.0.0.ebuild b/net-analyzer/openvas-server/openvas-server-2.0.0.ebuild
deleted file mode 100644
index 0a42f83d19f9..000000000000
--- a/net-analyzer/openvas-server/openvas-server-2.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-server/openvas-server-2.0.0.ebuild,v 1.1 2008/12/20 23:55:03 hanno Exp $
-
-inherit eutils
-
-DESCRIPTION="A remote security scanner for Linux (openvas-server)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/550/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tcpd gtk debug prelude"
-
-DEPEND=">=net-analyzer/openvas-libnasl-2.0.0
-	tcpd? ( sys-apps/tcp-wrappers )
-	gtk? ( =x11-libs/gtk+-2* )
-	prelude? ( dev-libs/libprelude )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-remove-useless-gpgme.diff" || die "epatch failed"
-	epatch "${FILESDIR}/${P}-ldflags.diff" || die "epatch failed"
-}
-
-src_compile() {
-	econf \
-		$(use_enable tcpd tcpwrappers) \
-		$(use_enable debug) \
-		$(use_enable gtk) \
-		|| die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die "einstall failed"
-
-	dodoc TODO CHANGES || die
-	dodoc doc/*.txt || die
-
-	doinitd "${FILESDIR}"/openvasd || die "doinitd failed"
-	keepdir /var/lib/openvas/logs
-	keepdir /var/lib/openvas/users
-}
diff --git a/net-analyzer/openvas-server/openvas-server-1.0.2.ebuild b/net-analyzer/openvas-server/openvas-server-2.0.2.ebuild
index f6eacd627f55..6738ef6c267a 100644
--- a/net-analyzer/openvas-server/openvas-server-1.0.2.ebuild
+++ b/net-analyzer/openvas-server/openvas-server-2.0.2.ebuild
@@ -1,20 +1,20 @@
-# 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/net-analyzer/openvas-server/openvas-server-1.0.2.ebuild,v 1.1 2008/08/29 09:05:59 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-server/openvas-server-2.0.2.ebuild,v 1.1 2009/07/24 19:32:56 hanno Exp $
 
 DESCRIPTION="A remote security scanner for Linux (openvas-server)"
 HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/485/${P}.tar.gz"
+SRC_URI="http://wald.intevation.org/frs/download.php/593/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="tcpd gtk debug prelude"
 
-DEPEND=">=net-analyzer/openvas-libraries-1.0.2
-	>=net-analyzer/openvas-libnasl-1.0.1
+DEPEND=">=net-analyzer/openvas-libnasl-2.0.1
 	tcpd? ( sys-apps/tcp-wrappers )
 	gtk? ( =x11-libs/gtk+-2* )
 	prelude? ( dev-libs/libprelude )"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	econf \
@@ -29,7 +29,7 @@ src_install() {
 	einstall || die "einstall failed"
 
 	dodoc TODO CHANGES || die
-	dodoc doc/*.txt doc/ntp/* || die
+	dodoc doc/*.txt || die
 
 	doinitd "${FILESDIR}"/openvasd || die "doinitd failed"
 	keepdir /var/lib/openvas/logs