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 A053C138330 for ; Wed, 30 May 2018 08:11:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6AA0E0880; Wed, 30 May 2018 08:11:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 77BC2E0880 for ; Wed, 30 May 2018 08:11:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C419B335C8A for ; Wed, 30 May 2018 08:11:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8D3C2AB for ; Wed, 30 May 2018 08:11:16 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1527667869.f295bf09c02ae28d64e812914d53c41e1a94be96.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/ant-tasks.eclass X-VCS-Directories: eclass/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: f295bf09c02ae28d64e812914d53c41e1a94be96 X-VCS-Branch: master Date: Wed, 30 May 2018 08:11:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e7d87b03-ec31-4106-bbe0-581313d7ebe1 X-Archives-Hash: e9702c573e8c4992d090d7a2424dbfa7 commit: f295bf09c02ae28d64e812914d53c41e1a94be96 Author: Marty E. Plummer startmail com> AuthorDate: Wed May 30 08:10:27 2018 +0000 Commit: Patrice Clement gentoo org> CommitDate: Wed May 30 08:11:09 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f295bf09 ant-tasks.eclass: use eapi7-ver. eclass/ant-tasks.eclass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass index e008e6eaea8..31683e68243 100644 --- a/eclass/ant-tasks.eclass +++ b/eclass/ant-tasks.eclass @@ -16,7 +16,8 @@ JAVA_ANT_DISABLE_ANT_CORE_DEP=true # rewriting build.xml for are the testcases has no reason atm JAVA_PKG_BSFIX_ALL=no -inherit versionator java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 +[[ ${EAPI:-0} == [0123456] ]] && inherit eapi7-ver EXPORT_FUNCTIONS src_unpack src_compile src_install @@ -60,12 +61,12 @@ if [[ ${PV} == *beta2* ]]; then MY_PV=${PV/_beta2/beta} UPSTREAM_PREFIX="http://people.apache.org/dist/ant/v1.7.1beta2/src" GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles" - ANT_TASK_PV=$(get_version_component_range 1-3) + ANT_TASK_PV=$(ver_cut 1-3) elif [[ ${PV} == *_rc* ]]; then MY_PV=${PV/_rc/RC} UPSTREAM_PREFIX="https://dev.gentoo.org/~caster/distfiles" GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles" - ANT_TASK_PV=$(get_version_component_range 1-3) + ANT_TASK_PV=$(ver_cut 1-3) else # default for final releases MY_PV=${PV} @@ -101,7 +102,7 @@ if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then fi # we need direct blockers with old ant-tasks for file collisions - bug #252324 -if version_is_at_least 1.7.1 ; then +if ver_test -ge 1.7.1; then DEPEND+=" !dev-java/ant-tasks" fi @@ -167,7 +168,7 @@ ant-tasks_src_install() { java-pkg_register-ant-task --version "${ANT_TASK_PV}" # create the compatibility symlink - if version_is_at_least 1.7.1_beta2; then + if ver_test -ge 1.7.1_beta2; then dodir /usr/share/ant/lib dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant/lib/${PN}.jar fi