commit: a36dec8f8c7398976af170fc8669a37913640b7e
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 8 20:38:23 2015 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Oct 8 20:38:46 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a36dec8f
dev-ruby/recog: bump and fix collisions
Package-Manager: portage-2.2.22
dev-ruby/recog/Manifest | 1 -
dev-ruby/recog/recog-2.0.12.ebuild | 37 ----------------------
...{recog-2.0.14.ebuild => recog-2.0.14-r1.ebuild} | 5 +--
.../{recog-2.0.6.ebuild => recog-2.0.6-r1.ebuild} | 5 +--
4 files changed, 6 insertions(+), 42 deletions(-)
diff --git a/dev-ruby/recog/Manifest b/dev-ruby/recog/Manifest
index d4e249d..2619bc6 100644
--- a/dev-ruby/recog/Manifest
+++ b/dev-ruby/recog/Manifest
@@ -1,3 +1,2 @@
-DIST recog-2.0.12.gem 196608 SHA256
49754e782aff74a1b9f95e48c2baafa5c4ec54d534013616d6dadb2b0d95fdd0 SHA512
d88347313807969ced0106a9134a70aa933d0ad8681067746c0c931a072add2466bf17e2eeb5c090e9be8f45eede66613659b942ca98f58fd0bc15d7ee523058
WHIRLPOOL
b035279dbd74e6ddbe12b90a5433c5fe66055f8a71fa3be2c61b13dc364fafbf95deea021d9e6f1d38225d3ffae675abd23892f2b296b463e6348e7b6f98855e
DIST recog-2.0.14.gem 193024 SHA256
65d4916bf92aa052dd0624654df46f51ec91270d568b52f18491c0b74bd21abf SHA512
6e1a3872f1daaf86c00c1c535b5019761efa23af83d4ccf5996fa3a1e66a1aa468603e3582f48b88c74dc419b1a659ead683781f3c93f4f315d4aeebbf95f768
WHIRLPOOL
61695b3e8c768c93eaa56819951c65dea435751da6f60b50f291fa54e1e46b22b35b4ef12d202c326f8adefe9a6b55975bb20d5ff88d08e31b469c7b525d5afa
DIST recog-2.0.6.gem 188928 SHA256
333d867db310b908342f857ee4f3f60b869386ff7b908e06f4dec8b9352ceb97 SHA512
408e83889632127d584ce8d09244c63246807aa5f89d88c082bbfd441a2e708cd67f23aebf23fa08c5db6bfd7ff771071daf64df9a66224aa5f04fcaba3d1387
WHIRLPOOL
2aaef470b15e3b8ac99d99bc3f8975447d5aa3d05220540d61f4972083f8cf6a0b04ba89e88aefc0dfd355f59f6f1bd5e9754bf00b6b5a5a953ef21f42fc3509
diff --git a/dev-ruby/recog/recog-2.0.12.ebuild
b/dev-ruby/recog/recog-2.0.12.ebuild
deleted file mode 100644
index 5a93294..0000000
--- a/dev-ruby/recog/recog-2.0.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pattern recognition for hosts, services, and content"
-HOMEPAGE="https://github.com/rapid7/${PN}";
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/nokogiri"
-
-ruby_add_bdepend "test? (
- dev-ruby/regexp_parser
- dev-ruby/rspec:3
- dev-util/aruba
- dev-util/cucumber
-)"
-
-all_ruby_prepare() {
- sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
- RSPEC_VERSION=3 ruby-ng_rspec
- ruby-ng_cucumber
-}
diff --git a/dev-ruby/recog/recog-2.0.14.ebuild
b/dev-ruby/recog/recog-2.0.14-r1.ebuild
similarity index 88%
rename from dev-ruby/recog/recog-2.0.14.ebuild
rename to dev-ruby/recog/recog-2.0.14-r1.ebuild
index 0ea65f6..585356a 100644
--- a/dev-ruby/recog/recog-2.0.14.ebuild
+++ b/dev-ruby/recog/recog-2.0.14-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=5
USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
+RUBY_FAKEGEM_BINWRAP=""
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -18,7 +18,8 @@ SLOT="${PV}"
KEYWORDS="~amd64 ~arm ~x86"
IUSE=""
-ruby_add_rdepend "dev-ruby/nokogiri"
+ruby_add_rdepend "dev-ruby/nokogiri
+ !<dev-ruby/recog-2.0.6-r1"
ruby_add_bdepend "test? (
dev-ruby/regexp_parser
diff --git a/dev-ruby/recog/recog-2.0.6.ebuild
b/dev-ruby/recog/recog-2.0.6-r1.ebuild
similarity index 77%
rename from dev-ruby/recog/recog-2.0.6.ebuild
rename to dev-ruby/recog/recog-2.0.6-r1.ebuild
index 600a3ee..0655906 100644
--- a/dev-ruby/recog/recog-2.0.6.ebuild
+++ b/dev-ruby/recog/recog-2.0.6-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=5
USE_RUBY="ruby19 ruby20 ruby21"
-
+RUBY_FAKEGEM_BINWRAP=""
inherit ruby-fakegem
DESCRIPTION="Pattern recognition for hosts, services, and content"
@@ -16,4 +16,5 @@ SLOT="${PV}"
KEYWORDS="~amd64 ~arm ~x86"
IUSE=""
-ruby_add_rdepend "dev-ruby/nokogiri !=dev-ruby/recog-2.0.0"
+ruby_add_rdepend "dev-ruby/nokogiri !=dev-ruby/recog-2.0.0
+ !<dev-ruby/recog-2.0.6-r1"
