Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/, sys-apps/portage/files/
Date: Tue, 02 Jan 2018 02:49:16
Message-Id: 1514861286.e5f430619b1dbdce1d9ba7836db55fee065798dd.floppym@gentoo
1 commit: e5f430619b1dbdce1d9ba7836db55fee065798dd
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 31 15:18:27 2017 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 2 02:48:06 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5f43061
7
8 sys-apps/portage: exclude /var/tmp/ccache from tmpfiles cleanup
9
10 By default, systemd-tmpfiles removes files older than 30 days from /var/tmp.
11 The default portage config sets CCACHE_DIR=/var/tmp/ccache.
12
13 Bug: https://bugs.gentoo.org/490676#c14
14 Package-Manager: Portage-2.3.19_p3, Repoman-2.3.6_p37
15
16 sys-apps/portage/files/portage-ccache.conf | 2 ++
17 sys-apps/portage/{portage-2.3.19.ebuild => portage-2.3.19-r1.ebuild} | 4 +++-
18 sys-apps/portage/portage-9999.ebuild | 4 +++-
19 3 files changed, 8 insertions(+), 2 deletions(-)
20
21 diff --git a/sys-apps/portage/files/portage-ccache.conf b/sys-apps/portage/files/portage-ccache.conf
22 new file mode 100644
23 index 00000000000..37857fde319
24 --- /dev/null
25 +++ b/sys-apps/portage/files/portage-ccache.conf
26 @@ -0,0 +1,2 @@
27 +# Prevent ccache files from being cleaned
28 +x /var/tmp/ccache
29
30 diff --git a/sys-apps/portage/portage-2.3.19.ebuild b/sys-apps/portage/portage-2.3.19-r1.ebuild
31 similarity index 99%
32 rename from sys-apps/portage/portage-2.3.19.ebuild
33 rename to sys-apps/portage/portage-2.3.19-r1.ebuild
34 index b4f03d91d2d..1c78b4a699f 100644
35 --- a/sys-apps/portage/portage-2.3.19.ebuild
36 +++ b/sys-apps/portage/portage-2.3.19-r1.ebuild
37 @@ -10,7 +10,7 @@ PYTHON_COMPAT=(
38 )
39 PYTHON_REQ_USE='bzip2(+),threads(+)'
40
41 -inherit distutils-r1
42 +inherit distutils-r1 tmpfiles
43
44 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
45 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
46 @@ -203,6 +203,8 @@ python_install_all() {
47 esetup.py "${targets[@]}"
48 fi
49
50 + dotmpfiles "${FILESDIR}"/portage-ccache.conf
51 +
52 # Due to distutils/python-exec limitations
53 # these must be installed to /usr/bin.
54 local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
55
56 diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
57 index adb4f2b5bde..e025371418a 100644
58 --- a/sys-apps/portage/portage-9999.ebuild
59 +++ b/sys-apps/portage/portage-9999.ebuild
60 @@ -10,7 +10,7 @@ PYTHON_COMPAT=(
61 )
62 PYTHON_REQ_USE='bzip2(+),threads(+)'
63
64 -inherit distutils-r1 git-r3
65 +inherit distutils-r1 git-r3 tmpfiles
66
67 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
68 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
69 @@ -202,6 +202,8 @@ python_install_all() {
70 esetup.py "${targets[@]}"
71 fi
72
73 + dotmpfiles "${FILESDIR}"/portage-ccache.conf
74 +
75 # Due to distutils/python-exec limitations
76 # they must be installed to /usr/bin.
77 local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'