gentoo resync : 12.05.2022

4 files changed, 7 insertions, 50 deletions

diff --git a/dev-ruby/git/Manifest b/dev-ruby/git/Manifest
index 04b1555363f4..fd555f38cb4c 100644
--- a/dev-ruby/git/Manifest
+++ b/dev-ruby/git/Manifest
@@ -1,7 +1,5 @@
-DIST git-1.10.0.tar.gz 207412 BLAKE2B e18406a9690d4c0fc3009b57629515e701f41113592fd7533b6b2ae659b90ec1b635410deb7bcb3bd711ce291aaec2010bfcfb4bfb812b9fffdafac167d33bb9 SHA512 717ae5df3cf2b700395df91e8f6e9632062c804955c8f18215c5220ec373a33c2a991534f2a63155111643a867f45f2e7056e2dd6e297340372143770bb70021
 DIST git-1.10.2.tar.gz 212738 BLAKE2B 4059066fac1a22e8f19ecce1ebaed648fedc30767b91cb38cf9cf4c9f7091f55f5e9682183e188357dd12ed06dc1ad905d9b688db0c536623487e3c5431ba6f8 SHA512 5d8150a8f974c9b9f531d169e2899b311965a9e9d48d1e45c8bb778a48ea0887ccecf7681baf7cbfad4d22509ba0aafb9886559565e918b84f740b3da7430d86
-DIST git-1.9.1.tar.gz 206509 BLAKE2B 3f8739286f3197fa86a3fccfab357510d562415f568726126cf96c8b74c716c4fbb592f854cafda26cf2f0371e4bc9b52a9f5efdea860d0ea6836198ca48b887 SHA512 ee1df3e704b8bf0687c9fce83d73502d3d46e7f3291da90906961dda057d8e6ec3a0fda5b68c258dd8542559055f1bfabf8915a7e594edafa4b3f267f302f397
-EBUILD git-1.10.0.ebuild 1200 BLAKE2B 991615dd67fe42429b509737211c7315f46a56a3648806acae33cdd3e7740defaa01571ad2bbeb4898902efb84d03e7d19c3274134cd132e1d8e50ad3085748b SHA512 e3fd22e22c2fd9e594e7e7d77fa2c11af491cb500d7589f18a2d3f71a50b840509037fb93bdb7d027ab9eb134846d26ad3f6ead54eeeacba400c419fccf1d006
-EBUILD git-1.10.2.ebuild 1224 BLAKE2B a78685594f262c426ae6fd5aad44dfec5c2078aafd4f1c3e058dd5c6c233d8647ddb9502ecb14230c3df84f35e224344f82ecb9ea4faec07340134393499307a SHA512 6136428443fa4f501f1e388d0fecafefae6f83a61521d5fdecea854d81507ae8ae6916b36b019b7c502fc7d74df88da8bdcf80ddbe8d70e1c79bec0fa74c4a07
-EBUILD git-1.9.1.ebuild 1268 BLAKE2B 19969628ac8dffcfe08bf9da5019623bfd92d224a8bada17fc823ec6fff2c91087b6cc377804d7f6b6de5eae6558cca6847c42b4be2761c53f13d06ce8061f3c SHA512 38a51246fe194c10e8178c9fc736a622d027ad0d15da4c93957f8aff3dfd3e5e337b4c677b36e6be88bb09085a15f03b2f7230ab3ccbbf4cac3ff9d88b760f02
+DIST git-1.11.0.tar.gz 214161 BLAKE2B 69471f89fddf18bf31d74e318141046395281ba64de1f91fd49cb866508dca9cf7c568c113ed7d7e928bf1d7dfdb0e130a193d4069b87155a4dbc046d6dd6ce9 SHA512 a71da8890622b6ad5a341908e968040ef6c00e2f9edd0bfee1a0c1e9f110cc12b9c01015605b0fb902fdf04fab6011adfbffcf5e8f853c550bff7c263d2e6bd6
+EBUILD git-1.10.2.ebuild 1223 BLAKE2B a67e85fa46696d86a668a252ce204c7a889f9df5966224d889cb9ae923db9158ca1e1f7d976894a2d5db8129d446090b30c7b7fd69676e76c4c4237729befe9d SHA512 efde69da7636dfe17ac57a98a2392a043634e19302d5855dbf23163add3bb2457e7a082e11ec9a7db0ebe30e6a36dfcada61a978ca4646190ec6e4371fb4757f
+EBUILD git-1.11.0.ebuild 1231 BLAKE2B be872f7dfc58513b26870b7f0af0d7a018ec0f1247bfa2d4c7a82b00c8644afb62f64b84c4c8faf2de17f79d7d6a66c8bdae49253a492bd03fb4bf3b4846b5df SHA512 9d8ecf43ef18941de1936da1befd314a62fdaf08508c0d22b28bd8d5c2b70528a4de0e4350309b2608b25814c019d6af137230f2ae0ad35336773e7379d58d6c
 MISC metadata.xml 343 BLAKE2B bc9a79524aa9216ddb3624e81f61f8ecaf988538693155f5b8de7289effc0613a5d102b55b4c9c9eccc50d8556b0c4fdcec1e9a9cdab67d28753008204c9af2d SHA512 d599ff9d1df8510ff8603e9030a65c294bef3ee93f0e5a438300a8bb5c0ffe3c4a9bdd7ec41fd5effa27b4b7e1c978faefe95dceedc270b6a995bb928f2d70be
diff --git a/dev-ruby/git/git-1.10.2.ebuild b/dev-ruby/git/git-1.10.2.ebuild
index e8578adcddc4..d643d9294e7c 100644
--- a/dev-ruby/git/git-1.10.2.ebuild
+++ b/dev-ruby/git/git-1.10.2.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 )"
diff --git a/dev-ruby/git/git-1.10.0.ebuild b/dev-ruby/git/git-1.11.0.ebuild
index 48659e920ef8..6029dfa5687c 100644
--- a/dev-ruby/git/git-1.10.0.ebuild
+++ b/dev-ruby/git/git-1.11.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
+RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
 RUBY_FAKEGEM_GEMSPEC="git.gemspec"
diff --git a/dev-ruby/git/git-1.9.1.ebuild b/dev-ruby/git/git-1.9.1.ebuild
deleted file mode 100644
index caa61b6460d3..000000000000
--- a/dev-ruby/git/git-1.9.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-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/schacon/ruby-git"
-SRC_URI="https://github.com/schacon/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/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 "1irequire 'pathname'" 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:.:test -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
-}