From 97c1912dc9c8337a7b2f06258b3305c8881869fe Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Fri, 16 Oct 2015 08:46:48 +0800
Subject: [PATCH] arachni: fix all deps so it compiles

---
 .../arachni-rpc-em/arachni-rpc-em-0.2.ebuild  |  9 +--
 dev-ruby/arachni-rpc/arachni-rpc-0.1.3.ebuild |  9 +--
 dev-ruby/backports/backports-3.3.3.ebuild     |  9 +--
 .../em-synchrony/em-synchrony-1.0.3.ebuild    |  9 +--
 dev-ruby/pony/pony-1.5.ebuild                 |  9 +--
 dev-ruby/rspec-its/rspec-its-1.0.1-r1.ebuild  |  4 +-
 .../sinatra-contrib-1.3.2-r1.ebuild           |  9 +--
 .../sinatra-contrib-1.4.2.ebuild              |  5 +-
 dev-ruby/sinatra/sinatra-1.3.6.ebuild         |  9 +--
 dev-ruby/sinatra/sinatra-1.4.2.ebuild         |  9 +--
 .../sys-proctable/sys-proctable-0.9.3.ebuild  | 10 +--
 .../terminal-table-1.4.5.ebuild               |  9 +--
 dev-ruby/typhoeus/typhoeus-0.3.3.ebuild       | 14 ++--
 dev-ruby/typhoeus/typhoeus-0.4.2.ebuild       | 16 ++---
 dev-ruby/typhoeus/typhoeus-0.6.8.ebuild       | 19 +++---
 www-apps/arachni/Manifest                     |  3 -
 www-apps/arachni/arachni-0.4.4-r2.ebuild      | 64 -------------------
 www-apps/arachni/arachni-0.4.5.2.ebuild       | 64 -------------------
 www-apps/arachni/arachni-0.4.6.ebuild         | 64 -------------------
 www-apps/arachni/arachni-0.4.7.ebuild         |  5 +-
 20 files changed, 78 insertions(+), 271 deletions(-)
 delete mode 100644 www-apps/arachni/arachni-0.4.4-r2.ebuild
 delete mode 100644 www-apps/arachni/arachni-0.4.5.2.ebuild
 delete mode 100644 www-apps/arachni/arachni-0.4.6.ebuild

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
index 18176e962..77fe9ed98 100644
--- a/dev-ruby/arachni-rpc-em/arachni-rpc-em-0.2.ebuild
+++ b/dev-ruby/arachni-rpc-em/arachni-rpc-em-0.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $id$
 
-EAPI=4
-USE_RUBY="ruby18 ruby19"
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 inherit multilib ruby-fakegem
 
diff --git a/dev-ruby/arachni-rpc/arachni-rpc-0.1.3.ebuild b/dev-ruby/arachni-rpc/arachni-rpc-0.1.3.ebuild
index 0a86aa567..01b883872 100644
--- a/dev-ruby/arachni-rpc/arachni-rpc-0.1.3.ebuild
+++ b/dev-ruby/arachni-rpc/arachni-rpc-0.1.3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=4
-USE_RUBY="ruby18 ruby19"
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 inherit multilib ruby-fakegem
 
diff --git a/dev-ruby/backports/backports-3.3.3.ebuild b/dev-ruby/backports/backports-3.3.3.ebuild
index bd8f23801..064ce5907 100644
--- a/dev-ruby/backports/backports-3.3.3.ebuild
+++ b/dev-ruby/backports/backports-3.3.3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=4
-USE_RUBY="ruby18 ruby19"
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 inherit multilib ruby-fakegem
 
