Drop old, fix version of dependencies; Version Bump

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 17 insertions, 55 deletions

diff --git a/net-analyzer/openvas/ChangeLog b/net-analyzer/openvas/ChangeLog
index 16fd6d6f420f..1842cd7b0b36 100644
--- a/net-analyzer/openvas/ChangeLog
+++ b/net-analyzer/openvas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/openvas
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas/ChangeLog,v 1.24 2015/02/14 14:07:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas/ChangeLog,v 1.25 2015/02/14 14:11:33 jlec Exp $
+
+*openvas-8_beta5 (14 Feb 2015)
+
+  14 Feb 2015; Justin Lecher <jlec@gentoo.org> +openvas-8_beta5.ebuild,
+  -openvas-8_beta3.ebuild, -openvas-8_beta4.ebuild, openvas-7.0.6.ebuild:
+  Drop old, fix version of dependencies; Version Bump
 
 *openvas-7.0.7 (14 Feb 2015)
 
diff --git a/net-analyzer/openvas/openvas-7.0.6.ebuild b/net-analyzer/openvas/openvas-7.0.6.ebuild
index a1d3daf19cc5..5a0687644529 100644
--- a/net-analyzer/openvas/openvas-7.0.6.ebuild
+++ b/net-analyzer/openvas/openvas-7.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas/openvas-7.0.6.ebuild,v 1.1 2014/12/01 17:01:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas/openvas-7.0.6.ebuild,v 1.2 2015/02/14 14:11:33 jlec Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ IUSE="+pdf"
 
 DEPEND="
 	~net-analyzer/openvas-libraries-7.0.6
-	~net-analyzer/openvas-scanner-4.0.5
+	~net-analyzer/openvas-scanner-4.0.4
 	~net-analyzer/openvas-manager-5.0.7
 	~net-analyzer/openvas-cli-1.3.1
 	net-analyzer/openvas-tools
diff --git a/net-analyzer/openvas/openvas-8_beta4.ebuild b/net-analyzer/openvas/openvas-8_beta4.ebuild
deleted file mode 100644
index 4771ed35e28b..000000000000
--- a/net-analyzer/openvas/openvas-8_beta4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas/openvas-8_beta4.ebuild,v 1.1 2014/12/01 17:01:06 jlec Exp $
-
-EAPI=5
-
-inherit readme.gentoo
-
-DESCRIPTION="A remote security scanner"
-HOMEPAGE="http://www.openvas.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE="+pdf"
-
-DEPEND="
-	>=net-analyzer/openvas-libraries-8_beta4
-	>=net-analyzer/openvas-scanner-5_beta4
-	>=net-analyzer/openvas-manager-6_beta4
-	>=net-analyzer/openvas-cli-1.4_beta4
-	net-analyzer/openvas-tools
-	>=net-analyzer/greenbone-security-assistant-6_beta4
-	pdf? (
-		app-text/htmldoc
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)"
-# greenbone-security-desktop is broken and unsupported upstream
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-pkg_postinst() {
-	elog "Additional support for extra checks can be get from"
-	optfeature "Nikto — a web server scanning and testing tool" net-analyzer/nikto
-	optfeature "NMAP — a portscanner" net-analyzer/nmap
-	optfeature "ike-scan - an IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
-	optfeature "amap — an application protocol detection tool" net-analyzer/amap
-	optfeature "ldapsearch from OpenLDAP utilities — retrieves information from LDAP dictionaries" net-nds/openldap
-	optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi
-	optfeature "portbunny — a Linux-kernel-based portscanner" net-analyzer/portbunny
-	optfeature "w3af — a web application attack and audit framework" net-analyzer/w3af
-}
diff --git a/net-analyzer/openvas/openvas-8_beta3.ebuild b/net-analyzer/openvas/openvas-8_beta5.ebuild
index 8989777910bd..af721bc6d147 100644
--- a/net-analyzer/openvas/openvas-8_beta3.ebuild
+++ b/net-analyzer/openvas/openvas-8_beta5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas/openvas-8_beta3.ebuild,v 1.2 2014/10/22 08:19:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas/openvas-8_beta5.ebuild,v 1.1 2015/02/14 14:11:33 jlec Exp $
 
 EAPI=5
 
@@ -15,12 +15,11 @@ KEYWORDS=""
 IUSE="+pdf"
 
 DEPEND="
-	>=net-analyzer/openvas-libraries-8_beta3
-	>=net-analyzer/openvas-scanner-5_beta3
-	>=net-analyzer/openvas-manager-6_beta3
-	>=net-analyzer/openvas-cli-1.4_beta3
+	>=net-analyzer/openvas-libraries-8_beta5
+	>=net-analyzer/openvas-scanner-5_beta5
+	>=net-analyzer/openvas-manager-6_beta5
+	>=net-analyzer/openvas-cli-1.4_beta5
 	net-analyzer/openvas-tools
-	>=net-analyzer/greenbone-security-assistant-6_beta3
 	pdf? (
 		app-text/htmldoc
 		dev-texlive/texlive-latexextra
@@ -41,4 +40,5 @@ pkg_postinst() {
 	optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi
 	optfeature "portbunny — a Linux-kernel-based portscanner" net-analyzer/portbunny
 	optfeature "w3af — a web application attack and audit framework" net-analyzer/w3af
+	optfeature "The Greenbone Security Assistant as alternative to the plain scanner" net-analyzer/greebone-security-assistant
 }