net-analyzer/metasploit: drop 'openvas' USE

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

diff --git a/net-analyzer/metasploit/metadata.xml b/net-analyzer/metasploit/metadata.xml
index e449553f4ecd2f94115a5e3697b3ccf94e4f837c..1edaa58c665f237f2892279a0e531b2df40e1508 100644 (file)
--- 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-r6.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
index 6a54bb420435bf67b624aae4a209b1dbcfc3de4c..e24648b0588f4020809b8d5aa1056a395a76f98a 100644 (file)
--- a/net-analyzer/metasploit/metasploit-4.17.21-r6.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)
@@ -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,6 @@ 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
        #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 407b7303e0f54a5b7eee2dedcdd66a339e1d3228..08d45194b38729073f31f765e64b2657852ead02 100644 (file)
--- 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)
@@ -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,6 @@ 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
        #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