[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Gilbert]

commit:     1d6d8f41b8a3e9be119abaaa66fa2d28e047845e
Author:     David Michael <fedora.dm0 <AT> gmail <DOT> com>
AuthorDate: Mon Jun 28 18:25:32 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jun 29 16:20:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d6d8f41

toolchain-glibc.eclass: migrate to tmpfiles.eclass

The systemd_newtmpfilesd function is deprecated.

Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 eclass/toolchain-glibc.eclass | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass
index ffe7b9e1fd1..e41cc711439 100644
--- a/eclass/toolchain-glibc.eclass
+++ b/eclass/toolchain-glibc.eclass
@@ -12,8 +12,10 @@
 
 if [[ -z ${_TOOLCHAIN_GLIBC_ECLASS} ]]; then
 
+TMPFILES_OPTIONAL=1
+
 inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig \
-       multilib systemd unpacker multiprocessing prefix
+       multilib systemd tmpfiles unpacker multiprocessing prefix
 
 case ${EAPI:-0} in
        0|1|2|3) EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test \
@@ -1348,10 +1350,10 @@ toolchain-glibc_do_src_install() {
                # TODO: Drop the $FILESDIR copy once 2.19 goes stable.
                if version_is_at_least 2.19 ; then
                        systemd_dounit nscd/nscd.service || die
-                       systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf || die
+                       newtmpfiles nscd/nscd.tmpfiles nscd.conf || die
                else
                        systemd_dounit "${FILESDIR}"/nscd.service || die
-                       systemd_newtmpfilesd "${FILESDIR}"/nscd.tmpfilesd 
nscd.conf || die
+                       newtmpfiles "${FILESDIR}"/nscd.tmpfilesd nscd.conf || 
die
                fi
        else
                # Do this since extra/etc/*.conf above might have nscd.conf.