On Wed, May 23, 2018 at 08:18:48PM -0500, Marty E. Plummer wrote:
>
> Should be the final iteration; added comments explaining why eclasses
> were inherited, again suggested by [Arfrever].
>
Any thoughts?
> ---
> eclass/java-utils-2.eclass | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
> index 25e35c33dd2..0ecc5eb5a94 100644
> --- a/eclass/java-utils-2.eclass
> +++ b/eclass/java-utils-2.eclass
> @@ -15,7 +15,12 @@
> # you should inherit java-pkg-2 for Java packages or java-pkg-opt-2 for
> packages
> # that have optional Java support. In addition you can inherit java-ant-2 for
> # Ant-based packages.
> -inherit eutils versionator multilib
> +
> +# Inherit multlib.eclass for get_libdir()
> +[[ ${EAPI:-0} == [012345] ]] && inherit multilib
> +# Inherit eapi7-ver.eclass for ver_cut()
> +# Inherit eutils for eqawarn()
> +[[ ${EAPI:-0} == [0123456] ]] && inherit eapi7-ver eutils
>
> IUSE="elibc_FreeBSD"
>
> @@ -1526,8 +1531,8 @@ java-pkg_is-vm-version-eq() {
>
> local vm_version="$(java-pkg_get-vm-version)"
>
> - vm_version="$(get_version_component_range 1-2 "${vm_version}")"
> - needed_version="$(get_version_component_range 1-2 "${needed_version}")"
> + vm_version="$(ver_cut 1-2 "${vm_version}")"
> + needed_version="$(ver_cut 1-2 "${needed_version}")"
>
> if [[ -z "${vm_version}" ]]; then
> debug-print "Could not get JDK version from DEPEND"
> --
> 2.17.0
>
