5 files changed, 100 insertions, 4 deletions
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index d31050e94111..9e6acabc8ffb 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/uksmd/Manifest b/sys-process/uksmd/Manifest
index 6a67c63fc6db..53a18d52abd7 100644
--- a/sys-process/uksmd/Manifest
+++ b/sys-process/uksmd/Manifest
@@ -1,5 +1,8 @@
 AUX uksmd-0-remove-systemd-dep.patch 749 BLAKE2B 566894f04aef0e37413c3fdc1f755466a28c03e7fd72f3259025c6f757cc2b9871eeac0ba0f0c4a02b5fe9e3ca95f6827aa49344bd8a52565dbca00f51e22fa4 SHA512 bd8819e8158e2b62eab47f7b7332276b4d725a7e7abaa9e2ad5814a04350e0f12608550f40b648fce05d5009c37f9fca4a509dc4fb1765d1f003a6029fb49f2f
+AUX uksmd-6.4.1-systemd-automagic.patch 1453 BLAKE2B 1c1eb3da40fb52bb523fb8cc046ba0c32d0a4154527baf19c31f6995dd0cb002d3066f52056a41d7c456585a0cca856999d74c536babb7400b7731c9de402242 SHA512 9de55e6bebe5b1c9154593d2acde6111996783d95007f7fd8325033032b5d0992c3c3e3a4e9a4230835f38a6521477422b9e3312a75b5556109a68c520488cee
 AUX uksmd.init 208 BLAKE2B f76e207c3e97750d31bf6b6d867f7f82abed8d19984408e78cb77e8d9c8ee22ae071aa880494748a955cb75d904e8cbe08c211cf24e2a048543d884d173c1a0c SHA512 404c5c6fdbd60d5c5f25d6cccdfa4efb35b0d3d8ec7da8162a3d8e59cb32327227ea165ee3561b3630df6e6b36c75c937b93cf6250a2227b92ac1be2843e300f
 DIST uksmd-0_pre20220705.tar.gz 15715 BLAKE2B f104a804cff15eb6b3a4ffd71180d67054f4e7c4ebbe10438f76aef96ca3d83740b24390183110a26691ebb832d6740765ab7ca5b7862a8d9afe09d1cacdc4d0 SHA512 a0e99e80e22e988ce98f790d5cc693a5b961e40ffa9650002c4ff39edb148b1586ded6b8321f5ea012f674ef8cbd03daca24dca557a773e23e83a373553f7ba9
