From 276a1fe4c812536cd9fe7988ef4a98092157e7dc Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 4 Jul 2023 13:38:42 +0100
Subject: [PATCH] libblockdev: update to 3.0.3.

---
 common/shlibs                |  4 ++--
 srcpkgs/libblockdev/template | 22 +++++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 39b5358aa11..bcc8fc7cddf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1029,8 +1029,8 @@ libcryptsetup.so.12 libcryptsetup-2.3.4_2
 libgusb.so.2 libgusb-0.1.3_1
 libmash-0.2.so.0 mash-0.2.0_4
 libbytesize.so.1 libbytesize-1.2_1
-libblockdev.so.2 libblockdev-2.16_1
-libbd_utils.so.2 libblockdev-2.16_1
+libblockdev.so.3 libblockdev-3.0_1
+libbd_utils.so.3 libblockdev-3.0_1
 libndctl.so.6 libndctl-60.3_1
 libdaxctl.so.1 libdaxctl-60.3_1
 libudisks2.so.0 udisks2-1.93.0_1
diff --git a/srcpkgs/libblockdev/template b/srcpkgs/libblockdev/template
index c3287673749..63cce854522 100644
--- a/srcpkgs/libblockdev/template
+++ b/srcpkgs/libblockdev/template
@@ -1,35 +1,39 @@
 # Template file for 'libblockdev'
 pkgname=libblockdev
-version=2.28
+version=3.0.3
 revision=1
 build_style=gnu-configure
+make_check_target="test"
 hostmakedepends="pkg-config python3"
 makedepends="cryptsetup-devel device-mapper-devel dmraid-devel libbytesize-devel
- libglib-devel libkmod-devel libparted-devel nss-devel
- volume_key-devel libyaml-devel pcre2-devel"
+ libglib-devel libkmod-devel libparted-devel libfdisk-devel nss-devel
+ volume_key-devel pcre2-devel e2fsprogs-devel libnvme-devel
+ keyutils-devel"
 short_desc="Library for manipulating block devices"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/storaged-project/libblockdev"
 # changelog needs to be adjusted on major version changes
-changelog="https://raw.githubusercontent.com/storaged-project/libblockdev/2.x-branch/NEWS.rst"
+changelog="https://raw.githubusercontent.com/storaged-project/libblockdev/master/NEWS.rst"
 distfiles="https://github.com/storaged-project/libblockdev/releases/download/${version}-1/libblockdev-${version}.tar.gz"
-checksum=82c9c841e28a74fecadedebfae6a772df623cecdf652e5376650fa26da5b7df4
-conf_files="/etc/libblockdev/conf.d/10-lvm-dbus.cfg
- /etc/libblockdev/conf.d/00-default.cfg"
+checksum=0f2872830293f3e222832903d80de4c38e06a9c3ea18915b3263272a72095ea8
+conf_files="/etc/libblockdev/3/conf.d/10-lvm-dbus.cfg
+ /etc/libblockdev/3/conf.d/00-default.cfg"
+# Requires root.
+make_check=no
 
 CFLAGS="-Wl,-lpcre2-8"
 
 #ndctl not present on ppc
 case "$XBPS_TARGET_MACHINE" in
-	ppc|ppc-musl)
+	ppc*)
 		configure_args+=" --without-nvdimm" ;;
 	*)
 		makedepends+=" libndctl-devel" ;;
 esac
 
 libblockdev-devel_package() {
-	depends="libblockdev>=${version}_${revision} ${makedepends}"
+	depends="${sourcepkg}>=${version}_${revision} libglib-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include