From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EE922138334 for ; Mon, 17 Dec 2018 08:09:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 474CDE0BD8; Mon, 17 Dec 2018 08:09:41 +0000 (UTC) Received: from mx-out1.startmail.com (mx-out1.startmail.com [145.131.90.139]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E3B67E0AD5 for ; Mon, 17 Dec 2018 08:09:40 +0000 (UTC) From: "Marty E. Plummer" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=startmail.com; s=2017-11; t=1545034179; bh=X0Ouvi1UzqtfqrK49MAWnNgJkgMdIM7YV52Ow/MZY+s=; h=From:To:Cc:Subject:Date:From; b=KwPklJJQ8Tazd01fblTpIixofhs8blm8LgGEWrDfZdJPqyvAkXFMSzLnINWveu9II TwW30tMp1RfacxUqFo/GRO5FQ7H1Skfo6kPJHxP7Xw2A6zbsCyLwXXAoOtRJiFzrP+ yCY7DGre3aejCigvy5YYMpddga9U44+vcHhbtSIo/9WxTxn+mqR0cGexZ1GIF5GJV2 7GbK2xNm97gdd2odfrtyeVI4JqVX3re/AjLmqLOhTLCjgAYvRREKV1L92nmMQqyvmy gwAPz0wqeK0leIbsaYNOsfoR/V8ZHRtOP4H5yH8SS5L9kVEcFTzmo4zcii/244bb8s 9/dtiYqdcYUXw== To: gentoo-dev@lists.gentoo.org Cc: "Marty E. Plummer" Subject: [gentoo-dev] [PATCH] eclass/java-utils-2: switch to eapi7-ver Date: Mon, 17 Dec 2018 02:09:13 -0600 Message-Id: <20181217080913.32217-1-hanetzer@startmail.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: b747b69f-ce1e-4abe-a62f-6288b92c50ed X-Archives-Hash: c748892bac3598bbf1fadfc6fce4b3d7 Signed-off-by: Marty E. Plummer --- eclass/java-utils-2.eclass | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 473b177e539..a4c218c394e 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2018 Gentoo Foundation +# Copyright 2004-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-utils-2.eclass @@ -15,7 +15,7 @@ # 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 eutils multilib IUSE="elibc_FreeBSD" @@ -25,6 +25,9 @@ export WANT_JAVA_CONFIG="2" # Prefix variables are only available for EAPI>=3 has "${EAPI:-0}" 0 1 2 && ED="${D}" EPREFIX= EROOT="${ROOT}" +# EAPI 7 has version functions built-in. Use eapi7-ver for all earlier eclasses. +[[ ${EAPI} == [0123456] ]] && inherit eapi7-ver + # @VARIABLE: JAVA_PKG_E_DEPEND # @INTERNAL # @DESCRIPTION: @@ -1518,8 +1521,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" @@ -1570,7 +1573,7 @@ java-pkg_is-vm-version-ge() { debug-print "Could not get JDK version from DEPEND" return 1 else - if version_is_at_least "${needed_version}" "${vm_version}"; then + if ver_test "${vm_version}" -ge "${needed_version}"; then debug-print "Detected a JDK(${vm_version}) >= ${needed_version}" return 0 else -- 2.20.0