gentoo resync : 18.08.2019

3 files changed, 2 insertions, 68 deletions

diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index 2b1937d744cb..104b5e4b396f 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1,8 +1,6 @@
 AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4
-DIST Nessus-6.10.5-es7.x86_64.rpm 41596796 BLAKE2B 2d9078eb3a53bc9fe63a649f6829ac757424bdecd007bdcaefcda661951a18918ce4f2823fe3ae88ded68453e82a06ccd2d225db26713c5b72bdd09f9e665b1d SHA512 a407aa010d3d59d5c4d717159851a6b81ef9e1f1b4327c8382abe1b866c4969cf6e32251077270eae719b66af9ce29641c40ca6093df30f88ce9be81ba168f75
-DIST Nessus-8.3.2-es7.x86_64.rpm 68708928 BLAKE2B 7a5bea2de3ca5ad9f18ffa61857e611e137c4f78decb7b4c855e6e55d01c11e2b5d26960070d2d06a383018692ff6b7844c7872903e505422f73b3d5001d95b9 SHA512 6e84a1f85ae98bd352d0ed77dfc3bbb7117e6cdf64b8fc0718f9f2200a95c53828e7e5ecce586d1b9abe55b3318c63ef03f28ada7365c7a9f0046e65fb59e615
 DIST Nessus-8.4.0-es7.x86_64.rpm 69321556 BLAKE2B 678a93b51a57688c45512e91f940fa372070484b67b5d716faada48b1d6a1d95126dc1a482c6e43b8ff37b9c1e99fa538c0cf01dfca05e22edb83d1156c4fd4d SHA512 cdbd1e94c283104c47ea29950339962b4aa541c783f849cd92b6ce83f04632d9ed7eb88a3791d1054a98b256ef787d84c70bb3b56af3fb1801e16d8412d4b763
-EBUILD nessus-bin-6.10.5.ebuild 1769 BLAKE2B 7fa43dc45ad25e40adbd568636257f1514a9464ec33fe4b9bd850564ba8deaeceedc2fafa259d7c53dab3293bbed0e34947bf28ec75df2842e1ba899572beeb6 SHA512 7302cbbabb12cb59b88a80055e4ff3c535bd866e175070736116dd5c98546e0c7b24742822a6a64a7b01979703452c4c7419c512e9a9185a3a99ffe822fb75c0
-EBUILD nessus-bin-8.3.2.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df
+DIST Nessus-8.5.2-es7.x86_64.rpm 72892020 BLAKE2B c5ae05c02da4fe3265ae1b31da0d8dc025c7275ef466d7f889ebefe6a6006e500e2df029ab90ab37cd0c5089078a22b4f0474a4cfa830a378aead68337154f91 SHA512 ef96ee30b693c72a33981757a8e9616ce7813837de90065c8d140e9702552798e09c0941c282d1a54817f036f606a9934bc9020e86dce12baf50a1a57dbcec08
 EBUILD nessus-bin-8.4.0.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df
+EBUILD nessus-bin-8.5.2.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df
 MISC metadata.xml 345 BLAKE2B 05fdd17a4decd9a096175a59991a6df8260591c09193fef114895d7d29e0f08210aacd4517678410813d06a27b1032889c529e2966427c5a9ad454f9534d25f5 SHA512 3535519b1c621f6df120e6aa39f9a11ec132b68499a029915650218c16e9ca1a07cb30409ace95b2aa0204194a61c7b4743051e1f4ffc94cb5ba3372cac72e8c
diff --git a/net-analyzer/nessus-bin/nessus-bin-6.10.5.ebuild b/net-analyzer/nessus-bin/nessus-bin-6.10.5.ebuild
deleted file mode 100644
index e29c3a053c5c..000000000000
--- a/net-analyzer/nessus-bin/nessus-bin-6.10.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm pax-utils systemd
-
-MY_P="Nessus-${PV}-es7"
-
-DESCRIPTION="A remote security scanner for Linux"
-HOMEPAGE="https://www.tenable.com/"
-SRC_URI="${MY_P}.x86_64.rpm"
-
-LICENSE="GPL-2 Nessus-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror fetch strip"
-
-QA_PREBUILT="opt/nessus/bin/nasl
-	opt/nessus/bin/ndbg
-	opt/nessus/bin/nessus-mkrand
-	opt/nessus/lib/nessus/libjemalloc.so.${PV}
-	opt/nessus/lib/nessus/libnessus-glibc-fix.so
-	opt/nessus/sbin/nessus-check-signature
-	opt/nessus/sbin/nessus-service
-	opt/nessus/sbin/nessuscli
-	opt/nessus/sbin/nessusd"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Please download ${A} from ${HOMEPAGE}/download"
-	einfo "The archive should then be placed into your DISTDIR directory."
-}
-
-src_install() {
-	# Using doins -r would strip executable bits from all binaries
-	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
-
-	pax-mark m "${D}"/opt/nessus/sbin/nessusd
-
-	# Make sure these originally empty directories do not vanish,
-	# Nessus will not run properly without them
-	keepdir /opt/nessus/com/nessus/CA
-	keepdir /opt/nessus/etc/nessus
-	keepdir /opt/nessus/lib/nessus/plugins
-	keepdir /opt/nessus/var/nessus/logs
-	keepdir /opt/nessus/var/nessus/tmp
-	keepdir /opt/nessus/var/nessus/users
-
-	newinitd "${FILESDIR}"/nessusd-initd nessusd-bin
-	systemd_newunit usr/lib/systemd/system/nessusd.service nessusd-bin.service
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To get started launch the nessusd-bin service, then point your Web browser to"
-		elog "  https://<yourhost>:8834/"
-	else
-		elog "You may want to restart the nessusd-bin service to use"
-		elog "the new version of Nessus."
-	fi
-}
diff --git a/net-analyzer/nessus-bin/nessus-bin-8.3.2.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.5.2.ebuild
index 45aa75d3c45a..45aa75d3c45a 100644
--- a/net-analyzer/nessus-bin/nessus-bin-8.3.2.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-8.5.2.ebuild