Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 659130 - net-libs/webkit-gtk add ruby25
Summary: net-libs/webkit-gtk add ruby25
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo Linux Gnome Desktop Team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-06-25 16:45 UTC by Charles G. Waldman
Modified: 2018-07-23 22:30 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Charles G. Waldman 2018-06-25 16:45:59 UTC
diff -u webkit-gtk-2.18.6.ebuild~ webkit-gtk-2.18.6.ebuild
--- webkit-gtk-2.18.6.ebuild~	2018-05-04 20:39:12.000000000 -0500
+++ webkit-gtk-2.18.6.ebuild	2018-06-25 11:24:40.513192288 -0500
@@ -4,7 +4,7 @@
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR="ninja"
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
 
@@ -192,8 +192,10 @@
 
 	local ruby_interpreter=""
 
-	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	if has_version "virtual/rubygems[ruby_targets_ruby25]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby25)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"		
 	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
 		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
 	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
Comment 1 Larry the Git Cow gentoo-dev 2018-07-23 22:30:02 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5721aab07bc4778c8667ca9ff8a330eae5d41b2c

commit 5721aab07bc4778c8667ca9ff8a330eae5d41b2c
Author:     Virgil Dupras <vdupras@gentoo.org>
AuthorDate: 2018-07-18 13:05:47 +0000
Commit:     Mart Raudsepp <leio@gentoo.org>
CommitDate: 2018-07-23 22:23:37 +0000

    net-libs/webkit-gtk: add support for ruby25
    
    Also, improve ruby interpreter detection logic.
    
    Closes: https://bugs.gentoo.org/659130
    Bug: https://bugs.gentoo.org/513888
    Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)