gentoo resync : 03.11.2019

4 files changed, 21 insertions, 18 deletions

diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index c573681025dd..55f7b4ae071b 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,5 +1,5 @@
 AUX database.yml 613 BLAKE2B c724103b21f7650e4c6a221a22984cbff1be21ae761b62666db5d048e087f3d4e891e30b75fcacdcb5dc2fc369dd8dff4de042d6b87f47bffffeb45bd05aca46 SHA512 b178724382a88b87b9007f950fb5e8f93936f3e5a58f89c90f67120c4d50c98d4de758c8a6e321a0a68caa12ccab003d502377621bfe762279eb5ae2a3d5ff2b
 DIST metasploit-4.17.21.tar.gz 28812125 BLAKE2B 15ff8ccac99d783b7b9cd20d6512df551b3143b4947d2f347b2558d1bafd2861d41fe6b051034c75cd25030ad85d26f261ffe9149dd27d551f92f17fcc0b4075 SHA512 00763f515bc6b556d4dbe15a7c58fac3c7febb64fb339fd5c05ad2b18b5b55bdf8815daca35f24bb22bea3d376db4f4610918730d813079e5ac3f8d5ad16d2d9
-EBUILD metasploit-4.17.21-r5.ebuild 12470 BLAKE2B 15d5d3b943bfaadcd355d5aa8eb6691296929c9b969c66374230ed708b3d3c94f73733fdd482bff7a9ca8b4760ba2931deffdf138f1ba6c3c272906df2837ab2 SHA512 49247dc10f2689bba6f34ec5fe1da5ca589009800bf7b35f3516fe08eea015c1ea9bdd39f48bdfc5544b167bdd9fad0c50f8690c48d5da482910029b74e30873
-EBUILD metasploit-9999.ebuild 12236 BLAKE2B 9a52de12c903d51345700cdef81c206cf18416fecb12375c698d93aadd04fc8ae9f245ebeb5f04ac982ba71d4ad8cdda78cf5753d102c88657d4e8bb5d973d5f SHA512 29bbe0fbf7316a662c08bf0a71593e339ce0293f8b8edfc9515aaf49a6c76b45e359b9dbb50a8908a7e07787874bdbe9beee1917ad1026ff41b42528e42210b9
-MISC metadata.xml 853 BLAKE2B 9b0b2e6c82a4df1327ded8b8381fa1e557ba4353ae5dab9665e7b59950d36e61faead5d8672e2cc10dad68b5a3250126a7fb1c4edc7f6814f28ea3f6df663473 SHA512 9af2dae0c12ae84ae2a7887fad0e7f5ea1d945a8b6e6674ba9e3c3bbff167b00a4aeff2da8b457ff8657f83d617dad67f633b260578a1e9608475fe45585cad0
+EBUILD metasploit-4.17.21-r6.ebuild 12576 BLAKE2B 03151033fc8bab37f09633a20922ce46dfc6fb63e2360595f51cf47f65eaba83939b76cef3ca74bcc40f80a39cc7828e3829a8993582c19fabbfe27e2ea6b073 SHA512 0cedeb24e1bbd58f4de8a83e4eb324d8cd80149c26225776bc1feaedb793953a0aaa95fd4610ef596dcdd620d9a3840e1b80e031264527ca413e614c4d166c69
+EBUILD metasploit-9999.ebuild 12342 BLAKE2B 200e886af2935c5a4c865d2c5cc3f906bdb9445971d78ca05d7541d7da6c6ba0d35bd40cec62fbb746d69a6d1aebc1a3d1db0a4dcbee2fb9501272f38a4ae497 SHA512 83a43d2be1cd706057503969d039d3525e6ba2e43c288198bc4ca4a50fa26f1e2c3382f4f58d66686a7bc6b1c6f1bcff3922197819089070b397f3e7f60cc952
+MISC metadata.xml 760 BLAKE2B 1d242b9a6216631670676d4f2653fd86a414c00fd52a0f29903004b6848b95abf543e3c2fe59617b629104e886a061dede551a61c911d8e09b82d70c03c9788e SHA512 c8b659a986e68a5f063ff7637fc5f3ea1939aae6ac22844292f30587cb6396ab7f02bd08c1d28739d07887ac23b7989f956197b345a90e14a98600b3150ed4f7
diff --git a/net-analyzer/metasploit/metadata.xml b/net-analyzer/metasploit/metadata.xml
index e449553f4ecd..1edaa58c665f 100644
--- a/net-analyzer/metasploit/metadata.xml
+++ b/net-analyzer/metasploit/metadata.xml
@@ -9,7 +9,6 @@
 	<use>
 		<flag name="development">Install dependencies needed for metasploit and exploit development</flag>
 		<flag name="nexpose">Enable the plugin to integrate with nexpose</flag>
