diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2016-02-14 21:40:59 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2016-02-14 21:41:13 +0000 |
| commit | 15baecd79c3d9a9dd0fbd4af5782d80a446c3eb0 (patch) | |
| tree | 1dac1320f1df0977994482731115d424d3eec2bb /net-libs/webkit-gtk | |
| parent | app-crypt/acme: Version bump (diff) | |
| download | gentoo-15baecd79c3d9a9dd0fbd4af5782d80a446c3eb0.tar.gz gentoo-15baecd79c3d9a9dd0fbd4af5782d80a446c3eb0.tar.bz2 gentoo-15baecd79c3d9a9dd0fbd4af5782d80a446c3eb0.zip | |
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
Diffstat (limited to 'net-libs/webkit-gtk')
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild | 7 | ||||
| -rw-r--r-- | 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 d58738ca35bb..3678472dc106 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 dcf3c4515295..fd95a77acc31 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)" |