From 8e84b8928036da30a91c2682d7910a23efb29132 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Mon, 16 Mar 2020 12:57:54 -0500 Subject: [PATCH] sys-auth/nss-pam-ldapd: moved some files around (no intalled changes) Closes: https://bugs.gentoo.org/712806 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Matthew Thode --- .../nss-pam-ldapd/files/{nslcd-init-r3 => nslcd.init} | 2 +- sys-auth/nss-pam-ldapd/files/{nslcd-run-s6 => nslcd.s6} | 0 .../files/{nslcd-2.service => nslcd.service} | 0 .../files/{pynslcd.initd-r2 => pynslcd.init} | 2 +- sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild | 8 ++++---- 5 files changed, 6 insertions(+), 6 deletions(-) rename sys-auth/nss-pam-ldapd/files/{nslcd-init-r3 => nslcd.init} (92%) rename sys-auth/nss-pam-ldapd/files/{nslcd-run-s6 => nslcd.s6} (100%) rename sys-auth/nss-pam-ldapd/files/{nslcd-2.service => nslcd.service} (100%) rename sys-auth/nss-pam-ldapd/files/{pynslcd.initd-r2 => pynslcd.init} (92%) diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-init-r3 b/sys-auth/nss-pam-ldapd/files/nslcd.init similarity index 92% rename from sys-auth/nss-pam-ldapd/files/nslcd-init-r3 rename to sys-auth/nss-pam-ldapd/files/nslcd.init index 513ad9af3fe1..959fb601f606 100644 --- a/sys-auth/nss-pam-ldapd/files/nslcd-init-r3 +++ b/sys-auth/nss-pam-ldapd/files/nslcd.init @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command=/usr/sbin/nslcd diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-run-s6 b/sys-auth/nss-pam-ldapd/files/nslcd.s6 similarity index 100% rename from sys-auth/nss-pam-ldapd/files/nslcd-run-s6 rename to sys-auth/nss-pam-ldapd/files/nslcd.s6 diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-2.service b/sys-auth/nss-pam-ldapd/files/nslcd.service similarity index 100% rename from sys-auth/nss-pam-ldapd/files/nslcd-2.service rename to sys-auth/nss-pam-ldapd/files/nslcd.service diff --git a/sys-auth/nss-pam-ldapd/files/pynslcd.initd-r2 b/sys-auth/nss-pam-ldapd/files/pynslcd.init similarity index 92% rename from sys-auth/nss-pam-ldapd/files/pynslcd.initd-r2 rename to sys-auth/nss-pam-ldapd/files/pynslcd.init index 21762ae5fd2b..3165b02843fc 100644 --- a/sys-auth/nss-pam-ldapd/files/pynslcd.initd-r2 +++ b/sys-auth/nss-pam-ldapd/files/pynslcd.init @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command=/usr/sbin/pynslcd diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild index f93312d95f08..f581f1f2fe4a 100644 --- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild +++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild @@ -91,8 +91,8 @@ multilib_src_configure() { multilib_src_install_all() { local script - newinitd "${FILESDIR}"/nslcd-init-r3 nslcd - s6_install_service nslcd "${FILESDIR}"/nslcd-run-s6 + newinitd "${FILESDIR}"/nslcd.init nslcd + s6_install_service nslcd "${FILESDIR}"/nslcd.s6 insinto /usr/share/nss-pam-ldapd doins "${WORKDIR}/${P}/nslcd.conf" @@ -113,11 +113,11 @@ multilib_src_install_all() { python_foreach_impl python_domodule pynslcd/*.py python_scriptinto /usr/sbin python_newscript pynslcd.py pynslcd - newinitd "${FILESDIR}"/pynslcd.initd-r2 pynslcd + newinitd "${FILESDIR}"/pynslcd.init pynslcd fi systemd_newtmpfilesd "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf - systemd_newunit "${FILESDIR}"/nslcd-2.service nslcd.service + systemd_newunit "${FILESDIR}"/nslcd.service nslcd.service } multilib_src_install() { -- 2.26.2