[gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/, net-dns/knot-resolver/files/

["Matthew Smith" <matthew@gentoo.org>]

commit:     a68f45ea0f1c0f438465e8f401744a41294c8b24
Author:     Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 19:44:11 2024 +0000
Commit:     Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 19:44:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68f45ea

net-dns/knot-resolver: fix USE=-systemd tmpfiles

Closes: https://bugs.gentoo.org/922635
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>

 ...tmpfiles.patch => knot-resolver-5.7.0-r2-tmpfiles.patch} | 13 +++++++++++++
 ...solver-5.7.0-r1.ebuild => knot-resolver-5.7.0-r2.ebuild} |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch b/net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch
similarity index 85%
rename from net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch
rename to net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch
index e199806972cb..a909a6e8c89b 100644
--- a/net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch
+++ b/net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch
@@ -2,6 +2,19 @@ Always install tmpfiles config.
 
 Bug: https://bugs.gentoo.org/921567
 Bug: https://gitlab.nic.cz/knot/knot-resolver/-/issues/886
+--- a/meson.build
++++ b/meson.build
+@@ -237,9 +237,7 @@ subdir('etc')
+ 
+ 
+ # Systemd unit files
+-if systemd_files != 'disabled'
+-  subdir('systemd')
+-endif
++subdir('systemd')
+ 
+ 
+ # Additional files
 --- a/systemd/meson.build
 +++ b/systemd/meson.build
 @@ -12,6 +12,18 @@ systemd_config.set('etc_dir', etc_dir)

diff --git a/net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.0-r2.ebuild
similarity index 97%
rename from net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild
rename to net-dns/knot-resolver/knot-resolver-5.7.0-r2.ebuild
index 23e7e7d6f11e..6757ff637a8b 100644
--- a/net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild
+++ b/net-dns/knot-resolver/knot-resolver-5.7.0-r2.ebuild
@@ -54,7 +54,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch
 
 	# Bug #921567
-	"${FILESDIR}"/${PN}-5.7.0-tmpfiles.patch
+	"${FILESDIR}"/${PN}-5.7.0-r2-tmpfiles.patch
 )
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg