From bbfd47b1cfe04a7e5523529c74edb57fb5bb36fc Mon Sep 17 00:00:00 2001
From: Anton Bolshakov <blshkv@users.noreply.github.com>
Date: Sat, 4 Oct 2014 02:17:59 +0000
Subject: [PATCH] metasploit: revert back deps requirement

---
 dev-ruby/metasploit-concern/Manifest          |  2 ++
 .../metasploit-concern-0.2.1.ebuild           | 20 +++++++++++++++
 dev-ruby/metasploit-credential/Manifest       |  2 ++
 .../metasploit-credential-0.10.2.ebuild       | 25 +++++++++++++++++++
 dev-ruby/metasploit-model/Manifest            |  2 ++
 .../metasploit-model-0.27.4.ebuild            | 21 ++++++++++++++++
 net-analyzer/metasploit/Manifest              |  2 +-
 .../metasploit/metasploit-9999-r1.ebuild      |  4 +--
 .../base/package.accept_keywords/dev-ruby     |  8 +++---
 9 files changed, 79 insertions(+), 7 deletions(-)
 create mode 100644 dev-ruby/metasploit-concern/metasploit-concern-0.2.1.ebuild
 create mode 100644 dev-ruby/metasploit-credential/metasploit-credential-0.10.2.ebuild
 create mode 100644 dev-ruby/metasploit-model/metasploit-model-0.27.4.ebuild

diff --git a/dev-ruby/metasploit-concern/Manifest b/dev-ruby/metasploit-concern/Manifest
index ab6aefb3a..864c09a6a 100644
--- a/dev-ruby/metasploit-concern/Manifest
+++ b/dev-ruby/metasploit-concern/Manifest
@@ -1,2 +1,4 @@
+DIST metasploit-concern-0.2.1.gem 12800 SHA256 ce61e89e69f39c462a4a8bb6d2cc3b357fe19a81b4257cef00d414c6ac9afbae SHA512 dc458ff88eb29e8b216adc534e59488e34a898a9376722092b819c2b4951a84f1043c75a31cdbfdff45cc09b5e6a5bc534f9515197d7728e33886f3f3d74144d WHIRLPOOL 6402b824034d0143c62a5f1741529b4a35c0a34eb7434b7ea7c8feb7aaa9a005ae902e59d137ecb4447a2b0df86db9278750d5d40147612d39777294203590a6
 DIST metasploit-concern-0.3.0.gem 12800 SHA256 fdc7313026bf6b0f208ab48f40fa81c25f0c2c529287dee4e2726c9aab6a0b5d SHA512 d62720019873d10e6e6d82d30c28b71b0a65c5272b34f5b4bc1876333af139f70f55a21de23a9b331a3e6000c40df052405e690ee1a48f31eeef92a5d33a38ca WHIRLPOOL 6296321a9d7e16303332ed48eb8f094a4ee9c6671c9daac3bb135bc6a725ff9d96711fe0a46cc8d5b53f8fac959112d0d8905ec8fefeceb4060a7c0af74d7221
+EBUILD metasploit-concern-0.2.1.ebuild 618 SHA256 99230e61f0f8ce82bd6eb0e00e7eff0b558beaa910807e7c0fc762c683696276 SHA512 5c78f7c9ea1d5dfbdfbf50594d0f6ac340a8d7016be00e554555e6d49f8a6e4ffc6db02b830cf7de6659024ccafcd73c8ff35b78077dbc2caedd912701bc9107 WHIRLPOOL eabd5e82f8aec10d9cc9880aff8ebd32d395ef6382dda2a5333ba1e20613110a864b7032b9f54eee60852b05df649030cb8649375692e90e61b146ab814a937d
 EBUILD metasploit-concern-0.3.0.ebuild 618 SHA256 99230e61f0f8ce82bd6eb0e00e7eff0b558beaa910807e7c0fc762c683696276 SHA512 5c78f7c9ea1d5dfbdfbf50594d0f6ac340a8d7016be00e554555e6d49f8a6e4ffc6db02b830cf7de6659024ccafcd73c8ff35b78077dbc2caedd912701bc9107 WHIRLPOOL eabd5e82f8aec10d9cc9880aff8ebd32d395ef6382dda2a5333ba1e20613110a864b7032b9f54eee60852b05df649030cb8649375692e90e61b146ab814a937d
