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

--k1lZvvs/B4yU6o8G
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Tuesday 22 May 2018 13:28:50, Ulrich Mueller wrote :
> >>>>> On Tue, 22 May 2018, Marty E Plummer wrote:
>=20
> > How's this?
> > ---
> >  eclass/ant-tasks.eclass | 11 ++++++-----
> >  1 file changed, 6 insertions(+), 5 deletions(-)
>=20
> > 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=3Dtrue
> >  # rewriting build.xml for are the testcases has no reason atm
> >  JAVA_PKG_BSFIX_ALL=3Dno
> > -inherit versionator java-pkg-2 java-ant-2
> > +inherit java-pkg-2 java-ant-2
> > +[[ ${EAPI:-0} =3D=3D [0123456] ]] && inherit eapi7-ver
> =20
> >  EXPORT_FUNCTIONS src_unpack src_compile src_install
> =20
> > @@ -60,12 +61,12 @@ if [[ ${PV} =3D=3D *beta2* ]]; then
> >  	MY_PV=3D${PV/_beta2/beta}
> >  	UPSTREAM_PREFIX=3D"http://people.apache.org/dist/ant/v1.7.1beta2/src"
> >  	GENTOO_PREFIX=3D"https://dev.gentoo.org/~caster/distfiles"
> > -	ANT_TASK_PV=3D$(get_version_component_range 1-3)
> > +	ANT_TASK_PV=3D$(ver_cut 1-3)
> >  elif [[ ${PV} =3D=3D *_rc* ]]; then
> >  	MY_PV=3D${PV/_rc/RC}
> >  	UPSTREAM_PREFIX=3D"https://dev.gentoo.org/~caster/distfiles"
> >  	GENTOO_PREFIX=3D"https://dev.gentoo.org/~caster/distfiles"
> > -	ANT_TASK_PV=3D$(get_version_component_range 1-3)
> > +	ANT_TASK_PV=3D$(ver_cut 1-3)
> >  else
> >  	# default for final releases
> >  	MY_PV=3D${PV}
> > @@ -101,7 +102,7 @@ if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then
> >  fi
> =20
> >  # 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+=3D" !dev-java/ant-tasks"
> >  fi
> =20
> > @@ -167,7 +168,7 @@ ant-tasks_src_install() {
> >  	java-pkg_register-ant-task --version "${ANT_TASK_PV}"
> =20
> >  	# 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
> > --=20
> > 2.17.0
>=20
> LGTM

Thanks Marty and Ulrich. LGTM too. I'm going to merge this patch.

--=20
Patrice Clement
Gentoo Linux developer
http://www.gentoo.org

--k1lZvvs/B4yU6o8G
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQKTBAABCgB9FiEEofVtNIa/h/ycoXfcZ9fxnZsZHOgFAlsOWDhfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEEx
RjU2RDM0ODZCRjg3RkM5Q0ExNzdEQzY3RDdGMTlEOUIxOTFDRTgACgkQZ9fxnZsZ
HOggrQ/9EEepuOf7xSl49XhcgyaboUPsIiECyQ5zLmesTrQeU65Vq43fBd3Gwu6N
1U+7osGDisS8fCSy1p5wIWo8SJDtxLN32JTRwuQtIImhuZ6j8mVTthkIxtNA8b+K
10c8nDYbQGSBjFlKgvXNTcsNYaDsr0vXBZQXR0bmBlwbtQJQwLhX8BEm0RFqYt/l
HoVLcyfCmppmAacGAZKENnl9kyjxXjGGM2GXgH0wxWePEoj6F1k8n1jxg9v346Go
MGsf4Rg6unQciNUmW3Pud3qCFr4xM7bZAT3a7N+Wfe+w2OgvSMzvaEnhCFPQ6dA9
Hm9QBLFYMLEEPt0NegxgkQB4v9pa4QyBE7SwCi8Vys02uqg8aWs1ElWuzT6y79TD
B8+xjsenweFCb6ofZaVvUGFjYatiVXhN8LRLy+p7AsGdKJpZ6RzYFsOh1+Qm/UG3
mNzmQNPsBF/BgM6yfqHb0Em5/ji6d0SQPAPkyf6h9uiY2rSkdCExywIjOh8VJR2C
bY/v7SE+CaQE5AQx8Q4vi9HCARax4F3LaITKMPGl/RcVZg3NGKOLyeyRcvt1tRpn
P8PzauXwrlxqRj3astYDeDbMrz5kQmGb134xQRWrYPpJ5SQynNvIvhg4UfjMiCKV
Dw8dUoKZsDozw+nsxxh66w/T6TUEP/iTH9Y0s7/XN3TZItW1gjU=
=77Ci
-----END PGP SIGNATURE-----

--k1lZvvs/B4yU6o8G--