[gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass

[Vlastimil Babka (caster)]

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=1.135&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.135&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.134&r2=1.135

Index: java-utils-2.eclass
===================================================================
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 2010/04/01 22:29:28 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.135 2010/04/28 19:40:40 caster Exp $
 
 # -----------------------------------------------------------------------------
 # @eclass-begin
@@ -2679,8 +2679,9 @@
 	local target_pkg="${2}"
 	local dev_error=""
 
+    # remove the version specification, which may include globbing (* and [123])
 	local stripped_pkg=$(echo "${target_pkg}" | sed \
-		's/-[0-9]*\(\.[0-9]\)*$//')
+		's/-\([0-9*]*\(\[[0-9]*\]\)*\)*\(\.\([0-9*]*\(\[[0-9]*\]\)*\)*\)*$//')
 
 	debug-print "Matching against: ${stripped_pkg}"