commit: 430383814e62b1e25efaf2f8e786db772a8b02f4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 13:20:41 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 13:20:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43038381
net-firewall/nftables: always install -mk variants
Fixes: 6a42bdbee74a5273dc7177cb62a250dffe21dea8
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../nftables/{nftables-1.0.8.ebuild => nftables-1.0.8-r1.ebuild} | 6 +++---
net-firewall/nftables/nftables-9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net-firewall/nftables/nftables-1.0.8.ebuild
b/net-firewall/nftables/nftables-1.0.8-r1.ebuild
similarity index 97%
rename from net-firewall/nftables/nftables-1.0.8.ebuild
rename to net-firewall/nftables/nftables-1.0.8-r1.ebuild
index d1055f03bbea..6acc2d710064 100644
--- a/net-firewall/nftables/nftables-1.0.8.ebuild
+++ b/net-firewall/nftables/nftables-1.0.8-r1.ebuild
@@ -133,9 +133,9 @@ src_install() {
rmdir "${ED}"/etc/nftables || die
exeinto /usr/libexec/${PN}
- newexe "${FILESDIR}"/libexec/${PN}.sh ${PN}.sh
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+ newexe "${FILESDIR}"/libexec/${PN}-mk.sh ${PN}.sh
+ newconfd "${FILESDIR}"/${PN}-mk.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}-mk.init-r1 ${PN}
keepdir /var/lib/nftables
systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
diff --git a/net-firewall/nftables/nftables-9999.ebuild
b/net-firewall/nftables/nftables-9999.ebuild
index d1055f03bbea..6acc2d710064 100644
--- a/net-firewall/nftables/nftables-9999.ebuild
+++ b/net-firewall/nftables/nftables-9999.ebuild
@@ -133,9 +133,9 @@ src_install() {
rmdir "${ED}"/etc/nftables || die
exeinto /usr/libexec/${PN}
- newexe "${FILESDIR}"/libexec/${PN}.sh ${PN}.sh
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+ newexe "${FILESDIR}"/libexec/${PN}-mk.sh ${PN}.sh
+ newconfd "${FILESDIR}"/${PN}-mk.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}-mk.init-r1 ${PN}
keepdir /var/lib/nftables
systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
