From dd312b0f4cf1f952c29bd0c6d88fb4aa2f8d1071 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 30 Mar 2023 10:48:14 +0200
Subject: [PATCH] libsolv, cleanup, fix install paths (#8186)

---
 dev-libs/libsolv/libsolv-0.7.2.recipe | 34 +++++++++++----------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/dev-libs/libsolv/libsolv-0.7.2.recipe b/dev-libs/libsolv/libsolv-0.7.2.recipe
index 2876b46d5..8de8a0b00 100644
--- a/dev-libs/libsolv/libsolv-0.7.2.recipe
+++ b/dev-libs/libsolv/libsolv-0.7.2.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="A Library for solving packages and reading repositories."
 HOMEPAGE="https://github.com/openSUSE/libsolv"
 COPYRIGHT="2007-2019, Novell Inc."
 LICENSE="BSD (3-clause)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/openSUSE/libsolv/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="8aa19c6726789f500e7301180608d09e6af99d75a2d336435686ae438bd9933e"
 SOURCE_FILENAME="libsolv-$portVersion.tar.gz"
@@ -49,36 +49,30 @@ PATCH()
 	sed -i 's,${CMAKE_INSTALL_PREFIX}/bin',$binDir, CMakeLists.txt
 	sed -i 's,${CMAKE_INSTALL_PREFIX}/include',$includeDir, \
 		src/CMakeLists.txt ext/CMakeLists.txt
+	sed -i 's,${CMAKE_INSTALL_PREFIX}/share/cmake/Modules',$dataDir/cmake/Modules, \
+		CMakeLists.txt
 }
 
 BUILD()
 {
-	rm -rf build
-	mkdir build
-	cd build
-	cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix -DLIB=$relativeLibDir ..
-	make $jobArgs
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX:PATH=$prefix \
+		-DLIB=$relativeLibDir \
+		-DINCLUDE=$relativeIncludeDir \
+		-DMAN_INSTALL_DIR=$manDir
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd build
-	make install
+	make -C build install
+
+	# remove the manpages for the binaries
+	rm -rf $manDir/man1
 
 	# set up the develop directory correctly
 	prepareInstalledDevelLibs libsolv libsolvext
-
-	# move cmake files
-	mkdir -p $dataDir
-	mv $prefix/share/cmake $dataDir
-
-	# move man pages
-	mkdir -p $manDir
-	mv $prefix/share/man/* $manDir
-	rmdir $prefix/share/man
-
-	# clean up share directory
-	rmdir $prefix/share
+	fixPkgconfig
 
 	# We don't want the executables.
 	rm -r $prefix/bin