gentoo resync : 24.12.2018

3 files changed, 69 insertions, 3 deletions

diff --git a/dev-ruby/metasploit_data_models/Manifest b/dev-ruby/metasploit_data_models/Manifest
index cb61526c0d2e..48fef01fe921 100644
--- a/dev-ruby/metasploit_data_models/Manifest
+++ b/dev-ruby/metasploit_data_models/Manifest
@@ -1,3 +1,5 @@
 DIST metasploit_data_models-2.0.14.gem 182272 BLAKE2B 76162d66be5ddbad8186aef84bdc31ca06635737203f6e25dfc5d74d11775aa7ef5f0e5e5e07f5cce524e7712e484e548d56398bbae95dcc7cb93a22bca223f4 SHA512 204505fd9073eaa7c9467ef8241f0cf3167f33e68eb4e5aac6101fc0b1fa68d2ec85e11ac9ce4fb80ae3db8ba6fcc0f7f2a93dacf9735c2d4d1d92fa0a41e70b
-EBUILD metasploit_data_models-2.0.14.ebuild 1556 BLAKE2B e7c1c04e8f28909d56e543ad62cd19fc818718dac5e5973100cafa22c5de802ba18e811da42f4174898f68f60298ccb194ac27fe444992faaf96c71640546677 SHA512 584aa12b38acc0ae0299fafebacafd09ef746b0a1db57f645d45ffb637bad36b337dfa49309f4bd39795bea160e6201149dd8ad52332e9d647251729f6f8a079
+DIST metasploit_data_models-2.0.16.gem 182272 BLAKE2B 918c57e62552e2b3288ca24e8ff7abeb30b0b6221906890c7b2e15c674356de6861a10500735d5a912b0deefb6b378b64111bd18770c65b10dcdbc911e6439d6 SHA512 bf2c2c162d23750eceeb315b9a5ba9e8b80bf4ace9e32f8c1e97c35939338d026d640675b3e5eaf61c6897007db07e186d4d5be944dc3bca16c138f1f6ae6ada
+EBUILD metasploit_data_models-2.0.14.ebuild 1555 BLAKE2B 9b44baef6a98481321a238b2a0e7cc1941bc9ac942d43988280a395e04cccda3ca2d80b1a7633724bfd1ba7926d27f2005f7afe09f4664ddb65c068c2aafe7bf SHA512 140dc1c358598b1957a2f59d5318aac23a9f7640935f26daaa8f87556526c46f13627d1438af7e89a1ccb935d972246d2cac1621946b7ecaba1a31bd667f9088
+EBUILD metasploit_data_models-2.0.16.ebuild 1710 BLAKE2B 85577ba1c7eb5d627ff332ee9b682a6943f4998259fcf9450a8ad1c1630a5139e4d3571d25dd83297a8df73f12b634bf3e8842506b96784a99aaf4830dc0f096 SHA512 6a1c0daa85852cc6535d4eea4b602ecaee4db73b1d653bfdfc6874db27cb71bccbea8f2b713c43cb9b1709dfe4f14039e1dd0542e20c5d4717004c938a4935cb
 MISC metadata.xml 351 BLAKE2B 0155a3cb58926357628d45ce946dfeec0ca027907e1fbbb40fb046f01328efb8eafbaafa9e8f7736ea78671a5bfb1dcf3226d9d386795f3580b3286d8f7cf230 SHA512 ee266255d74e739d98e87921a9f60e21ace6b1d0b2ebe403747ed27a06cbf944a70739c0f2ab31f80a2239853ed228da1d86bb1f601648d4f8d5c233a4e62fbd
diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-2.0.14.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-2.0.14.ebuild
index d810551b5a32..a79ca8886438 100644
--- a/dev-ruby/metasploit_data_models/metasploit_data_models-2.0.14.ebuild
+++ b/dev-ruby/metasploit_data_models/metasploit_data_models-2.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ RDEPEND="${RDEPEND} !dev-ruby/metasploit_data_models:0"
 ruby_add_rdepend "
 		>=dev-ruby/activerecord-4.2.6:4.2[postgres]
 		>=dev-ruby/activesupport-4.2.6:4.2
-		dev-ruby/pg
+		dev-ruby/pg:*
 		dev-ruby/postgres_ext
 		>=dev-ruby/railties-4.2.6:4.2
 		>=dev-ruby/recog-2.0.0:*
diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-2.0.16.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-2.0.16.ebuild
new file mode 100644
index 000000000000..e99cda7e99d1
--- /dev/null
+++ b/dev-ruby/metasploit_data_models/metasploit_data_models-2.0.16.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db script spec"
+RUBY_FAKEGEM_GEMSPEC="${PN}".gemspec
+DESCRIPTION="The database layer for Metasploit"
+HOMEPAGE="https://github.com/rapid7/metasploit_data_models"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+RESTRICT=test
+#IUSE="development test"
+IUSE=""
+
+RDEPEND="${RDEPEND} !dev-ruby/metasploit_data_models:0"
+
+ruby_add_rdepend "
+		>=dev-ruby/activerecord-4.2.6:4.2[postgres]
+		>=dev-ruby/activesupport-4.2.6:4.2
+		dev-ruby/pg:*
+		dev-ruby/postgres_ext
+		>=dev-ruby/railties-4.2.6:4.2
+		>=dev-ruby/recog-2.0.0:*
+		dev-ruby/arel-helpers
+		>=dev-ruby/metasploit-concern-2.0.0
+		>=dev-ruby/metasploit-model-2.0.0
+		<dev-ruby/thor-2.0"
+
+ruby_add_bdepend "dev-ruby/bundler"
+
+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
+	#use the stable version of pg
+	sed -i "s/'pg', \"0.20.0\"/'pg', '0.21.0'/" metasploit_data_models.gemspec || die
+}
+
+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
+}
+
+all_ruby_install() {
+	ruby_fakegem_binwrapper mdm_console mdm_console-${SLOT}
+}