Reorder setting of REQUIRED_USE to stay near IUSE setting; also use ruby_get_use_targ...

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 4b645640b57b53c1e4f761cc2821cd946380c5e9..0ced77e8ce26231ed87cf3684da9379285f3c990 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.48 2011/12/18 00:00:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.49 2011/12/18 21:33:50 flameeyes Exp $
+
+  18 Dec 2011; Diego E. Pettenò <flameeyes@gentoo.org> ruby-ng.eclass:
+  Reorder setting of REQUIRED_USE to stay near IUSE setting; also use
+  ruby_get_use_targets to set IUSE.
 
   18 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> kde4-base.eclass,
   kde4-functions.eclass, kde4-meta.eclass:

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index d01a4ac5d56ec76bca7091a9ceeaf53e3796f344..1b5ed3fe3ef79ee16edab160c8724ae8b0ea472a 100644 (file)
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.43 2011/10/24 18:20:05 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.44 2011/12/18 21:33:50 flameeyes Exp $
 
 # @ECLASS: ruby-ng.eclass
 # @MAINTAINER:
@@ -283,10 +283,6 @@ ruby_get_use_targets() {
        echo $t
 }
 
-if [[ ${EAPI:-0} -ge 4 && ${RUBY_OPTIONAL} != "yes" ]]; then
-       REQUIRED_USE=" || ( $(ruby_get_use_targets) )"
-fi
-
 # @FUNCTION: ruby_implementations_depend
 # @RETURN: Dependencies suitable for injection into DEPEND and RDEPEND.
 # @DESCRIPTION:
@@ -311,14 +307,14 @@ ruby_implementations_depend() {
        echo "${depend}"
 }
 
-for _ruby_implementation in ${USE_RUBY}; do
-       IUSE="${IUSE} ruby_targets_${_ruby_implementation}"
-done
+IUSE+=" $(ruby_get_use_targets)"
 # If you specify RUBY_OPTIONAL you also need to take care of
 # ruby useflag and dependency.
 if [[ ${RUBY_OPTIONAL} != yes ]]; then
        DEPEND="${DEPEND} $(ruby_implementations_depend)"
        RDEPEND="${RDEPEND} $(ruby_implementations_depend)"
+
+       [[ ${EAPI:-0} -ge 4 ]] && REQUIRED_USE+=" || ( $(ruby_get_use_targets) )"
 fi
 
 _ruby_invoke_environment() {