diff --git a/dev-ruby/em-synchrony/em-synchrony-1.0.3.ebuild b/dev-ruby/em-synchrony/em-synchrony-1.0.3.ebuild
index b540af206..71717c332 100644
--- a/dev-ruby/em-synchrony/em-synchrony-1.0.3.ebuild
+++ b/dev-ruby/em-synchrony/em-synchrony-1.0.3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=4
-USE_RUBY="ruby18 ruby19"
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/pony/pony-1.5.ebuild b/dev-ruby/pony/pony-1.5.ebuild
index 09064578b..6ce0ac40f 100644
--- a/dev-ruby/pony/pony-1.5.ebuild
+++ b/dev-ruby/pony/pony-1.5.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=2
-USE_RUBY="ruby18 ruby19"
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/rspec-its/rspec-its-1.0.1-r1.ebuild b/dev-ruby/rspec-its/rspec-its-1.0.1-r1.ebuild
index 13913cab1..f3cadfdbb 100644
--- a/dev-ruby/rspec-its/rspec-its-1.0.1-r1.ebuild
+++ b/dev-ruby/rspec-its/rspec-its-1.0.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/metasploit_data_models/metasploit_data_models-0.17.0.ebuild,v 1.3 2014/07/09 21:13:54 zerochaos Exp $
+# $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/sinatra-contrib/sinatra-contrib-1.3.2-r1.ebuild b/dev-ruby/sinatra-contrib/sinatra-contrib-1.3.2-r1.ebuild
index 53bdc0d2b..285503720 100644
--- a/dev-ruby/sinatra-contrib/sinatra-contrib-1.3.2-r1.ebuild
+++ b/dev-ruby/sinatra-contrib/sinatra-contrib-1.3.2-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=4
-USE_RUBY="ruby18 ruby19"
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 inherit multilib ruby-fakegem
 
diff --git a/dev-ruby/sinatra-contrib/sinatra-contrib-1.4.2.ebuild b/dev-ruby/sinatra-contrib/sinatra-contrib-1.4.2.ebuild
index 4114d199b..aeaf25b35 100644
--- a/dev-ruby/sinatra-contrib/sinatra-contrib-1.4.2.ebuild
+++ b/dev-ruby/sinatra-contrib/sinatra-contrib-1.4.2.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
-USE_RUBY="ruby18 ruby19"
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 inherit multilib ruby-fakegem
 
diff --git a/dev-ruby/sinatra/sinatra-1.3.6.ebuild b/dev-ruby/sinatra/sinatra-1.3.6.ebuild
index ea3dde3af..f9fb3f1ec 100644
--- a/dev-ruby/sinatra/sinatra-1.3.6.ebuild
+++ b/dev-ruby/sinatra/sinatra-1.3.6.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.3.3.ebuild,v 1.4 2013/01/16 01:02:36 zerochaos Exp $
+# $Id$
 
-EAPI=4
-USE_RUBY="ruby18 ruby19 ree18"
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 # no documentation is generable, it needs hanna, which is broken
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/sinatra/sinatra-1.4.2.ebuild b/dev-ruby/sinatra/sinatra-1.4.2.ebuild
index ea8398faa..5ea5167ad 100644
--- a/dev-ruby/sinatra/sinatra-1.4.2.ebuild
+++ b/dev-ruby/sinatra/sinatra-1.4.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.3.3.ebuild,v 1.4 2013/01/16 01:02:36 zerochaos Exp $
+# $Id$
 
-EAPI=4
-USE_RUBY="ruby18 ruby19 ree18"
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 # no documentation is generable, it needs hanna, which is broken
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/sys-proctable/sys-proctable-0.9.3.ebuild b/dev-ruby/sys-proctable/sys-proctable-0.9.3.ebuild
index 3e3d6bb5a..e9f6a88dd 100644
--- a/dev-ruby/sys-proctable/sys-proctable-0.9.3.ebuild
+++ b/dev-ruby/sys-proctable/sys-proctable-0.9.3.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
-EAPI=2
-USE_RUBY="ruby18 ruby19"
 RUBY_FAKEGEM_VERSION="${PV}-universal-linux"
 
 inherit ruby-fakegem
diff --git a/dev-ruby/terminal-table/terminal-table-1.4.5.ebuild b/dev-ruby/terminal-table/terminal-table-1.4.5.ebuild
index 7baef577a..60b26107f 100644
--- a/dev-ruby/terminal-table/terminal-table-1.4.5.ebuild
+++ b/dev-ruby/terminal-table/terminal-table-1.4.5.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=4
-USE_RUBY="ruby18 ruby19"
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 inherit multilib ruby-fakegem
 
diff --git a/dev-ruby/typhoeus/typhoeus-0.3.3.ebuild b/dev-ruby/typhoeus/typhoeus-0.3.3.ebuild
index 728670082..167140384 100644
--- a/dev-ruby/typhoeus/typhoeus-0.3.3.ebuild
+++ b/dev-ruby/typhoeus/typhoeus-0.3.3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
-USE_RUBY="ruby18 ruby19"
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 inherit multilib ruby-fakegem
 
@@ -17,13 +18,6 @@ IUSE="hardened"
 
 ruby_add_rdepend "dev-ruby/mime-types"
 
