From affaf49dbdd5a04ce166bb5ab1c90370e60b8751 Mon Sep 17 00:00:00 2001 From: Alexey Shvetsov Date: Tue, 14 Jan 2020 22:13:55 +0300 Subject: dev-qt/qtwebkit: works with ruby27 Package-Manager: Portage-2.3.83, Repoman-2.3.20 Signed-off-by: Alexey Shvetsov --- dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'dev-qt/qtwebkit') diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild index fc9fd9ccaf81..7414f1309bff 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby24 ruby25 ruby26" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" MY_P="${PN}-${PV/_pre20190629/-alpha3}" # present as upgrade over previous snapshot inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs @@ -120,7 +120,9 @@ src_configure() { -DENABLE_X11_TARGET=$(usex X) ) - if has_version "virtual/rubygems[ruby_targets_ruby26]"; then + if has_version "virtual/rubygems[ruby_targets_ruby27]"; then + mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby27) ) + elif has_version "virtual/rubygems[ruby_targets_ruby26]"; then mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) ) elif has_version "virtual/rubygems[ruby_targets_ruby25]"; then mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) ) @@ -139,4 +141,4 @@ src_install() { eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment." die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH' fi -} +} \ No newline at end of file -- cgit v1.2.3-65-gdbad