gentoo auto-resync : 27:08:2024 - 12:00:02

6 files changed, 26 insertions, 48 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 9cc16e6c9d87..c79acc958396 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/git/Manifest b/dev-ruby/git/Manifest
index 81a1689e1b54..1aa0055d143d 100644
--- a/dev-ruby/git/Manifest
+++ b/dev-ruby/git/Manifest
@@ -1,7 +1,7 @@
-DIST git-1.18.0.tar.gz 175341 BLAKE2B 5a8dee1fef79c0386c59d37f37f2249c72600f2f11dbf2cc2c5bf63ff91f068c9c3164d24c2670585e8261d890f07b998255ddb80ce35ce53de09f402a4ec9e3 SHA512 520886b23758229cf25bfdd17e9d86e53d62feb6b2b3c155efe493db42d2f247a29bd629ff6c80ffa599ad429bcb6f09e44b015eeeecf9d9a5f4ee6ab3f1a265
 DIST git-1.19.1.tar.gz 177887 BLAKE2B 0da2a829679fd4e2d4b3aec5e88f421d221593729b827f2207bc3d26ce290ee2a41e8dde33b81138cf9df75fa1d1316fa5c69318a1247c627889f5c6971b8fd6 SHA512 4fb27cc2c59d15b0424ac16accc13d2310fec0710815b8deee399767b3cd9707cdf767a301cae271b4cd1ff6718cb955a6c86a9ea99076aaffbbadf595c64c0c
 DIST git-2.1.1.tar.gz 189005 BLAKE2B 8c273d28bc0b8ccc1a1ac74242086e56941fb6827e39d358adab0e645d080eaf5e4727b0a9aa131ea068efbd77c1ff645b55ddf69d615d13b972566f964aca06 SHA512 4815dff308a32b4b1d4984ea8b96e3cf2870412771afa7b56c74031f66d1eba607506587bf7de740091c285b84c3f4fa1929523d653870679ea317e8933c6b4a
-EBUILD git-1.18.0.ebuild 1255 BLAKE2B 155cc93656318be5a9499f747ce8570becdebc822cb54031f48f4474c7eae5a447a3be8846b01faf34d497d33526882dc83ea25bcc6738f0d856a427954eb752 SHA512 58166a367d1ef571a29fee8fd5527107ffae592a8cd8479202cb406032d0d70e3391a172426e1a419005fd889d9b1f01cd1f20cc0fe413b319d1a68689b1b942
+DIST git-2.2.0.tar.gz 192227 BLAKE2B 9c3ff354c0484863991a83d4ccba68181e64311bcde7699ac4c211ab1fe92fba7ad108f179b88e61c73681bd1e0b3e7b67f53ab33224a0fc4a00b10201beb608 SHA512 f8da84b8ba0bc9adb2b20eb33ef92f3050941297bf0fe0983d387a150c4cfd1b3342b61417bb1ee732e310c203de2acdca4cc3dad5b1a5f2a08556e19c905905
 EBUILD git-1.19.1.ebuild 1413 BLAKE2B 04cbd3817b4a3967372ec354fdd44ef7f9b065d6cd52f7d4058c7da14b09457eac098db194abfc8dec53ae7d1c880186b5ac0603e74257067f78ed15915da79f SHA512 4e41f916509bb7e3748708772c9db21c417f781433821ca4011c68cf44d763c17507b25299bde928fb66a7d976924e78551fbf3d0157fdb8b051b7b6a44de029
 EBUILD git-2.1.1.ebuild 1503 BLAKE2B 87facd870fc890e41162242a3ea2ff3bcaad4925f508f2fd8063ae8fca28b2b32c497685b1d8b0c89ea2e44d126a1ecd3c7c1c8a600d383aaec39fed83b132b3 SHA512 acc269209d7a67c418e93c2f11be9fcd6b3b3a12b58b5823d5764426ce26d5c33a8bab58c83cad23a81f65fca58add70b5f3efc0370b15150b73e741685426ea
