From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 79FAD138335 for ; Mon, 23 Jul 2018 22:30:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A68CE095E; Mon, 23 Jul 2018 22:30:24 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0EFD6E0940 for ; Mon, 23 Jul 2018 22:30:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 77EA233BECB for ; Mon, 23 Jul 2018 22:30:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21BBD373 for ; Mon, 23 Jul 2018 22:30:19 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1532384617.5721aab07bc4778c8667ca9ff8a330eae5d41b2c.leio@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.20.3.ebuild X-VCS-Directories: net-libs/webkit-gtk/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 5721aab07bc4778c8667ca9ff8a330eae5d41b2c X-VCS-Branch: master Date: Mon, 23 Jul 2018 22:30:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ed16ad12-a08a-45a3-8762-c52b87d84e80 X-Archives-Hash: 52578191b17b463ce1dc189f3e0b5a9f commit: 5721aab07bc4778c8667ca9ff8a330eae5d41b2c Author: Virgil Dupras gentoo org> AuthorDate: Wed Jul 18 13:05:47 2018 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Mon Jul 23 22:23:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5721aab0 net-libs/webkit-gtk: add support for ruby25 Also, improve ruby interpreter detection logic. Closes: https://bugs.gentoo.org/659130 Bug: https://bugs.gentoo.org/513888 Package-Manager: Portage-2.3.40, Repoman-2.3.9 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild index d07aadc54b8..5990cd0d5ea 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild @@ -4,7 +4,7 @@ EAPI=6 CMAKE_MAKEFILE_GENERATOR="ninja" PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby22 ruby23 ruby24" +USE_RUBY="ruby23 ruby24 ruby25" inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx @@ -188,17 +188,17 @@ src_configure() { # Multiple rendering bugs on youtube, github, etc without this, bug #547224 append-flags $(test-flags -fno-strict-aliasing) + # Ruby situation is a bit complicated. See bug 513888 + local rubyimpl local ruby_interpreter="" - - if has_version "virtual/rubygems[ruby_targets_ruby24]"; then - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)" - elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)" - elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)" - else - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)" - fi + for rubyimpl in ${USE_RUBY}; do + if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then + ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})" + 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" # TODO: Check Web Audio support # should somehow let user select between them?