[gentoo-commits] repo/gentoo:master commit in: sys-kernel/ugrd/

["Andrew Ammerlaan" <andrewammerlaan@gentoo.org>]

commit:     3e71275a32b75e80bb5709ef4323ec95843f2e35
Author:     Zen <z <AT> pyl <DOT> onl>
AuthorDate: Fri Aug 23 19:18:03 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 07:16:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e71275a

sys-kernel/ugrd: add 1.19.2, drop 1.16.0, integrate tests

Closes: 938125
Signed-off-by: Zen <z <AT> pyl.onl>
Closes: https://github.com/gentoo/gentoo/pull/38272
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sys-kernel/ugrd/Manifest                           |  2 +-
 .../{ugrd-1.16.0.ebuild => ugrd-1.19.2.ebuild}     | 30 ++++++++++++++++++++--
 sys-kernel/ugrd/ugrd-9999.ebuild                   | 26 +++++++++++++++++++
 3 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/sys-kernel/ugrd/Manifest b/sys-kernel/ugrd/Manifest
index 37cfe1987723..b663d79e8e87 100644
--- a/sys-kernel/ugrd/Manifest
+++ b/sys-kernel/ugrd/Manifest
@@ -1,3 +1,3 @@
 DIST ugrd-1.13.0.tar.gz 63781 BLAKE2B 3f2d3095c6303b16947121071dabdbef81baaea5a7e208d53250e57edf136618497710ce3cca2906b87fbdc529b8a9ef119659365bba8c795594774cf8d096f6 SHA512 a745685668e981accfd32d1c47c6cf506ae63304ef5b3fdad200731db75b76fe56a4339876465bb1857c2fed35c273f95bbce390224fa0d01aebd67adbc31aa6
-DIST ugrd-1.16.0.tar.gz 66050 BLAKE2B 50417d15a50f3e6da2609d61f4a88f4bafe76d02f82ce4a8f8b152e311a68543956c30487a7caee769c8da2a266d9266377a798b6577f4b3d54164acb55f20fc SHA512 ac67a5164c2d239a5994bfde972bf82fe9f63bfc339ad263256e9889826ff71df224a8d003b0db2e2900d862dbd2a07c11c1b99fe12f94e52a8c5cd65ef302e5
 DIST ugrd-1.17.0.tar.gz 69517 BLAKE2B 2acadac8ab3830791146522ccfff6f8c5e98eff4cea355dafd5f5498bedf5d0f200ec2bc2ee4a20c62e3920590c70b2c788c776c148e7291cd3391eb2e0018df SHA512 5caeebadb579536a60cecd6c9fd9036c178ab5c5700418b95841e7102ac0c3c5fa14ceebc9994a86f65bd0623ca819ed7cb7a986f412e0358c9597c0e579f90c
+DIST ugrd-1.19.2.tar.gz 63366 BLAKE2B 3bc2168bd92a41fef54e627a1ce9679fc628c55f58667b682fde3cc8a3c67792856dab11540bccc2c85f9270c20701c52dc3290e619ac19e5371b0b8dc18550d SHA512 60ce2ce0fa349c24579a042e18ea5b092a57ba41bb9434a5804d5f42b83a0e4371c212a755b4a78ee4c41d3c9e80e7f6f67913fcb207eaf53288f72570a063a9

diff --git a/sys-kernel/ugrd/ugrd-1.16.0.ebuild b/sys-kernel/ugrd/ugrd-1.19.2.ebuild
similarity index 68%
rename from sys-kernel/ugrd/ugrd-1.16.0.ebuild
rename to sys-kernel/ugrd/ugrd-1.19.2.ebuild
index 2259e96649a2..6869d9c50265 100644
--- a/sys-kernel/ugrd/ugrd-1.16.0.ebuild
+++ b/sys-kernel/ugrd/ugrd-1.19.2.ebuild
@@ -17,11 +17,18 @@ KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	app-misc/pax-utils
-	>=dev-python/zenlib-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pycpio-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/zenlib-2.2.3[${PYTHON_USEDEP}]
+	>=dev-python/pycpio-1.3.2[${PYTHON_USEDEP}]
 	sys-apps/pciutils
 "
 
+BDEPEND="
+	test? (
+		amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] )
+		arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] )
+	)
+"
+
 python_install_all() {
 	# Call the distutils-r1_python_install_all function
 	distutils-r1_python_install_all
@@ -46,3 +53,22 @@ pkg_postinst() {
 	optfeature "ugrd.crypto.gpg support" app-crypt/gnupg
 	optfeature "ugrd.fs.lvm support" sys-fs/lvm2[lvm]
 }
+
+distutils_enable_tests unittest
+
+src_test() {
+	if [[ ! -w '/dev/kvm' ]]; then
+		ewarn "Skipping tests: Cannot write to /dev/kvm."
+		return 1
+	fi
+	if [[ ! -r "$(command -v mount)" ]]; then
+		ewarn "Cannot read the mount binary, tests may fail until"
+		ewarn "util-linux is re-emerged without the sfperms feature."
+	fi
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	eunittest tests/
+}

diff --git a/sys-kernel/ugrd/ugrd-9999.ebuild b/sys-kernel/ugrd/ugrd-9999.ebuild
index 79e735294206..6f4810071f2d 100644
--- a/sys-kernel/ugrd/ugrd-9999.ebuild
+++ b/sys-kernel/ugrd/ugrd-9999.ebuild
@@ -21,6 +21,13 @@ RDEPEND="
 	sys-apps/pciutils
 "
 
+BDEPEND="
+	test? (
+		amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] )
+		arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] )
+	)
+"
+
 python_install_all() {
 	# Call the distutils-r1_python_install_all function
 	distutils-r1_python_install_all
@@ -45,3 +52,22 @@ pkg_postinst() {
 	optfeature "ugrd.crypto.gpg support" app-crypt/gnupg
 	optfeature "ugrd.fs.lvm support" sys-fs/lvm2[lvm]
 }
+
+distutils_enable_tests unittest
+
+src_test() {
+	if [[ ! -w '/dev/kvm' ]]; then
+		ewarn "Skipping tests: Cannot write to /dev/kvm."
+		return 1
+	fi
+	if [[ ! -r "$(command -v mount)" ]]; then
+		ewarn "Cannot read the mount binary, tests may fail until"
+		ewarn "util-linux is re-emerged without the sfperms feature."
+	fi
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	eunittest tests/
+}