From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OFbUT-0000WE-CC for garchives@archives.gentoo.org; Fri, 21 May 2010 23:18:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2CEA9E09A7; Fri, 21 May 2010 23:18:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0BE21E09A7 for ; Fri, 21 May 2010 23:18:48 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id A871E1B408A for ; Fri, 21 May 2010 23:18:47 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 948) id DA3582CA7B; Fri, 21 May 2010 23:18:46 +0000 (UTC) From: "Diego Petteno (flameeyes)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, flameeyes@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: ruby-ng.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ruby-ng.eclass X-VCS-Directories: eclass X-VCS-Committer: flameeyes X-VCS-Committer-Name: Diego Petteno Content-Type: text/plain; charset=utf8 Message-Id: <20100521231846.DA3582CA7B@corvid.gentoo.org> Date: Fri, 21 May 2010 23:18:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 8af07cdc-1a92-47bc-bd3f-c3b40ad191fd X-Archives-Hash: 2dd68f468dc856a199b026d99edb4440 flameeyes 10/05/21 23:18:46 Modified: ruby-ng.eclass Log: Change processing of atoms in ruby_add_rdepend and ruby_add_bdepend to make it possible to process complex dependency strings, such as =20 || ( virtual/ruby-test-unit dev-ruby/test-unit:2 ) =20 which is going to be common for test-unit-2 compatible packages; to have a proper dependency tree. =20 This, theorically, can also drop the need for the 2-ary calls for ruby_add_bdepend and ruby_add_rdepend. Revision Changes Path 1.14 eclass/ruby-ng.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.ecl= ass?rev=3D1.14&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.ecl= ass?rev=3D1.14&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.ecl= ass?r1=3D1.13&r2=3D1.14 Index: ruby-ng.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ruby-ng.eclass 1 May 2010 16:05:45 -0000 1.13 +++ ruby-ng.eclass 21 May 2010 23:18:46 -0000 1.14 @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.13 2010/05/= 01 16:05:45 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.14 2010/05/= 21 23:18:46 flameeyes Exp $ # # @ECLASS: ruby-ng.eclass # @MAINTAINER: @@ -142,6 +142,19 @@ _ruby_add_bdepend "$atom" test } =20 +_ruby_atoms_samelib() { + local samelib=3D$(ruby_samelib) + + for token in $*; do + case "$token" in + "||" | "(" | ")" ) + echo "${token}" ;; + *) + echo "${token}${samelib}" ;; + esac + done +} + # @FUNCTION: ruby_add_rdepend # @USAGE: [conditions] atom # @DESCRIPTION: @@ -167,9 +180,7 @@ ;; esac =20 - for atom in $atoms; do - _ruby_add_rdepend "${atom}$(ruby_samelib)" "$conditions" - done + _ruby_add_rdepend "$(_ruby_atoms_samelib "${atoms}")" "$conditions" } =20 # @FUNCTION: ruby_add_bdepend @@ -198,9 +209,7 @@ ;; esac =20 - for atom in $atoms; do - _ruby_add_bdepend "${atom}$(ruby_samelib)" "$conditions" - done + _ruby_add_bdepend "$(_ruby_atoms_samelib "${atoms}")" "$conditions" } =20 for _ruby_implementation in $USE_RUBY; do