commit:     2af9e69f3462abfcf97679a24897b708f522059e
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  6 17:16:26 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 17:35:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af9e69f

sys-apps/portage: Migrate to tmpfiles eclass

The systemd_dotmpfilesd function is deprecated. Note that this
effectively forces upgrade to >=sys-apps/openrc-0.23 for OpenRC users,
since opentmpfiles blocks older versions of OpenRC (bug 643386).
This should be acceptable, since the older OpenRC versions are nearly
4 years old now.

Closes: https://bugs.gentoo.org/740600
Bug: https://bugs.gentoo.org/490676
Bug: https://bugs.gentoo.org/643386
Bug: https://bugs.gentoo.org/740638
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 sys-apps/portage/portage-2.3.103-r1.ebuild | 4 ++--
 sys-apps/portage/portage-2.3.99-r2.ebuild  | 4 ++--
 sys-apps/portage/portage-3.0.4-r1.ebuild   | 4 ++--
 sys-apps/portage/portage-3.0.5.ebuild      | 4 ++--
 sys-apps/portage/portage-9999.ebuild       | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys-apps/portage/portage-2.3.103-r1.ebuild 
b/sys-apps/portage/portage-2.3.103-r1.ebuild
index f35ebfa2822..9645491a32c 100644
--- a/sys-apps/portage/portage-2.3.103-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.103-r1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_{6..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 linux-info systemd prefix
+inherit distutils-r1 linux-info tmpfiles prefix
 
 DESCRIPTION="Portage is the package management and distribution system for 
Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
@@ -213,7 +213,7 @@ python_install_all() {
                esetup.py "${targets[@]}"
        fi
 
-       systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+       dotmpfiles "${FILESDIR}"/portage-ccache.conf
 
        # Due to distutils/python-exec limitations
        # these must be installed to /usr/bin.

diff --git a/sys-apps/portage/portage-2.3.99-r2.ebuild 
b/sys-apps/portage/portage-2.3.99-r2.ebuild
index 38f185f95eb..8be8d77ed5d 100644
--- a/sys-apps/portage/portage-2.3.99-r2.ebuild
+++ b/sys-apps/portage/portage-2.3.99-r2.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_6 python3_7 python3_8 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 epatch linux-info systemd prefix
+inherit distutils-r1 epatch linux-info tmpfiles prefix
 
 DESCRIPTION="Portage is the package management and distribution system for 
Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
@@ -218,7 +218,7 @@ python_install_all() {
                esetup.py "${targets[@]}"
        fi
 
-       systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+       dotmpfiles "${FILESDIR}"/portage-ccache.conf
 
        # Due to distutils/python-exec limitations
        # these must be installed to /usr/bin.

diff --git a/sys-apps/portage/portage-3.0.4-r1.ebuild 
b/sys-apps/portage/portage-3.0.4-r1.ebuild
index 2cb5d1ea7a9..9d1c4aea699 100644
--- a/sys-apps/portage/portage-3.0.4-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.4-r1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_{6..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 linux-info systemd prefix
+inherit distutils-r1 linux-info tmpfiles prefix
 
 DESCRIPTION="Portage is the package management and distribution system for 
Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
@@ -217,7 +217,7 @@ python_install_all() {
                esetup.py "${targets[@]}"
        fi
 
-       systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+       dotmpfiles "${FILESDIR}"/portage-ccache.conf
 
        # Due to distutils/python-exec limitations
        # these must be installed to /usr/bin.

diff --git a/sys-apps/portage/portage-3.0.5.ebuild 
b/sys-apps/portage/portage-3.0.5.ebuild
index 5578b8a560f..223bb29de2c 100644
--- a/sys-apps/portage/portage-3.0.5.ebuild
+++ b/sys-apps/portage/portage-3.0.5.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_{6..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 linux-info systemd prefix
+inherit distutils-r1 linux-info tmpfiles prefix
 
 DESCRIPTION="Portage is the package management and distribution system for 
Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
@@ -214,7 +214,7 @@ python_install_all() {
                esetup.py "${targets[@]}"
        fi
 
-       systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+       dotmpfiles "${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 18b40afe288..6bd101cf192 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_{6..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 git-r3 linux-info systemd prefix
+inherit distutils-r1 git-r3 linux-info tmpfiles prefix
 
 DESCRIPTION="Portage is the package management and distribution system for 
Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
@@ -207,7 +207,7 @@ python_install_all() {
                esetup.py "${targets[@]}"
        fi
 
-       systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+       dotmpfiles "${FILESDIR}"/portage-ccache.conf
 
        # Due to distutils/python-exec limitations
        # they must be installed to /usr/bin.

Reply via email to