diff --git a/dev-ruby/arachni-reactor/Manifest b/dev-ruby/arachni-reactor/Manifest
deleted file mode 100644
index 55226bc0a..000000000
--- a/dev-ruby/arachni-reactor/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST arachni-reactor-0.1.2.gem 47104 BLAKE2B 0766737f6e5e7a27fe6c2b571d927f9fee76742973a84d2cb43d6cca7e7ea3660001d89393d54a7011c2018a3f6397b0b5a8d8b3cd1403d71b27de4899478866 SHA512 aa5e7933a06ecb2e256929e08278bce83b2af3136289df076574614c3e9860268cfb2c26ab2f632e3db38e72075d3ee90daeb5042ce69dde0f1018d2a3823d56
diff --git a/dev-ruby/arachni-reactor/arachni-reactor-0.1.2.ebuild b/dev-ruby/arachni-reactor/arachni-reactor-0.1.2.ebuild
deleted file mode 100644
index 88134a4c8..000000000
--- a/dev-ruby/arachni-reactor/arachni-reactor-0.1.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A simple, lightweight, pure-Ruby implementation of the Reactor pattern"
-HOMEPAGE="https://rubygems.org/gems/arachni-reactor"
-
-LICENSE="BSD-3-CLAUSE"
-SLOT=0
-KEYWORDS="~amd64 ~arm ~x86"
diff --git a/dev-ruby/arachni-rpc-em/Manifest b/dev-ruby/arachni-rpc-em/Manifest
deleted file mode 100644
index f8fa9e7a8..000000000
--- a/dev-ruby/arachni-rpc-em/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST arachni-rpc-em-0.2.gem 37376 BLAKE2B 85eae0f52b25ba886c3b0f12f57ffd1f7e8d3309b32fc2113e7a2d3b03d87a51271b0f889b45612e5f9e12c643743b402020cb42ff8886db05210bdc254368e7 SHA512 c7ade00a6f49fcc8f962723c42a09bab225932344713080749bbcaa37224e60f09ad6455d3edf609f1d2e3826686931144ddd061cbb43caceff5554a409c5f61
diff --git a/dev-ruby/arachni-rpc-em/arachni-rpc-em-0.2.ebuild b/dev-ruby/arachni-rpc-em/arachni-rpc-em-0.2.ebuild
deleted file mode 100644
index 0db35bd2a..000000000
--- a/dev-ruby/arachni-rpc-em/arachni-rpc-em-0.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="EventMachine-based client and server implementation of Arachni-RPC"
-HOMEPAGE="https://rubygems.org/gems/arachni-rpc-em"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="~amd64 ~arm ~x86"
-
-ruby_add_rdepend "=dev-ruby/arachni-rpc-0.1*
-		>=dev-ruby/em-synchrony-1.0.0
-		=dev-ruby/eventmachine-1.0* >=dev-ruby/eventmachine-1.0.0"
diff --git a/dev-ruby/arachni-rpc/Manifest b/dev-ruby/arachni-rpc/Manifest
deleted file mode 100644
index 01359147a..000000000
--- a/dev-ruby/arachni-rpc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST arachni-rpc-0.2.1.4.gem 34816 BLAKE2B ab2cb8e2ce58668d6504448f2b77ad6c963beee0d7c866b3e42050a6143ca4af51ea3d82089e09b739760a82305e36e62f1c23b35df3d122683634d566315137 SHA512 77559e47819b1967b05bb678b76e9d498d11edff0306409d530a3e7ab8d5e734e98d3794fc474e8c872bfef0bf08f38fd74aeb2eb39f0fc51712a8c22f0f5238
diff --git a/dev-ruby/arachni-rpc/arachni-rpc-0.2.1.4.ebuild b/dev-ruby/arachni-rpc/arachni-rpc-0.2.1.4.ebuild
deleted file mode 100644
index 02cbea57b..000000000
--- a/dev-ruby/arachni-rpc/arachni-rpc-0.2.1.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Arachni-RPC is a simple and lightweight Remote Procedure Call protocol"
-HOMEPAGE="https://rubygems.org/gems/arachni-rpc"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="~amd64 ~arm ~x86"
-
-ruby_add_rdepend "=dev-ruby/arachni-reactor-0.1*"
diff --git a/net-analyzer/owtf/Manifest b/net-analyzer/owtf/Manifest
index d1c21942d..846fb502e 100644
--- a/net-analyzer/owtf/Manifest
+++ b/net-analyzer/owtf/Manifest
@@ -1,2 +1 @@
-DIST owtf-2.0a.tar.gz 2381123 BLAKE2B 36b9cef04d609fb49901d7bda97fcf5bac1c5ee7e4c23d26d0f3cb007bf4f32467d4273fbd7f3faf1d8ebb02d9fa1e5f1807ee2593238e858414be36799568f6 SHA512 ea26ef86ac0e88e6baaae222933e09beaa073bf9bea4f011a06c96c5a226950d8293a3f4cb4217be7da5fdf8a21173e4687edc1f5d285f1159b12aecdba01f6b
 DIST owtf-2.4.tar.gz 5721812 BLAKE2B 960e840033119ddff6f378ac0e02fcb893126d46935fd918429ef7d5ff4c225d6b1d77170ed7f3dfcb1a0600e47b653551cf3d4c13a84b5370f345668e528822 SHA512 19dfad8fff9896deaf4793985c89a2e17b32249826ae5d8932d7fe925c14d8e662639414df0bd45be0a367ed1b2023d44f4ac0ca8759c9f006b895968a564f8b
