From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 D6EEB138350 for ; Tue, 14 Jan 2020 19:14:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16F5CE0891; Tue, 14 Jan 2020 19:14:55 +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 E52A7E0891 for ; Tue, 14 Jan 2020 19:14:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 891B034E08E for ; Tue, 14 Jan 2020 19:14:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1793B92 for ; Tue, 14 Jan 2020 19:14:52 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <1579029255.affaf49dbdd5a04ce166bb5ab1c90370e60b8751.alexxy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild X-VCS-Directories: dev-qt/qtwebkit/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: affaf49dbdd5a04ce166bb5ab1c90370e60b8751 X-VCS-Branch: master Date: Tue, 14 Jan 2020 19:14:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 02acd106-d639-433d-a05a-29983069c5bb X-Archives-Hash: 445304a836829a560c9a341d86cb6401 commit: affaf49dbdd5a04ce166bb5ab1c90370e60b8751 Author: Alexey Shvetsov gentoo org> AuthorDate: Tue Jan 14 19:13:55 2020 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Tue Jan 14 19:14:15 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=affaf49d dev-qt/qtwebkit: works with ruby27 Package-Manager: Portage-2.3.83, Repoman-2.3.20 Signed-off-by: Alexey Shvetsov gentoo.org> dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild index fc9fd9ccaf8..7414f1309bf 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