Drop old, fix version of dependencies; Version Bump

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 34 insertions, 73 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/Manifest b/net-analyzer/openvas/Manifest
index 285978727754..47b2f257330c 100644
--- a/net-analyzer/openvas/Manifest
+++ b/net-analyzer/openvas/Manifest
@@ -2,28 +2,27 @@
 Hash: SHA512
 
 AUX README.gentoo 988 SHA256 867d295aa7a2dd36625c954c030077f1a8670ae1aacf36354ee64284d4cdbd26 SHA512 8aed367e5a8039648ced2466a96db830f90ddabc8ff2f06f420ec5a6f95be301e6ced30f8d5fc192ea618f32d9caebd83dcce9e32eb4729848411ff84b00ad01 WHIRLPOOL da6a21dee0867e21a837fdec90da9c29fe3a35ac13e67a87107a2a357a7d0c2d4ce989adbed314818f00df7f439e898369961f17211cf840696d6e5929d76bc0
-EBUILD openvas-7.0.6.ebuild 1565 SHA256 552bf1ddfebaa329b0692362b02fd892ed133db17c0a10c1ca31cd5c80f67c00 SHA512 75667cb6b01d904d9685c785ec02740e0dc6657b686907e8751c81ced41215a825abeba76d1412e91acdf263ee397dcbf0928be0ad69d6da86ad560a98d152b0 WHIRLPOOL 9221e7b441e15cf78b7bf5895d86d272ea8729dc07236463bb6e2fbf42cd6c07edda0bf0c3179a9113de4b895c933470600cee001fd20e8249a0debf5ceb82ef
+EBUILD openvas-7.0.6.ebuild 1565 SHA256 4630b9912d6790870f9751423c851fac0e9308a8cafafb95da89db184a8194a4 SHA512 9e6b9ed192aeb52c59a05bff484788e8f388517a600cce855fc0c22d12e1f0f9ac5f7df2ecbb23902b466ee3fd16b83ac2379f267ecc0bdd3d3662e65be550a0 WHIRLPOOL 473f93768acc7c43b9dc6925f276f3721638e96caee3b4785f8bd09816f2d924a429d79396007c8ac1ae28395b5e818e2eb2498a32635ad54189c9d5cbc8c281
 EBUILD openvas-7.0.7.ebuild 1640 SHA256 99ea887522c306e33d12543bb3a521ad884381fbfa5fc684101601a49f44fa58 SHA512 ee8deb06f903cfb6aa7d8a7cb3668c12fe1983e55c85e5d23f8245d5c4d1f232a194bdb5274572f19470e0d8eedddb21ade38c48dd1755866493c2c5f62abcdb WHIRLPOOL f3bd65016139c1df9f59d71770e1025416151e7775ec4846e1033b1794bca40fff06e5ce0b04742a9eb644a29bd256348315bcb48d26b83d8d123fa72c6b1ade
