gentoo resync : 12.03.2021

4 files changed, 4 insertions, 53 deletions

diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 67a49115d94b..915cb1718a61 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -3,13 +3,11 @@ DIST rspec-expectations-3.10.0-git.tgz 211125 BLAKE2B 50fc17eadc94b94a28bf56b1ba
 DIST rspec-expectations-3.10.1-git.tgz 212281 BLAKE2B a1872a7f71c198db1662eca48bcb34c054f05c16193395962cb47a7fa230c2f0f83bedee302a0ab6a81380a361640177ac3370d8829faa6bd362c07e3a551e5e SHA512 35999542bf70ff04a472e50434abb8815cac8bf10b680da458f5e0e6ee290a1a6356a22cc12f0a8a6310cf282bb6cd99f922fcc63a0cf1e252b167e451bcf7d4
 DIST rspec-expectations-3.8.4-git.tgz 200149 BLAKE2B 45fe4cdc4b032bb773ef0e7d3e9b75e6d14a6e8c1850ad6fd84991d85a61860730caa9f191aa9d1ce4e21c85dadd2c52bb69bd0a1454f5ab918dc1e563fc54f1 SHA512 0ecb16f11ccf19c02c40ce587f33846fb2241f1663dd87f012b9b782338c213362dac624c434dee6e00ad2cc7ec4a1cd0af7f2edf1a8e9ebb0a0dfb31cd244d8
 DIST rspec-expectations-3.8.6-git.tgz 200343 BLAKE2B 9d668216c18716344e8c249086bcbf2b70e7c1a5a0d1f3a5328fe03752ef4ace6f5029219314016a4bb00ef482f440702a2adb7d9fe49392b5b1c6ec15f6a2e5 SHA512 9ded8de53127f63f2117f5ef64b6608b643586be498d8df24909366ce159a8bb95c9d8771633b777897f3e4ad3c9a12e3dfe62b2310513320b3d9656d24a120a
-DIST rspec-expectations-3.9.1-git.tgz 203727 BLAKE2B 47db054658bdec43c252fd5ac155e7ca794d60ecf8c8b0d3c8e072cf05629153c9778ad618619e5cde5400c95a85c1520f2b9fc3824699af33805fa187549115 SHA512 23a453a46c3eb3bd3f2a39f48f62f05832cf559b570ba0e09235dd6299687254491bab50f5502fefe69dbdeefa09e9d8c5568bc77d0b6b658bb469e197e67572
 DIST rspec-expectations-3.9.4-git.tgz 206297 BLAKE2B c5dbebcf7b411c9cb5cd815dc06fb6f455e82181856661110f803b25f3910975f0676f3cf154e93fe771849363593e104e0f2dd298dfd3d8b1dd96a6ff991547 SHA512 bd025b89751b5b8d3c6bd61a90386fc05ca371e04247d93b29334bbb3eceb84bacea3f3846c20f08dbf53f174992b2dc0fe9f2bc449c4591188b5e428b1d8003
 EBUILD rspec-expectations-2.99.2.ebuild 1623 BLAKE2B 01a190b296cc4dccb178114c105ad33bb266278cf87b63354a4450a03c667e085bcfaca61aee8fcb8926406f45d33cd429b02a750623e885e315c39d772fa831 SHA512 9d4fba250dab08c2405370a0dfd5b56abb37a6bfa48406d19c127a651cd360483206e496664b6566de5baeee733d9a1047926d9078c5f2a32b3dacbb57dd45c2
 EBUILD rspec-expectations-3.10.0.ebuild 1304 BLAKE2B ad2aabe0ea5dc817aa69e8de604a4cc3ec8d0f796d44769ee652bf468f9dad38902a2da949f09970e8c393e211c247c1a6a8132ab4e5ec318af2fb572cd8eff7 SHA512 ca0c3b67e5418123b152a46e33cafdb6e79ff76c14c4f7bf802fd172e3468c5b1cf8c291effdec7d11e324897016fa8a09008da135bc67f5acae85946b5f146e
