gentoo resync : 13.11.2021

3 files changed, 46 insertions, 30 deletions

diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index 78737c007151..64990d3e1081 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -1,7 +1,7 @@
-DIST hashie-2.1.2.gem 34816 BLAKE2B 7406fece6c731f62ab8b73095b6c61d4d79cc3811ba20db68d2d6c54a780e8b37ce92ffa97ddc6c9ae2b802fbdbb04cc0d9c752761c9032739f3548f05696757 SHA512 6f72998710da58a2584939b4e74a114ae54168902020dc16ec5ea0422a91316b84aa6835fffb36a2985634f24ff5b0d01bcdb50134a414a269a4881ebcd728ac
 DIST hashie-3.6.0.gem 74752 BLAKE2B b689843d30001dd7eaa09d62ab908d60e76128df66055283ccf0770830e5901b4e792c4bebd2cad8bb6d5e97a23016aee0d0114f2fb0f7ace8ebd722b8941020 SHA512 7b5355a2b93267d6b7c63608aeac4bb7d21f32a982e2c59771d5a791f9a0c921d11e1b4a185067447917315ce98f8cc5f2b48a31efec3068fb1f1ec0e4386e15
 DIST hashie-4.1.0.tar.gz 86972 BLAKE2B 33979037db67f8a7f20ae85e3db6e8b5415b9b2659a5961e2c2a97e3197fef1500cedd8557af314baf8395a9790e8a457633ecade944c198c295f7f13847afa5 SHA512 f2a36ee812e39d679390647514ff894d4170b61ece6d37ef42f1203212d80d2dee63b4af162d81ded451a53c058746f26fc16810db4c748cce9ca6635a300a4b
-EBUILD hashie-2.1.2-r1.ebuild 736 BLAKE2B d54f1f1d5cf059d17af6bbd20c229cb8cf28cc2cd2a62a4ee6e42200f76c16393e0b1f2927fec47c485a5e144211dd8ed9ee790c73dee30fa93ab865b79bb084 SHA512 650393587f133232d8bc304fd1783d19c8eb6f9baab5e5efb3b3619b957f69dab9b46c90d8c7622519a2b3ba3e06c4496c2074079dedad14a768a36789acc1fb
+DIST hashie-5.0.0.tar.gz 105224 BLAKE2B f15fd3ecd5dcdf88ea97d4aa5e13d984bbfb4dc54a687b4f166d9d84f07ddc0037f4fe251a4ec4950a5b89aaf4f0e43d11467018d63e3a89ae980ec06caf3dd6 SHA512 fc1f9399895f67af77af7b2d1d993eebd221d2b779781625bf1bbee579547580add7d7d0dbf1791564c8df6764c19617721ae5139ca949c81a316beacfe8c806
 EBUILD hashie-3.6.0.ebuild 1266 BLAKE2B 5003bc6dff9dee766277c1399fffcc0b7beef0cf006fe2dcac444fdb0c21548f3287c37f92756ca9fb46a570ee9ea6747756088e3d4a8ea39c59c87ea3a7dcb2 SHA512 fa6d6a28b708aeb94c791a3925bb8f52d80f0fd8b31192a1a6a83bd2cddbbe4391f5126ecec9ca17517fa96cd213c132feb7c4bb554a1130b69fc0bbfe360253
 EBUILD hashie-4.1.0-r1.ebuild 1421 BLAKE2B 0bfd27fc464961d35ea4be3bd9359d02db368313f5f8db101c4dcf0d4facbf635107e9a5169dd093c6ce87a4c0558042ab85f9274b842361394a37bb8da9cede SHA512 1a5bedaaebc502d1cabedbff3f2f8f83900f0b726bd78ee4c173ca2a73d3173060fc3ab5c259e87f45e5ee92d971c54742f2f9cfd74ea6182b8f316a7450200f
+EBUILD hashie-5.0.0.ebuild 1409 BLAKE2B 621c0e650d81342785990736902ab82db9db0b8190fa7b0e43384862623a90a88629021ea8379c0023ae72b7df5d480fd7cf973fd4040c1745d7b435b3151e24 SHA512 b05e94cf7307acab11515c5be0d1b9c07a0fae61486322d53d63434433451ee6ceb5ad95f770819cd083cb953959059539d250ce4f5f7f314d1dfe1d95b1221b
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/hashie/hashie-2.1.2-r1.ebuild b/dev-ruby/hashie/hashie-2.1.2-r1.ebuild
deleted file mode 100644
index 0359eeb54b7a..000000000000
--- a/dev-ruby/hashie/hashie-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
-HOMEPAGE="http://intridea.com/posts/hashie-the-hash-toolkit"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Remove bundler and fix one spec that depends on its requires
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -e '2irequire "hashie/version"' -i spec/hashie/version_spec.rb || die
-}
diff --git a/dev-ruby/hashie/hashie-5.0.0.ebuild b/dev-ruby/hashie/hashie-5.0.0.ebuild
new file mode 100644
index 000000000000..7c67d1e53386
--- /dev/null
+++ b/dev-ruby/hashie/hashie-5.0.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="hashie.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
+HOMEPAGE="https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/"
+SRC_URI="https://github.com/intridea/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/activesupport )"
+
+all_ruby_prepare() {
+	# Remove bundler and fix one spec that depends on its requires
+	#rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -e '/pry/ s:^:#:' \
+		-e '1irequire "pathname"; require "tempfile"; require "json"' -i spec/spec_helper.rb || die
+
+	# Avoid dependency on rspec-pending_for and its dependencies
+	sed -i -e '/pending_for/ s:^:#:' \
+		spec/spec_helper.rb \
+		spec/hashie/mash_spec.rb \
+		spec/hashie/extensions/strict_key_access_spec.rb || die
+
+	# Avoid integration specs to avoid complicated dependencies
+	rm spec/integration/{elasticsearch,omniauth*,rails}/integration_spec.rb || die
+}