From 58ac1d43425b41796cba488f10c6f318e197e25c Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Fri, 10 Oct 2014 02:27:52 +0000 Subject: [PATCH] metasploit_data_models: this is how you abuse bundler properly, you can use this as a guide to fix the remaining deps. I wrote this instead of sleeping tonight. --- dev-ruby/metasploit_data_models/Manifest | 1 + ...> metasploit_data_models-0.21.1-r2.ebuild} | 18 +++++++++-- .../metasploit_data_models-0.21.1.ebuild | 30 ------------------- 3 files changed, 17 insertions(+), 32 deletions(-) rename dev-ruby/metasploit_data_models/{metasploit_data_models-0.21.1-r1.ebuild => metasploit_data_models-0.21.1-r2.ebuild} (68%) delete mode 100644 dev-ruby/metasploit_data_models/metasploit_data_models-0.21.1.ebuild diff --git a/dev-ruby/metasploit_data_models/Manifest b/dev-ruby/metasploit_data_models/Manifest index 04c697842..8740ce602 100644 --- a/dev-ruby/metasploit_data_models/Manifest +++ b/dev-ruby/metasploit_data_models/Manifest @@ -1,4 +1,5 @@ DIST metasploit_data_models-0.21.1.gem 143360 SHA256 138937e373e037e5947b4c920855f150e31e4fdedeba7d986a42eb9ca7be8a7b SHA512 7c67b57399e5879da172e77c6e3eaec88b47f221dff918b5ad9c4fa65cb2e034e4ae63cbe0c0bf01ae61f180ff9867671de93e4b5cdfef96ab37de8c73591dc8 WHIRLPOOL 5542eaf108e7698ff1cdd3a726321e1a5e7d418984a7628f037a3aa90cddf6063c1e3b0a25257d9b2e456f7692f086376e7b2ff1eb29a057643c57bb22cebb81 EBUILD metasploit_data_models-0.21.1-r1.ebuild 1037 SHA256 9d741ac46cabe1298be31abeed7c950ed1548a6be4e164f378e05b965a9cfe36 SHA512 bae40f22081098c0d8a297c85363149846d23379f5215478c6f048a6b09d46c714b2585c49a0b423a3b82648d7e28286faa51377a1d095325bd24bbe67eb7c30 WHIRLPOOL b449bdb132a52cf6e240c0593ed19efbe21c4aa08453e3a6635fa89bbe05871cfa3b5cf082cf8a4e95cad3046bc9de650d05318323c38e9d3df58bc1977c6a2a +EBUILD metasploit_data_models-0.21.1-r2.ebuild 1477 SHA256 e2fe9cd8273997e525fe00831afc139cc8d1aca7c6d0e5ac936d0bb81966d767 SHA512 2cd45aca005c8686f663d262dc0f46a8fee2fbb8e30e64b52e517f8a63dc00c0d97e74dec8e322a0cdb160ccb9d1410b5fd8703c2aab92f6f7f85817f4a52a4a WHIRLPOOL c22d7eb8c3c1e26b95b4c69091d5536da44fc4f91222317bee8a0800664baecdef2fb25c5b05cf39fe18fd1ebda825045f1ab2a168a4eb3574b28a04ddba7916 EBUILD metasploit_data_models-0.21.1.ebuild 860 SHA256 0dd54a96550abb0874ae1cfcf5c9a5ecbb9e2fced55cb4b64fe389f70c1d7086 SHA512 a282f90a286a4a1d2188a7825f145f0325111a7988ffbf5a8615d887aa8bd9d9349637e8757e9e806ab223cb1552e8eac7b1edf3ec33abab99e267182fa6f9fd WHIRLPOOL 0755406f75c12bde3ab91e651823d87b365f9096ac057ee69a9f09aa04831068d20c44078f4f01b64fd3dc90b19defbda33b17c4881e7852635f03ff51af93e0 MISC ChangeLog 5640 SHA256 fc1fe2917199d227a562cc9d256e3701f942ba8a801f56e73f7120c2af458897 SHA512 d1c3c6b62e69c8ac0e43d8a541ff784cc205049ab4090b0b159ebd8877a08091482198ce34afe1ba1fd8c9b70e4eb9c82a4593d3e0928c10a520e3dd629e9658 WHIRLPOOL 473751d299eeac872fac34ae0207f89216ec362c53c33a3f2aaf93e9fde6aa622f3afdc5f6ada173277febb0731ed8c239f9674992774c2d2e111ee2eb3fb9c5 diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-0.21.1-r1.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-0.21.1-r2.ebuild similarity index 68% rename from dev-ruby/metasploit_data_models/metasploit_data_models-0.21.1-r1.ebuild rename to dev-ruby/metasploit_data_models/metasploit_data_models-0.21.1-r2.ebuild index 81c63cbd9..295b9fad0 100644 --- a/dev-ruby/metasploit_data_models/metasploit_data_models-0.21.1-r1.ebuild +++ b/dev-ruby/metasploit_data_models/metasploit_data_models-0.21.1-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://rubygems/${P}.gem" LICENSE="BSD" SLOT="$(get_version_component_range 1-2)" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="development test" ruby_add_rdepend " >=dev-ruby/activerecord-3.2.13[postgres] @@ -25,8 +25,22 @@ ruby_add_rdepend " =dev-ruby/metasploit-concern-0.3* =dev-ruby/metasploit-model-0.28*" +all_ruby_prepare() { + [ -f Gemfile.lock ] && rm Gemfile.lock + if ! use development; then + sed -i -e "/^group :development do/,/^end$/d" Gemfile || die + sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die + fi + if ! use test; then + sed -i -e "/^group :test do/,/^end$/d" Gemfile || die + fi + if ! use test && ! use development; then + sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die + fi +} + each_ruby_prepare() { - if [ -f Gemfile ] + if [ -f Gemfile ] then BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-0.21.1.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-0.21.1.ebuild deleted file mode 100644 index 9709c2de2..000000000 --- a/dev-ruby/metasploit_data_models/metasploit_data_models-0.21.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# 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 versionator - -DESCRIPTION="The database layer for Metasploit" -HOMEPAGE="https://github.com/rapid7/metasploit_data_models" -SRC_URI="mirror://rubygems/${P}.gem" - -LICENSE="BSD" -SLOT="$(get_version_component_range 1-2)" -KEYWORDS="~amd64 ~x86" -IUSE="" - -ruby_add_rdepend " - >=dev-ruby/activerecord-3.2.13[postgres] - dev-ruby/activesupport - dev-ruby/pg -