diff --git a/dev-ruby/metasploit-concern/metasploit-concern-0.2.1.ebuild b/dev-ruby/metasploit-concern/metasploit-concern-0.2.1.ebuild
new file mode 100644
index 000000000..a0e57ac9b
--- /dev/null
+++ b/dev-ruby/metasploit-concern/metasploit-concern-0.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 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 $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Metasploit concern allows you to define concerns in app/concerns. "
+HOMEPAGE="https://github.com/rapid7/metasploit-concern"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/railties-4.0.0
+				>=dev-ruby/activesupport-3.0.0"
diff --git a/dev-ruby/metasploit-credential/Manifest b/dev-ruby/metasploit-credential/Manifest
index 596dd7af3..869d4e53a 100644
--- a/dev-ruby/metasploit-credential/Manifest
+++ b/dev-ruby/metasploit-credential/Manifest
@@ -1,3 +1,5 @@
+DIST metasploit-credential-0.10.2.gem 5963776 SHA256 8c8952d43a4ed578dd2b647e8c8d25620725b2cd659e46535522c43e1f27f427 SHA512 54c2e9115ba121fb94a1a9cf35308cf39e3463aa3f8aa1764b9a7291243e3a0a6c03d1a13655fd4edac08db0b7bbf19593201c4581fbd19d0e9d2fd1e35cf4c2 WHIRLPOOL 2b5a716febba982fba18fe3be3a02c441ba9ed0149d52e444469b01b392b8a061df28ae5442c9bb9cd73bdf1bea6f881e3d858ef7b40e6f0750a1a333b07b3c9
 DIST metasploit-credential-0.12.0.gem 1958400 SHA256 fcbe4f1bd3c568ef8cc3a4699c2f6b3f462aaaeaf346ebc82f22cceca4145b39 SHA512 f1057542cd385aa96e4166d0a81db3409c91ea1dc633fc5e993a1ebdc016c408209d38a294d77c2a74730a4cc6b94272187eb3c2eaa131d36544459a0b3df6bc WHIRLPOOL db5740f284c10091932b416ec94004d1b48b2a5a56cfccf4e5740b32ebfe1127dde526f498b61b7e93b05267cfe66234fb45307e038009d4cd0a2e2315731525
+EBUILD metasploit-credential-0.10.2.ebuild 739 SHA256 6cee88305dc4ca43cf70eb9b46eea35d635f571fec3463c85cb4a25e94865750 SHA512 191bcd86f1afa939d99b42c50c20fb24afaeccb718696489031db9448dc1f6947d52645aa42ff2d7af3f4366f8ca0fc6b024ac517d0ad3623a40fb543b755cfc WHIRLPOOL 9c3e19d88cf8e2d9b52ae650808d942be4cfc2ce9201a24172fdfa4e2a3d792e03402ec090b4c308108984cb4793bc13faf6d8436356332e91f438146225733b
 EBUILD metasploit-credential-0.12.0.ebuild 739 SHA256 14e63ee1e2341763d2571d2612b2d58c8a7865490249145aa28178aa61366180 SHA512 a37a57f83db82eb8b998a79ecfd86f7715f7102271ddd08f5d00e6de81f6eae3954de598d72f41cceb5ebd99ac6a8676b146fe9a346e770424f5ed1a18d0adf3 WHIRLPOOL 58cd4c317e3fc14e4b5172edc54c291170b7befceffdb14c375245a8036216c161f2d783a8c3b8fb8416026414d317dca6500ad2b255884525b39116941c13ce
 MISC metadata.xml 275 SHA256 ddea40fdfb3de36c4e8ec395d93195500089d461dc340ca376d7d93a3b6c3c70 SHA512 23a0fff59aeb0bceae496a74b75da3bc80d71fe9c60f63b1c20eecb97dd75fa32180457dfca21871c1e8d0a34f85a4a201a0eae0b46cbf91abb0fc8322d0b9f2 WHIRLPOOL 9f6a81dc72dc72656e6c32be440c3276225a7d7d09b4b1833db219eee071d3916e8eda3bdf6dbde6db1e5a6c9b4972fa6bb6e6ddecd2302941d9fdf283246761