-EBUILD uksmd-0_pre20220705-r1.ebuild 709 BLAKE2B 85548f1b160ca18190a2a97e09e92e5b0ac399da939846a65500783276b3aed71217d37a760d2c04767b1a6ad445f829c30ee8f2712aa823879f873cb13c6857 SHA512 fe018f88f4695a518e2f39a36c62f2ef42faf435d4e9ae01895d5aeed629fb72b2389936df5cb49953f5863dffa22ae284909e9dca366b477854f90470f80e58
+DIST uksmd-6.4.1.tar.gz 16790 BLAKE2B 284302f0a77684fc00d16faf868d857adf539840ea26746dd9774a1501b3361afa58a77dd74bd40680c32a7b1baf632d60d52fae3c031d1be69c8f17e6bbf73d SHA512 ea851a75b7afd4d9c789f31ca473f2c265b0633c86e38b26ec3602dfa3e63e6bea13caca551aba08c5093332cfbb485f40cb96254c39eb083ab66d6256661dd4
+EBUILD uksmd-0_pre20220705-r1.ebuild 748 BLAKE2B ed76474b8316560d7e950f1b2fbdc7f0b2c0ecfed49afd57a95b42d95b87e91dbe1733363c3a734f4100c023f4531833d518f8aa423077e50d68eb25f2502fd2 SHA512 cbe5059f54515d6a8292001c431cbb6850aac30e462052ac574cb8c6a27c779b74f0e9b367d362f51698d106679831a14837c2f631529fdb2c179fc12971e828
+EBUILD uksmd-6.4.1.ebuild 767 BLAKE2B 260cace70cc1c8cec15ea359fe0aaceb452bab37e232df2d9b1979196e93ce0b92e09dea249ac039cbc44dd4d7989e6032544258bbbceb23ff4af94c24691b19 SHA512 d353b25fc9f164a605274147328e89ac2322cfa409934f9debb7a9d76564d2af233518afabb9bae189208f17e124f920cc30136109913a9fa28cf923a7e3f184
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/sys-process/uksmd/files/uksmd-6.4.1-systemd-automagic.patch b/sys-process/uksmd/files/uksmd-6.4.1-systemd-automagic.patch
new file mode 100644
index 000000000000..7f897731737f
--- /dev/null
+++ b/sys-process/uksmd/files/uksmd-6.4.1-systemd-automagic.patch
@@ -0,0 +1,47 @@
+https://codeberg.org/pf-kernel/uksmd/pulls/5
+
+From 0ed68078ed829ff03f95d01f0079485966e3c07a Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 3 Sep 2023 07:21:56 +0100
+Subject: [PATCH] meson: add systemd option
+
+We may not always want to link against systemd even if installed - consider
+the case where a user is switching from systemd->another init system, systemd
+may still be installed temporarily but the user wants to rebuild without it.
+
+This perserves the default behaviour of using systemd if available.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ meson.build       | 2 +-
+ meson_options.txt | 6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+ create mode 100644 meson_options.txt
+
+diff --git a/meson.build b/meson.build
+index 7170db8..bf0b119 100644
+--- a/meson.build
++++ b/meson.build
+@@ -18,7 +18,7 @@ build_args = [
+   '-DPROJECT_VERSION="' + meson.project_version() + '"',
+ ]
+ 
+-systemd = dependency('systemd', required: false)
++systemd = dependency('systemd', required: get_option('systemd'))
+ 
+ if systemd.found()
+   systemd_system_unit_dir = systemd.get_variable(pkgconfig : 'systemdsystemunitdir')
+diff --git a/meson_options.txt b/meson_options.txt
+new file mode 100644
+index 0000000..3a8cdd4
+--- /dev/null
++++ b/meson_options.txt
+@@ -0,0 +1,6 @@
++option(
++  'systemd',
++  type: 'feature',
++  value: 'auto',
++  description: 'sd-notify support via libsystemd and install systemd unit files'
++)
+-- 
+2.30.8
diff --git a/sys-process/uksmd/uksmd-0_pre20220705-r1.ebuild b/sys-process/uksmd/uksmd-0_pre20220705-r1.ebuild
index cd90995efde0..0c3b180be3a5 100644
--- a/sys-process/uksmd/uksmd-0_pre20220705-r1.ebuild
+++ b/sys-process/uksmd/uksmd-0_pre20220705-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,8 +15,11 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="sys-libs/libcap-ng
-	sys-process/procps:="
+# <procps-4 for bug #913523
+DEPEND="
+	sys-libs/libcap-ng
+	<sys-process/procps-4:=
+"
 RDEPEND="${DEPEND}"
 
 CONFIG_CHECK="~KSM"
diff --git a/sys-process/uksmd/uksmd-6.4.1.ebuild b/sys-process/uksmd/uksmd-6.4.1.ebuild
new file mode 100644
index 000000000000..3977cb96df11
--- /dev/null
+++ b/sys-process/uksmd/uksmd-6.4.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info meson
+
+DESCRIPTION="Userspace KSM helper daemon"
+HOMEPAGE="https://codeberg.org/pf-kernel/uksmd"
+SRC_URI="https://codeberg.org/pf-kernel/uksmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+DEPEND="
+	sys-libs/libcap-ng
+	>=sys-process/procps-4:=
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~KSM"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.4.1-systemd-automagic.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature systemd)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	newinitd "${FILESDIR}/uksmd.init" uksmd
+}