6 files changed, 2 insertions, 73 deletions
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 8e38c43acfc0..b333a314888d 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index e204dc0cbaa3..e303b31817db 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -8,5 +8,5 @@ AUX procps-4.0.4-xfail-pmap-test.patch 697 BLAKE2B 22f9ebf50f0a89a804eaeaf9515a4
 DIST procps-ng-3.3.17.tar.xz 1008428 BLAKE2B 43aa1a21d4f0725b1c02457f343cf1fc66bc1771b25c6eaf689c9775c190e90545bfac1729f027abc4d3d13de37ffac4828554b5b25e12bcf6af9540de1695f3 SHA512 59e9a5013430fd9da508c4655d58375dc32e025bb502bb28fb9a92a48e4f2838b3355e92b4648f7384b2050064d17079bf4595d889822ebb5030006bc154a1a7
 DIST procps-ng-4.0.4.tar.xz 1401540 BLAKE2B 63b972666ef9e92042be96739ffa15c787d0346b2d3ffcb0d240b0a4e999dc90024b2c5b058df683dd9d2c436ceb812abd0b115cc877a6ca1023988b86de443f SHA512 94375544e2422fefc23d7634063c49ef1be62394c46039444f85e6d2e87e45cfadc33accba5ca43c96897b4295bfb0f88d55a30204598ddb26ef66f0420cefb4
 EBUILD procps-3.3.17-r2.ebuild 2587 BLAKE2B a2f0c26b0f1da996566b2798b44789a0e7c9ed6baf7fc248a318036092e180af55da5ff6bb4fd39a907bf3aeeaf66a612350b4f695d4e85355f9e4eaf8a9da91 SHA512 d2f052ab6f3da4cbaa286c63af409c8e6de6aab304249580eb4b243f7b4f2cd6dbb31d6b0ebef2001eabb540d6933d520ec0a6244bbddc036c7e421b417cb317
-EBUILD procps-4.0.4.ebuild 2830 BLAKE2B a8f4341802b89bb26094eca83e7cceab5a2aa35d0f1abbff32f48d1fb89884977930de57f90851c1e6913b8fa6cbe1813b7328937e5f9ed0944562bb68184dd4 SHA512 2a61feedd4da15a153c00464a09f8aac62e45e57be45ba87fd4a45b529845266f3d801b8ef82ca1d5372dfeb947c5984e93f2c081ceb80a921c5e82ebffd11e9
+EBUILD procps-4.0.4.ebuild 2828 BLAKE2B 4d5a68f66543fbbfd07a498a09d3bfb74b421aa14c315ba4c9c6305c07ea404c72c2010dd163214645c6fd2e5830da957e9eee2069db2f85ef6c7bdcdca637f6 SHA512 035569adc92faa3f1f83026feb96f96cbe1b1f315bb8e8f3dc00804ee0b729bdb33994502c9ed779bc3c7f90ea7d6cf85431b594f35088a72f741b60475787d1
 MISC metadata.xml 788 BLAKE2B b8352d682de7ad98344997d344783c444f326153bf5ed479d9e3032dac52b5f938c47ec83ca2d284617f98d0fbde2d9357ee7c205f74d7a2b2c586865a1de756 SHA512 cb6ebcf57a2800ae492fed52ad3de2ba7e767b121ccd6c20f8a0fd6c5fbbc97fb42d20e083ee3d3935fa6fa6e318bccd96d557c9b693507e64b22b8d3c92d1fd
diff --git a/sys-process/procps/procps-4.0.4.ebuild b/sys-process/procps/procps-4.0.4.ebuild
index 58e8d0c5adb7..e4dd2d9b0515 100644
--- a/sys-process/procps/procps-4.0.4.ebuild
+++ b/sys-process/procps/procps-4.0.4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-ng-${PV}
 # See bug #913210
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/0-ng"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-process/uksmd/Manifest b/sys-process/uksmd/Manifest
index 53a18d52abd7..54d86085684d 100644
--- a/sys-process/uksmd/Manifest
+++ b/sys-process/uksmd/Manifest
@@ -1,8 +1,5 @@
-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
 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-0-remove-systemd-dep.patch b/sys-process/uksmd/files/uksmd-0-remove-systemd-dep.patch
deleted file mode 100644
index 6940f78e4662..000000000000
--- a/sys-process/uksmd/files/uksmd-0-remove-systemd-dep.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur a/meson.build b/meson.build
---- a/meson.build	2022-07-08 23:53:08.000000000 +0300
-+++ b/meson.build	2022-07-14 08:12:38.358174169 +0300
-@@ -13,28 +13,6 @@
-   dependency('libcap-ng'),
- ]
- 
--systemd = dependency('systemd', required: false)
--
--if systemd.found()
--  systemd_system_unit_dir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
--  unit_files = [
--    'uksmd.service'
--  ]
--
--
--  foreach u: unit_files
--    configure_file(
--      copy: true,
--      input: u,
--      install: true,
--      install_dir: systemd_system_unit_dir,
--      output: u,
--    )
--  endforeach
--
--  project_dependencies += systemd
--endif
--
- build_args = [
-   '-DPROJECT_NAME=' + meson.project_name(),
-   '-DPROJECT_VERSION=' + meson.project_version(),
diff --git a/sys-process/uksmd/uksmd-0_pre20220705-r1.ebuild b/sys-process/uksmd/uksmd-0_pre20220705-r1.ebuild
deleted file mode 100644
index 0c3b180be3a5..000000000000
--- a/sys-process/uksmd/uksmd-0_pre20220705-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info meson systemd
-
-MY_COMMIT="f10f38e3adcaf6175e6c4c1846cad72ae9ab2cf2"
-
-DESCRIPTION="Userspace KSM helper daemon"
-HOMEPAGE="https://codeberg.org/pf-kernel/uksmd"
-SRC_URI="https://codeberg.org/pf-kernel/uksmd/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# <procps-4 for bug #913523
-DEPEND="
-	sys-libs/libcap-ng
-	<sys-process/procps-4:=
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~KSM"
-
-S="${WORKDIR}/uksmd"
-
-PATCHES=( "${FILESDIR}"/uksmd-0-remove-systemd-dep.patch )
-
-src_install() {
-	meson_src_install
-
-	newinitd "${FILESDIR}/uksmd.init" uksmd
-	systemd_dounit uksmd.service
-}