From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0DCBD59CA3 for ; Sun, 14 Feb 2016 21:41:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4EF38E06FE; Sun, 14 Feb 2016 21:41:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D1A4CE06FE for ; Sun, 14 Feb 2016 21:41:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E02F2340D31 for ; Sun, 14 Feb 2016 21:41:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 194C48EE for ; Sun, 14 Feb 2016 21:41:37 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1455486073.15baecd79c3d9a9dd0fbd4af5782d80a446c3eb0.chewi@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.4.9-r200.ebuild net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild X-VCS-Directories: net-libs/webkit-gtk/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 15baecd79c3d9a9dd0fbd4af5782d80a446c3eb0 X-VCS-Branch: master Date: Sun, 14 Feb 2016 21:41:37 +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: d6a291b5-e1b5-4714-993d-7192bec36105 X-Archives-Hash: 1d852b468210d59fca40589b68b60556 commit: 15baecd79c3d9a9dd0fbd4af5782d80a446c3eb0 Author: James Le Cuirot gentoo org> AuthorDate: Sun Feb 14 21:40:59 2016 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sun Feb 14 21:41:13 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15baecd7 net-libs/webkit-gtk: Allow Ruby 2.3 when building 2.4.9 wrt #573714 No revbump because it's a build time only change and Ruby 2.3 isn't stable anyway. Package-Manager: portage-2.2.27 net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild | 7 +++++-- net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild index d58738c..3678472 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -73,6 +73,7 @@ DEPEND="${RDEPEND} virtual/rubygems[ruby_targets_ruby20] virtual/rubygems[ruby_targets_ruby21] virtual/rubygems[ruby_targets_ruby22] + virtual/rubygems[ruby_targets_ruby23] virtual/rubygems[ruby_targets_ruby19] ) >=dev-libs/atk-2.8.0 @@ -206,7 +207,9 @@ src_configure() { local ruby_interpreter="" - if has_version "virtual/rubygems[ruby_targets_ruby22]"; then + if has_version "virtual/rubygems[ruby_targets_ruby23]"; then + ruby_interpreter="RUBY=$(type -P ruby23)" + elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then ruby_interpreter="RUBY=$(type -P ruby22)" elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then ruby_interpreter="RUBY=$(type -P ruby21)" diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild index dcf3c45..fd95a77 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -81,6 +81,7 @@ DEPEND="${RDEPEND} virtual/rubygems[ruby_targets_ruby20] virtual/rubygems[ruby_targets_ruby21] virtual/rubygems[ruby_targets_ruby22] + virtual/rubygems[ruby_targets_ruby23] virtual/rubygems[ruby_targets_ruby19] ) >=app-accessibility/at-spi2-core-2.5.3 @@ -219,7 +220,9 @@ src_configure() { local ruby_interpreter="" - if has_version "virtual/rubygems[ruby_targets_ruby22]"; then + if has_version "virtual/rubygems[ruby_targets_ruby23]"; then + ruby_interpreter="RUBY=$(type -P ruby23)" + elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then ruby_interpreter="RUBY=$(type -P ruby22)" elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then ruby_interpreter="RUBY=$(type -P ruby21)"