From 5d04e061b6734106e178548980f422efdabb27a1 Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Fri, 16 Oct 2015 09:28:49 +0800
Subject: [PATCH] arachni: ruby21 support

---
 .../base/package.accept_keywords/dev-ruby     |  8 ++++
 www-apps/arachni/arachni-0.4.7.ebuild         | 41 ++++++++++++-------
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby
index b5b361b46..9adfaa13c 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-ruby
+++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby
@@ -1,5 +1,6 @@
 #ruby21
 ~dev-ruby/rspec-core-2.14.8
+~dev-ruby/rspec-2.14.1
 ~dev-ruby/ruby_parser-3.6.5
 ~dev-ruby/rdoc-4.1.2
 ~dev-ruby/json-1.8.2
@@ -27,6 +28,13 @@
 =dev-ruby/ruby-atk-2.2.3-r1
 =dev-ruby/rcairo-1.14.3
 ~dev-ruby/tins-1.5.4
+~dev-ruby/rspec-mocks-2.14.6-r1 ~amd64
+~dev-ruby/diff-lcs-1.2.5-r1 ~amd64
+~dev-ruby/ffi-1.9.10 ~amd64
+~dev-ruby/rspec-expectations-2.14.5-r1 ~amd64
+~dev-ruby/highline-1.7.7 ~amd64
+~virtual/ruby-ffi-3 ~amd64
+
 
 dev-ruby/mini_exiftool
 ~dev-ruby/spider-0.4.4
diff --git a/www-apps/arachni/arachni-0.4.7.ebuild b/www-apps/arachni/arachni-0.4.7.ebuild
index 5d80e4860..d057d1940 100644
--- a/www-apps/arachni/arachni-0.4.7.ebuild
+++ b/www-apps/arachni/arachni-0.4.7.ebuild
@@ -4,7 +4,9 @@
 
 EAPI=5
 
-inherit eutils
+USE_RUBY="ruby19 ruby21"
+
+inherit eutils ruby-ng
 
 MY_V="0.4.1.1"
 MY_P=${P}-${MY_V}
@@ -19,17 +21,17 @@ 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
+RDEPEND="dev-libs/libxslt
 	dev-libs/openssl
 	dev-libs/libxml2
 	dev-libs/mpfr
 	dev-libs/libyaml
+"
+ruby_add_rdepend "dev-ruby/rubygems
+	dev-ruby/diff-lcs
+	dev-ruby/json
+	dev-ruby/yard
+	dev-ruby/redcarpet
 	virtual/ruby-ffi
 	=dev-ruby/addressable-2.3* >=dev-ruby/addressable-2.3.2
 	dev-ruby/awesome_print
@@ -37,29 +39,38 @@ RDEPEND=">=dev-lang/ruby-1.9.2
 	>=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/typhoeus:0.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/sinatra:1.3
+	dev-ruby/sinatra-contrib:1.3
 
 	dev-ruby/bundler
-	dev-ruby/rspec
+	dev-ruby/rspec:2
 	www-servers/thin
-
-	test? ( dev-ruby/rspec
+"
+ruby_add_bdepend "
+	test? ( dev-ruby/rspec:2
 		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"
 #}
 
+#each_ruby_configure(){
+#    einfo ""
+#}
+#all_ruby_configure(){
+#    einfo ""
+#}
+
 src_install() {
 	dodir /usr/$(get_libdir)/${PN}
-	cp -R "${S}"/* "${ED}"/usr/$(get_libdir)/${PN}/ || die "Copy files failed"
+	cp -R "${S}"/all/${P}/* "${ED}"/usr/$(get_libdir)/${PN}/ || die "Copy files failed"
 	dosbin "${FILESDIR}"/${PN}
 }