diff --git a/net-analyzer/owtf/files/owtf b/net-analyzer/owtf/files/owtf
deleted file mode 100644
index db34476f5..000000000
--- a/net-analyzer/owtf/files/owtf
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-python2.7 /usr/lib/owtf/owtf.py
diff --git a/net-analyzer/owtf/files/owtf-deps.patch b/net-analyzer/owtf/files/owtf-deps.patch
deleted file mode 100644
index ecc9cb9e3..000000000
--- a/net-analyzer/owtf/files/owtf-deps.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- owtf.py.orig	2016-05-14 10:46:56.000000000 +0800
-+++ owtf.py	2016-08-22 16:20:14.556200478 +0800
-@@ -9,9 +9,9 @@
- import os
- import sys
- import logging
--from framework.dependency_check import verify_dependencies
- 
--verify_dependencies(os.path.dirname(os.path.abspath(sys.argv[0])) or '.')
-+#from framework.dependency_check import verify_dependencies
-+#verify_dependencies(os.path.dirname(os.path.abspath(sys.argv[0])) or '.')
- 
- 
- from framework.core import Core
diff --git a/net-analyzer/owtf/owtf-2.0a-r3.ebuild b/net-analyzer/owtf/owtf-2.0a-r3.ebuild
deleted file mode 100644
index c6e82b415..000000000
--- a/net-analyzer/owtf/owtf-2.0a-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1
-
-DESCRIPTION="The Offensive Web Testing Framework"
-HOMEPAGE="https://github.com/owtf/owtf"
-SRC_URI="https://github.com/owtf/owtf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-python/beautifulsoup:4
-	>=dev-python/cookies-2.2.1
-	>=dev-python/ipaddr-2.1.11
-	>=dev-python/lxml-3.4.0
-	>=dev-python/markdown-2.5.1
-	>=dev-python/pexpect-3.3
-	>=dev-python/psycopg-2.6.1:2
-	>=dev-python/pycurl-7.19.5
-	>=dev-python/six-1.8.0
-	>=dev-python/pyopenssl-0.14
-	>=dev-python/rdflib-4.1.2
-	>=dev-python/selenium-2.43.0
-	>=dev-python/sqlalchemy-1.0.11
-	>=dev-python/PTP-0.3.0
-	>=dev-python/zap-api-python-0.0.9
-	>=dev-python/PyVirtualDisplay-0.1.5
-	>=www-servers/tornado-4.0.2"
-
-src_prepare() {
-	epatch "${FILESDIR}"/owtf-deps.patch
-
-	sed -i 's|/usr/lib64/arachni/bin/arachni|/usr/bin/arachni|g' profiles/general/default.cfg
-	sed -i 's|TOOL\(.*\)/usr/share/w3af/w3af_console|TOOL\1/usr/bin/w3af_console|g' profiles/general/default.cfg
-	sed -i 's|TOOL\(.*\)metasploit-framework|TOOL\1metasploit|g' profiles/general/default.cfg
-#	http://www.pathname.com/fhs/pub/fhs-2.3.html
-	sed -i 's|TOOL\(.*\)/usr/share/|TOOL\1/usr/'$(get_libdir)/'|g' profiles/general/default.cfg
-
-	#I gave up here, see https://github.com/owtf/owtf/issues/725
-	sed -i 's|owtf_review|~/.owtf/owtf_review|g' framework/config/framework_config.cfg
-}
-
-src_install() {
-
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r *
-
-#	python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}
-
-	fperms +x /usr/$(get_libdir)/${PN}/${PN}.py
-
-#	dosym /usr/$(get_libdir)/${PN}/${PN}.py /usr/bin/${PN}
-	dobin "${FILESDIR}/${PN}"
-
-#ERROR: monitor_page_manager.py", line 89
-#	python_optimize "${D}"usr/$(get_libdir)/${PN}
-
-}
-
-pkg_config() {
-	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
-	su postgres -c "createuser owtf_db_user -D -S -R"
-	su postgres -c "createdb --owner=owtf_db_user owtfdb"
-}
-
-pkg_postinst() {
-	einfo "To complete the installation, run the following command:"
-	einfo "emerge --config net-analyzer/owtf-2.0a"
-	einfo
-	einfo "You will also need to create a certificate for the current user using the following commands:"
-	einfo "mdkir -p ~/.owtf/proxy/ca.key"
-	einfo "openssl genrsa -des3 -passout pass:owtf_ca_pass -out ~/.owtf/proxy/ca.key 4096"
-	einfo "openssl req -new -x509 -days 3650 -subj \"/C=US/ST=Pwnland/L=OWASP/O=OWTF/CN=MiTMProxy\" -passin pass:owtf_ca_pass -key ~/.owtf/proxy/ca.key -out ~/.owtf/proxy/ca.crt"
-	einfo
-	einfo "In addition, you might want to change owtf_db_user password in the database (currently empty)"
-	einfo "and adjust ~/.owtf/db.cfg accordingly"
-}
diff --git a/www-apps/arachni/Manifest b/www-apps/arachni/Manifest
deleted file mode 100644
index 1e591d60b..000000000
--- a/www-apps/arachni/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST arachni-1.4.tar.gz 2066668 BLAKE2B a5a3cdc226f868fb4165387cda8a1314390cf3ed4e09357246d162903003a99115f85f97f84e17e5076afb62a46c0e1b8ce79a8c395f2027b706af8701fbdb12 SHA512 af16d77e24d82575c03a080d6e2291c6db0f0015cc73ac067fd83c229fe4b3a1f12d07f43cda9e95eba9a3f5e4402bd202fb5c9c3715c58b3ba6b2003119f818
diff --git a/www-apps/arachni/arachni-1.4.ebuild b/www-apps/arachni/arachni-1.4.ebuild
deleted file mode 100644
index f94129359..000000000
--- a/www-apps/arachni/arachni-1.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24"
-
-inherit eutils ruby-ng
-
-DESCRIPTION="Arachni is a feature-full web application scanner"
-HOMEPAGE="http://arachni-scanner.com/"
-SRC_URI="https://github.com/Arachni/arachni/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-libs/libxslt
-	dev-libs/openssl
-	dev-libs/libxml2
-	dev-libs/mpfr
-	dev-libs/libyaml
-"
-ruby_add_rdepend "
-	=dev-ruby/addressable-2.3* >=dev-ruby/addressable-2.3.6
-	>=dev-ruby/arachni-rpc-0.2.1.3
-	dev-ruby/awesome_print
-	dev-ruby/bundler
-	>=dev-ruby/childprocess-0.5.3
-	>=dev-ruby/coderay-1.1.0
-	>=dev-ruby/kramdown-1.4.1
-	=dev-ruby/loofah-2.0*
-	>=dev-ruby/msgpack-0.5.8
-	>dev-ruby/nokogiri-1.6.7
-	>=dev-ruby/concurrent-ruby-ext-1.0.1
-	=dev-ruby/oj-2.14*
-	dev-ruby/oj_mimic_json
-	>=dev-ruby/pony-1.8
-	dev-ruby/rack:*
-	>=dev-ruby/rb-readline-0.5.1
-	dev-ruby/rubyzip:1
-	>=dev-ruby/terminal-table-1.4.5
-	dev-ruby/typhoeus:0
-	>=dev-ruby/watir-webdriver-0.8.0
-	>=dev-ruby/sinatra-contrib-1.4.6
-	>=dev-ruby/sinatra-1.4.6
-	>=dev-ruby/puma-2.14.0
-	dev-ruby/http_parser_rb
-"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-}
-
-each_ruby_prepare() {
-	epatch "${FILESDIR}/${PV}-config.patch"
-	epatch "${FILESDIR}/${PV}-easierdep.patch"
-	for file in $(ls -1 bin/*); do
-		sed "s#/usr/bin/env ruby#${RUBY}#" -i "${file}" || die "Conversion of shebang in '${file}' failed"
-	done
-
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-}
-
-each_ruby_install() {
-	dodir /usr/$(get_libdir)/${PN}
-	cp -R "${S}"/* "${ED}"/usr/$(get_libdir)/${PN}/ || die "Copy files failed"
-
-	#we write a loader to make sure ${RUBY} is pax marked
-#	cat <<-EOF > "${ED}"/usr/$(get_libdir)/${PN}/bin/arachni-loader
-#		#!/bin/sh
-#		exec ${RUBY} /usr/$(get_libdir)/${PN}/bin/\$(basename \$0)
-#	EOF
-#	fperms +x /usr/$(get_libdir)/${PN}/bin/arachni-loader
-
-	dosym /usr/$(get_libdir)/arachni/bin/arachni /usr/bin/arachni
-	dosym /usr/$(get_libdir)/arachni/bin/arachni_console /usr/bin/arachni_console
-}
diff --git a/www-apps/arachni/files/0.4.3.2-unbundler.patch b/www-apps/arachni/files/0.4.3.2-unbundler.patch
deleted file mode 100644
index 9b0dc8d82..000000000
--- a/www-apps/arachni/files/0.4.3.2-unbundler.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -urN arachni-0.4.3.2.orig/lib/arachni/banner.rb arachni-0.4.3.2/lib/arachni/banner.rb
---- arachni-0.4.3.2.orig/lib/arachni/banner.rb	2013-07-16 08:30:16.000000000 +0800
-+++ arachni-0.4.3.2/lib/arachni/banner.rb	2013-07-22 21:58:01.086460730 +0800
-@@ -15,7 +15,7 @@
- =end
- 
- require 'rubygems'
--require 'bundler/setup'
-+#require 'bundler/setup'
- 
- module Arachni
- 
-diff -urN arachni-0.4.3.2.orig/lib/arachni/framework.rb arachni-0.4.3.2/lib/arachni/framework.rb
---- arachni-0.4.3.2.orig/lib/arachni/framework.rb	2013-07-16 08:30:16.000000000 +0800
-+++ arachni-0.4.3.2/lib/arachni/framework.rb	2013-07-22 21:58:26.102462463 +0800
-@@ -17,9 +17,9 @@
- =end
- 
- require 'rubygems'
--require 'bundler/setup'
-+#require 'bundler/setup'
- 
--require 'ap'
-+#require 'ap'
- require 'pp'
- 
- require File.expand_path( File.dirname( __FILE__ ) ) + '/options'
-diff -urN arachni-0.4.3.2.orig/lib/arachni/options.rb arachni-0.4.3.2/lib/arachni/options.rb
---- arachni-0.4.3.2.orig/lib/arachni/options.rb	2013-07-16 08:30:16.000000000 +0800
-+++ arachni-0.4.3.2/lib/arachni/options.rb	2013-07-22 21:58:39.126463365 +0800
-@@ -15,7 +15,7 @@
- =end
- 
- require 'rubygems'
--require 'bundler/setup'
-+#require 'bundler/setup'
- 
- require 'base64'
- 
-diff -urN arachni-0.4.3.2.orig/lib/arachni.rb arachni-0.4.3.2/lib/arachni.rb
---- arachni-0.4.3.2.orig/lib/arachni.rb	2013-07-16 08:30:16.000000000 +0800
-+++ arachni-0.4.3.2/lib/arachni.rb	2013-07-22 21:58:48.366464005 +0800
-@@ -15,7 +15,7 @@
- =end
- 
- require 'rubygems'
--require 'bundler/setup'
-+#require 'bundler/setup'
- 
- def ap( obj )
-     super obj, raw: true
diff --git a/www-apps/arachni/files/1.3.2-config.patch b/www-apps/arachni/files/1.3.2-config.patch
deleted file mode 100644
index 9f309384f..000000000
--- a/www-apps/arachni/files/1.3.2-config.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urN arachni-1.3.2.orig/config/write_paths.yml arachni-1.3.2/config/write_paths.yml
---- arachni-1.3.2.orig/config/write_paths.yml	2015-10-19 13:32:18.000000000 +0800
-+++ arachni-1.3.2/config/write_paths.yml	2015-12-29 21:19:56.852987770 +0800
-@@ -7,9 +7,12 @@
-     # Default directory for AFR reports generated by CLI interfaces, either
-     # local or RPC clients.
-     report_path:
-+        ~/.arachni/reports
- framework:
-     # Error and RPC logs.
-     logs:
-+        ~/.arachni/logs
-     # Default directory for scan snapshots generated either by the CLI
-     # or by RPC Instances.
-     snapshots:
-+        ~/.arachni/snapshots
diff --git a/www-apps/arachni/files/1.3.2-easierdep.patch b/www-apps/arachni/files/1.3.2-easierdep.patch
deleted file mode 100644
index d90b4c203..000000000
--- a/www-apps/arachni/files/1.3.2-easierdep.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -urN arachni-1.3.2.orig/Gemfile arachni-1.3.2/Gemfile
---- arachni-1.3.2.orig/Gemfile	2015-10-19 13:32:18.000000000 +0800
-+++ arachni-1.3.2/Gemfile	2015-12-29 21:20:01.903988066 +0800
-@@ -2,27 +2,4 @@
- 
- gem 'rake'
- 
--group :docs do
--    gem 'yard'
--    gem 'redcarpet'
--end
--
--group :spec do
--    gem 'simplecov', require: false, group: :test
--
--    gem 'rspec', '2.99'
--    gem 'faker'
--
--    gem 'puma' if !Gem.win_platform? || RUBY_PLATFORM == 'java'
--
--    gem 'sinatra'
--    gem 'sinatra-contrib'
--end
--
--group :prof do
--    gem 'stackprof'
--    gem 'sys-proctable'
--    gem 'ruby-mass'
--end
--
- gemspec
-diff -urN arachni-1.3.2.orig/arachni.gemspec arachni-1.3.2/arachni.gemspec
---- arachni-1.3.2.orig/arachni.gemspec	2015-10-19 13:32:18.000000000 +0800
-+++ arachni-1.3.2/arachni.gemspec	2015-12-29 21:20:06.003988307 +0800
-@@ -49,31 +49,31 @@
-     s.add_dependency 'bundler'
- 
-     # For compressing/decompressing system state archives.
--    s.add_dependency 'rubyzip',           '1.1.6'
-+    s.add_dependency 'rubyzip',           '~> 1.1.6'
- 
-     # HTML report
--    s.add_dependency 'coderay',           '1.1.0'
-+    s.add_dependency 'coderay',           '~> 1.1.0'
- 
--    s.add_dependency 'childprocess',      '0.5.3'
-+    s.add_dependency 'childprocess',      '~> 0.5.3'
- 
-     # RPC serialization.
-     if RUBY_PLATFORM == 'java'
--        s.add_dependency 'msgpack-jruby', '1.4.0'
-+        s.add_dependency 'msgpack-jruby', '~> 1.4.0'
-     else
--        s.add_dependency 'msgpack',       '0.5.8'
-+        s.add_dependency 'msgpack',       '>= 0.5.8'
-     end
- 
-     # RPC client/server implementation.
--    s.add_dependency 'arachni-rpc',       '0.2.1.2'
-+    s.add_dependency 'arachni-rpc',       '~> 0.2.1.2'
- 
-     # HTTP client.
--    s.add_dependency 'typhoeus',          '0.6.9'
-+    s.add_dependency 'typhoeus',          '~> 0.6.9'
- 
-     # Fallback URI parsing and encoding utilities.
--    s.add_dependency 'addressable',       '2.3.6'
-+    s.add_dependency 'addressable',       '~> 2.3.6'
- 
-     # E-mail plugin.
--    s.add_dependency 'pony',              '1.8'
-+    s.add_dependency 'pony',              '~> 1.8'
- 
-     # Printing complex objects.
-     s.add_dependency 'awesome_print',     '~> 1.2.0'
-@@ -83,20 +83,20 @@
-     s.add_dependency 'oj_mimic_json'
- 
-     # For the Arachni console (arachni_console).
--    s.add_dependency 'rb-readline',       '0.5.1'
-+    s.add_dependency 'rb-readline',       '~> 0.5.1'
- 
-     # Markup parsing.
-     s.add_dependency 'nokogiri',          '~> 1.6.5'
- 
-     # Outputting data in table format (arachni_rpcd_monitor).
--    s.add_dependency 'terminal-table',    '1.4.5'
-+    s.add_dependency 'terminal-table',    '~> 1.4.5'
- 
-     # Browser support for DOM/JS/AJAX analysis stuff.
--    s.add_dependency 'watir-webdriver',   '0.6.9'
-+    s.add_dependency 'watir-webdriver',   '~> 0.6.9'
- 
-     # Markdown to HTML conversion, used by the HTML report for component
-     # descriptions.
--    s.add_dependency 'kramdown',          '1.4.1'
-+    s.add_dependency 'kramdown',          '~> 1.4.1'
- 
-     # Used to scrub Markdown for XSS etc.
-     s.add_dependency 'loofah',            '~> 2.0.0'
diff --git a/www-apps/arachni/files/1.4-config.patch b/www-apps/arachni/files/1.4-config.patch
deleted file mode 100644
index 9f309384f..000000000
--- a/www-apps/arachni/files/1.4-config.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urN arachni-1.3.2.orig/config/write_paths.yml arachni-1.3.2/config/write_paths.yml
---- arachni-1.3.2.orig/config/write_paths.yml	2015-10-19 13:32:18.000000000 +0800
-+++ arachni-1.3.2/config/write_paths.yml	2015-12-29 21:19:56.852987770 +0800
-@@ -7,9 +7,12 @@
-     # Default directory for AFR reports generated by CLI interfaces, either
-     # local or RPC clients.
-     report_path:
-+        ~/.arachni/reports
- framework:
-     # Error and RPC logs.
-     logs:
-+        ~/.arachni/logs
-     # Default directory for scan snapshots generated either by the CLI
-     # or by RPC Instances.
-     snapshots:
-+        ~/.arachni/snapshots
diff --git a/www-apps/arachni/files/1.4-easierdep.patch b/www-apps/arachni/files/1.4-easierdep.patch
deleted file mode 100644
index deeb473d7..000000000
--- a/www-apps/arachni/files/1.4-easierdep.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -urN arachni-1.4.orig/Gemfile arachni-1.4/Gemfile
---- arachni-1.4.orig/Gemfile	2016-02-08 09:37:50.000000000 +0800
-+++ arachni-1.4/Gemfile	2016-03-13 17:37:27.272505586 +0800
-@@ -2,23 +2,4 @@
- 
- gem 'rake'
- 
--group :docs do
--    gem 'yard'
--    gem 'redcarpet'
--end
--
--group :spec do
--    gem 'simplecov', require: false, group: :test
--
--    gem 'rspec', '2.99.0'
--    gem 'faker'
--end
--
--group :prof do
--    gem 'stackprof'
--    gem 'sys-proctable'
--    gem 'ruby-mass'
--    gem 'benchmark-ips'
--end
--
- gemspec
-diff -urN arachni-1.4.orig/arachni.gemspec arachni-1.4/arachni.gemspec
---- arachni-1.4.orig/arachni.gemspec	2016-02-08 09:37:50.000000000 +0800
-+++ arachni-1.4/arachni.gemspec	2016-03-13 17:39:31.326513650 +0800
-@@ -48,22 +48,22 @@
- 
-     s.add_dependency 'bundler'
- 
--    s.add_dependency 'concurrent-ruby',     '1.0.0'
--    s.add_dependency 'concurrent-ruby-ext', '1.0.0'
-+    s.add_dependency 'concurrent-ruby',     '~> 1.0.0'
-+    s.add_dependency 'concurrent-ruby-ext', '~> 1.0.0'
- 
-     # For compressing/decompressing system state archives.
--    s.add_dependency 'rubyzip',           '1.1.6'
-+    s.add_dependency 'rubyzip',           '~> 1.1.6'
- 
-     # HTTP proxy server
-     s.add_dependency 'http_parser.rb'
- 
-     # HTML report
--    s.add_dependency 'coderay',           '1.1.0'
-+    s.add_dependency 'coderay',           '~> 1.1.0'
- 
--    s.add_dependency 'childprocess',      '0.5.3'
-+    s.add_dependency 'childprocess',      '~> 0.5.3'
- 
-     # RPC serialization.
--    s.add_dependency 'msgpack',           '0.7.0'
-+    s.add_dependency 'msgpack',           '~> 0.7.0'
- 
-     if RUBY_PLATFORM != 'java'
-         # Optimized JSON.
-@@ -72,39 +72,39 @@
-     end
- 
-     # Web server
--    s.add_dependency 'puma',              '2.14.0'
-+    s.add_dependency 'puma',              '~> 2.14.0'
- 
-     # REST API
--    s.add_dependency 'sinatra',           '1.4.6'
--    s.add_dependency 'sinatra-contrib',   '1.4.6'
-+    s.add_dependency 'sinatra',           '~> 1.4.6'
-+    s.add_dependency 'sinatra-contrib',   '~> 1.4.6'
- 
-     # RPC client/server implementation.
--    s.add_dependency 'arachni-rpc',       '0.2.1.3'
-+    s.add_dependency 'arachni-rpc',       '~> 0.2.1.3'
- 
-     # HTTP client.
--    s.add_dependency 'typhoeus',          '1.0.1'
-+    s.add_dependency 'typhoeus',          '~> 1.0.1'
- 
-     # Fallback URI parsing and encoding utilities.
--    s.add_dependency 'addressable',       '2.3.6'
-+    s.add_dependency 'addressable',       '~> 2.3.6'
- 
-     # E-mail plugin.
--    s.add_dependency 'pony',              '1.8'
-+    s.add_dependency 'pony',              '~> 1.8'
- 
-     # For the Arachni console (arachni_console).
--    s.add_dependency 'rb-readline',       '0.5.1'
-+    s.add_dependency 'rb-readline',       '~> 0.5.1'
- 
-     # Markup parsing.
--    s.add_dependency 'nokogiri',          '1.6.8rc2'
-+    s.add_dependency 'nokogiri',          '~> 1.6.8rc2'
- 
-     # Outputting data in table format (arachni_rpcd_monitor).
--    s.add_dependency 'terminal-table',    '1.4.5'
-+    s.add_dependency 'terminal-table',    '~> 1.4.5'
- 
-     # Browser support for DOM/JS/AJAX analysis stuff.
--    s.add_dependency 'watir-webdriver',   '0.8.0'
-+    s.add_dependency 'watir-webdriver',   '~> 0.8.0'
- 
-     # Markdown to HTML conversion, used by the HTML report for component
-     # descriptions.
--    s.add_dependency 'kramdown',          '1.4.1'
-+    s.add_dependency 'kramdown',          '~> 1.4.1'
- 
-     # Used to scrub Markdown for XSS etc.
-     s.add_dependency 'loofah',            '~> 2.0.0'
diff --git a/www-apps/arachni/files/arachni b/www-apps/arachni/files/arachni
deleted file mode 100644
index f7962780d..000000000
--- a/www-apps/arachni/files/arachni
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-#issue #189 workaround. Should solve it in future
-rm /usr/lib/arachni/Gemfile.lock
-
-cd /usr/lib/arachni/
-./bin/arachni $@