+EBUILD git-2.2.0.ebuild 1507 BLAKE2B 9b286b0c1e28ae3970c00b7ba65541a818cec1b137ad9e0f256595a1d03bf6298ba67b6e7f8dff6acca59cf754540b46805a672c5fbbc6eebb1d363901bc1687 SHA512 df5bcb7ca96f86ef7581fbb88a39c8fb3786a2cc73cbb398d0bf482e86ac433793408b1873b9a6c39037e326e9afdbd6267765026d996d001b7eb0a1e0d4ae33
 MISC metadata.xml 391 BLAKE2B 3d03aece790440be04e0a72615824cb5aeb627e67b87b9457b7625a330c5d4736b77897a9b6655b0e45d99d134615090a95077fe2ee62131d572686f9a4bc682 SHA512 0ac01abe3193d7e8566420333c2bbf301bdc2ad3c4587ef9f48bf260322a3763eed3319c879472c0028cf8d63c73e82d24f2e2164692a06f3e14bd992e3b301c
diff --git a/dev-ruby/git/git-1.18.0.ebuild b/dev-ruby/git/git-2.2.0.ebuild
index a697294543e8..626852e98276 100644
--- a/dev-ruby/git/git-1.18.0.ebuild
+++ b/dev-ruby/git/git-2.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -17,22 +17,30 @@ SRC_URI="https://github.com/ruby-git/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.
 RUBY_S="ruby-git-${PV}"
 
 LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~ppc64"
 IUSE="test"
 
-DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
-RDEPEND+=">=dev-vcs/git-1.6.0.0"
+DEPEND="test? ( >=dev-vcs/git-1.6.0.0 net-misc/openssh app-arch/tar )"
+RDEPEND=">=dev-vcs/git-1.6.0.0"
 
