[patch] Patch that iterates over RUBY_TARGETS_PREFERENCE

webkit-gtk-ruby.patch (text/plain), 2.26 KB, created by James Le Cuirot on 2017-01-17 23:26:15 UTC

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.2.ebuild
index 0a5fc100f476..755c4eb5e82c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.14.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.14.2.ebuild
@@ -195,17 +195,14 @@ src_configure() {
 	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
 	append-flags $(test-flags -fno-strict-aliasing)
 
-	local ruby_interpreter=""
+	local ruby ruby_interpreter
 
-	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
-	fi
+	for ruby in ${RUBY_TARGETS_PREFERENCE}; do
+		if has ${ruby} ${USE_RUBY} && has_version "virtual/rubygems[ruby_targets_${ruby}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=${ruby_path}"
+			break
+		fi
+	done
 
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
index a92c6b1baa43..2914b47a3048 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
@@ -192,17 +192,14 @@ src_configure() {
 		append-ldflags "-Wl,--reduce-memory-overheads"
 	fi
 
-	local ruby_interpreter=""
+	local ruby ruby_interpreter
 
-	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="RUBY=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="RUBY=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="RUBY=$(type -P ruby21)"
-	else
-		ruby_interpreter="RUBY=$(type -P ruby20)"
-	fi
+	for ruby in ${RUBY_TARGETS_PREFERENCE}; do
+		if has ${ruby} ${USE_RUBY} && has_version "virtual/rubygems[ruby_targets_${ruby}]"; then
+			ruby_interpreter="RUBY=$(type -P ${ruby})"
+			break
+		fi
+	done
 
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?