gentoo auto-resync : 09:04:2023 - 11:34:26

7 files changed, 48 insertions, 18 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 87948a7f583f..3a0fc4badbdb 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -3,10 +3,10 @@ AUX 2.38.5-gcc-13.patch 1128 BLAKE2B 1ca6050cda18720060a90eedba3561d12b4af9d1909
 AUX 2.40.0-respect-RUBY.patch 1447 BLAKE2B 2212d15e50362004349245ee75285d96951d2ca8d15a30b8a4b6707bea93ea0e12a5993ec88848085e4ec71ac835b5d87a18f26240e014a4cf3812ef2c8096f9 SHA512 430bad9af15922cb9e4b879694a5759f8e30c56b75b7d90d91ef96dabb94ae023dd80a87d436bef3d13bb3a0c7b971af9639f654a587886413e4ed5f355ccb51
 DIST webkitgtk-2.38.5.tar.xz 33011600 BLAKE2B 0dba732c18b7f21602b9f834866d137b6be582adc36f91775e838f99a6ee89216773ab641be62a0fd0834bac8adb45d315a2be9caf19551484a8b95c22797d46 SHA512 9038892910e95d3b7819396c9071b59ee51eadd6cad62130fdd4e02d3f5187b7a2986c5939a378190e14059149f2db0a0b57feb23ac44f5ea764c160e6181eef
 DIST webkitgtk-2.40.0.tar.xz 40042140 BLAKE2B 4f26d893da99c7aed18594a844b1f91e32178a1bdd236e0cdd21683ed095ab2196f37c13f749e69b22b72146b98fca2a27778948aabde336d17c4d40dcf0cdc1 SHA512 550dafb31d71edf984d6b7636366f839d31f6b244b87f83c6efe7af17efe3f2f63268d2c39a6a3c474afadf2b30df868efaefcf38197b30cc6b11c63de7d2ddc