-ruby_add_rdepend ">=dev-ruby/addressable-2.8:0 >=dev-ruby/rchardet-1.8:1"
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-5.0:*
+	>=dev-ruby/addressable-2.8:0
+	>=dev-ruby/process_executer-1.1:1
+	>=dev-ruby/rchardet-1.8:1
+"
 
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitar dev-ruby/test-unit:2 )"
+ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/minitar-0.9 >=dev-ruby/mocha-2.1:2 dev-ruby/test-unit:2 )"
 
 all_ruby_prepare() {
 	# Don't use hardcoded /tmp directory.
 	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
 
 	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Don't use deprecated key type that is removed from openssh
+	sed -i -e 's/-t dsa/-t rsa/' tests/units/test_signed_commits.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/pundit/Manifest b/dev-ruby/pundit/Manifest
index 191e4561f890..f506d6d033a3 100644
--- a/dev-ruby/pundit/Manifest
+++ b/dev-ruby/pundit/Manifest
@@ -1,7 +1,5 @@
-DIST pundit-2.3.0.gem 27136 BLAKE2B 651f008426ce010c8a5be8543cde5c91f1bb8c6513e08cde4c4fda965fa95647f130d0a68094107be0b0c639ab520a74da0c2a50715ec5bd86a7a9243cf53686 SHA512 5a2c8563ab8402d3454afae499368b06d0a7ce23b59fdade3034da06604b025a567c4f9bc745bbc8a51226d768fad99b9057ff38c2930258d943265053a09636
-DIST pundit-2.3.1.gem 27648 BLAKE2B f81bececa11fb4df90779e7a92abb3854f77e47207afb162fdbaac1b23448018b04a35808bac7857e4f766eab949802a58b16ba8ed2331ccd3457a88826fda0d SHA512 dc919a8879aa613efa1b3ebf0c9a3673a060d50814a5ec6b3cc4120dceda407e483d9c265d08d5bf4a1cbe56a0ea698ecbc485f24fe0325a9b90635bc1cc125a
 DIST pundit-2.3.2.gem 30720 BLAKE2B 44745ef190e6cc2b503b5d6d341eafa8bc8325dcda0ed83c3c111e67ebfc27683c8918ab29eec625f04f88d206586429cce862b76115d0cf770f73d165cdd9ff SHA512 8415b4f334ec0a97309aed4da4e36ece2a5705c64bd05ca7583367f53a7987a8bddb8ba3ac3e18febec1f023be703e5014d42cd258d42d7c7f535829c4a53cf8
-EBUILD pundit-2.3.0.ebuild 696 BLAKE2B 891be5771ed7d46cb27783c850a6c9920535a11e63c07131b3b489cb8cc8a7822a840569cd44d814cbab71824b11a845856679a669176e168b6718175362b1ec SHA512 a44da63338135b3284518d0438a21a87a9fdb7b5b7281516ebf7cb7ac7c43cbca28df7f19aa3ebcfad5270efccf70d2a61c80e35181448ad7750955af3f96537
-EBUILD pundit-2.3.1.ebuild 696 BLAKE2B 891be5771ed7d46cb27783c850a6c9920535a11e63c07131b3b489cb8cc8a7822a840569cd44d814cbab71824b11a845856679a669176e168b6718175362b1ec SHA512 a44da63338135b3284518d0438a21a87a9fdb7b5b7281516ebf7cb7ac7c43cbca28df7f19aa3ebcfad5270efccf70d2a61c80e35181448ad7750955af3f96537
+DIST pundit-2.4.0.gem 32256 BLAKE2B e027ac82d5d58be1cb2cbf0460c507805beb2ad366f7ed89d1f1179dd469349727f88d0b045d7a5d88b02df802d376bf643cdff71bba07ce33235cd1fea975e8 SHA512 4fef014fa392b6db61ae6e4a0bce44cf54569cf026db6825acddc8eb4b52bd48ea60cb56c84e8f9321948efbc4d3caafc77334bc25fce28c07ee56f40a25d492
 EBUILD pundit-2.3.2.ebuild 680 BLAKE2B cab2e06a6caa5c1ace2c0f342183caa79bb87bf078414aab5125d90823f80db0db0038129bf65325763346a23fa4a596ce05357897ac43f74b89a7d870600612 SHA512 b9f00d7bbcedd1a99911a72a1387b61b35d2e1878a1d3afb0efdc517e928fedd37d42e2e871d3d8afd91d13312dbd77ab8f5a44123057fda5ccd72940e8e0f7f
+EBUILD pundit-2.4.0.ebuild 680 BLAKE2B cab2e06a6caa5c1ace2c0f342183caa79bb87bf078414aab5125d90823f80db0db0038129bf65325763346a23fa4a596ce05357897ac43f74b89a7d870600612 SHA512 b9f00d7bbcedd1a99911a72a1387b61b35d2e1878a1d3afb0efdc517e928fedd37d42e2e871d3d8afd91d13312dbd77ab8f5a44123057fda5ccd72940e8e0f7f
 MISC metadata.xml 378 BLAKE2B 40682576c599cab0d6c7d00f02787a2ebb8b2fd2957bed989defd695401a3ac47763fbcb35b108409679ee36f62593415fba180f5d1731c0481be146df54915b SHA512 20bcadd063c143987741e90973c6bd27093384b7f5e731addcb334392397609cdd02d71a451b81e39abd474334f701d1c1b0dd9b0563d5d860f902d38781ab52
diff --git a/dev-ruby/pundit/pundit-2.3.1.ebuild b/dev-ruby/pundit/pundit-2.3.1.ebuild
deleted file mode 100644
index 4c7a17a0feb1..000000000000
--- a/dev-ruby/pundit/pundit-2.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Object oriented authorization for Rails applications"
-HOMEPAGE="https://github.com/varvet/pundit https://rubygems.org/gems/pundit"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0:*"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/actionpack-3.0.0
-	>=dev-ruby/activemodel-3.0.0
-	>=dev-ruby/railties-3.0.0
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/pry/d" -e '/simplecov/,/^end/ s:^:#:' -e '2igem "rack", "~> 2.0"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/pundit/pundit-2.3.0.ebuild b/dev-ruby/pundit/pundit-2.4.0.ebuild
index 4c7a17a0feb1..951d72e8c91f 100644
--- a/dev-ruby/pundit/pundit-2.3.0.ebuild
+++ b/dev-ruby/pundit/pundit-2.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/varvet/pundit https://rubygems.org/gems/pundit"
 LICENSE="MIT"
 SLOT="2"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0:*"
 
@@ -26,5 +26,7 @@ ruby_add_bdepend "test? (
 )"
 
 all_ruby_prepare() {
-	sed -i -e "/pry/d" -e '/simplecov/,/^end/ s:^:#:' -e '2igem "rack", "~> 2.0"' spec/spec_helper.rb || die
+	sed -e "/pry/ s:^:#:" \
+		-e '3irequire "ostruct"' \
+		-i spec/spec_helper.rb || die
 }