gentoo auto-resync : 08:04:2023 - 23:33:13

6 files changed, 34 insertions, 9 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index b647dd71d644..cf5a32a79b5f 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 3da644bf401a..4afcc702a728 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,5 +1,6 @@
 AUX backport-pr-962.patch 1773 BLAKE2B b4eb227a949136143a98e8a5ed9067599d3a4ec14376c52619e2f3db56906ed028f9be889aa6eea5abe7e7ca9c3196208ede7dc5768cba43ecf9d000f1e3e1da SHA512 dc6a17bccde42b3a64e7de3bed5fe0818a4bfe9e109b665ccf06963a4939fec2a77e3fcff073cf3a4feccb68d3dc05bbb4885ebe53c2060965e114041c9e3ce5
+AUX fix-regenerate-types-conf.patch 906 BLAKE2B dfeb2257e4cf63de918a194a74ac367bbe5755c6104a1c289adcaf04805623ffcad3ac553b07e063aea468fdc9cb3a904fa86f22b40f22a2a5d68b23aa01baae SHA512 6c6c8518e7bebe55a64ea4469b8649f13c4ac81266a1788ac88229438084a894d222907edcf9aeb28587531e95a33644c58f53890a1b3cbcde181365c4352875
 AUX pr-957-sparc.patch 1681 BLAKE2B e08a03d5e054ce030c04cb0645ed2683faa9d0ec8782313464112e3dd3adf0b8ee40f7fbea9aec15ee7590189e93f03617fe06b506e2ea049535e48bc33a8f23 SHA512 32bd488a3cc4b0c81d8f7f9f2875e591b8de7bf741b838aab3f20ea64025984b3d83c393e1e8f0b628f009b2473d381139655f965cc746dc9074cbe57171cb7d
 DIST ffi-git-1.15.5.tgz 168139 BLAKE2B 2ddd5bd7bfb7bcd39b6d740cbb1e0f4cd419ce6cb4ec12926f91f254b3f3142bc6166728a81a6f23dccfbf7aec911c63237c20fb0e2c70d30d48f4648e352585 SHA512 3668bafae936bf5010f014fbcf63258b023bcc318882775e7d2fcfc11334722ec2b6e8a8b9c910d406889fb173dd503c5c13f5af8e4f6927921f12f688461707
-EBUILD ffi-1.15.5-r1.ebuild 1813 BLAKE2B 1f46b8434f5fec974a489978e3134a347892aae7f05331b8366c1a836d2ee2349e50099145b42f756d16cb2088c60d7863dec475adb75c8adb72fee34c9a6394 SHA512 f9e05a5e626d78baff158a21d6850066e0accfa0f42934dc91a5812225e63b5b9987ef3be7b0dc06927a8211af95b071f966c1f05c9fb76a62ec75d2f1e7478d
+EBUILD ffi-1.15.5-r1.ebuild 1852 BLAKE2B a8888b6e45f06c3e45d347d9a057170acc1d06da9fddcc2816f96bc2da0488d852ce29c754c572a30db7ba7993a8db2da2043a5a0968a128d2ddd2f3c7669070 SHA512 5f67ec6e50b63fce07ed252a70f6e6088b25683ef3e8ab36132992d56460bd2616aa2f61c1822656979e0199fdbff1cd12852bdd2bed09c88424e74f1b952e80
 MISC metadata.xml 334 BLAKE2B 02ad2c909797d4aaf2a23497611777a790000683866cfbd9d12c4b19cca6de902e219584c4edc85c46b4b0dc51c63e770506a077a4c1052b46f8df19a9588c15 SHA512 e72dc6ce177ad3881f5465f10cd44ca6740b7603ab4e55cfa9e6088be3c6615abeefaee4b717e76fab2850c64d66eee626115544e10709f64c4187f1987bcfe3
diff --git a/dev-ruby/ffi/ffi-1.15.5-r1.ebuild b/dev-ruby/ffi/ffi-1.15.5-r1.ebuild
index aa69729ffc73..cadd0c23bbbc 100644
--- a/dev-ruby/ffi/ffi-1.15.5-r1.ebuild
+++ b/dev-ruby/ffi/ffi-1.15.5-r1.ebuild
@@ -18,23 +18,23 @@ inherit ruby-fakegem toolchain-funcs
 
 DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
 HOMEPAGE="https://wiki.github.com/ffi/ffi"
-
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
 
-IUSE=""
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-PATCHES=(
-	"${FILESDIR}/backport-pr-962.patch"
-	"${FILESDIR}/pr-957-sparc.patch" # submitted upstream as https://github.com/ffi/ffi/pull/957
-)
 
 RDEPEND+=" dev-libs/libffi:="
 DEPEND+=" dev-libs/libffi:="
 
 ruby_add_bdepend "dev-ruby/rake"
 