-all_ruby_prepare() {
-	#dev-lang/ruby might need the "hardened" flag to enforce the following:
-	if use hardened; then
-		paxctl -v /usr/bin/ruby19 2>/dev/null | grep MPROTECT | grep disabled || ewarn '!!! Typhoeus may only work if ruby19 is MPROTECT disabled\n  Please disable it if required using paxctl -m /usr/bin/ruby19'
-	fi
-}
-
 each_ruby_configure() {
 	${RUBY} -C ext/typhoeus extconf.rb || die "extconf failed"
 }
diff --git a/dev-ruby/typhoeus/typhoeus-0.4.2.ebuild b/dev-ruby/typhoeus/typhoeus-0.4.2.ebuild
index c96b4cb98..22bee6715 100644
--- a/dev-ruby/typhoeus/typhoeus-0.4.2.ebuild
+++ b/dev-ruby/typhoeus/typhoeus-0.4.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=4
-USE_RUBY="ruby18 ruby19"
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 inherit multilib ruby-fakegem
 
@@ -17,10 +18,3 @@ IUSE="hardened"
 
 ruby_add_rdepend "virtual/ruby-ffi
 	>=dev-ruby/mime-types-1.18"
-
-all_ruby_prepare() {
-	#dev-lang/ruby might need the "hardened" flag to enforce the following:
-	if use hardened; then
-		paxctl -v /usr/bin/ruby19 2>/dev/null | grep MPROTECT | grep disabled || ewarn '!!! Typhoeus may only work if ruby19 is MPROTECT disabled\n  Please disable it if required using paxctl -m /usr/bin/ruby19'
-	fi
-}
diff --git a/dev-ruby/typhoeus/typhoeus-0.6.8.ebuild b/dev-ruby/typhoeus/typhoeus-0.6.8.ebuild
index f0d5baf83..515ebfac3 100644
--- a/dev-ruby/typhoeus/typhoeus-0.6.8.ebuild
+++ b/dev-ruby/typhoeus/typhoeus-0.6.8.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
-USE_RUBY="ruby18 ruby19"
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 inherit multilib ruby-fakegem
 
@@ -17,9 +18,9 @@ IUSE="hardened"
 
 ruby_add_rdepend ">=dev-ruby/ethon-0.7.0"
 
-all_ruby_prepare() {
-	#dev-lang/ruby might need the "hardened" flag to enforce the following:
-	if use hardened; then
-		paxctl -v /usr/bin/ruby19 2>/dev/null | grep MPROTECT | grep disabled || ewarn '!!! Typhoeus may only work if ruby19 is MPROTECT disabled\n  Please disable it if required using paxctl -m /usr/bin/ruby19'
-	fi
-}
+#all_ruby_prepare() {
+#	#dev-lang/ruby might need the "hardened" flag to enforce the following:
+#	if use hardened; then
+#		paxctl -v /usr/bin/ruby19 2>/dev/null | grep MPROTECT | grep disabled || ewarn '!!! Typhoeus may only work if ruby19 is MPROTECT disabled\n  Please disable it if required using paxctl -m /usr/bin/ruby19'
+#	fi
+#}
diff --git a/www-apps/arachni/Manifest b/www-apps/arachni/Manifest
index 521263c5a..fa3d872e6 100644
--- a/www-apps/arachni/Manifest
+++ b/www-apps/arachni/Manifest
@@ -1,4 +1 @@
-DIST arachni-0.4.4.tar.gz 1237372 SHA256 eacdcb613e84ac8e64e12bfc818783e2e81aa5a99d7047235a29d485b6b31217 SHA512 f58bc6c6067861e3e9cfd10f46a160e724a5d521c1de3f4aa49412e4393d2c1acd1caeaa43e1dfdaba36ba776b5b6991f4c969906cc615ffb715bc20c4b2a75a WHIRLPOOL 1a3279604e2a293d9c10294e12406011b7a146468b7ad7cddbae56ce76eebcfcd77cf0de21c5630490e1d7369f269f962d204aacc59504f121dfc1de2c2de8df
-DIST arachni-0.4.5.2.tar.gz 1242564 SHA256 a1a9ec04791f1a825f835478978669df66d5d71184540c255db03a8d1cab14a2 SHA512 4992f58316470637703ab76f70e980362364fd9e13bb42417f676f4ab3ad0097bbb0482de183f27c7796b407e9f5b4e2b0ff9f625907327a47e3f0e6948003ee WHIRLPOOL 3d391be3cd631d92eb2b3363ca6f1d114778aa28abc374514961d331f263449f45c3612c0d7fb8b7ba571f750ebffb00c9d2633d36fc8d1b1735ff270d1ab94e
-DIST arachni-0.4.6.tar.gz 1255894 SHA256 7506783085b5c1e0a59b91e1741722d3d89a2b8734207fb9b5c9ad4984253fd5 SHA512 81627c4f3436726a5c4e65bdd876d601de1586c0ad9b544dea7178f23fa32dbfa3f9ef498c5653ff9184a2eb4d155c601e9e2e1833ee5f360fa0794a4150046d WHIRLPOOL 49cb7e36b37adc4af1fe0da34cd2920616f577ec2064c01c1a96030c98eb5ece780c293401445df33187ce8bc8c03ea46c3d1b6f6a3b4e9b628653b05789bd2f
 DIST arachni-0.4.7.tar.gz 1275305 SHA256 13193d4ea3a6b36d162396a7406afc3b066359614aa831dc0cceaf483bb7addd SHA512 3533e48c141fa6401d761002efa183240297d871be7bb7d2fb6ea4612918ae38b17451a2bb3df61ab97fa458363be8991faafd1431c804e17bb49b0b36193477 WHIRLPOOL 6728c4c0b7a675ef7922e65d9da10294e0bceeb60c2c05087ee83757a6fd018d407cf2e1df37f0ef9bc0013ca5b55b18bbef08a091e9574f02d2c2f0102d3e9f
