Drop old; fix dependencies versions

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

4 files changed, 26 insertions, 67 deletions

diff --git a/net-analyzer/openvas/ChangeLog b/net-analyzer/openvas/ChangeLog
index 1842cd7b0b36..54a0084b93d8 100644
--- a/net-analyzer/openvas/ChangeLog
+++ b/net-analyzer/openvas/ChangeLog
@@ -1,6 +1,10 @@
 # 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.25 2015/02/14 14:11:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas/ChangeLog,v 1.26 2015/02/14 14:40:03 jlec Exp $
+
+  14 Feb 2015; Justin Lecher <jlec@gentoo.org> -openvas-7.0.6.ebuild,
+  openvas-7.0.7.ebuild:
+  Drop old; fix dependencies versions
 
 *openvas-8_beta5 (14 Feb 2015)
 
diff --git a/net-analyzer/openvas/Manifest b/net-analyzer/openvas/Manifest
index 47b2f257330c..f121bf3f896d 100644
--- a/net-analyzer/openvas/Manifest
+++ b/net-analyzer/openvas/Manifest
@@ -2,27 +2,26 @@
 Hash: SHA512
 
 AUX README.gentoo 988 SHA256 867d295aa7a2dd36625c954c030077f1a8670ae1aacf36354ee64284d4cdbd26 SHA512 8aed367e5a8039648ced2466a96db830f90ddabc8ff2f06f420ec5a6f95be301e6ced30f8d5fc192ea618f32d9caebd83dcce9e32eb4729848411ff84b00ad01 WHIRLPOOL da6a21dee0867e21a837fdec90da9c29fe3a35ac13e67a87107a2a357a7d0c2d4ce989adbed314818f00df7f439e898369961f17211cf840696d6e5929d76bc0
-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-7.0.7.ebuild 1644 SHA256 ed1624b2d8f1d3f82efe921a5719b5b078abf45bbd106b699bdd83d9b1cf0de7 SHA512 10c01717a14097e065bd7a4b14a6ecd2e66207262c208ca6d9689c31881e7cabcee8a9e21f8c63c15c43ba1e3bb62c5c4f534ecb8b2b0d249fbde2b3ec8f34d8 WHIRLPOOL 2cca2b45b38465adad0660071031bca692dce19701b0098e3a031d8f0ebdd470c31bd1947f29235115e7d955fbf24030c4277a8faa548b5459b1d276bc06928e
 EBUILD openvas-8_beta5.ebuild 1644 SHA256 a60df9814b8ef54e17d2d6c3f5e37faff89d3f2d83026e68351614948c3b1ebd SHA512 f263dd24885facc38744377c77ac8d4db6abd4a833daa4dcde6846d6020671d0cd4394a1f6aa3e4c63dc75ab259075dd2d1eb525809661f0dec24f11bbab1e3c WHIRLPOOL b43a7db1501dfc2f3d31b950ec3d8c67f2328a70cbf388cf11b67256c49b720b4bcdb44086b219d14a1eaccfdc3a1685a32948b7697b6205bee499ebe495d902
