From: Hasan ÇALIŞIR Date: Tue, 29 Oct 2019 14:47:29 +0000 (+0300) Subject: net-analyzer/metasploit: drop openvas-omp support X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4c0c5c558ac80025dc8b3f1ae48f67412ab9b203;p=gentoo.git net-analyzer/metasploit: drop openvas-omp support set slot on dev-ruby/rubyzip. drop openvas-omp support. Closes: https://bugs.gentoo.org/698762 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Hasan ÇALIŞIR Closes: https://github.com/gentoo/gentoo/pull/13488 Signed-off-by: Joonas Niilola --- diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild index e24648b0588f..db815de8d1d6 100644 --- a/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild +++ b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild @@ -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:* @@ -215,6 +215,12 @@ all_ruby_prepare() { #if ! use nessus; then sed -i -e "/nessus/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 08d45194b387..42bf6440d53d 100644 --- a/net-analyzer/metasploit/metasploit-9999.ebuild +++ b/net-analyzer/metasploit/metasploit-9999.ebuild @@ -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:* @@ -214,6 +214,12 @@ all_ruby_prepare() { #if ! use nessus; then sed -i -e "/nessus/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