-EBUILD openvas-8_beta3.ebuild 1573 SHA256 0c08b9e9171499ffeaab7e1bf1995b7a780e445879a76f4e0be17f62d8850901 SHA512 55e34cb1de0d5ef8376000aa41dc9f819478fdf934b894f2da8534a0d238ebb1587e09dd8f09cf464505ffe7b86a23cbf7922ae2022e763c1c7d791250551362 WHIRLPOOL f295c9b2e3d5d9482caf531f932cdd2e15cc08306e261a49323a5b2c018732e3f33f227fa44f969a08a507529ba9e1fef2ff96e1ea921c81a642d60b100b3d02
-EBUILD openvas-8_beta4.ebuild 1573 SHA256 4639e4a52194e6ed4f4fbca3f2726989dca96176198e461fde5737ca7e8198f2 SHA512 eb65ac8a385caff550ffca3fdabd669f36af0fffdf30cf64e75e04791bac88793e331e387394d5e789912d3484bbbf48333a6526198244abdece18eb54615942 WHIRLPOOL 9af65e69fd434bd955ca6588a006336493d0273be7f78dfa6704f1e18675c3d31a5e5e1ef4f080c568105d7ec80f68f498ec1e60a1eca0421d6bb072ff2c519a
-MISC ChangeLog 3593 SHA256 cdd572e703f3ab9156baf27b6bad01a5d06f3bba51efb19d6aa8b2a25d2c4e34 SHA512 53876242ba135439e6a9e71090f7c0d721a2ffd471b08d40bdfcdeb7eb5b8700b074375ba8f9dcd57b38acd5e74c9192c1e15104d9bcc0c328991c1c4609a132 WHIRLPOOL a8c12627a4a8c64a61ec8fa81a056d77f7cfdddb6a6af20b68e245770bfca3cf021be5a1a0955fa621e44b885b241a6c73698738b855a11e6be91eb52da55e24
+EBUILD openvas-8_beta5.ebuild 1644 SHA256 a60df9814b8ef54e17d2d6c3f5e37faff89d3f2d83026e68351614948c3b1ebd SHA512 f263dd24885facc38744377c77ac8d4db6abd4a833daa4dcde6846d6020671d0cd4394a1f6aa3e4c63dc75ab259075dd2d1eb525809661f0dec24f11bbab1e3c WHIRLPOOL b43a7db1501dfc2f3d31b950ec3d8c67f2328a70cbf388cf11b67256c49b720b4bcdb44086b219d14a1eaccfdc3a1685a32948b7697b6205bee499ebe495d902
+MISC ChangeLog 3826 SHA256 789682da0b403db51e59eedaeb5037ecb9be5f932624934a74ed87397212dc30 SHA512 add441f333f12d87bae8a40f9b74620c8c74f9606d74062272752da2313a83442afff0f6b1a42d7c0ef6ce44acb3f4fab4b1c78b091450b0cb1ca07ce98afa03 WHIRLPOOL b3aae85568a64be9d06eb5567f0a91d306e018557edbf0fddbe7f69bff9b6f7b7bc86cc787002beda272930c3b092aa3cc12226ce6b98af543085b39337617b3
 MISC metadata.xml 344 SHA256 2effe8f48c74f6aadff139546a16fd02f0e00f67579f4edc2e61fe089a3d217b SHA512 40380aa9dc4b70f1e67a5ad025624e7c74f6677a831243ee900dc64848e8ccf188538789e828bec413c7e7cb77b78605af4c882be893648db176bed4b21329f2 WHIRLPOOL 558376634f1ce90023e1d5f7249047db601ee48353f8949e9f086d428dfa8f889028886da805220d6b9c4eb4042efd92cd838a3b71279502718dcbe5a19c0087
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJU31eeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU31iLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirml0P/iTiRhNOxoa6x/0gm00n+80X
-/8wO1GRkdnCml/m76H6SA+36/fxx1uGRyIRjnQYg1AaG+Y9eut62G35t8f4Rk9VP
-Cg1U5kbG1/noDOkzutj7h1wK+qMbUy70CNm/3az9MF8/tMN/o74tmhaeWICNJWGn
-0odwZMa9olRG2fjn9SRo1d/XzLY+Blo4QDeWMQdJ+YiHOhRcljQ2QlEsBIBALIFu
-xLcE0cYD+YRtELFGh5LcLGJA6HvpKe1F2ZFeX3M7vHiEYmelOyS7K35eCGFWC/jh
-HAFQcNDBHniQp8rSyofLSoCrbSqWZtkQ7MPHyBL105OhjhJ5x7kmJkzkjU4dLbCF
-pjYKqHnS+nyHb4uxp3ld6hf2Y+wXMtPNGOE4/2USUtAZ1eMhOFJnZKDP6ucCaLw7
-GAVB5xlB3SP4SkX70UPVLmynRU7dcTE7At8LWuprPuQoqaTpMpKxrslPQ05hajj6
-aC0LvMB6+miIM7ZHtWksyCKfz5ogf/wSPQvIR/H1hp58ub63Z1vZhS998E9URE2f
-N+H87tKpFXydyFu9E/2RVQqF7u4XLLZ1xl9bL9/wGAM6hKXnaZ/T+7RgbVnYdAG9
-LMOs0PjMS7LsuhI2aY5ZVjz7N8oaytAz3qc/8HWeIxp1Ymqv6dXmlhx/01DYULCC
-Pq++hwH4RNfs8wtkwuTM
-=8KLt
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir/L0P/0AW2Qw8M5BU1oEkRInUlNPj
+1ZBW3FzE9TU4bpImpWnt+iLtEiOiXsIKBYYNpTKVJ2s3mWWGAg4ySSeaX5YPC9Wn
+WzedHGhkO7vUeoHkZq8D6qX6y81BFRrgRr2Bold7ZK2MntX8g/iiOkkyQY4tTELF
+brIqS1xeIGQ5bGE1P1LrbUxaYJpI2FeQFg6lTznFipP3I62lS+w0kKwWWfax8meO
+C6Nf1+XmxTxvUzLRn6so2fzTXCRcNcAIOE1DTjh4AEc60MheLbT4lW4+dUJPvMxT
+XZzLmNpFO3gZKq7XU8tv/pWwaITDRV9obDpWj2Su+iIMm2IU0CvVZ80sOazpEseZ
+zgt6+xC8u4ezmQXNe3L+fu0DlFomZC6ckRFmCqIwm6gidyABAAxcKLofUNDKoR5J
+EvWNGmhZSNafeBRwnqeJ4/gLfsguA0ZGswLkdKX0dxCTVJB29IxLLiSXjB/Bq93r
+6GnY1gGlQ4e8AKk93orRb2tPXC6daLxsaZaJ84MKx/MXTlWuZyQaUjI6dDf1VYe8
+2vKH+AkzWwMJ7RnUozifbR2bn0TNfcWRbOfk/rmXGijnI/kDTiREgeoES3ZXBq7+
+hVZbDsv4FxNMDAajdn/SJ7wmxpH8gWUykutO90t8KLzvVYe3u13rEcszlpMzRbJM
+Pf2+6lYmVlC/cfCuBnlL
+=6P5S
 -----END PGP SIGNATURE-----
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
 }