-MISC ChangeLog 3826 SHA256 789682da0b403db51e59eedaeb5037ecb9be5f932624934a74ed87397212dc30 SHA512 add441f333f12d87bae8a40f9b74620c8c74f9606d74062272752da2313a83442afff0f6b1a42d7c0ef6ce44acb3f4fab4b1c78b091450b0cb1ca07ce98afa03 WHIRLPOOL b3aae85568a64be9d06eb5567f0a91d306e018557edbf0fddbe7f69bff9b6f7b7bc86cc787002beda272930c3b092aa3cc12226ce6b98af543085b39337617b3
+MISC ChangeLog 3959 SHA256 ae00af1394c555d4df59023af1dc13f1cd6c5d2f4164c127142d38a8dda36bf7 SHA512 9f3b04f0accf2198aab4d9f0fdc345708ddf4781828adc5024c437e2594b002f52c7c573ed7465a7bdea41e12c869329f3e2d7deba2dcf9db6852904fa605670 WHIRLPOOL 2d33d9607303a5faa21bb4f485de439421337cbac4c8fb5512f1c5b2e8564abe0f002a1c6c3b1be48b8c0df1207008a4773508a0f072bdaf775cb3c61193eed2
 MISC metadata.xml 344 SHA256 2effe8f48c74f6aadff139546a16fd02f0e00f67579f4edc2e61fe089a3d217b SHA512 40380aa9dc4b70f1e67a5ad025624e7c74f6677a831243ee900dc64848e8ccf188538789e828bec413c7e7cb77b78605af4c882be893648db176bed4b21329f2 WHIRLPOOL 558376634f1ce90023e1d5f7249047db601ee48353f8949e9f086d428dfa8f889028886da805220d6b9c4eb4042efd92cd838a3b71279502718dcbe5a19c0087
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJU31iLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU3185XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-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
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirrZAP+wbmjYKUVgX//LhUrG8gUdS9
+dBQ/WBzzxGw7DPnxlebDPWwo21XPl8o5gogWWXGYf7bmIXZmVNw8rDDilBLh9M7I
+uA7D1y1jY3q/rFl3UB2piMTYjqG0Es6NJBGbpE02A/GBlBy1qO48tGwNM14+ZMZx
+zd2Ke+Stc0UFs+Ij4nNgPLxpHvuhSOgcHD8SxMVmVmjr7mfgd/hLc6NwnEyobWcp
+bDFj+UovtJlYSshKF5FQ/roJnTbJdjWodQFVSq5mLZqWcDTnB9gG4Py9128qWj9z
+0sggkvPMjiK/pCsnmdDXEekmHF0JWZ4winpMJK9WhcjgqVZkoYOxDmhA2vBetzJn
+0RTn6g45j1GMv1PcwjUgNuwwSOCo3FU8itWLEsprr6FbNsDK650TW3q+e0TIevvj
+P1X5VLRXosEkawCqzBhFI/kNaQ/C0FKYJWg3+taPB0Lv57G4z46rD1PCzloL4tlo
+GCpQf1kimZ1AWN2tAcyWWyxkSOek+PKAurg6SdvHurjEZP876kHfD40uhGlsubP0
+osVkXD9aFoz8PDlSslmVtmsZtgp4L3rPW4IUY1yrWCApP2+1PQUGeAVVw5Uy7GJT
+Stw8VgQ+2kNIKtH82dM21nnKumQKPhwS2EchLTAAc4fEzPxQe2Sp/Zm1/rJqlrIE
+HOP+fG5djRi8NjCoH3zY
+=rYwX
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/openvas/openvas-7.0.6.ebuild b/net-analyzer/openvas/openvas-7.0.6.ebuild
deleted file mode 100644
index 5a0687644529..000000000000
--- a/net-analyzer/openvas/openvas-7.0.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.2 2015/02/14 14:11:33 jlec Exp $
-
-EAPI=5
-
-inherit readme.gentoo
-
-DESCRIPTION="A remote security scanner"
-HOMEPAGE="http://www.openvas.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pdf"
-
-DEPEND="
-	~net-analyzer/openvas-libraries-7.0.6
-	~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
-	~net-analyzer/greenbone-security-assistant-5.0.4
-	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-7.0.7.ebuild b/net-analyzer/openvas/openvas-7.0.7.ebuild
index 09ba02afd8ee..ba23a13cb872 100644
--- a/net-analyzer/openvas/openvas-7.0.7.ebuild
+++ b/net-analyzer/openvas/openvas-7.0.7.ebuild
@@ -1,6 +1,6 @@
 # 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.7.ebuild,v 1.1 2015/02/14 14:07:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas/openvas-7.0.7.ebuild,v 1.2 2015/02/14 14:40:03 jlec Exp $
 
 EAPI=5
 
@@ -15,10 +15,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+pdf"
 
 DEPEND="
-	~net-analyzer/openvas-libraries-7.0.7
-	~net-analyzer/openvas-scanner-4.0.5
-	~net-analyzer/openvas-manager-5.0.8
-	~net-analyzer/openvas-cli-1.3.1
+	>=net-analyzer/openvas-libraries-7.0.7
+	>=net-analyzer/openvas-scanner-4.0.5
+	>=net-analyzer/openvas-manager-5.0.8
+	>=net-analyzer/openvas-cli-1.3.1
 	net-analyzer/openvas-tools
 	pdf? (
 		app-text/htmldoc