-		<flag name="openvas">Enable the plugin to integrate <pkg>net-analyzer/openvas</pkg></flag>
 		<flag name="oracle">Enable restricted oracle modules which have additional deps</flag>
 		<flag name="pcap">Enable libpcap for packet sniffing</flag>
 	</use>
diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r5.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
index e980b733098c..db815de8d1d6 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r5.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
@@ -27,7 +27,7 @@ fi
 DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 LICENSE="BSD"
-IUSE="development +java nexpose openvas oracle +pcap test"
+IUSE="development +java nexpose oracle +pcap test"
 
 #multiple known bugs with tests reported upstream and ignored
 #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
@@ -44,7 +44,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/bit-struct
 	dev-ruby/bundler
 	dev-ruby/dnsruby
-	dev-ruby/faker
+	dev-ruby/faker:0
 	dev-ruby/faraday
 	dev-ruby/filesize:*
 	dev-ruby/jsobfu:*
@@ -92,7 +92,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/ruby-macho
 	dev-ruby/rubyntlm
 	dev-ruby/ruby_smb:*
-	dev-ruby/rubyzip
+	dev-ruby/rubyzip:*
 	dev-ruby/sqlite3
 	dev-ruby/sshkey
 	dev-ruby/tzinfo:*
@@ -101,7 +101,6 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/xmlrpc
 	java? ( dev-ruby/rjb )
 	nexpose? ( dev-ruby/nexpose )
-	openvas? ( dev-ruby/openvas-omp )
 	oracle? ( dev-ruby/ruby-oci8 )
 	pcap? ( dev-ruby/pcaprub:*
 		dev-ruby/network_interface )
@@ -216,9 +215,12 @@ all_ruby_prepare() {
 	#if ! use nessus; then
 		sed -i -e "/nessus/d" metasploit-framework.gemspec || die
 	#fi
-	if ! use openvas; then
-		sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
-	fi
+
+	#OpenVAS support dropped on net-analyzer/metasploit. Bug:692076
+	#openvas-omp is deprecated and masked for removal. Bug:692076
+	#Remove openvas-omp in gemspec. Bug:698762
+	sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
+
 	#even if we pass --without=blah bundler still calculates the deps and messes us up
 	if ! use development; then
 		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 49691b5c0747..42bf6440d53d 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -27,7 +27,7 @@ fi
 DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 LICENSE="BSD"
-IUSE="development +java nexpose openvas oracle +pcap test"
+IUSE="development +java nexpose oracle +pcap test"
 
 #multiple known bugs with tests reported upstream and ignored
 #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
@@ -44,7 +44,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/bit-struct
 	dev-ruby/bundler
 	dev-ruby/dnsruby
-	dev-ruby/faker
+	dev-ruby/faker:0
 	dev-ruby/filesize:*
 	dev-ruby/jsobfu:*
 	dev-ruby/json:*
@@ -91,7 +91,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/ruby-macho
 	dev-ruby/rubyntlm
 	dev-ruby/ruby_smb:*
-	dev-ruby/rubyzip
+	dev-ruby/rubyzip:*
 	dev-ruby/sqlite3
 	dev-ruby/sshkey
 	dev-ruby/tzinfo:*
@@ -100,7 +100,6 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/xmlrpc
 	java? ( dev-ruby/rjb )
 	nexpose? ( dev-ruby/nexpose )
-	openvas? ( dev-ruby/openvas-omp )
 	oracle? ( dev-ruby/ruby-oci8 )
 	pcap? ( dev-ruby/pcaprub:*
 		dev-ruby/network_interface )
@@ -215,9 +214,12 @@ all_ruby_prepare() {
 	#if ! use nessus; then
 		sed -i -e "/nessus/d" metasploit-framework.gemspec || die
 	#fi
-	if ! use openvas; then
-		sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
-	fi
+
+	#OpenVAS support dropped on net-analyzer/metasploit. Bug:692076
+	#openvas-omp is deprecated and masked for removal. Bug:692076
+	#Remove openvas-omp in gemspec. Bug:698762
+	sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
+
 	#even if we pass --without=blah bundler still calculates the deps and messes us up
 	if ! use development; then
 		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die