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 9414F1396D0 for ; Thu, 17 Aug 2017 09:09:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1182BE0E56; Thu, 17 Aug 2017 09:09:09 +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 ABF78E0DFE for ; Thu, 17 Aug 2017 09:09:08 +0000 (UTC) Received: from [192.168.42.125] (cable-static-236-115.teleport.ch [213.188.236.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: soap) by smtp.gentoo.org (Postfix) with ESMTPSA id 49B9D33BE2E; Thu, 17 Aug 2017 09:09:03 +0000 (UTC) Message-ID: <1502960939.7527.6.camel@gentoo.org> Subject: Re: [gentoo-dev] [PATCH 02/12] dev-util/ccache: Convert to EAPI=6 From: David Seifert To: gentoo-dev@lists.gentoo.org Cc: cluster@gentoo.org, robbat2@gentoo.org, toolchain@gentoo.org, suse@gentoo.org, llvm@gentoo.org Date: Thu, 17 Aug 2017 11:08:59 +0200 In-Reply-To: <1502960411.18375.0.camel@gentoo.org> References: <20170817083641.3507-1-mgorny@gentoo.org> <20170817083641.3507-3-mgorny@gentoo.org> <1502959733.7527.5.camel@gentoo.org> <1502960411.18375.0.camel@gentoo.org> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.6 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 Content-Transfer-Encoding: 8bit X-Archives-Salt: dd24ff5f-c2ec-46d8-964f-30a8e76cda84 X-Archives-Hash: c6ae89249b8d404733578f965fccb3c4 On Thu, 2017-08-17 at 11:00 +0200, Michał Górny wrote: > W dniu czw, 17.08.2017 o godzinie 10∶48 +0200, użytkownik David > Seifert > napisał: > > On Thu, 2017-08-17 at 10:36 +0200, Michał Górny wrote: > > > --- > > >  dev-util/ccache/ccache-3.3.4-r1.ebuild | 68 > > > ++++++++++++++++++++++++++++++++++ > > >  1 file changed, 68 insertions(+) > > >  create mode 100644 dev-util/ccache/ccache-3.3.4-r1.ebuild > > > > > > diff --git a/dev-util/ccache/ccache-3.3.4-r1.ebuild b/dev- > > > util/ccache/ccache-3.3.4-r1.ebuild > > > new file mode 100644 > > > index 000000000000..1ef1d45179d1 > > > --- /dev/null > > > +++ b/dev-util/ccache/ccache-3.3.4-r1.ebuild > > > @@ -0,0 +1,68 @@ > > > +# Copyright 1999-2017 Gentoo Foundation > > > +# Distributed under the terms of the GNU General Public License > > > v2 > > > + > > > +EAPI=6 > > > + > > > +inherit readme.gentoo-r1 > > > + > > > +DESCRIPTION="fast compiler cache" > > > +HOMEPAGE="http://ccache.samba.org/" > > > +SRC_URI="https://samba.org/ftp/ccache/${P}.tar.xz" > > > + > > > +LICENSE="GPL-3" > > > +SLOT="0" > > > +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc > > > ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux > > > ~ppc- > > > macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64- > > > solaris > > > ~x86-solaris" > > > +IUSE="" > > > + > > > +DEPEND="app-arch/xz-utils > > > + sys-libs/zlib" > > > +RDEPEND="${DEPEND} > > > + sys-apps/gentoo-functions" > > > + > > > +src_prepare() { > > > + # make sure we always use system zlib > > > + rm -rf zlib || die > > > + eapply "${FILESDIR}"/${PN}-3.3-size-on-disk.patch > > > #456178 > > > + eapply_user > > > + sed \ > > > + -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ > > > + "${FILESDIR}"/ccache-config-3 > ccache-config || > > > die > > > +} > > > + > > > +src_install() { > > > + DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.md ) > > > + default > > > + > > > + dobin ccache-config > > > + > > > + DOC_CONTENTS=" > > > +To use ccache with **non-Portage** C compiling, add > > > +${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, > > > before > > > ${EPREFIX}/usr/bin. > > > +Portage 2.0.46-r11+ will automatically take advantage of ccache > > > with > > > +no additional steps.  If this is your first install of ccache, > > > type > > > +something like this to set a maximum cache size of 2GB:\\n > > > +# ccache -M 2G\\n > > > +If you are upgrading from an older version than 3.x you should > > > clear > > > all of your caches like so:\\n > > > +# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache > > > -C\\n > > > +ccache now supports sys-devel/clang and dev-lang/icc, too!" > > > + > > > + readme.gentoo_create_doc > > > +} > > > + > > > +pkg_prerm() { > > > + if [[ -z ${REPLACED_BY_VERSION} ]] ; then > > > + "${EROOT}"/usr/bin/ccache-config --remove-links > > > + "${EROOT}"/usr/bin/ccache-config --remove-links > > > ${CHOST} > > > + fi > > > +} > > > + > > > +pkg_postinst() { > > > + "${EROOT}"/usr/bin/ccache-config --install-links > > > + "${EROOT}"/usr/bin/ccache-config --install-links > > > ${CHOST} > > > + > > > + # nuke broken symlinks from previous versions that > > > shouldn't > > > exist > > > + rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc || die > > > + rm -rf "${EROOT}"/usr/lib/ccache.backup || die > > > + > > > + readme.gentoo_print_elog > > > +} > > > > While I personally am not as uptight about 'local'ising variables, > > I > > believe making DOC_CONTENTS local serves an important purpose: to > > dodge > > any chance of people thinking it is allowed to leak into pkg_* > > phases > > (i.e. the whole rationale of readme.gentoo-r1 in the first place). > > For > > DOCS and friends its irrelevant, as their semantics are only import > > in > > src_* phases. > > > > Are you saying that I should move it to pkg_setup()? > No, all I'm saying is make DOC_CONTENTS local in src_install().