/[gentoo-x86]/eclass/ruby-ng.eclass
Gentoo

Diff of /eclass/ruby-ng.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.17 Revision 1.21
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2009 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.17 2010/05/22 12:31:03 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.21 2010/07/08 04:00:57 flameeyes Exp $
4# 4#
5# @ECLASS: ruby-ng.eclass 5# @ECLASS: ruby-ng.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Ruby herd <ruby@gentoo.org> 7# Ruby herd <ruby@gentoo.org>
8# 8#
111 111
112 echo "[${res%,}]" 112 echo "[${res%,}]"
113} 113}
114 114
115_ruby_atoms_samelib_generic() { 115_ruby_atoms_samelib_generic() {
116 eshopts_push -o noglob
116 echo "RUBYTARGET? (" 117 echo "RUBYTARGET? ("
117 for token in $*; do 118 for token in $*; do
118 case "$token" in 119 case "$token" in
119 "||" | "(" | ")" | *"?") 120 "||" | "(" | ")" | *"?")
120 echo "${token}" ;; 121 echo "${token}" ;;
122 *])
123 echo "${token%[*}[RUBYTARGET,${token/*[}" ;;
121 *) 124 *)
122 # TODO we need to deal with merging USE-based
123 # dependencies
124 echo "${token}[RUBYTARGET]" ;; 125 echo "${token}[RUBYTARGET]" ;;
125 esac 126 esac
126 done 127 done
127 echo ")" 128 echo ")"
129 eshopts_pop
128} 130}
129 131
130_ruby_atoms_samelib() { 132_ruby_atoms_samelib() {
131 local atoms=$(_ruby_atoms_samelib_generic "$*") 133 local atoms=$(_ruby_atoms_samelib_generic "$*")
132 134
138_ruby_wrap_conditions() { 140_ruby_wrap_conditions() {
139 local conditions="$1" 141 local conditions="$1"
140 local atoms="$2" 142 local atoms="$2"
141 143
142 for condition in $conditions; do 144 for condition in $conditions; do
143 hasq $condition "$IUSE" || IUSE="${IUSE} $condition"
144 atoms="${condition}? ( ${atoms} )" 145 atoms="${condition}? ( ${atoms} )"
145 done 146 done
146 147
147 echo "$atoms" 148 echo "$atoms"
148} 149}
176 177
177 RDEPEND="${RDEPEND} $dependency" 178 RDEPEND="${RDEPEND} $dependency"
178 179
179 # Add the dependency as a test-dependency since we're going to 180 # Add the dependency as a test-dependency since we're going to
180 # execute the code during test phase. 181 # execute the code during test phase.
181 DEPEND="${DEPEND} $(_ruby_wrap_conditions test "${dependency}")" 182 DEPEND="${DEPEND} test? ( ${dependency} )"
183 hasq test "$IUSE" || IUSE="${IUSE} test"
182} 184}
183 185
184# @FUNCTION: ruby_add_bdepend 186# @FUNCTION: ruby_add_bdepend
185# @USAGE: dependencies 187# @USAGE: dependencies
186# @DESCRIPTION: 188# @DESCRIPTION:
204 esac 206 esac
205 207
206 local dependency=$(_ruby_atoms_samelib "$1") 208 local dependency=$(_ruby_atoms_samelib "$1")
207 209
208 DEPEND="${DEPEND} $dependency" 210 DEPEND="${DEPEND} $dependency"
211 RDEPEND="${RDEPEND}"
209} 212}
210 213
211for _ruby_implementation in $USE_RUBY; do 214for _ruby_implementation in $USE_RUBY; do
212 IUSE="${IUSE} ruby_targets_${_ruby_implementation}" 215 IUSE="${IUSE} ruby_targets_${_ruby_implementation}"
213 216

Legend:
Removed from v.1.17  
changed lines
  Added in v.1.21

  ViewVC Help
Powered by ViewVC 1.1.20