From b70c7c4e205c1a7bb26a61d351275a20675c8ce8 Mon Sep 17 00:00:00 2001
From: PulkoMandy <pulkomandy@pulkomandy.tk>
Date: Tue, 20 Dec 2022 19:29:10 +0100
Subject: [PATCH] util-linux: move libuuid to a separate subpackage

This makes it possible to install cmd:col and other utilities next to
the other libuuid.

Fixes #7600
---
 sys-apps/util-linux/util_linux-2.34.recipe | 32 ++++++++++++++--------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/sys-apps/util-linux/util_linux-2.34.recipe b/sys-apps/util-linux/util_linux-2.34.recipe
index 5217c32fe..058f6e6f3 100644
--- a/sys-apps/util-linux/util_linux-2.34.recipe
+++ b/sys-apps/util-linux/util_linux-2.34.recipe
@@ -6,7 +6,7 @@ LICENSE="GNU GPL v2
 	GNU LGPL v2
 	BSD (4-clause)
 	Public Domain"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://www.kernel.org/pub/linux/utils/util-linux/v$portVersion/util-linux-$portVersion.tar.xz"
 CHECKSUM_SHA256="743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5"
 SOURCE_DIR="util-linux-$portVersion"
@@ -35,7 +35,6 @@ done
 
 PROVIDES="
 	util_linux$secondaryArchSuffix = $portVersionCompat
-	cmd:blkid$commandSuffix = $portVersion
 	cmd:col$commandSuffix = $portVersion
 	cmd:colrm$commandSuffix = $portVersion
 	cmd:column$commandSuffix = $portVersion
@@ -43,11 +42,7 @@ PROVIDES="
 	cmd:nologin$commandSuffix = $portVersion
 	cmd:rename$commandSuffix = $portVersion
 	cmd:ul$commandSuffix = $portVersion
-	cmd:uuidgen$commandSuffix = $portVersion
-	lib:libblkid$secondaryArchSuffix = $libblkidVersionCompat
-	lib:libfdisk$secondaryArchSuffix = $libfdiskVersionCompat
 	lib:libsmartcols$secondaryArchSuffix = $libsmartcolsVersionCompat
-	lib:libuuid$secondaryArchSuffix = $libuuidVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -56,6 +51,17 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 
+SUMMARY_libuuid="Util-linux implementation of libuuid"
+PROVIDES_libuuid="
+	util_linux${secondaryArchSuffix}_libuuid = $portVersionCompat
+	cmd:uuidgen$commandSuffix = $portVersion
+	lib:libuuid$secondaryArchSuffix = $libuuidVersionCompat
+"
+REQUIRES_libuuid="
+	haiku$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+"
+
 SUMMARY_cal="A random collection of Linux utilities (cal)"
 PROVIDES_cal="
 	util_linux${secondaryArchSuffix}_cal = $portVersionCompat
@@ -77,13 +83,17 @@ ARCHITECTURES_fdisk="!x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES_fdisk="?x86"
 PROVIDES_fdisk="
 	util_linux${secondaryArchSuffix}_fdisk = $portVersionCompat
+	cmd:blkid$commandSuffix = $portVersion
 	cmd:fdisk$commandSuffix = $portVersionCompat
+	lib:libfdisk$secondaryArchSuffix = $libfdiskVersionCompat
+	lib:libblkid$secondaryArchSuffix = $libblkidVersionCompat
 	"
 REQUIRES_fdisk="
 	util_linux$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libncursesw$secondaryArchSuffix
+	lib:libuuid$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -118,7 +128,6 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage util_linux$secondaryArchSuffix \
-	"$commandBinDir"/blkid \
 	"$commandBinDir"/col \
 	"$commandBinDir"/colrm \
 	"$commandBinDir"/column \
@@ -127,11 +136,7 @@ defineDebugInfoPackage util_linux$secondaryArchSuffix \
 	"$commandBinDir"/nologin \
 	"$commandBinDir"/rename \
 	"$commandBinDir"/ul \
-	"$commandBinDir"/uuidgen \
-	"$libDir"/libblkid.so.$libblkidVersion \
-	"$libDir"/libfdisk.so.$libfdiskVersion \
 	"$libDir"/libsmartcols.so.$libsmartcolsVersion \
-	"$libDir"/libuuid.so.$libuuidVersion \
 
 BUILD()
 {
@@ -217,7 +222,10 @@ INSTALL()
 	$maybe_packageEntries_fdisk \
 		"$commandBinDir"/fdisk \
 		"$dataDir"/bash-completion/completions/fdisk \
-		"$manDir"/man8/fdisk.8
+		"$manDir"/man8/fdisk.8 \
+		$libDir/libblkid.so.* $libDir/libfdisk.so.* $commandBinDir/blkid
+
+	packageEntries libuuid $libDir/libuuid.so.* $commandBinDir/uuidgen
 
 	packageEntries devel \
 		"$developDir" \