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 1O7D7j-0000H5-AV for garchives@archives.gentoo.org; Wed, 28 Apr 2010 19:40:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3207BE0809; Wed, 28 Apr 2010 19:40:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0DA05E0809 for ; Wed, 28 Apr 2010 19:40:42 +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 AC7C11B402D for ; Wed, 28 Apr 2010 19:40:41 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2130) id B5C312C06A; Wed, 28 Apr 2010 19:40:40 +0000 (UTC) From: "Vlastimil Babka (caster)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, caster@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: java-utils-2.eclass X-VCS-Directories: eclass X-VCS-Committer: caster X-VCS-Committer-Name: Vlastimil Babka Content-Type: text/plain; charset=utf8 Message-Id: <20100428194040.B5C312C06A@corvid.gentoo.org> Date: Wed, 28 Apr 2010 19:40:40 +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: dd151aaa-3089-444c-a714-22bc19faf4c3 X-Archives-Hash: f08c4ed08e0ab5b99fbf44df7170c300 caster 10/04/28 19:40:40 Modified: java-utils-2.eclass Log: Support version globbing when checking dependencies, bug #315123. Revision Changes Path 1.135 eclass/java-utils-2.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-= 2.eclass?rev=3D1.135&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-= 2.eclass?rev=3D1.135&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-= 2.eclass?r1=3D1.134&r2=3D1.135 Index: java-utils-2.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/java-utils-2.eclass,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- java-utils-2.eclass 1 Apr 2010 22:29:28 -0000 1.134 +++ java-utils-2.eclass 28 Apr 2010 19:40:40 -0000 1.135 @@ -6,7 +6,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.134 20= 10/04/01 22:29:28 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.135 20= 10/04/28 19:40:40 caster Exp $ =20 # ----------------------------------------------------------------------= ------- # @eclass-begin @@ -2679,8 +2679,9 @@ local target_pkg=3D"${2}" local dev_error=3D"" =20 + # remove the version specification, which may include globbing (* an= d [123]) local stripped_pkg=3D$(echo "${target_pkg}" | sed \ - 's/-[0-9]*\(\.[0-9]\)*$//') + 's/-\([0-9*]*\(\[[0-9]*\]\)*\)*\(\.\([0-9*]*\(\[[0-9]*\]\)*\)*\)*$//') =20 debug-print "Matching against: ${stripped_pkg}" =20