/[gentoo-x86]/eclass/java-utils-2.eclass
Gentoo

Diff of /eclass/java-utils-2.eclass

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

Revision 1.134 Revision 1.135
4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org> 4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
5# Copyright (c) 2004-2005, Gentoo Foundation 5# Copyright (c) 2004-2005, Gentoo Foundation
6# 6#
7# Licensed under the GNU General Public License, v2 7# Licensed under the GNU General Public License, v2
8# 8#
9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.134 2010/04/01 22:29:28 caster Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.135 2010/04/28 19:40:40 caster Exp $
10 10
11# ----------------------------------------------------------------------------- 11# -----------------------------------------------------------------------------
12# @eclass-begin 12# @eclass-begin
13# @eclass-shortdesc Java Utility eclass 13# @eclass-shortdesc Java Utility eclass
14# @eclass-maintainer java@gentoo.org 14# @eclass-maintainer java@gentoo.org
2677 2677
2678 local limit_to="${1}" 2678 local limit_to="${1}"
2679 local target_pkg="${2}" 2679 local target_pkg="${2}"
2680 local dev_error="" 2680 local dev_error=""
2681 2681
2682 # remove the version specification, which may include globbing (* and [123])
2682 local stripped_pkg=$(echo "${target_pkg}" | sed \ 2683 local stripped_pkg=$(echo "${target_pkg}" | sed \
2683 's/-[0-9]*\(\.[0-9]\)*$//') 2684 's/-\([0-9*]*\(\[[0-9]*\]\)*\)*\(\.\([0-9*]*\(\[[0-9]*\]\)*\)*\)*$//')
2684 2685
2685 debug-print "Matching against: ${stripped_pkg}" 2686 debug-print "Matching against: ${stripped_pkg}"
2686 2687
2687 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then 2688 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2688 dev_error="The ebuild is attempting to use ${target_pkg} that is not" 2689 dev_error="The ebuild is attempting to use ${target_pkg} that is not"

Legend:
Removed from v.1.134  
changed lines
  Added in v.1.135

  ViewVC Help
Powered by ViewVC 1.1.20