gentoo auto-resync : 18:07:2024 - 12:29:01

4 files changed, 10 insertions, 48 deletions

diff --git a/dev-ruby/git/Manifest b/dev-ruby/git/Manifest
index 3c7ff74766f0..81a1689e1b54 100644
--- a/dev-ruby/git/Manifest
+++ b/dev-ruby/git/Manifest
@@ -1,9 +1,7 @@
 DIST git-1.18.0.tar.gz 175341 BLAKE2B 5a8dee1fef79c0386c59d37f37f2249c72600f2f11dbf2cc2c5bf63ff91f068c9c3164d24c2670585e8261d890f07b998255ddb80ce35ce53de09f402a4ec9e3 SHA512 520886b23758229cf25bfdd17e9d86e53d62feb6b2b3c155efe493db42d2f247a29bd629ff6c80ffa599ad429bcb6f09e44b015eeeecf9d9a5f4ee6ab3f1a265
-DIST git-1.19.0.tar.gz 177079 BLAKE2B 663d6303a49315567cbac77b4acfea10e24f1c61f1e1bb6d5807681eee03633edadcac9453ea4d919d3ad8b14fc0301b03e69033427b58d46b776caabd418cd9 SHA512 1935bd6bac26b46cd8563d6545bb7e4712636469624d11089bc5a7f716ee4a0f1e217167e6d0c6023a7ea4ef1644d93431bcdbd28d2a947589c288c0280a1286
 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
-EBUILD git-1.19.0.ebuild 1249 BLAKE2B d9968a180831832d4ac28f0ed4c436d290ac80495a1cda85beecf94640627eef7dfca96e64534c905e1c089ba63627a7859b71ebe84775b78ca92f5f4918db71 SHA512 b096c54c229f4ac524987793d6f44f29f7b95e158990360b4012f136a5a4cbd3de439dc33760eac162a05f535ff8f07adb714d9f1e1b945b0ce385e193c41143
-EBUILD git-1.19.1.ebuild 1279 BLAKE2B 3c4a0d53e3d861c54c67af61b18a0152db6faed3020e05a9d11b0fdf1c572de45d38c3a6f3af0c6364989ad2f1a9a86cf8f780e5700ffa588a74f42c4547e27e SHA512 07353917a893563d8c898ca6af03876854eba7dea439d9c8fed6987f30e4aaab1b9dc9f79e3d98904320eb94283f6454cf11dc2ef2776098b00ead45912ff64b
-EBUILD git-2.1.1.ebuild 1351 BLAKE2B e1d4f1e4272e75f68c8917483c3af31ec919a98b77bcc988d491b0b1ebd72377b29dfaf6ae29f40533af02c6e7f19fb5de05938d498950b44d7b56401b3dd1f7 SHA512 acf1bd62faf056cf05e76583245ebc548009702aab11425362b29dfaa8ef3eeade152ec7a5ac61961b3228ba20ca5584d932b87c963deac2d269e014d2e34ffb
+EBUILD git-1.19.1.ebuild 1413 BLAKE2B 04cbd3817b4a3967372ec354fdd44ef7f9b065d6cd52f7d4058c7da14b09457eac098db194abfc8dec53ae7d1c880186b5ac0603e74257067f78ed15915da79f SHA512 4e41f916509bb7e3748708772c9db21c417f781433821ca4011c68cf44d763c17507b25299bde928fb66a7d976924e78551fbf3d0157fdb8b051b7b6a44de029
+EBUILD git-2.1.1.ebuild 1503 BLAKE2B 87facd870fc890e41162242a3ea2ff3bcaad4925f508f2fd8063ae8fca28b2b32c497685b1d8b0c89ea2e44d126a1ecd3c7c1c8a600d383aaec39fed83b132b3 SHA512 acc269209d7a67c418e93c2f11be9fcd6b3b3a12b58b5823d5764426ce26d5c33a8bab58c83cad23a81f65fca58add70b5f3efc0370b15150b73e741685426ea
 MISC metadata.xml 391 BLAKE2B 3d03aece790440be04e0a72615824cb5aeb627e67b87b9457b7625a330c5d4736b77897a9b6655b0e45d99d134615090a95077fe2ee62131d572686f9a4bc682 SHA512 0ac01abe3193d7e8566420333c2bbf301bdc2ad3c4587ef9f48bf260322a3763eed3319c879472c0028cf8d63c73e82d24f2e2164692a06f3e14bd992e3b301c
diff --git a/dev-ruby/git/git-1.19.0.ebuild b/dev-ruby/git/git-1.19.0.ebuild
deleted file mode 100644
index 86a5200e027c..000000000000
--- a/dev-ruby/git/git-1.19.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="git.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for using Git in Ruby"
-HOMEPAGE="https://github.com/ruby-git/ruby-git"
-SRC_URI="https://github.com/ruby-git/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="ruby-git-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 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_bdepend "test? ( dev-ruby/bundler dev-ruby/minitar 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
-}
-
-each_ruby_test() {
-	git config --global user.email "git@example.com" || die
-	git config --global user.name "GitExample" || die
-	${RUBY} -Ilib:.:tests -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/git/git-1.19.1.ebuild b/dev-ruby/git/git-1.19.1.ebuild
index 36d7c68160a4..bbf958a96748 100644
--- a/dev-ruby/git/git-1.19.1.ebuild
+++ b/dev-ruby/git/git-1.19.1.ebuild
@@ -18,7 +18,7 @@ RUBY_S="ruby-git-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
@@ -33,6 +33,9 @@ all_ruby_prepare() {
 	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/git/git-2.1.1.ebuild b/dev-ruby/git/git-2.1.1.ebuild
index c74d6b700a04..b09921a3b99e 100644
--- a/dev-ruby/git/git-2.1.1.ebuild
+++ b/dev-ruby/git/git-2.1.1.ebuild
@@ -21,7 +21,7 @@ SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~ppc64"
 IUSE="test"
 
-DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
+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 "
@@ -38,6 +38,9 @@ all_ruby_prepare() {
 	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() {