gentoo auto-resync : 13:07:2022 - 19:37:38

4 files changed, 32 insertions, 53 deletions

diff --git a/sys-process/uksmd/Manifest b/sys-process/uksmd/Manifest
index 22026a29cda9..b758d2f72e18 100644
--- a/sys-process/uksmd/Manifest
+++ b/sys-process/uksmd/Manifest
@@ -1,5 +1,4 @@
-AUX uksmd-0_pre20200504-respect-cflags-ldflags.patch 435 BLAKE2B ca387ab901fd49f3c909a31135afd67b55a07f8e3d2f40b1deee6761510bd33cb281f684f0cd9e841a80cd12c15e83a6ba04a57bd6186d83c9d0f52bdf870772 SHA512 3e9923e6b382dfad13afb91d706998231f556341b7e36caaccdc7aa9cab05a758423eb0accea9c81c85d0ee78f7eddfc21951d2a65c6fb6d996e0e6c01ab92bf
 AUX uksmd.init 208 BLAKE2B f76e207c3e97750d31bf6b6d867f7f82abed8d19984408e78cb77e8d9c8ee22ae071aa880494748a955cb75d904e8cbe08c211cf24e2a048543d884d173c1a0c SHA512 404c5c6fdbd60d5c5f25d6cccdfa4efb35b0d3d8ec7da8162a3d8e59cb32327227ea165ee3561b3630df6e6b36c75c937b93cf6250a2227b92ac1be2843e300f
-DIST uksmd-0_pre20211019.tar.bz2 14434 BLAKE2B de17d4dd566eec378062d2040b9387ddbe88f14c9d0ac121d7357d9da190fb5426476b59158655104af4de2be49d14367fe13328de2fb40df23cceddbf6f1a3e SHA512 89f3784c50e1a9bae28e12f562d1c28f97b71859d3b0e2d83416785f9c47cd7da2b93481855c4b46ae6c71c332534991c28b98a5497b301c1d674744308681ce
-EBUILD uksmd-0_pre20211019.ebuild 775 BLAKE2B fd27fe3018e37258edf3dc5cd9c468405faed391db9a97e94bcb290bcc86ee78cf139539af07240466c45521c8ad3fb2b204b7ab24f80d12db7865b33ed1d54f SHA512 39e3d240b38e095c32abdbb4fc8f0d27f04d2d00fbc6c01aeff7d1d2905dde8be49979b671db577c84f403c2bbde314728ad316c2d4375e1f8360fd37d14428d
+DIST uksmd-0_pre20220705.tar.gz 15715 BLAKE2B f104a804cff15eb6b3a4ffd71180d67054f4e7c4ebbe10438f76aef96ca3d83740b24390183110a26691ebb832d6740765ab7ca5b7862a8d9afe09d1cacdc4d0 SHA512 a0e99e80e22e988ce98f790d5cc693a5b961e40ffa9650002c4ff39edb148b1586ded6b8321f5ea012f674ef8cbd03daca24dca557a773e23e83a373553f7ba9
+EBUILD uksmd-0_pre20220705.ebuild 611 BLAKE2B f9547fa1ff1489479261921a6e47f93ff33c8343cdad523e88869b09c7d0d51adb064901a93e1c1bc072f93c321d8663c8a1c21f32a82b66df240246d7d81f5d SHA512 3e6efb2f51151248a953d72445b44e058f253affb41fc99f84de43f764a67fab1339c79f62cc2f2ad39585d9e150e90041c20745ffa78c7e71100fbbf9a3ef67
 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362
diff --git a/sys-process/uksmd/files/uksmd-0_pre20200504-respect-cflags-ldflags.patch b/sys-process/uksmd/files/uksmd-0_pre20200504-respect-cflags-ldflags.patch
deleted file mode 100644
index 407198d5aba6..000000000000
--- a/sys-process/uksmd/files/uksmd-0_pre20200504-respect-cflags-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur a/Makefile b/Makefile
---- a/Makefile	2019-05-19 16:36:31.000000000 +0300
-+++ b/Makefile	2019-07-24 18:12:29.444896030 +0300
-@@ -1,8 +1,8 @@
- PROG = uksmd
- OBJS = uksmd.o
--PREFIX ?= /usr/local
--CFLAGS = -O3 -Wall -Wextra -pedantic -pipe -fstack-protector-strong -fno-plt
--LDFLAGS = -lprocps -lcap-ng
-+PREFIX ?= /usr
-+CFLAGS += -Wextra -pedantic -fstack-protector-strong -fno-plt
-+LDFLAGS += -lprocps -lcap-ng
- 
- all: build
- 
diff --git a/sys-process/uksmd/uksmd-0_pre20211019.ebuild b/sys-process/uksmd/uksmd-0_pre20211019.ebuild
deleted file mode 100644
index bbc2fd9e6bf8..000000000000
--- a/sys-process/uksmd/uksmd-0_pre20211019.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd
-
-MY_COMMIT="e1d4b12d22fd710f0155d75585940f0d439f1544"
-MY_P="${PN}-${MY_COMMIT}"
-
-DESCRIPTION="Userspace KSM helper daemon"
-HOMEPAGE="https://gitlab.com/post-factum/uksmd"
-SRC_URI="https://gitlab.com/post-factum/uksmd/-/archive/${MY_COMMIT}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/libcap-ng
-	sys-process/procps:="
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~KSM"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/uksmd-0_pre20200504-respect-cflags-ldflags.patch" )
-
-src_install() {
-	default
-	einstalldocs
-
-	newinitd "${FILESDIR}/uksmd.init" uksmd
-	systemd_dounit distro/uksmd.service
-}
diff --git a/sys-process/uksmd/uksmd-0_pre20220705.ebuild b/sys-process/uksmd/uksmd-0_pre20220705.ebuild
new file mode 100644
index 000000000000..aaf2918acc1f
--- /dev/null
+++ b/sys-process/uksmd/uksmd-0_pre20220705.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info meson
+
+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"
+
+DEPEND="sys-libs/libcap-ng
+	sys-process/procps:="
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~KSM"
+
+S="${WORKDIR}/uksmd"
+
+src_install() {
+	meson_src_install
+
+	newinitd "${FILESDIR}/uksmd.init" uksmd
+}