public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Alexey Shvetsov" <alexxy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
Date: Mon, 14 Jan 2019 09:08:15 +0000 (UTC)	[thread overview]
Message-ID: <1547456840.8661ebebb868d061842495889307c22f10698921.alexxy@gentoo> (raw)

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) )


             reply	other threads:[~2019-01-14  9:08 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-14  9:08 Alexey Shvetsov [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-04-06 22:39 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/ Andreas Sturmlechner
2020-07-19 13:27 Sergei Trofimovich
2020-04-08  9:47 Mart Raudsepp
2020-04-05  9:38 Agostino Sarubbo
2020-04-04 13:34 Agostino Sarubbo
2020-04-04 13:27 Agostino Sarubbo
2020-04-04 13:27 Agostino Sarubbo
2020-04-03 20:07 Andreas Sturmlechner
2020-03-11 17:31 Andreas Sturmlechner
2020-01-14 19:28 Alexey Shvetsov
2020-01-14 19:14 Alexey Shvetsov
2019-11-30 13:26 Andreas Sturmlechner
2019-11-27 13:18 Mikle Kolyada
2019-11-23 12:43 Agostino Sarubbo
2019-11-12 15:01 Aaron Bauman
2019-10-20 16:15 Mikle Kolyada
2019-10-20 16:10 Mikle Kolyada
2019-09-12  7:49 Andreas Sturmlechner
2019-05-25  0:40 Aaron Bauman
2019-04-26 17:51 Anthony G. Basile
2018-10-19 20:23 Andreas Sturmlechner
2018-10-19  8:51 Michał Górny
2018-09-24  1:50 Thomas Deutschmann
2018-09-15 19:23 Mikle Kolyada
2018-09-15 18:26 Sergei Trofimovich
2018-09-12 14:29 Andreas Sturmlechner
2018-09-04 18:40 Andreas Sturmlechner
2018-09-04 18:40 Andreas Sturmlechner
2018-07-14  8:20 Andreas Sturmlechner
2018-07-05 17:06 Davide Pesavento
2018-07-05 17:06 Davide Pesavento
2018-06-17 20:34 David Seifert
2018-06-02 23:21 Andreas Sturmlechner
2018-03-26  7:04 Sergei Trofimovich
2017-12-02  5:55 Davide Pesavento
2017-09-02 14:25 Andreas Sturmlechner
2017-07-15  5:16 Markus Meier
2017-07-07 11:40 Alexis Ballier
2017-07-04 15:49 Agostino Sarubbo
2017-07-04 14:02 Agostino Sarubbo
2017-06-24  2:29 Michael Palimaka
2017-06-06 16:12 Markus Meier
2017-06-03 20:09 Sergei Trofimovich
2017-05-21 16:41 Michael Weber
2017-05-20 10:37 Michael Weber
2017-05-20  9:34 Agostino Sarubbo
2017-05-18 12:39 Agostino Sarubbo
2017-01-02 18:59 Markus Meier
2016-08-23 19:46 Markus Meier
2016-08-15  5:56 Jeroen Roovers
2016-04-18  9:43 Patrice Clement
2016-04-18  8:13 Patrice Clement
2016-03-09  4:12 Jeroen Roovers
2016-03-05 22:20 Mikle Kolyada
2016-01-20 15:28 Davide Pesavento
2016-01-20 15:28 Davide Pesavento
2015-09-21  4:58 Jeroen Roovers
2015-08-26 14:56 Mikle Kolyada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1547456840.8661ebebb868d061842495889307c22f10698921.alexxy@gentoo \
    --to=alexxy@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox