From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1505995-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id D021C15ACFB
for <garchives@archives.gentoo.org>; Sun, 9 Apr 2023 04:45:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id EB36EE07FA;
Sun, 9 Apr 2023 04:45:14 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 81B08E07FA
for <gentoo-commits@lists.gentoo.org>; Sun, 9 Apr 2023 04:45:13 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6F854335D66
for <gentoo-commits@lists.gentoo.org>; Sun, 9 Apr 2023 04:45:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id F3D168D1
for <gentoo-commits@lists.gentoo.org>; Sun, 9 Apr 2023 04:45:08 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1681015428.0515195fe51c244e1b85ce0a78b9cea3a7a5c2bc.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
X-VCS-Directories: net-libs/webkit-gtk/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 0515195fe51c244e1b85ce0a78b9cea3a7a5c2bc
X-VCS-Branch: master
Date: Sun, 9 Apr 2023 04:45:08 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f516a83b-529f-4a92-a372-2c91c6a7c767
X-Archives-Hash: 663314dc31d9ded63d2dac875c969111
commit: 0515195fe51c244e1b85ce0a78b9cea3a7a5c2bc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 9 04:43:48 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 9 04:43:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0515195f
net-libs/webkit-gtk: handle more RUBY_EXECUTABLE cases
postprocess-asm invokes another Ruby script by itself, so let's just
fix the shebangs.
Closes: https://bugs.gentoo.org/771744
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild | 9 +++++++--
net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild | 9 +++++++--
net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild | 9 +++++++--
net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild | 9 +++++++--
net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild | 9 +++++++--
net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild | 9 +++++++--
6 files changed, 42 insertions(+), 12 deletions(-)
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?