| 1 |
commit: 8661ebebb868d061842495889307c22f10698921 |
| 2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 14 09:07:20 2019 +0000 |
| 4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 14 09:07:20 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8661ebeb |
| 7 |
|
| 8 |
dev-qt/qtwebkit: works with ruby26 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/674572 |
| 11 |
Package-Manager: Portage-2.3.55, Repoman-2.3.12 |
| 12 |
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 8 +++++--- |
| 15 |
1 file changed, 5 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild |
| 18 |
index d520d1f87ea..49f0ae2bc99 100644 |
| 19 |
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild |
| 20 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2018 Gentoo Authors |
| 23 |
+# Copyright 1999-2019 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=6 |
| 27 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 28 |
COMMIT=72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da |
| 29 |
CMAKE_MAKEFILE_GENERATOR="ninja" |
| 30 |
PYTHON_COMPAT=( python2_7 ) |
| 31 |
-USE_RUBY="ruby23 ruby24 ruby25" |
| 32 |
+USE_RUBY="ruby23 ruby24 ruby25 ruby26" |
| 33 |
|
| 34 |
inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs |
| 35 |
|
| 36 |
@@ -125,7 +125,9 @@ src_configure() { |
| 37 |
-DENABLE_X11_TARGET=$(usex X) |
| 38 |
) |
| 39 |
|
| 40 |
- if has_version "virtual/rubygems[ruby_targets_ruby25]"; then |
| 41 |
+ if has_version "virtual/rubygems[ruby_targets_ruby26]"; then |
| 42 |
+ mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) ) |
| 43 |
+ elif has_version "virtual/rubygems[ruby_targets_ruby25]"; then |
| 44 |
mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) ) |
| 45 |
elif has_version "virtual/rubygems[ruby_targets_ruby24]"; then |
| 46 |
mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) ) |
Archives