From 4e5b32085a9ffc71b78b0cd7dd9cc6ecd412edc1 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Wed, 28 Apr 2010 19:40:40 +0000 Subject: [PATCH] Support version globbing when checking dependencies, bug #315123. --- eclass/java-utils-2.eclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 785063ac102e..da5961016384 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -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 @@ java-pkg_ensure-dep() { 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}" -- 2.26.2