[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/

[Zac Medico]

commit:     72533ec33e2fa41ac5f9859a4e1826a1baac512a
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  4 23:55:17 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jan  4 23:56:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72533ec3

sys-apps/portage: eliminate virtual/tmpfiles dependency

Closes: https://bugs.gentoo.org/643386
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-apps/portage/portage-2.3.19-r1.ebuild | 7 ++++---
 sys-apps/portage/portage-9999.ebuild      | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sys-apps/portage/portage-2.3.19-r1.ebuild b/sys-apps/portage/portage-2.3.19-r1.ebuild
index 1c78b4a699f..ad03ed45ed6 100644
--- a/sys-apps/portage/portage-2.3.19-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ PYTHON_COMPAT=(
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 tmpfiles
+inherit distutils-r1
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
@@ -203,7 +203,8 @@ python_install_all() {
 		esetup.py "${targets[@]}"
 	fi
 
-	dotmpfiles "${FILESDIR}"/portage-ccache.conf
+	insinto /usr/lib/tmpfiles.d
+	doins "${FILESDIR}"/portage-ccache.conf
 
 	# Due to distutils/python-exec limitations
 	# these must be installed to /usr/bin.

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index e025371418a..db45902de9a 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ PYTHON_COMPAT=(
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 git-r3 tmpfiles
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
@@ -202,7 +202,8 @@ python_install_all() {
 		esetup.py "${targets[@]}"
 	fi
 
-	dotmpfiles "${FILESDIR}"/portage-ccache.conf
+	insinto /usr/lib/tmpfiles.d
+	doins "${FILESDIR}"/portage-ccache.conf
 
 	# Due to distutils/python-exec limitations
 	# they must be installed to /usr/bin.