gentoo resync : 24.12.2018

3 files changed, 78 insertions, 4 deletions

diff --git a/dev-ruby/metasploit-model/Manifest b/dev-ruby/metasploit-model/Manifest
index ea1fbab9c880..be103fce39f1 100644
--- a/dev-ruby/metasploit-model/Manifest
+++ b/dev-ruby/metasploit-model/Manifest
@@ -1,3 +1,5 @@
 DIST metasploit-model-2.0.3.gem 81408 BLAKE2B e62074efbdd66fc951b4c304d9c0adbf54b631bf0e343658b395e76bf4783db8a0186f375ce2650110b2200b805832ae25cd81779d894c1b7475a07d3041b35a SHA512 a6d77940e6b85925cc93c57f69910fde5c8eb2458d6707847be9f5856cfceee33304209e8c7076484151d9daf1f23cfe28cb0c00abb83176b7bc6c819fb128ec
-EBUILD metasploit-model-2.0.3.ebuild 1888 BLAKE2B bf26f289c0edaa5d3439c62c34d16748c8d9bc90ad7fe34ea21f674201f3c1207bfa76a7e0aa6289932fd14f1689f3162fab66322e0f49998f7f4d1f34c5fb8d SHA512 fed2f4dd07f83b5c2037b5625c22aaedff446bd25a32205231d6d99e51ef4bd57992b46c00152285aacd777a4253e8e5754b4e5bbf2c31cbedc69fc68a7ee0d4
+DIST metasploit-model-2.0.4.gem 81408 BLAKE2B 5a4be9e61649710470618d4334279054cbefc1027a1d4674b6be0c6a4c632219fd2dc3ac5f9f56dc9018712e5cbcbe191d5749ed2ed10cf98f884a06e41ec736 SHA512 70f6d948227bc99f877c3b5631a964087c0ebfdb091f128c72bc5da276bf57a5055aea5cdda4dc66e1fb177606afec9b7b3ee4076211f43928a2defb93294ac5
+EBUILD metasploit-model-2.0.3.ebuild 1863 BLAKE2B 8d8d60573ce18712c3f2a0427d88888c8c0f56cceab90ae0c7503afbf51989502fb9828ea91d0533664c7ee62e9bc0efc9605df00991b8e06fda3814cad591eb SHA512 a23d6a7f7ed3208f3ebbb9fae9bb2ab0d1fc64dfbfc0f7fb8bab712f7fe41a101bc83884d732223c50fce0bcf729d8be38b4a903ed45f81a24d466725dd7b2e7
+EBUILD metasploit-model-2.0.4.ebuild 1868 BLAKE2B eef2ee7bb7d6cf203c0eedfdb777d53bbdb53a7c411af2844ee8fa0964233843034e439afda606e8e48c8df0b0b74d11c3f2c010da983e1ccaa81fce7ddf1c8a SHA512 f364c77866a2f6332206abf4a374354b189323e06b7e3bccccf676554de7dcb75454fc89cc15f26126a9985c016c4f6e135b0ddf6d6cd1a20ed5fd62bef13bdb
 MISC metadata.xml 541 BLAKE2B 5cbf1dc5abd33de9b63c4b70eceaa58cc2e9b4d4fbf4ebae04ee5ad769c3a419ae7c5e3f5508370f88fc2b3f44e13c5de0ba782322173142211e92a3c713f5b7 SHA512 a61494f72cb863a18cf370ebfdadcda7f4f3ed54e2c9d1e4ab9cf006f26bbefd30b1f293bd3f7df5e766994b044fe27a7b4fb4d78a1c7fdac7e2380aace901cc
diff --git a/dev-ruby/metasploit-model/metasploit-model-2.0.3.ebuild b/dev-ruby/metasploit-model/metasploit-model-2.0.3.ebuild
index 8ffc7598d3c7..00924336d8ec 100644
--- a/dev-ruby/metasploit-model/metasploit-model-2.0.3.ebuild
+++ b/dev-ruby/metasploit-model/metasploit-model-2.0.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 USE_RUBY="ruby23"
 
-inherit ruby-fakegem versionator
+inherit ruby-fakegem eapi7-ver
 
 RUBY_FAKEGEM_EXTRAINSTALL="app config script spec"
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/rapid7/metasploit-model"
 SRC_URI="mirror://rubygems/${P}.gem"
 
 LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm"
 #IUSE="development test"
 RESTRICT=test
diff --git a/dev-ruby/metasploit-model/metasploit-model-2.0.4.ebuild b/dev-ruby/metasploit-model/metasploit-model-2.0.4.ebuild
new file mode 100644
index 000000000000..d3b004a03f63
--- /dev/null
+++ b/dev-ruby/metasploit-model/metasploit-model-2.0.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24"
+
+inherit ruby-fakegem eapi7-ver
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config script spec"
+
+DESCRIPTION="Common code, such as validators and mixins"
+HOMEPAGE="https://github.com/rapid7/metasploit-model"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+#IUSE="development test"
+RESTRICT=test
+IUSE=""
+
+RDEPEND="${RDEPEND} !dev-ruby/metasploit-model:0"
+
+ruby_add_rdepend ">=dev-ruby/railties-4.2.6:4.2
+			>=dev-ruby/activesupport-4.2.6:4.2
+			>=dev-ruby/activemodel-4.2.6:4.2"
+#		development? (	dev-ruby/bundler
+#			dev-ruby/rake
+#			dev-ruby/i18n
+#			dev-ruby/multi_json
+#			dev-ruby/builder
+#			dev-ruby/erubis
+#			dev-ruby/journey
+#			dev-ruby/rack
+#			dev-ruby/rack-cache
+#			dev-ruby/rack-test
+#			dev-ruby/hike
+#			dev-ruby/tilt
+#			dev-ruby/sprockets:*
+#			dev-ruby/actionpack:4.0
+#			dev-ruby/json
+#			dev-ruby/rack-ssl:*
+#			dev-ruby/rdoc
+#			dev-ruby/thor
+#			dev-ruby/redcarpet
+#			<dev-ruby/yard-0.8.7.4 )"
+
+ruby_add_bdepend "dev-ruby/bundler"
+
+all_ruby_prepare() {
+	[ -f Gemfile.lock ] && rm Gemfile.lock
+	#For now, we don't support development or testing at all
+	#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
+		sed -i -e "/spec.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 ]
+	then
+			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+	fi
+}