diff --git a/dev-ruby/metasploit-credential/metasploit-credential-0.10.2.ebuild b/dev-ruby/metasploit-credential/metasploit-credential-0.10.2.ebuild
new file mode 100644
index 000000000..986eb3e51
--- /dev/null
+++ b/dev-ruby/metasploit-credential/metasploit-credential-0.10.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 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 $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Code for modeling and managing credentials in Metasploit"
+HOMEPAGE="https://github.com/rapid7/metasploit-credential"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/metasploit-concern-0.2*
+	=dev-ruby/metasploit_data_models-0.20*
+	=dev-ruby/metasploit-model-0.27*
+	=dev-ruby/rubyzip-1*
+	dev-ruby/rubyntlm
+	<dev-ruby/railties-4.0.0
+	dev-ruby/pg"
diff --git a/dev-ruby/metasploit-model/Manifest b/dev-ruby/metasploit-model/Manifest
index c2663b0b4..8340ccafb 100644
--- a/dev-ruby/metasploit-model/Manifest
+++ b/dev-ruby/metasploit-model/Manifest
@@ -1,3 +1,5 @@
+DIST metasploit-model-0.27.4.gem 154624 SHA256 f0e0b8ac45fbf89da5ef1fbf9831ee6251805f500ae5e02d98bfaf068e21fbc6 SHA512 957d9b1f36d14e94aec3678e46fa3257919343ca102f179234603c8686869e4d4ac966dffce7a7aa31cf4096584a5d0e5950925f7410a247072edae41902b146 WHIRLPOOL 0b305aa6580a0fc8ee639ad59ea1b765ced86c179ee019d191126a3833acfed9f2f4774e099cf9d95c10be88f4665ab5b58ac91bd3646df9daa3a2e83d30ce56
 DIST metasploit-model-0.28.0.gem 154624 SHA256 c6d8862a5923476e805ff52c4f9b1584a365f8a5a688f2c63802056e5aef2e9b SHA512 84de515ad5b6b35229d249daffa58c54a020e3f51dfc9e2c90e2895dcd0b8648815a878f741133b8f6e6dec0e421ef218d9bac7df1bafb54482b11edd95c9e05 WHIRLPOOL 3cde3a36e13b90ea08d3ed6091be450ae7dd6910eef922b3b3b86699fda575cacf01d3bf8486b78912ca048d3187f85876b100591d32935a7e245330351391e7
+EBUILD metasploit-model-0.27.4.ebuild 691 SHA256 4ec75b7b1ee09d454d7ca6865f0ff381fd0a4018fcef79bd12d83c307001b2c4 SHA512 270f123f6403a486fb56b8551bd27ee6276190cdafa4084f6c9a55a78ee5df32629b86913275dfed42cc77c40a81ee567c37808489288f44a8499e515a13cb4a WHIRLPOOL d95298d710a759fd5552dbd164a18a2aae210e6d874af286f840ea0d246cdd14fe9415f07883a213309721e082e8ffe53a0d3b9a9e3de330a92f84fa299263c7
 EBUILD metasploit-model-0.28.0.ebuild 691 SHA256 4ec75b7b1ee09d454d7ca6865f0ff381fd0a4018fcef79bd12d83c307001b2c4 SHA512 270f123f6403a486fb56b8551bd27ee6276190cdafa4084f6c9a55a78ee5df32629b86913275dfed42cc77c40a81ee567c37808489288f44a8499e515a13cb4a WHIRLPOOL d95298d710a759fd5552dbd164a18a2aae210e6d874af286f840ea0d246cdd14fe9415f07883a213309721e082e8ffe53a0d3b9a9e3de330a92f84fa299263c7
 MISC metadata.xml 275 SHA256 ddea40fdfb3de36c4e8ec395d93195500089d461dc340ca376d7d93a3b6c3c70 SHA512 23a0fff59aeb0bceae496a74b75da3bc80d71fe9c60f63b1c20eecb97dd75fa32180457dfca21871c1e8d0a34f85a4a201a0eae0b46cbf91abb0fc8322d0b9f2 WHIRLPOOL 9f6a81dc72dc72656e6c32be440c3276225a7d7d09b4b1833db219eee071d3916e8eda3bdf6dbde6db1e5a6c9b4972fa6bb6e6ddecd2302941d9fdf283246761
