commit: 37ee13ae10ec6676101b28ead666afbdaf18e6a5 Author: Theo Anderson <telans <AT> posteo <DOT> de> AuthorDate: Sun Mar 7 11:57:05 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Mar 7 11:57:05 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37ee13ae
net-fs/samba: migrate to tmpfiles.eclass Closes: https://bugs.gentoo.org/740610 Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Theo Anderson <telans <AT> posteo.de> Signed-off-by: David Seifert <soap <AT> gentoo.org> net-fs/samba/samba-4.12.11.ebuild | 4 ++-- net-fs/samba/samba-4.12.9-r1.ebuild | 4 ++-- net-fs/samba/samba-4.13.3-r1.ebuild | 4 ++-- net-fs/samba/samba-4.13.4.ebuild | 4 ++-- net-fs/samba/samba-4.14.0_rc4.ebuild | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/net-fs/samba/samba-4.12.11.ebuild b/net-fs/samba/samba-4.12.11.ebuild index 4c218a5d089..849733e5d9a 100644 --- a/net-fs/samba/samba-4.12.11.ebuild +++ b/net-fs/samba/samba-4.12.11.ebuild @@ -5,7 +5,7 @@ EAPI=6 PYTHON_COMPAT=( python3_{7,8} ) PYTHON_REQ_USE='threads(+),xml(+)' -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam +inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles MY_PV="${PV/_rc/rc}" MY_P="${PN}-${MY_PV}" @@ -287,7 +287,7 @@ multilib_src_install() { newinitd "${CONFDIR}/samba4.initd-r1" samba newconfd "${CONFDIR}/samba4.confd" samba - systemd_dotmpfilesd "${FILESDIR}"/samba.conf + dotmpfiles "${FILESDIR}"/samba.conf use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die # Preserve functionality for old gentoo-specific unit names diff --git a/net-fs/samba/samba-4.12.9-r1.ebuild b/net-fs/samba/samba-4.12.9-r1.ebuild index 84df21f0f49..76829ea314e 100644 --- a/net-fs/samba/samba-4.12.9-r1.ebuild +++ b/net-fs/samba/samba-4.12.9-r1.ebuild @@ -5,7 +5,7 @@ EAPI=6 PYTHON_COMPAT=( python3_{7,8} ) PYTHON_REQ_USE='threads(+),xml(+)' -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam +inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles MY_PV="${PV/_rc/rc}" MY_P="${PN}-${MY_PV}" @@ -288,7 +288,7 @@ multilib_src_install() { newinitd "${CONFDIR}/samba4.initd-r1" samba newconfd "${CONFDIR}/samba4.confd" samba - systemd_dotmpfilesd "${FILESDIR}"/samba.conf + dotmpfiles "${FILESDIR}"/samba.conf use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die # Preserve functionality for old gentoo-specific unit names diff --git a/net-fs/samba/samba-4.13.3-r1.ebuild b/net-fs/samba/samba-4.13.3-r1.ebuild index 315792bf568..77f12371c1a 100644 --- a/net-fs/samba/samba-4.13.3-r1.ebuild +++ b/net-fs/samba/samba-4.13.3-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) PYTHON_REQ_USE="threads(+),xml(+)" -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam +inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles DESCRIPTION="Samba Suite Version 4" HOMEPAGE="https://samba.org/"; @@ -288,7 +288,7 @@ multilib_src_install() { newinitd "${CONFDIR}/samba4.initd-r1" samba newconfd "${CONFDIR}/samba4.confd" samba - systemd_dotmpfilesd "${FILESDIR}"/samba.conf + dotmpfiles "${FILESDIR}"/samba.conf use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die # Preserve functionality for old gentoo-specific unit names diff --git a/net-fs/samba/samba-4.13.4.ebuild b/net-fs/samba/samba-4.13.4.ebuild index 315792bf568..77f12371c1a 100644 --- a/net-fs/samba/samba-4.13.4.ebuild +++ b/net-fs/samba/samba-4.13.4.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) PYTHON_REQ_USE="threads(+),xml(+)" -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam +inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles DESCRIPTION="Samba Suite Version 4" HOMEPAGE="https://samba.org/"; @@ -288,7 +288,7 @@ multilib_src_install() { newinitd "${CONFDIR}/samba4.initd-r1" samba newconfd "${CONFDIR}/samba4.confd" samba - systemd_dotmpfilesd "${FILESDIR}"/samba.conf + dotmpfiles "${FILESDIR}"/samba.conf use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die # Preserve functionality for old gentoo-specific unit names diff --git a/net-fs/samba/samba-4.14.0_rc4.ebuild b/net-fs/samba/samba-4.14.0_rc4.ebuild index 197b80e6797..0fa1731cdd3 100644 --- a/net-fs/samba/samba-4.14.0_rc4.ebuild +++ b/net-fs/samba/samba-4.14.0_rc4.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) PYTHON_REQ_USE="threads(+),xml(+)" -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam +inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles DESCRIPTION="Samba Suite Version 4" HOMEPAGE="https://samba.org/"; @@ -288,7 +288,7 @@ multilib_src_install() { newinitd "${CONFDIR}/samba4.initd-r1" samba newconfd "${CONFDIR}/samba4.confd" samba - systemd_dotmpfilesd "${FILESDIR}"/samba.conf + dotmpfiles "${FILESDIR}"/samba.conf use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die # Preserve functionality for old gentoo-specific unit names
