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

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 d58738ca35bb562e65f3940f85d91b0dba53ef0e..3678472dc106c5e891d5d6cc9640d274d5481eb0 100644 (file)
--- 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 dcf3c4515295404547b1de5302246c431d6d77d6..fd95a77acc310cfb381f8f4759ed1f331a6391c7 100644 (file)
--- 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)"