Re: Re: [PATCH] ant-tasks.eclass: use eapi7-ver

On Tue, May 22, 2018 at 01:59:51AM -0500, Marty E. Plummer wrote:
> On Tue, May 22, 2018 at 08:27:27AM +0200, Ulrich Mueller wrote:
> > >>>>> On Mon, 21 May 2018, Marty E Plummer wrote:
> > 
> > > On Tue, May 22, 2018 at 05:57:35AM +0200, Micha?? G??rny wrote:
> > 
> > [Please check you mailer configuration. It's sending MIME, but
> > charset=us-ascii cannot represent these chars.]
> > 
> > >> Always check for old EAPIs, instead of expecting people to keep updating
> > >> this forever.
> > >> 
> > > Would you prefer something like
> > > [[ ${EAPI} ~= [0-6] ]] && inherit eapi7-ver, then?
> > 
> > The regexp operator is =~ not ~=. Also it will match partial
> > expressions, so it will fail in EAPI 10.
> > 
> Fair, I knew it was something like that. Also, by the time EAPI 10 hits
> this section of code should have been long culled since eapi7-ver's
> functions are 'native' in EAPI 7.
> > Use this instead: [[ ${EAPI:-0} == [0123456] ]]
> > 
> Fair enough, that should do the trick and keep everyone happy in the
> long run.
> > Ulrich

How's this?
---
 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
-- 
2.17.0