-EBUILD rspec-expectations-3.10.1.ebuild 1304 BLAKE2B ad2aabe0ea5dc817aa69e8de604a4cc3ec8d0f796d44769ee652bf468f9dad38902a2da949f09970e8c393e211c247c1a6a8132ab4e5ec318af2fb572cd8eff7 SHA512 ca0c3b67e5418123b152a46e33cafdb6e79ff76c14c4f7bf802fd172e3468c5b1cf8c291effdec7d11e324897016fa8a09008da135bc67f5acae85946b5f146e
+EBUILD rspec-expectations-3.10.1.ebuild 1311 BLAKE2B 48188a1f2266e9f4e438eb24d3e3440fb8a4ddd355cd4d89c80c6b5556ef099534efaf2f1b29180abfa79fba41a075d2055ecdaf1ff1fa9ef504a91a84cc1828 SHA512 68e428d1980b7527d0cb9009ea56d224c0b2d81e76df9404a538a9e5a3df6a698e72b1d30731c895495532e481f406d70cb45515c954d8c5ff2b19b05b20d4e2
 EBUILD rspec-expectations-3.8.4.ebuild 1299 BLAKE2B 2d152af47e6fbccc9211ed3c1669e68e73f70c79306af5258967686b29706c6c748b441fee855880463015abb18ffaa771c7f535614dc3dd8789e0db22eec785 SHA512 c11432c627555f53566662313080dccd7e8ddc3f3ab316b3a815e93c215eb39c5c2ac0b6ff73bd01683b6e1b6a44e4070df8f59db5ab767eae848c710835dbd7
 EBUILD rspec-expectations-3.8.6.ebuild 1303 BLAKE2B 2c40484e29ab7a72beff3861fa6ab65716d4699de5dad11d3502ab85a1aec89161804baf427a711a1a650c4e789236811cc032d253b6478d304b7b331c2a82f1 SHA512 921ec7cb34858a17d79d8bf5ff9dc34c5fea372e9f8dd3d2ef4be6136c57d9a26f2b36ad8c338bb640ad82ba8f06553715499c4bbd8fd9d1c61fa083ab8de66b
-EBUILD rspec-expectations-3.9.1.ebuild 1310 BLAKE2B 28f1cad1c59e68d28ff5ee321c2e40f6e43464d24fd44822dc6d1d495edc12913b3f34a4e411304c38a3ae49a07e688f833d6acea17ba00f2ec82ddbcc1577cd SHA512 ed9d66416e749783f908890d56e6c503446883a6b573c864892395b8b9966fb5ecba5c2c8b9fbc6f2b15c386c077c2b97f04989f9c2a8254f8def36a3067da88
-EBUILD rspec-expectations-3.9.4.ebuild 1303 BLAKE2B f540a213e8c94c12fd4a663858c977869f4b8e4f87c7531d0230da49d655d5b3a2395071bc6c35089929c067dcad1304bf58a887ae63a58062655a35f5df3afa SHA512 415310cf665b405393e02ae31628cee9184c259d4f7b5cafad653232a5c962074e1ca51c61f6e9fea817dbaeddc1ddd8af82e1a9a4df6306fc4b40db1144e496
+EBUILD rspec-expectations-3.9.4.ebuild 1299 BLAKE2B ae4d0205ab05655ead04b2cbf4cde7cfe3b7c2687906ad4b58cd88df75bd4b8e4ae2b0a9c0f48f8ff968fe79f94280e42c0d1916e1d276f0c305118abc3027b8 SHA512 9126e6064fd2efc0db83ce88647dab5acf19910aba7b1d1b4ba51a75a36acb798f0596bb890f8e3353eeccdd50f102c496a6c95d8fc403ff70ff8ee059c98d70
 MISC metadata.xml 350 BLAKE2B bd2aeaa98f6f5cdbdce70c0dd6eed61eee36323502021664e10356e0e558eb9fbf09f9b056944aaf13859c0f4f29603c5523584e4b823a9218fefb2824edcff6 SHA512 c0cbdb181bc5981daa6dea5ecb445cedbda6d6430218aad98a39b2db67074169305f3cba419fb1e24d79900be311619337a5421b75e0da6d2838a0ccb7de45b1
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
index 84439fd818ed..e005f9f4340b 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.9.1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.9.1.ebuild
deleted file mode 100644
index 8e7b7dbf84dc..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.9.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-expectations"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
-	=dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/rspec-mocks-3.2.0:3
-		>=dev-ruby/rspec-support-3.5.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm -f Gemfile || die
-
-	# fix up the gemspecs
-	sed -i \
-		-e '/git ls/d' \
-		-e '/add_development_dependency/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild
index b1c99b29bae3..10b10ab52562 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"