From 23589740c529ef6e15f2c32358c8e95d6e4619c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Tue, 12 Nov 2019 01:11:50 +0100 Subject: [webkit-gtk] Remove support for older ruby versions --- net-libs/webkit-gtk/Manifest | 2 +- net-libs/webkit-gtk/webkit-gtk-2.4.11-r201.ebuild | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 9a6c215..85a1fc6 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1 +1 @@ -DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3 +DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r201.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r201.ebuild index 8bef588..007ea47 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r201.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r201.ebuild @@ -3,7 +3,7 @@ EAPI="6" PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby20 ruby21 ruby22 ruby23" +USE_RUBY="ruby22 ruby23 ruby24" inherit autotools check-reqs flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx @@ -196,14 +196,12 @@ src_configure() { local ruby_interpreter="" - if has_version "virtual/rubygems[ruby_targets_ruby23]"; then + if has_version "virtual/rubygems[ruby_targets_ruby24]"; then + ruby_interpreter="RUBY=$(type -P ruby24)" + elif 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)" - else - ruby_interpreter="RUBY=$(type -P ruby20)" fi # TODO: Check Web Audio support -- cgit v1.2.3