commit: 02a94ae03dfe1575709b4de66c26c0502b0e6b4b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jan 4 10:37:31 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jan 4 12:04:51 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=02a94ae0
dev-qt/qtwebkit: Add python3* and ruby27 support Bug: https://bugs.gentoo.org/698990 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild index 5cfb0ac6..6123926f 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,8 +11,8 @@ else SRC_URI="https://github.com/annulen/webkit/releases/download/${P}/${P}.tar.xz"; KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" fi -PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby25 ruby26" +PYTHON_COMPAT=( python3_{6,7,8} ) +USE_RUBY="ruby25 ruby26 ruby27" inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" @@ -121,7 +121,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) ) else mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) )
