/[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.70 Revision 1.71
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.70 2007/04/17 09:16:22 ali_bush Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.71 2007/04/18 08:52:00 betelgeuse Exp $
10 10
11 11
12# ----------------------------------------------------------------------------- 12# -----------------------------------------------------------------------------
13# @eclass-begin 13# @eclass-begin
14# @eclass-shortdesc Java Utility eclass 14# @eclass-shortdesc Java Utility eclass
2351# @param $2 - Package name and slot. 2351# @param $2 - Package name and slot.
2352 2352
2353java-pkg_ensure-dep() { 2353java-pkg_ensure-dep() {
2354 debug-print-function ${FUNCNAME} $* 2354 debug-print-function ${FUNCNAME} $*
2355 2355
2356 local build_only="${1}" 2356 local build_only="${1}"
2357 local target_pkg="${2}" 2357 local target_pkg="${2}"
2358 local dev_error="" 2358 local dev_error=""
2359 2359
2360 local stripped_pkg=$(echo "${target_pkg}" | sed \ 2360 local stripped_pkg=$(echo "${target_pkg}" | sed \
2361 's/-[0-9]*\(\.[0-9]\)*$//') 2361 's/-[0-9]*\(\.[0-9]\)*$//')
2363 if [[ ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then 2363 if [[ ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2364 dev_error="The ebuild is attempting to use ${target_pkg} that is not" 2364 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2365 dev_error="${dev_error} declared in DEPEND." 2365 dev_error="${dev_error} declared in DEPEND."
2366 if is-java-strict; then 2366 if is-java-strict; then
2367 die "${dev_error}" 2367 die "${dev_error}"
2368 else 2368 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2369 eerror "${dev_error}" 2369 eerror "${dev_error}"
2370 einfo "Because you have this package installed the package will" 2370 einfo "Because you have this package installed the package will"
2371 einfo "build without problems, but please report this to" 2371 einfo "build without problems, but please report this to"
2372 einfo "http://bugs.gentoo.org" 2372 einfo "http://bugs.gentoo.org"
2373 fi 2373 fi
2375 2375
2376 if [[ -z ${build_only} && ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then 2376 if [[ -z ${build_only} && ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2377 dev_error="The ebuild is attempting to use ${target_pkg}," 2377 dev_error="The ebuild is attempting to use ${target_pkg},"
2378 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND." 2378 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND."
2379 if is-java-strict; then 2379 if is-java-strict; then
2380 die "${error}" 2380 die "${dev_error}"
2381 else 2381 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2382 eerror "${dev_error}" 2382 eerror "${dev_error}"
2383 einfo "Because you have this package installed the package will" 2383 einfo "Because you have this package installed the package will"
2384 einfo "build without problems, but please report this to" 2384 einfo "build without problems, but please report this to"
2385 einfo "http://bugs.gentoo.org" 2385 einfo "http://bugs.gentoo.org"
2386 fi 2386 fi

Legend:
Removed from v.1.70  
changed lines
  Added in v.1.71

  ViewVC Help
Powered by ViewVC 1.1.20