Attachment #461282 for bug #513888




# The order of dependencies will change over time to best match the
# current state of ruby targets, e.g. stable version first.


# @FUNCTION: ruby_single_implementation_command
# @RETURN: the path to the preferred Ruby implementation
# @DESCRIPTION:
# Returns the path of the first Ruby implementation from
# RUBY_TARGETS_PREFERENCE that is both installed and in USE_RUBY.
ruby_single_implementation_command() {
	local _ruby_name

	for _ruby_name in ${RUBY_TARGETS_PREFERENCE}; do
		if has ${_ruby_name} ${USE_RUBY} && has_version "virtual/rubygems[ruby_targets_${_ruby_name}]"; then
			type -P ${_ruby_name} 2>/dev/null && return 0
		fi
	done

	die "Unable to find working Ruby implementation"
}


_ruby_single_implementations_depend() {
	local depend
	for _ruby_implementation in ${RUBY_TARGETS_PREFERENCE}; do
		if has ${_ruby_implementation} ${USE_RUBY}; then
			depend+=" virtual/rubygems[ruby_targets_${_ruby_implementation}]"
		fi
	done
	echo "|| ( ${depend} )"
}

_ruby_single_set_globals() {




	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
	append-flags $(test-flags -fno-strict-aliasing)

	local ruby_interpreter=""

	if 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
		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
	else
		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
	fi

	# TODO: Check Web Audio support
	# should somehow let user select between them?
	#

		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
		-DCMAKE_BUILD_TYPE=Release
		-DPORT=GTK
		-DRUBY_EXECUTABLE="$(ruby_single_implementation_command)"
	)

	# Allow it to use GOLD when possible as it has all the magic to





EAPI="6"
PYTHON_COMPAT=( python2_7 )
USE_RUBY="ruby20 ruby21 ruby22 ruby23 ruby24"

inherit autotools check-reqs flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx


		append-ldflags "-Wl,--reduce-memory-overheads"
	fi

	local 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

	# TODO: Check Web Audio support
	# should somehow let user select between them?
	#

		--with-gtk=3.0 \
		--enable-dependency-tracking \
		--disable-gtk-doc \
		RUBY="$(ruby_single_implementation_command)"
}

src_test() {





EAPI="6"
PYTHON_COMPAT=( python2_7 )
USE_RUBY="ruby20 ruby21 ruby22 ruby23 ruby24"

inherit autotools check-reqs flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx


		append-ldflags "-Wl,--reduce-memory-overheads"
	fi

	local 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

	# TODO: Check Web Audio support
	# should somehow let user select between them?
	#

		--disable-webkit2 \
		--enable-dependency-tracking \
		--disable-gtk-doc \
		RUBY="$(ruby_single_implementation_command)"
}

