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 26F7F139694 for ; Fri, 17 Mar 2017 20:40:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32F3321C10A; Fri, 17 Mar 2017 20:39:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DDFED21C073 for ; Fri, 17 Mar 2017 20:39:57 +0000 (UTC) Received: from mail-qk0-f172.google.com (mail-qk0-f172.google.com [209.85.220.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: floppym) by smtp.gentoo.org (Postfix) with ESMTPSA id AB5D93415A2 for ; Fri, 17 Mar 2017 20:39:56 +0000 (UTC) Received: by mail-qk0-f172.google.com with SMTP id y76so74123735qkb.0 for ; Fri, 17 Mar 2017 13:39:56 -0700 (PDT) X-Gm-Message-State: AFeK/H2vRs0c8Ysce9XXcNccUa8bPfopNDRoA3rcImeMlRjEeSDQPE+FGxuRJbC4hEnsrqQJ5fHR+e3PzYqRww== X-Received: by 10.55.166.11 with SMTP id p11mr15684313qke.132.1489783194477; Fri, 17 Mar 2017 13:39:54 -0700 (PDT) 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 MIME-Version: 1.0 Received: by 10.200.45.11 with HTTP; Fri, 17 Mar 2017 13:39:34 -0700 (PDT) In-Reply-To: <1489781462.1490.9.camel@gentoo.org> References: <20170317184859.4348-1-mgorny@gentoo.org> <20170317184859.4348-3-mgorny@gentoo.org> <1489781462.1490.9.camel@gentoo.org> From: Mike Gilbert Date: Fri, 17 Mar 2017 16:39:34 -0400 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [gentoo-dev] [PATCH 2/3] libtool.eclass: Use app-portage/elt-patches to provide patch files To: Gentoo Dev Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e86b51b4-3d98-41fb-9d1a-707b565080af X-Archives-Hash: 035c1cb74b1c8b4bfa960dcb4aa429dc On Fri, Mar 17, 2017 at 4:11 PM, Micha=C5=82 G=C3=B3rny = wrote: > On pi=C4=85, 2017-03-17 at 15:47 -0400, Mike Gilbert wrote: >> On Fri, Mar 17, 2017 at 2:48 PM, Micha=C5=82 G=C3=B3rny 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=3D1 >> > >> > -# If an overlay has eclass overrides, but doesn't actually override t= he >> > -# 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 o= n. >> > -# Note: Duplicated in eutils.eclass. >> > -_LIBTOOL_ECLASSDIR_LOCAL=3D${BASH_SOURCE[0]%/*} >> > +DEPEND=3D">=3Dapp-portage/elt-patches-20170317" >> > + >> > libtool_elt_patch_dir() { >> > - local d=3D"${ECLASSDIR}/ELT-patches" >> > - if [[ ! -d ${d} ]] ; then >> > - d=3D"${_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.