+PATCHES=(
+	"${FILESDIR}/backport-pr-962.patch"
+	"${FILESDIR}/pr-957-sparc.patch" # submitted upstream as https://github.com/ffi/ffi/pull/957
+	"${FILESDIR}/fix-regenerate-types-conf.patch"
+)
+
 all_ruby_prepare() {
 	sed -i -e '/tasks/ s:^:#:' \
 		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
diff --git a/dev-ruby/ffi/files/fix-regenerate-types-conf.patch b/dev-ruby/ffi/files/fix-regenerate-types-conf.patch
new file mode 100644
index 000000000000..1c1cca1c7d4d
--- /dev/null
+++ b/dev-ruby/ffi/files/fix-regenerate-types-conf.patch
@@ -0,0 +1,23 @@
+https://github.com/ffi/ffi/commit/19348fe09e1aeb08424abdf331c3497159139f20
+
+From 19348fe09e1aeb08424abdf331c3497159139f20 Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Tue, 14 Mar 2023 21:03:33 -0400
+Subject: [PATCH] Update gen/Rakefile for Ruby 3 compat
+
+Ruby 3 changed the 'mode' argument from an option hash to keyword
+argument.  This change is backwards-compatible with Ruby 2.
+
+See: https://github.com/ruby/fileutils/commit/482de6d397742526d1111576e2791f9b7051e3c0
+--- a/gen/Rakefile
++++ b/gen/Rakefile
+@@ -9,7 +9,7 @@ logfile = File.join(File.dirname(__FILE__), 'log')
+ 
+ file types_conf do |task|
+   options = {}
+-  FileUtils.mkdir_p(File.dirname(task.name), { :mode => 0755 })
++  FileUtils.mkdir_p(File.dirname(task.name), mode: 0755)
+   File.open(task.name, File::CREAT|File::TRUNC|File::RDWR, 0644) do |f|
+     f.puts FFI::TypesGenerator.generate(options)
+   end
+
diff --git a/dev-ruby/http/Manifest b/dev-ruby/http/Manifest
index ca9ca9543aad..64597de71e37 100644
--- a/dev-ruby/http/Manifest
+++ b/dev-ruby/http/Manifest
@@ -1,5 +1,5 @@
 DIST http-4.4.1.gem 75776 BLAKE2B ab34a6a567842d52f9b7cbe3fc3fb8e4757f5cf1303deacdf2f2130a44e82fde64f0db561c3f8fc28100faea277a9c4a9352f95e6cb1359730b34e83a7b36d72 SHA512 6e43a8ae379d7c8a807a9a03c87bfb5ad1719f9838e26ac7a695220ee2bc50344accc2db268d30da175328fd5468b87ec8532d17ce42a5b74d6c2c4c281d1bc9
 DIST http-5.1.0.gem 81920 BLAKE2B cc80149b89eabd5c6b468ffe28b33e17845bd996fa3bf8b9c38c517fe79994412b376b3bac365e8debbeb272cf4333aebd398d1955a358faa27ba9f124671443 SHA512 b99da5318da54e7b64abd48df0b68cde9a02e1ae92b51fc43302e3dea28ba9672e2b7a25e31c342235835e16b2e1b98c94b6d4efa7916a0aa99258fc8290260f
 EBUILD http-4.4.1-r1.ebuild 1655 BLAKE2B b4aab0ac50e5c6a92b9380b94da5750df06123a143844edfb81ec999fc48abea0ed79eb3634694629ef2391592ce8701cd56be906c4c65ff2764626ed14cbef1 SHA512 831d09d20dc6f96f26bb47e89bc814f4f5947e755920d788b8fab0254bb471648fc95bff0feea19b439063896b81bca2db75d8d387eeaf0b8088ec7239fb2cc4
-EBUILD http-5.1.0.ebuild 1843 BLAKE2B 7d0ca726ee42179a1634526b378106d411476f97995d3f547df62c353ffb313c453a30b3a1ca2108f5acb9aeb5527f0c48b5a476a8faa8af4fdcd8c42c1fca4b SHA512 8bb0976f7d1d84ca993561a8bde57fd28b0501de034e85db5572c1e53679eb04ff919f662eb546ebb3bb676ca9f9ab3c10195cf7a7f1f6d3bfdc6c80ba1811f2
+EBUILD http-5.1.0.ebuild 1862 BLAKE2B 4b4cf02b4203738f83bbd83ec9c15cb370265781f0942ba7f3ae9b1db5db3f03a24cd1f22acac05779dc6c033513923d9d38f62c7cb89dc7b7d799d04e8c9169 SHA512 8f919abe5d81ca64d895aa893399c876a6f6a414bc1f6cd041b1d50b4147cc9ce149b4cd3d839d429a69e5f133ec7919827412b82fb90a02e364d14fc7eca4c4
 MISC metadata.xml 340 BLAKE2B 3f69f47d5faad39a2de9cce22c25a490645c3ca3b9bebca74e2c19bec16d5b05927e4d0a56a32d615c26d01513bd82ee09e13ab0b1b2fc9cd02f7e5723d8db34 SHA512 6cd51992e506d9df562267d357d7af6ff55aa2e9cfb8b1147b6544f12464a02c0c28b08bb5a4c00e3cb084b4f891f78b731c4bd1f8988f7d192d15986c5b2290
diff --git a/dev-ruby/http/http-5.1.0.ebuild b/dev-ruby/http/http-5.1.0.ebuild
index 213880e6d088..e47900e891b9 100644
--- a/dev-ruby/http/http-5.1.0.ebuild
+++ b/dev-ruby/http/http-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,6 +27,7 @@ ruby_add_bdepend "
 	test? (
 		=dev-ruby/certificate_authority-1*
 		dev-ruby/rspec-its
+		dev-ruby/webrick
 	)"
 
 all_ruby_prepare() {