-EBUILD webkit-gtk-2.38.5-r410.ebuild 8152 BLAKE2B e9925588c4443a717eb7ebb546751173450483434989a7873abfa38fd1b8c7f99a03b720d9ddf203e6e851269cf4d27718f89612aae325661e820616b32ce65b SHA512 8d57f629d4b9e75122bc150f40661c94bc86ebaa9e2a3ab11fa835575355441e2ed23885a5ea03c10a48fe7882c463666ca07d31e5309d3479f0efc8a76c308d
-EBUILD webkit-gtk-2.38.5-r500.ebuild 8031 BLAKE2B 4875f2ba95e80bc258d45bf8491dab8714ebb5e20665541d1d8f322850e635ac9b8efb5bde41fa47224984279c32aa4c79f8091c2753aacd640627766b56d485 SHA512 751c5f7bb1609d6e2bfaccc31c5c4ef1ba90c6e784df02ab923d21aa180537f34fea3c5d686b9a3ca2cc0fd59419826efd39111e085a274bf40c7d04e3df55ca
-EBUILD webkit-gtk-2.38.5.ebuild 7878 BLAKE2B 095e3729897708663abd5c83a5be334640da07ffc5ab44dc99aaf2dd74ecba18bc5afb3de55da3d686211548d6aa1ec32058098a18334b818f7da94de4dcc503 SHA512 139a7d99290f903b8cd517d739a8c553bc9e969de796f3abddeb437609d0b062382285679807417b62642f418a2b4f9c57e87aa7b177c0893330326b5149ab7d
-EBUILD webkit-gtk-2.40.0-r410.ebuild 7678 BLAKE2B b06da39d8777bed865612ff88414e55a75b4f194835fff068cd3b6315607e0c9c4d6317e9bee8ae4eec7dd93cff927de6d00dcd157fbc3e5da073ee203d2931c SHA512 534135955ab0432d3d1b057c961218f37547483cf62a599e36a0b2fab3a1dec97b0cf601f0bab95885fc05d34a307152a30894aab9afc54e7e9db911e14784ec
-EBUILD webkit-gtk-2.40.0-r600.ebuild 7557 BLAKE2B 2d4dd0cae88fb6178be8885e0a839eb51e715ba6ded7e931e44c67494d57977daac2ac3e3b46fc8ed1f67a12bb83254f7e8faedb6b133619bb22a5590cd77f94 SHA512 e7de2a6b96121587ef22c249b346b7018e1f787303c208283422963518c9a91858a19dde8bedf4f35d84d389e447a56e84512854375a1a70518eb39f836acdd7
-EBUILD webkit-gtk-2.40.0.ebuild 7404 BLAKE2B 26da7073109d0429c0165e690c8545cb64f81e00289deb5173f03624261c41ac2874b79fa3bc73ffcca41638e952f32f2b5c199f5aa3c15eec85bc3f670f6871 SHA512 7334887c189c11d76543e523952fae4a189634c15b9a8c2b4775af93bd856922bfc9debbc037f4f41c0227e5a4fa945c7abff2ce5f45b24f63a0fb49b6f2c6cc
+EBUILD webkit-gtk-2.38.5-r410.ebuild 8432 BLAKE2B 3d3a67ebb8a9335fbf4c9c63f5777029aa7d7b50e2b3c5b9f0a87497dc59d235642a47a3f04c557fda543d574b5a38ffbae63ccce519d145377305db8c485967 SHA512 797dd13ffc1775318f5b5b9472108fe680a54efb84bd6655f87853d97bc06eccb99ad9239a7f1053bb2aa0d5eb7fcb21195f4aa9ec3fe5cf4e61bf8569e6cd29
+EBUILD webkit-gtk-2.38.5-r500.ebuild 8311 BLAKE2B 2ae0a77121a838d52eb9e42479c4a5a72283e45b667cb882bbf1d8f1bb77d7bfdf0e1ef16cd75e7440701c3c36286fe71f0421d796055fa0c983602fa4e001ab SHA512 75d49e6b1e27ccb5c564c8985be7bf2fc9706c5a3150c848c9d91a5f7621d702d9b45e902e7bb4d74ec54d1ab04ddf2160813572f6ec785beb690ddff9e130f4
+EBUILD webkit-gtk-2.38.5.ebuild 8158 BLAKE2B b064e778f6ff050d66ca3e8d3e8b49c0f13ec15a5a18032360634435b944043ec33944205e4e9cc00554d6dc5502e0146f5db7d9b5f4de15b0a8c36c62a8bd83 SHA512 b9cdc4f618b88805c0410e91ffe4323f97cb41bd4dd17afc451121ed54d63aba8b40cdcb9a5e4bbb6c390e39aacf0022ccfe9b524aecb4f89a2dd6b22ad999d8
+EBUILD webkit-gtk-2.40.0-r410.ebuild 7958 BLAKE2B 29de8135c469d4a979bb5e3cecf4e83f7010ea1e5265526e0072c350eb15e8ca0cdebe3d8f4f7bfe8d11dcd4c8142a9b42922f43b708e98c719ad9af404c88e9 SHA512 da62591aab3d28f4ca5cb378966d62120b036ac04643a028fc690eab9935236ae81d973b684d479cb10cc1f48493607789e95f411a212cd10a25c65f3d81059c
+EBUILD webkit-gtk-2.40.0-r600.ebuild 7837 BLAKE2B ccc4d55fa5165f4f3fef1b636b73b2aafe4766dcfbaaa3adf0118d9f475f6c33df5ec52935812e01ebad461a62aa5de16aecf04ec77b6ce5c5b71202347f268d SHA512 7bd7bd5df06882ff15be37a9153d35d70686ec98a2ed3cd05002bed1faadc9d3fe9cb56531b512305fc0e1ce3d07022e8b1f58216a541e8d8fe0ee172af7b05e
+EBUILD webkit-gtk-2.40.0.ebuild 7684 BLAKE2B 23322f7670e59b304d47228cd70a33d4aa17ecf8d9c856c92bcd184e120e40a3741d3ee38152f2fbfed09a769f17ba2d03076e0a94b6548b16fb22ff79c88d7e SHA512 d3a143eb7b055b5740b1d50f527de4d09c6d6c966d47a7c18904bc0b8f25d5d536c870432e091ad785b0125d5c18e16e64b0c82dd7c7ef24d20a562c17b5fe1a
 MISC metadata.xml 756 BLAKE2B ac278b1ed9ad7d7dcce220e686ef4c67c79f7d4c25e43e0fedaad14925eb03c74140e49a4e86d2146d6d467f14a737fb2ff1e90b506ab4d43b79d3462d58cb24 SHA512 584ce6c8dc66e3e3b3677dbffe8b2a58bb81146f3dc8eaf830597781f03580e0b94620322834b6e558ac9fcb06b3eda02645803f63d78e88104ecc0950c6f369
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
index e153b458de45..d36da49abdb9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
@@ -185,14 +185,19 @@ src_configure() {
 	# Ruby situation is a bit complicated. See bug 513888
 	local rubyimpl
 	local ruby_interpreter=""
+	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
 		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi
 	done
 	# This will rarely occur. Only a couple of corner cases could lead us to
 	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
 
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
index 2ff1d54297c4..6e59f1ad2650 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
@@ -187,14 +187,19 @@ src_configure() {
 	# Ruby situation is a bit complicated. See bug 513888
 	local rubyimpl
 	local ruby_interpreter=""
+	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
 		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi
 	done
 	# This will rarely occur. Only a couple of corner cases could lead us to
 	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
 
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
index a845061cb588..e2f9861228c6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
@@ -183,14 +183,19 @@ src_configure() {
 	# Ruby situation is a bit complicated. See bug 513888
 	local rubyimpl
 	local ruby_interpreter=""
+	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
 		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi
 	done
 	# This will rarely occur. Only a couple of corner cases could lead us to
 	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
 
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild
index ef3510d3d31e..80ebcb3d8538 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild
@@ -174,14 +174,19 @@ src_configure() {
 	# Ruby situation is a bit complicated. See bug 513888
 	local rubyimpl
 	local ruby_interpreter=""
+	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
 		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi
 	done
 	# This will rarely occur. Only a couple of corner cases could lead us to
 	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
 
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild
index 520cc3925b2f..4dbf4738cb41 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild
@@ -175,14 +175,19 @@ src_configure() {
 	# Ruby situation is a bit complicated. See bug 513888
 	local rubyimpl
 	local ruby_interpreter=""
+	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
 		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi
 	done
 	# This will rarely occur. Only a couple of corner cases could lead us to
 	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
 
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
index 07c7e859bc5b..8f448fa012f1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
@@ -172,14 +172,19 @@ src_configure() {
 	# Ruby situation is a bit complicated. See bug 513888
 	local rubyimpl
 	local ruby_interpreter=""
+	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
 		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi
 	done
 	# This will rarely occur. Only a couple of corner cases could lead us to
 	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
 
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?