diff --git a/www-apps/arachni/arachni-0.4.4-r2.ebuild b/www-apps/arachni/arachni-0.4.4-r2.ebuild
deleted file mode 100644
index c4f8b8999..000000000
--- a/www-apps/arachni/arachni-0.4.4-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit eutils
-
-MY_V="0.4.1.1"
-MY_P=${P}-${MY_V}
-
-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="test"
-
-DEPEND=""
-RDEPEND=">=dev-lang/ruby-1.9.2
-	dev-ruby/rubygems
-	dev-ruby/diff-lcs
-	dev-ruby/json
-	dev-ruby/yard
-	dev-ruby/redcarpet
-	dev-libs/libxslt
-	dev-libs/openssl
-	dev-libs/libxml2
-	dev-libs/mpfr
-	dev-libs/libyaml
-	virtual/ruby-ffi
-	=dev-ruby/addressable-2.3* >=dev-ruby/addressable-2.3.2
-	dev-ruby/awesome_print
-	>=dev-ruby/nokogiri-1.5.7_rc1
-	>=dev-ruby/terminal-table-1.4.2
-
-	=dev-ruby/arachni-rpc-em-0.2
-	=dev-ruby/typhoeus-0.3* >=dev-ruby/typhoeus-0.3.3
-	dev-ruby/pony
-	dev-ruby/rb-readline
-	>=dev-ruby/sys-proctable-0.9.1
-	dev-ruby/highline
-	=dev-ruby/sinatra-1.3* >=dev-ruby/sinatra-1.3.2
-	=dev-ruby/sinatra-contrib-1.3* >=dev-ruby/sinatra-contrib-1.3.1
-
-	dev-ruby/bundler
-	dev-ruby/rspec
-	www-servers/thin
-
-	test? ( dev-ruby/rspec
-		dev-ruby/rake
-	)
-"
-#FIXME: dev-ruby/typhoeus:0.3 must be enforced. bundler is the only solution for now
-#src_prepare() {
-#	epatch "${FILESDIR}/${PV}-unbundler.patch"
-#}
-
-src_install() {
-	dodir /usr/$(get_libdir)/${PN}
-	cp -R "${S}"/* "${ED}"/usr/$(get_libdir)/${PN}/ || die "Copy files failed"
-	dosbin "${FILESDIR}"/${PN}
-}
diff --git a/www-apps/arachni/arachni-0.4.5.2.ebuild b/www-apps/arachni/arachni-0.4.5.2.ebuild
deleted file mode 100644
index c4f8b8999..000000000
--- a/www-apps/arachni/arachni-0.4.5.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit eutils
-
-MY_V="0.4.1.1"
-MY_P=${P}-${MY_V}
-
-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="test"
-
-DEPEND=""
-RDEPEND=">=dev-lang/ruby-1.9.2
-	dev-ruby/rubygems
-	dev-ruby/diff-lcs
-	dev-ruby/json
-	dev-ruby/yard
-	dev-ruby/redcarpet
-	dev-libs/libxslt
-	dev-libs/openssl
-	dev-libs/libxml2
-	dev-libs/mpfr
-	dev-libs/libyaml
-	virtual/ruby-ffi
-	=dev-ruby/addressable-2.3* >=dev-ruby/addressable-2.3.2
-	dev-ruby/awesome_print
-	>=dev-ruby/nokogiri-1.5.7_rc1
-	>=dev-ruby/terminal-table-1.4.2
-
-	=dev-ruby/arachni-rpc-em-0.2
-	=dev-ruby/typhoeus-0.3* >=dev-ruby/typhoeus-0.3.3
-	dev-ruby/pony
-	dev-ruby/rb-readline
-	>=dev-ruby/sys-proctable-0.9.1
-	dev-ruby/highline
-	=dev-ruby/sinatra-1.3* >=dev-ruby/sinatra-1.3.2
-	=dev-ruby/sinatra-contrib-1.3* >=dev-ruby/sinatra-contrib-1.3.1
-
-	dev-ruby/bundler
-	dev-ruby/rspec
-	www-servers/thin
-
-	test? ( dev-ruby/rspec
-		dev-ruby/rake
-	)
-"
-#FIXME: dev-ruby/typhoeus:0.3 must be enforced. bundler is the only solution for now
-#src_prepare() {
-#	epatch "${FILESDIR}/${PV}-unbundler.patch"
-#}
-
-src_install() {
-	dodir /usr/$(get_libdir)/${PN}
-	cp -R "${S}"/* "${ED}"/usr/$(get_libdir)/${PN}/ || die "Copy files failed"
-	dosbin "${FILESDIR}"/${PN}
-}
diff --git a/www-apps/arachni/arachni-0.4.6.ebuild b/www-apps/arachni/arachni-0.4.6.ebuild
deleted file mode 100644
index c4f8b8999..000000000
--- a/www-apps/arachni/arachni-0.4.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit eutils
-
-MY_V="0.4.1.1"
-MY_P=${P}-${MY_V}
-
-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="test"
-
-DEPEND=""
-RDEPEND=">=dev-lang/ruby-1.9.2
-	dev-ruby/rubygems
-	dev-ruby/diff-lcs
-	dev-ruby/json
-	dev-ruby/yard
-	dev-ruby/redcarpet
-	dev-libs/libxslt
-	dev-libs/openssl
-	dev-libs/libxml2
-	dev-libs/mpfr
-	dev-libs/libyaml
-	virtual/ruby-ffi
-	=dev-ruby/addressable-2.3* >=dev-ruby/addressable-2.3.2
-	dev-ruby/awesome_print
-	>=dev-ruby/nokogiri-1.5.7_rc1
-	>=dev-ruby/terminal-table-1.4.2
-
-	=dev-ruby/arachni-rpc-em-0.2
-	=dev-ruby/typhoeus-0.3* >=dev-ruby/typhoeus-0.3.3
-	dev-ruby/pony
-	dev-ruby/rb-readline
-	>=dev-ruby/sys-proctable-0.9.1
-	dev-ruby/highline
-	=dev-ruby/sinatra-1.3* >=dev-ruby/sinatra-1.3.2
-	=dev-ruby/sinatra-contrib-1.3* >=dev-ruby/sinatra-contrib-1.3.1
-
-	dev-ruby/bundler
-	dev-ruby/rspec
-	www-servers/thin
-
-	test? ( dev-ruby/rspec
-		dev-ruby/rake
-	)
-"
-#FIXME: dev-ruby/typhoeus:0.3 must be enforced. bundler is the only solution for now
-#src_prepare() {
-#	epatch "${FILESDIR}/${PV}-unbundler.patch"
-#}
-
-src_install() {
-	dodir /usr/$(get_libdir)/${PN}
-	cp -R "${S}"/* "${ED}"/usr/$(get_libdir)/${PN}/ || die "Copy files failed"
-	dosbin "${FILESDIR}"/${PN}
-}
diff --git a/www-apps/arachni/arachni-0.4.7.ebuild b/www-apps/arachni/arachni-0.4.7.ebuild
index c4f8b8999..5d80e4860 100644
--- a/www-apps/arachni/arachni-0.4.7.ebuild
+++ b/www-apps/arachni/arachni-0.4.7.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
+
 inherit eutils
 
 MY_V="0.4.1.1"