vapier 14/03/12 13:34:31 Modified: src_install.eblit Log: Install the systemd files from upstream with glibc-2.19+.
Revision Changes Path 1.34 sys-libs/glibc/files/eblits/src_install.eblit file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?rev=1.34&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?rev=1.34&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?r1=1.33&r2=1.34 Index: src_install.eblit =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- src_install.eblit 17 Jan 2014 07:45:29 -0000 1.33 +++ src_install.eblit 12 Mar 2014 13:34:31 -0000 1.34 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.33 2014/01/17 07:45:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.34 2014/03/12 13:34:31 vapier Exp $ toolchain-glibc_src_install() { local GBUILDDIR @@ -185,7 +185,12 @@ version_is_at_least 2.16 || nscd_args+=( -e 's: --foreground : :' ) sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd - if [[ $(type -t systemd_dounit) == "function" ]] ; then + # Newer versions of glibc include the nscd.service themselves. + # 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 || die + else systemd_dounit "${FILESDIR}"/nscd.service || die systemd_newtmpfilesd "${FILESDIR}"/nscd.tmpfilesd nscd.conf || die fi