src_test() {

Return to bug 513888

Lines 70-83 inherit ruby-utils Link Here

(-)a/eclass/ruby-single.eclass (-3 / +22 lines)
70	# The order of dependencies will change over time to best match the	70	# The order of dependencies will change over time to best match the
71	# current state of ruby targets, e.g. stable version first.	71	# current state of ruby targets, e.g. stable version first.
72		72
		73
		74	# @FUNCTION: ruby_single_implementation_command
		75	# @RETURN: the path to the preferred Ruby implementation
		76	# @DESCRIPTION:
		77	# Returns the path of the first Ruby implementation from
		78	# RUBY_TARGETS_PREFERENCE that is both installed and in USE_RUBY.
		79	ruby_single_implementation_command() {
		80	local _ruby_name
		81
		82	for _ruby_name in ${RUBY_TARGETS_PREFERENCE}; do
		83	if has ${_ruby_name} ${USE_RUBY} && has_version "virtual/rubygems[ruby_targets_${_ruby_name}]"; then
		84	type -P ${_ruby_name} 2>/dev/null && return 0
		85	fi
		86	done
		87
		88	die "Unable to find working Ruby implementation"
		89	}
		90
		91
73	_ruby_single_implementations_depend() {	92	_ruby_single_implementations_depend() {
74	local depend	93	local depend
75	for _ruby_implementation in ${RUBY_TARGETS_PREFERENCE}; do	94	for _ruby_implementation in ${RUBY_TARGETS_PREFERENCE}; do
76	if [[ ${USE_RUBY} =~ ${_ruby_implementation} ]]; then	95	if has ${_ruby_implementation} ${USE_RUBY}; then
77	depend="${depend} $(_ruby_implementation_depend $_ruby_implementation)"	96	depend+=" virtual/rubygems[ruby_targets_${_ruby_implementation}]"
78	fi	97	fi
79	done	98	done
80	echo "\|\| ( ${depend} ) virtual/rubygems"	99	echo "\|\| ( ${depend} )"
81	}	100	}
82		101
83	_ruby_single_set_globals() {	102	_ruby_single_set_globals() {

Lines 196-213 src_configure() { Link Here

(-)a/net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild (-13 / +1 lines)
196	# Multiple rendering bugs on youtube, github, etc without this, bug #547224	196	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
197	append-flags $(test-flags -fno-strict-aliasing)	197	append-flags $(test-flags -fno-strict-aliasing)
198		198
199	local ruby_interpreter=""
200
201	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
202	ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
203	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
204	ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
205	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
206	ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
207	else
208	ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
209	fi
210
211	# TODO: Check Web Audio support	199	# TODO: Check Web Audio support
212	# should somehow let user select between them?	200	# should somehow let user select between them?
213	#	201	#
Lines 254-260 src_configure() { Link Here
254	-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}	242	-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
255	-DCMAKE_BUILD_TYPE=Release	243	-DCMAKE_BUILD_TYPE=Release
256	-DPORT=GTK	244	-DPORT=GTK
257	${ruby_interpreter}	245	-DRUBY_EXECUTABLE="$(ruby_single_implementation_command)"
258	)	246	)
259		247
260	# Allow it to use GOLD when possible as it has all the magic to	248	# Allow it to use GOLD when possible as it has all the magic to

Lines 4-10 Link Here

(-)a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild (-14 / +2 lines)
4		4
5	EAPI="6"	5	EAPI="6"
6	PYTHON_COMPAT=( python2_7 )	6	PYTHON_COMPAT=( python2_7 )
7	USE_RUBY="ruby20 ruby21 ruby22 ruby23"	7	USE_RUBY="ruby20 ruby21 ruby22 ruby23 ruby24"
8		8
9	inherit autotools check-reqs flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx	9	inherit autotools check-reqs flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
10		10
Lines 207-224 src_configure() { Link Here
207	append-ldflags "-Wl,--reduce-memory-overheads"	207	append-ldflags "-Wl,--reduce-memory-overheads"
208	fi	208	fi
209		209
210	local ruby_interpreter=""
211
212	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
213	ruby_interpreter="RUBY=$(type -P ruby23)"
214	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
215	ruby_interpreter="RUBY=$(type -P ruby22)"
216	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
217	ruby_interpreter="RUBY=$(type -P ruby21)"
218	else
219	ruby_interpreter="RUBY=$(type -P ruby20)"
220	fi
221
222	# TODO: Check Web Audio support	210	# TODO: Check Web Audio support
223	# should somehow let user select between them?	211	# should somehow let user select between them?
224	#	212	#
Lines 245-251 src_configure() { Link Here
245	--with-gtk=3.0 \	233	--with-gtk=3.0 \
246	--enable-dependency-tracking \	234	--enable-dependency-tracking \
247	--disable-gtk-doc \	235	--disable-gtk-doc \
248	${ruby_interpreter}	236	RUBY="$(ruby_single_implementation_command)"
249	}	237	}
250		238
251	src_test() {	239	src_test() {

Lines 4-10 Link Here

(-)a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild (-14 / +2 lines)
4		4
5	EAPI="6"	5	EAPI="6"
6	PYTHON_COMPAT=( python2_7 )	6	PYTHON_COMPAT=( python2_7 )
7	USE_RUBY="ruby20 ruby21 ruby22 ruby23"	7	USE_RUBY="ruby20 ruby21 ruby22 ruby23 ruby24"
8		8
9	inherit autotools check-reqs flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx	9	inherit autotools check-reqs flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
10		10
Lines 192-209 src_configure() { Link Here
192	append-ldflags "-Wl,--reduce-memory-overheads"	192	append-ldflags "-Wl,--reduce-memory-overheads"
193	fi	193	fi
194		194
195	local ruby_interpreter=""
196
197	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
198	ruby_interpreter="RUBY=$(type -P ruby23)"
199	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
200	ruby_interpreter="RUBY=$(type -P ruby22)"
201	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
202	ruby_interpreter="RUBY=$(type -P ruby21)"
203	else
204	ruby_interpreter="RUBY=$(type -P ruby20)"
205	fi
206
207	# TODO: Check Web Audio support	195	# TODO: Check Web Audio support
208	# should somehow let user select between them?	196	# should somehow let user select between them?
209	#	197	#
Lines 229-235 src_configure() { Link Here
229	--disable-webkit2 \	217	--disable-webkit2 \
230	--enable-dependency-tracking \	218	--enable-dependency-tracking \
231	--disable-gtk-doc \	219	--disable-gtk-doc \
232	${ruby_interpreter}	220	RUBY="$(ruby_single_implementation_command)"
233	}	221	}
234		222
235	src_test() {	223	src_test() {