From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1135991-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C15BF138334
for <garchives@archives.gentoo.org>; Sat, 4 Jan 2020 12:45:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 98954E08A8;
Sat, 4 Jan 2020 12:45:36 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 74DACE08A8
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Jan 2020 12:45:36 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 4BB8A34DCA4
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Jan 2020 12:45:34 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id ED094AC
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Jan 2020 12:45:32 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1578139491.02a94ae03dfe1575709b4de66c26c0502b0e6b4b.asturm@gentoo>
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/
X-VCS-Repository: proj/qt
X-VCS-Files: dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
X-VCS-Directories: dev-qt/qtwebkit/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 02a94ae03dfe1575709b4de66c26c0502b0e6b4b
X-VCS-Branch: master
Date: Sat, 4 Jan 2020 12:45:32 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b7b0426f-aa59-4d5b-895f-d41b771c92e3
X-Archives-Hash: 7fd8768e219398720041fc68c513c7ba
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) )