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 CCDD6138206 for ; Tue, 2 Jan 2018 02:49:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4FE6E0831; Tue, 2 Jan 2018 02:49:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 72171E0831 for ; Tue, 2 Jan 2018 02:49:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 69029335C0C for ; Tue, 2 Jan 2018 02:49:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 841EF197 for ; Tue, 2 Jan 2018 02:49:09 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1514861286.e5f430619b1dbdce1d9ba7836db55fee065798dd.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/, sys-apps/portage/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/portage/files/portage-ccache.conf sys-apps/portage/portage-2.3.19-r1.ebuild sys-apps/portage/portage-2.3.19.ebuild sys-apps/portage/portage-9999.ebuild X-VCS-Directories: sys-apps/portage/ sys-apps/portage/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: e5f430619b1dbdce1d9ba7836db55fee065798dd X-VCS-Branch: master Date: Tue, 2 Jan 2018 02:49:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 657680ce-33d9-4b65-8e31-c4e0302f9d5f X-Archives-Hash: 356f783bff25bf4eb943fadd24b55807 commit: e5f430619b1dbdce1d9ba7836db55fee065798dd Author: Mike Gilbert gentoo org> AuthorDate: Sun Dec 31 15:18:27 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Jan 2 02:48:06 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5f43061 sys-apps/portage: exclude /var/tmp/ccache from tmpfiles cleanup By default, systemd-tmpfiles removes files older than 30 days from /var/tmp. The default portage config sets CCACHE_DIR=/var/tmp/ccache. Bug: https://bugs.gentoo.org/490676#c14 Package-Manager: Portage-2.3.19_p3, Repoman-2.3.6_p37 sys-apps/portage/files/portage-ccache.conf | 2 ++ sys-apps/portage/{portage-2.3.19.ebuild => portage-2.3.19-r1.ebuild} | 4 +++- sys-apps/portage/portage-9999.ebuild | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sys-apps/portage/files/portage-ccache.conf b/sys-apps/portage/files/portage-ccache.conf new file mode 100644 index 00000000000..37857fde319 --- /dev/null +++ b/sys-apps/portage/files/portage-ccache.conf @@ -0,0 +1,2 @@ +# Prevent ccache files from being cleaned +x /var/tmp/ccache diff --git a/sys-apps/portage/portage-2.3.19.ebuild b/sys-apps/portage/portage-2.3.19-r1.ebuild similarity index 99% rename from sys-apps/portage/portage-2.3.19.ebuild rename to sys-apps/portage/portage-2.3.19-r1.ebuild index b4f03d91d2d..1c78b4a699f 100644 --- a/sys-apps/portage/portage-2.3.19.ebuild +++ b/sys-apps/portage/portage-2.3.19-r1.ebuild @@ -10,7 +10,7 @@ PYTHON_COMPAT=( ) PYTHON_REQ_USE='bzip2(+),threads(+)' -inherit distutils-r1 +inherit distutils-r1 tmpfiles DESCRIPTION="Portage is the package management and distribution system for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" @@ -203,6 +203,8 @@ python_install_all() { esetup.py "${targets[@]}" fi + dotmpfiles "${FILESDIR}"/portage-ccache.conf + # Due to distutils/python-exec limitations # these must be installed to /usr/bin. local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index adb4f2b5bde..e025371418a 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -10,7 +10,7 @@ PYTHON_COMPAT=( ) PYTHON_REQ_USE='bzip2(+),threads(+)' -inherit distutils-r1 git-r3 +inherit distutils-r1 git-r3 tmpfiles DESCRIPTION="Portage is the package management and distribution system for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" @@ -202,6 +202,8 @@ python_install_all() { esetup.py "${targets[@]}" fi + dotmpfiles "${FILESDIR}"/portage-ccache.conf + # Due to distutils/python-exec limitations # they must be installed to /usr/bin. local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'