On Fri, Mar 17, 2017 at 4:11 PM, Michał Górny <mgo...@gentoo.org> wrote:
> On pią, 2017-03-17 at 15:47 -0400, Mike Gilbert wrote:
>> On Fri, Mar 17, 2017 at 2:48 PM, Michał Górny <mgo...@gentoo.org> wrote:
>> > ---
>> >  eclass/libtool.eclass | 14 +++-----------
>> >  1 file changed, 3 insertions(+), 11 deletions(-)
>> >
>> > diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
>> > index a8df6ca58fef..037a6a2734df 100644
>> > --- a/eclass/libtool.eclass
>> > +++ b/eclass/libtool.eclass
>> > @@ -16,18 +16,10 @@
>> >  if [[ -z ${_LIBTOOL_ECLASS} ]]; then
>> >  _LIBTOOL_ECLASS=1
>> >
>> > -# If an overlay has eclass overrides, but doesn't actually override the
>> > -# libtool.eclass, we'll have ECLASSDIR pointing to the active overlay's
>> > -# eclass/ dir, but libtool.eclass is still in the main Gentoo tree.  So
>> > -# add a check to locate the ELT-patches/ regardless of what's going on.
>> > -# Note: Duplicated in eutils.eclass.
>> > -_LIBTOOL_ECLASSDIR_LOCAL=${BASH_SOURCE[0]%/*}
>> > +DEPEND=">=app-portage/elt-patches-20170317"
>> > +
>> >  libtool_elt_patch_dir() {
>> > -       local d="${ECLASSDIR}/ELT-patches"
>> > -       if [[ ! -d ${d} ]] ; then
>> > -               d="${_LIBTOOL_ECLASSDIR_LOCAL}/ELT-patches"
>> > -       fi
>> > -       echo "${d}"
>> > +       echo /usr/share/elt-patches
>>
>> I think this should probably be "${EPREFIX}/usr/share/elt-patches".
>
> Makes sense. Do we still do the 'use prefix' hoops for old EAPIs, or
> just ${EPREFIX} these days?

I'm not sure what hoops you are referring to, but I think we can just
use ${EPREFIX} unconditionally here. It's not formally defined before
EAPI 3, but it probably works anyway.

Reply via email to