gentoo auto-resync : 28:03:2023 - 09:49:10

3 files changed, 29 insertions, 4 deletions

diff --git a/dev-ruby/gh/Manifest b/dev-ruby/gh/Manifest
index 6f040ccd88f9..5743a7092a63 100644
--- a/dev-ruby/gh/Manifest
+++ b/dev-ruby/gh/Manifest
@@ -1,3 +1,4 @@
+AUX gh-0.18.0-ruby30.patch 1158 BLAKE2B 551e33a2f0354d731835dc3bfc90aaca4e5a052eb472004640d9edb096f07e16ec763251d57dc727dd7cd752d77244f9ec01d5fddcf71c0e4e353febbbf70be0 SHA512 70e6127c52fe3898a2d8c8c7e5a72755e6f15cc1639853478137131d3c785b35d20fc847c4bd83923cfb6a973fa34e5b03975bc7e7276e5121af53bb550120c3
 DIST gh-0.18.0.tar.gz 129730 BLAKE2B e4e9a3b158daf83f8a0f0a809eff87e169c7a0a23120b9ae002d0fee4be166d3e6a09ef85ed61b35148d4285dc358a8d616e09c71403b85293574f3bfbbf922c SHA512 a265d25984d4c40340d4e80ce615f2f291f5636725e7dcdc181e3351d00fe8c3355148f206807180041f20db7f09bf94f5d279ceb25ea12ec19215640fff7839
-EBUILD gh-0.18.0-r1.ebuild 915 BLAKE2B 24e9e761d87275122b3953fd05dace1e0386930af19ddecabf255db818e46bb7682ca7901659d15a471d320db628fab0894276f011220f05bfba4ccaa69fc0c5 SHA512 0f6b14a1b922863f36e455b293237a1d8bbaf9913e6fb9245f402854501ba6c3f63540a2f40ffbb7c03e75e5ded84918ad4da890298a876fd1d1816a6564b1dc
+EBUILD gh-0.18.0-r1.ebuild 1041 BLAKE2B 99d712bb338ded5fcb4a091fa911e5c32d57fd3c2efe6e05784d2061469fdc10596289761ac00582fd088712851b6d4e8872bc6ecea907e5eb3a77f6b062e177 SHA512 f0440fcdcf5c7f4125fee9bca2f31e8814929b3d5b6817c8b8bede43b96e66fb82451ab9f2c684a88bc5e9134282d80b6afd580fc214d8dc9c1d15865a5b5476
 MISC metadata.xml 329 BLAKE2B 5b9c65d604d22d834d0d11acd97a937d2722d3f40ee06b58105ec5ff71f399a4172fd5bd0c6514804be10af26e982644d028664570e620805682ec9e17c91bdd SHA512 4d021616e09e4766d328820d850a1259ccd724e536bad6d5d73acc22d523c9c8d4e866daedd318b5c053f1478ab7e4ae320c1a2951ce2d1d9124785eb6ee40c3
diff --git a/dev-ruby/gh/files/gh-0.18.0-ruby30.patch b/dev-ruby/gh/files/gh-0.18.0-ruby30.patch
new file mode 100644
index 000000000000..cdd4aba84d59
--- /dev/null
+++ b/dev-ruby/gh/files/gh-0.18.0-ruby30.patch
@@ -0,0 +1,20 @@
+--- a/spec/token_check_spec.rb	2020-06-25 16:44:11.000000000 +0200
++++ b/spec/token_check_spec.rb	2023-03-27 16:20:56.781510771 +0200
+@@ -8,7 +8,7 @@
+   end
+ 
+   it 'adds client_id and client_secret to a request' do
+-    expect(subject.backend).to receive(:http).with(:post, "/applications/foo/token", :body => "{\"access_token\": \"baz\"}", "Authorization" => "Basic Zm9vOmJhcg==") do
++    expect(subject.backend).to receive(:http).with(:post, "/applications/foo/token", { :body => "{\"access_token\": \"baz\"}", "Authorization" => "Basic Zm9vOmJhcg==" }) do
+       error = GH::Error.new
+       error.info[:response_status] = 404
+       raise error
+@@ -17,7 +17,7 @@
+   end
+ 
+   it 'does not swallow other status codes' do
+-    expect(subject.backend).to receive(:http).with(:post, "/applications/foo/token", :body => "{\"access_token\": \"baz\"}", "Authorization" => "Basic Zm9vOmJhcg==") do
++    expect(subject.backend).to receive(:http).with(:post, "/applications/foo/token", { :body => "{\"access_token\": \"baz\"}", "Authorization" => "Basic Zm9vOmJhcg==" }) do
+       error = GH::Error.new
+       error.info[:response_status] = 500
+       raise error
diff --git a/dev-ruby/gh/gh-0.18.0-r1.ebuild b/dev-ruby/gh/gh-0.18.0-r1.ebuild
index a256ac6f3d6a..b0fb14016be7 100644
--- a/dev-ruby/gh/gh-0.18.0-r1.ebuild
+++ b/dev-ruby/gh/gh-0.18.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_GEMSPEC="gh.gemspec"
@@ -19,12 +19,14 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
+PATCHES=( "${FILESDIR}/${P}-ruby30.patch" )
+
 ruby_add_bdepend "
 	dev-ruby/webmock
 "
 
 ruby_add_rdepend "
-	dev-ruby/activesupport:6.0
+	dev-ruby/activesupport:6.1
 	>=dev-ruby/addressable-2.4.0:0
 	dev-ruby/faraday:1
 	dev-ruby/faraday_middleware:1
@@ -36,7 +38,9 @@ ruby_add_rdepend "
 all_ruby_prepare() {
 	sed -i \
 		-e '/net-http-persistent/ s/~> 2.9/>= 2.9/' \
-		-e "/activesupport/ s/'~> 5.0'/'>= 5', '< 6.1'/" \
+		-e "/activesupport/ s/'~> 5.0'/'>= 5', '< 6.2'/" \
 		-e 's/git ls-files/find/' \
 		"${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	sed -i -e '1igem "faraday", "~> 1.0"' spec/spec_helper.rb || die
 }