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