diff options
| author |   Alistair Bush <ali_bush@gentoo.org> | 2007-05-26 23:24:52 +0000 |
|---|---|---|
| committer | Alistair Bush <ali_bush@gentoo.org> | 2007-05-26 23:24:52 +0000 |
| commit | 1da00fe98592bb3e0b5ac2d470f1f53e291861f9 (patch) | |
| tree | 410c4f4804b2a79f6bafca7cf68f6f002e3c5120 /eclass | |
| parent | Clean out old version (diff) | |
| download | gentoo-2-1da00fe98592bb3e0b5ac2d470f1f53e291861f9.tar.gz gentoo-2-1da00fe98592bb3e0b5ac2d470f1f53e291861f9.tar.bz2 gentoo-2-1da00fe98592bb3e0b5ac2d470f1f53e291861f9.zip | |
Adding PDEPEND support to ensure-dep function
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index fa30fff82a8a..4b1837a41eb6 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.85 2007/05/25 10:27:57 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.86 2007/05/26 23:24:52 ali_bush Exp $ # ----------------------------------------------------------------------------- @@ -2499,16 +2499,21 @@ java-pkg_ensure-dep() { fi fi - if [[ ${limit_to} != build && ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then - dev_error="The ebuild is attempting to use ${target_pkg}," - dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND." - if is-java-strict; then - die "${dev_error}" - elif [[ ${BASH_SUBSHELL} = 0 ]]; then - eerror "${dev_error}" - elog "The package will build without problems, but may fail to run" - elog "if you don't have ${target_pkg} installed, so please report" - elog "this to http://bugs.gentoo.org" + if [[ ${limit_to} != build ]]; then + if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then + if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then + dev_error="The ebuild is attempting to use ${target_pkg}," + dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND" + dev_error="${dev_error} or PDEPEND." + if is-java-strict; then + die "${dev_error}" + elif [[ ${BASH_SUBSHELL} = 0 ]]; then + eerror "${dev_error}" + elog "The package will build without problems, but may fail to run" + elog "if you don't have ${target_pkg} installed, so please report" + elog "this to http://bugs.gentoo.org" + fi + fi fi fi } |