gentoo resync : 08.01.2021

3 files changed, 7 insertions, 46 deletions

diff --git a/dev-ruby/recog/Manifest b/dev-ruby/recog/Manifest
index f24c413284c4..3baf41925ed0 100644
--- a/dev-ruby/recog/Manifest
+++ b/dev-ruby/recog/Manifest
@@ -1,9 +1,7 @@
 DIST recog-2.3.14.gem 331776 BLAKE2B 62aad2cf8252c24cd7adc456a022555f05924e501fd5f2fafeb87c2587e049ee41a501602bc1b5d97370a69a6b98f1ae77df22bfb7ae2c9e80b38b5e0a1518df SHA512 1154ca3d610fe8f554a15846b49f978d3798c9a43893c40d58c8421e8012c0823368d374ecadd351fc1479037c898966dc2dba9debb4c46ce6b743c7782a848f
 DIST recog-2.3.15.gem 332800 BLAKE2B 4a6360f72d5ee48e066a30abf875fba18e8dcdcba6d36bf8d8de28b36405870819a1b91edee1a5877b1ddda99a25918419bf42bdd4851c7d814a2acf558439d3 SHA512 a26f722da886be22332330a9b0407ec28431ca900b43d6cb7c6fe65938a026a51d54f90cb264652fb8a70352f5e548a7ed013a4b136a7a21df4a9987b36faf0e
-DIST recog-2.3.6.gem 266752 BLAKE2B ec11be53a79f83b174c12f44d90c4085e02ae10fb49744ee6c5d655e4be32414fa158f6a11b2d73786c00447f8ebf3f40aecd422f14886a72eb59f1519a65f63 SHA512 b4731092884de9dcf961122bf0cd5b4ed2fe8b9fc7ecdbd144d0813cbad52895ab4b3c0b7069a7f7e7a80bcf236cfd1c8c0d594d2caa65a76cca60e362009b43
-DIST recog-2.3.7.gem 276480 BLAKE2B 227b5ee13245a8c3f47b9aae1a3a15133669bf2d0438f6c693da6496243b915e036ee922f0db3bbfa605b38803c4bd1cae472b8494f74d7dc73b2d476cc164b0 SHA512 184ed1bbd661899d66f51675f2c5e62804b24b75426ad064c1fff8d5e3f2e083cdbd48c5482beedbaebc355f0fcff3e29d1406d7bbc31c55a17fa467adf7c280
+DIST recog-2.3.18.gem 331776 BLAKE2B 8a44b13c73e4487fc41c00b34d907fc91b6c3b9bfcf29a7366e3462a946db51e9ae8cefb09d47890c8bb71fed6b6277f117f96b5a6f7e611c8583873049ec4ad SHA512 023486b1812c7e90f1eab6f6b49733c77207b725f82adc71d0d79eafad07a13cb368b5d02c23d8f00341cbe94d77ac1b590430f0c891ab7095643af1a1772ba0
 EBUILD recog-2.3.14.ebuild 781 BLAKE2B 491ff32a9898c4e49a9538f6b748276391d57a050cda369386d1b890afcbce515044a4dea8d276a36c4f6e31923fa5aaef2fa8503b735df92d4a4ae5f79565be SHA512 3b600044289bd0523684974660fd072e304df6aa4e3de777b62172da4dc4b0c737ddd707e89286879bda83fa6cdd62e238cc28c49cf371fcbd13c5396349d40b
 EBUILD recog-2.3.15.ebuild 781 BLAKE2B 491ff32a9898c4e49a9538f6b748276391d57a050cda369386d1b890afcbce515044a4dea8d276a36c4f6e31923fa5aaef2fa8503b735df92d4a4ae5f79565be SHA512 3b600044289bd0523684974660fd072e304df6aa4e3de777b62172da4dc4b0c737ddd707e89286879bda83fa6cdd62e238cc28c49cf371fcbd13c5396349d40b
-EBUILD recog-2.3.6.ebuild 779 BLAKE2B dd2b02b306c18b6f15988de6782069b006ec90434adb8e20e304eebf63bf35d94edfa57d233c6dd58e653b2c9771953a1ed345185f9bd6456645fc7ce4b3d3a2 SHA512 2f173a35948cc68d497787501bfe60e8fe9ebf69e7ec558be13563dbc6b00cdf398d0c09ba408668e2c1f992c7a3fc6f258d8415fa764ed467228fbecee9d305
-EBUILD recog-2.3.7.ebuild 786 BLAKE2B 5fd7e5d4070af67ee769f066c1cb476f1ed2702890c3194e4c09d16868f960a489bbe5a144b894283b488ec46a36bc208321c61967c5950f086b3051f60cb880 SHA512 c4e517d65bd0eefbdf4dff4f67f63401baea31638c98e975ed9acd677e6901418b95353d5b4d44ee4541db153c4e1153361bdc08d59aebdeb7c64e30861f3e50
+EBUILD recog-2.3.18.ebuild 743 BLAKE2B bf211180aa7a2651db6f923e41c91dd0ee8bdd4eabd9c2485fa06f694c3bc2b4d01a13bbb44d8f4e565f46e504480de6f5a566e8b89cb21cbb57744cebf05a28 SHA512 fbf11002303a746fd65b14375441804cc5b87f9c4c30f1e53ee7c1c62ff0fe6b44c4365b7824bdb713d31e1e25d8260495f5661f5b2bbef3779271e5a6e7f94f
 MISC metadata.xml 334 BLAKE2B bccb589153c4961a76c8bbd83ace97d4295b5c6a3b66ede325156940c8d0a1119bfaa838caa5d1e7ffb1363e4a3cbe8d2899fc2430b051dab63b11709f16d190 SHA512 cb416ad148d55b439a260d17b6f014075031a7b60cbf686b75e2b34f4d7bf82a8f0001c84f0dcbd9506a855a64dd20902965a0744cdd9fa06f6391929d5245fa
diff --git a/dev-ruby/recog/recog-2.3.6.ebuild b/dev-ruby/recog/recog-2.3.18.ebuild
index c000a7c6eb5c..18077246bb19 100644
--- a/dev-ruby/recog/recog-2.3.6.ebuild
+++ b/dev-ruby/recog/recog-2.3.18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -21,14 +21,14 @@ IUSE=""
 ruby_add_rdepend "dev-ruby/nokogiri"
 
 ruby_add_bdepend "test? (
-	dev-ruby/regexp_parser:0
+	dev-ruby/regexp_parser
 	dev-ruby/rspec:3
-	dev-util/aruba
+	dev-util/aruba:1
 	dev-util/cucumber
 )"
 
 all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' -e '1igem "regexp_parser", "~>0.2"' spec/spec_helper.rb || die
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/recog/recog-2.3.7.ebuild b/dev-ruby/recog/recog-2.3.7.ebuild
deleted file mode 100644
index c3a8e9db148c..000000000000
--- a/dev-ruby/recog/recog-2.3.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="xml"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pattern recognition for hosts, services, and content"
-HOMEPAGE="https://github.com/rapid7/recog"
-
-LICENSE="BSD-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/nokogiri"
-
-ruby_add_bdepend "test? (
-	dev-ruby/regexp_parser:0
-	dev-ruby/rspec:3
-	dev-util/aruba
-	dev-util/cucumber
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' -e '1igem "regexp_parser", "~>0.2"' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	ruby-ng_cucumber
-}