diff --git a/dev-ruby/metasploit-model/metasploit-model-0.27.4.ebuild b/dev-ruby/metasploit-model/metasploit-model-0.27.4.ebuild
new file mode 100644
index 000000000..a17a0e62b
--- /dev/null
+++ b/dev-ruby/metasploit-model/metasploit-model-0.27.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 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 $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Common code, such as validators and mixins, that are shared between ActiveModels in metasploit-framework and ActiveRecords in metasploit_data_models"
+HOMEPAGE="https://github.com/rapid7/metasploit-model"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/railties-4.0.0
+				dev-ruby/activesupport"
+
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index e65945154..ad15aa7db 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -11,4 +11,4 @@ AUX msfrpcd-4.4-conf 598 SHA256 3ad3e837061fd2b8b28d5afede50fc1965b0df083a8e4b74
 AUX msfrpcd-4.4-initd 638 SHA256 4e3f18ab619a0067c7ac9a9f13d6824496cb36adf20c216bb96ad365b1ef2725 SHA512 21faadd62a90deaecb617cb106a471de39147e1702f149c1d356ae18f188bf3102bb9e9642122afa2d9c49325bd4cba6f04acaa8f5be2ca238adeb56c9c81821 WHIRLPOOL 8069bec85919e26faf838b8965153425adbd5c46c004ddb0a94c7e6d2b63aeaa30479592b556f2939c90c216d63103931967c36a21b3d9eaa2763d0120c9ba09
 AUX msfweb.confd 273 SHA256 006040ecd27dc0279c2bea6d69365fe1f0d66f507c039ae43720662abe9f4460 SHA512 58481d69f99bec1644188ecb5f67249c3c85c12ae65d46643c3daf42b5221f8d1b025ea318ed6d11557cbc16e50acc5eaabb99162d538518265755ebcdb042ab WHIRLPOOL 1cbb5a5ff20eb90f7db6f5523bf8834cfd5aa2c98e378408e418f388993af661273257112db2ebcd950bfa9243e9f19ba4a5262fd2bccc7cc6276658f86115bb
 AUX msfweb.initd 533 SHA256 4fd9668e4b467ecfa5160e2c108ac8ace71fbeaefaf829d2f7bfb566d44bb13c SHA512 ec8eb9c09191d273417174c23d2fb1a3d27939a74b010fa33ca696bcce88e9c81d6cc1e6ebff90ea97cb6d730776364de4560db1bed10516ba4a7030e7233a53 WHIRLPOOL dec6ca3cf45ac4e6cea35266df1342b4dcdb3f813dc90820603f23e9d62ee67a9633de17d747cc12d7cb9c982e8868559896c2f8c42540a5005f485045d9730a
-EBUILD metasploit-9999-r1.ebuild 10599 SHA256 a2ea95a7efbafc431d99276980a9083e783e204d9b3f2edfe831a9b6d7d3f083 SHA512 485bbfa497a4bbab9a908bd8d5b84270dd098195224cddf47ef233d10ab72083b2a3496db12833b12a5e2eed5e48814aed9587e7b4be373460071da6b0caadf6 WHIRLPOOL d3ee8402f87e343bc8872aa3250b235b8996ce70af85082fdb165ff45b3e3d7f9a7b9710929448f52f8c101cfa595ed5c9c63d5e5e82872ae8b30bef4cef6dda
+EBUILD metasploit-9999-r1.ebuild 10601 SHA256 3a2cc9d2e0d9fb59abc0b687e6875c8ad5dccfda14077bfc7f94b098f94cd7d5 SHA512 77e96b18dfa730c934bb9e4bc7fc504f8bc0d4340f0c266ac09485ad6c89b7f366efca715f873d3aee0d2362d8ceca8ac71d9d31cee12e47a3ba211f9125aa04 WHIRLPOOL 2c0bcc18e07f109f083b94a1a7ae93da83a4f1b37d2517d0c7e134de5e4b24de2bf43c7ddd55ceba516389ca6fd2ef7583dd51b14de8e8991184394efdefa8d4
diff --git a/net-analyzer/metasploit/metasploit-9999-r1.ebuild b/net-analyzer/metasploit/metasploit-9999-r1.ebuild
index 7af649b01..5014f9f73 100644
--- a/net-analyzer/metasploit/metasploit-9999-r1.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999-r1.ebuild
@@ -39,9 +39,9 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	=dev-ruby/jsobfu-0.2*
 	dev-ruby/json
 	dev-ruby/kissfft
-	=dev-ruby/metasploit_data_models-0.21*
+	=dev-ruby/metasploit_data_models-0.20*
 	=dev-ruby/meterpreter_bins-0.0.7
-	=dev-ruby/metasploit-credential-0.12*
+	>=dev-ruby/metasploit-credential-0.10.2
 	dev-ruby/msgpack
 	dev-ruby/nokogiri
 	=dev-ruby/recog-1*
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby
index ffb44e57f..488511a4a 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-ruby
+++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby
@@ -14,10 +14,10 @@ dev-ruby/builder:3
 ~dev-ruby/mime-types-1.19
 
 #required by metasploit-9999
-=dev-ruby/metasploit_data_models-0.21*
-=dev-ruby/metasploit-credential-0.12*
-=dev-ruby/metasploit-model-0.28*
-=dev-ruby/metasploit-concern-0.3*
+=dev-ruby/metasploit_data_models-0.20*
+=dev-ruby/metasploit-credential-0.10*
+=dev-ruby/metasploit-model-0.27*
+=dev-ruby/metasploit-concern-0.2*
 dev-ruby/rkelly-remix
 ~dev-ruby/json-1.6.7
 ~dev-ruby/msgpack-0.5.8