commit: 8661ebebb868d061842495889307c22f10698921 Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> AuthorDate: Mon Jan 14 09:07:20 2019 +0000 Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> CommitDate: Mon Jan 14 09:07:20 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8661ebeb
dev-qt/qtwebkit: works with ruby26 Closes: https://bugs.gentoo.org/674572 Package-Manager: Portage-2.3.55, Repoman-2.3.12 Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org> dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild index d520d1f87ea..49f0ae2bc99 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 COMMIT=72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da CMAKE_MAKEFILE_GENERATOR="ninja" PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby23 ruby24 ruby25" +USE_RUBY="ruby23 ruby24 ruby25 ruby26" inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs @@ -125,7 +125,9 @@ src_configure() { -DENABLE_X11_TARGET=$(usex X) ) - if has_version "virtual/rubygems[ruby_targets_ruby25]"; then + if 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) ) elif has_version "virtual/rubygems[ruby_targets_ruby24]"; then mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) )
