From 95fc89f4ccc2373cb1de4aff24e5c1e61057ec45 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 20 Sep 2023 09:44:22 +0000
Subject: [PATCH] poppler, revbump, move binaries to tools package (#9459)

---
 app-text/poppler/poppler-22.01.0.recipe | 85 +++++++++++++------------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/app-text/poppler/poppler-22.01.0.recipe b/app-text/poppler/poppler-22.01.0.recipe
index 0275c88ec..5b4e8d658 100644
--- a/app-text/poppler/poppler-22.01.0.recipe
+++ b/app-text/poppler/poppler-22.01.0.recipe
@@ -1,6 +1,5 @@
 SUMMARY="A PDF rendering library"
-DESCRIPTION="Poppler is a PDF rendering library based on the xpdf-3.0 code \
-base."
+DESCRIPTION="Poppler is a PDF rendering library based on the xpdf-3.0 code base."
 HOMEPAGE="https://poppler.freedesktop.org/"
 COPYRIGHT="2008 Adam Batkin
  	Adobe Systems Inc.
@@ -221,7 +220,7 @@ COPYRIGHT="2008 Adam Batkin
  	2007 Will Stephenson
  	1994 X Consortium"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://poppler.freedesktop.org/poppler-$portVersion.tar.xz"
 CHECKSUM_SHA256="7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e"
 SOURCE_DIR="poppler-$portVersion"
@@ -242,19 +241,6 @@ libQt6VersionCompat="$libQt6Version compat >= ${libQt6Version%%.*}"
 
 PROVIDES="
 	poppler$secondaryArchSuffix = $portVersion
-	cmd:pdfattach
-	cmd:pdfdetach
-	cmd:pdffonts
-	cmd:pdfimages
-	cmd:pdfinfo
-	cmd:pdfseparate
-	cmd:pdfsig
-	cmd:pdftocairo
-	cmd:pdftohtml
-	cmd:pdftoppm
-	cmd:pdftops
-	cmd:pdftotext
-	cmd:pdfunite
 	lib:libpoppler$secondaryArchSuffix = $libVersionCompat
 	lib:libpoppler_cpp$secondaryArchSuffix = $libCppVersionCompat
 	"
@@ -319,10 +305,6 @@ REQUIRES_devel="
 	devel:libtiff$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
-CONFLICTS_devel="
-	poppler066${secondaryArchSuffix}_devel
-	poppler076${secondaryArchSuffix}_devel
-	"
 
 # GLIB
 SUMMARY_glib="$SUMMARY (glib bindings)"
@@ -350,11 +332,6 @@ REQUIRES_glib="
 	lib:libtiff$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
-CONFLICTS_glib="
-	poppler062${secondaryArchSuffix}_glib
-	poppler066${secondaryArchSuffix}_glib
-	poppler076${secondaryArchSuffix}_glib
-	"
 
 # QT5
 SUMMARY_qt5="$SUMMARY (Qt5 bindings)"
@@ -381,11 +358,6 @@ REQUIRES_qt5="
 	lib:libtiff$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
-CONFLICTS_qt5="
-	poppler062${secondaryArchSuffix}_qt5
-	poppler066${secondaryArchSuffix}_qt5
-	poppler076${secondaryArchSuffix}_qt5
-	"
 
 # QT6
 SUMMARY_qt6="$SUMMARY (Qt6 bindings)"
@@ -413,6 +385,31 @@ REQUIRES_qt6="
 	lib:libz$secondaryArchSuffix
 	"
 
+SUMMARY_tools="Binaries for the poppler package"
+PROVIDES_tools="
+	poppler${secondaryArchSuffix}_tools
+	cmd:pdfattach
+	cmd:pdfdetach
+	cmd:pdffonts
+	cmd:pdfimages
+	cmd:pdfinfo
+	cmd:pdfseparate
+	cmd:pdfsig
+	cmd:pdftocairo
+	cmd:pdftohtml
+	cmd:pdftoppm
+	cmd:pdftops
+	cmd:pdftotext
+	cmd:pdfunite
+	"
+REQUIRES_tools="
+	poppler$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	lib:libcairo$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:liblcms2$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	poppler_data >= 0.4.11
@@ -452,21 +449,20 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix
-#	cmd:python3
 	"
 
 defineDebugInfoPackage poppler$secondaryArchSuffix \
-	"$prefix"/bin/pdfdetach \
-	"$prefix"/bin/pdffonts \
-	"$prefix"/bin/pdfimages \
-	"$prefix"/bin/pdfinfo \
-	"$prefix"/bin/pdfseparate \
-	"$prefix"/bin/pdftocairo \
-	"$prefix"/bin/pdftohtml \
-	"$prefix"/bin/pdftoppm \
-	"$prefix"/bin/pdftops \
-	"$prefix"/bin/pdftotext \
-	"$prefix"/bin/pdfunite \
+	"$(getPackagePrefix tools)"/bin/pdfdetach \
+	"$(getPackagePrefix tools)"/bin/pdffonts \
+	"$(getPackagePrefix tools)"/bin/pdfimages \
+	"$(getPackagePrefix tools)"/bin/pdfinfo \
+	"$(getPackagePrefix tools)"/bin/pdfseparate \
+	"$(getPackagePrefix tools)"/bin/pdftocairo \
+	"$(getPackagePrefix tools)"/bin/pdftohtml \
+	"$(getPackagePrefix tools)"/bin/pdftoppm \
+	"$(getPackagePrefix tools)"/bin/pdftops \
+	"$(getPackagePrefix tools)"/bin/pdftotext \
+	"$(getPackagePrefix tools)"/bin/pdfunite \
 	"$libDir"/libpoppler.so.$libVersion \
 	"$libDir"/libpoppler-cpp.so.$libCppVersion \
 	"$(getPackagePrefix glib)/$relativeLibDir"/libpoppler-glib.so.$libGlibVersion \
@@ -514,6 +510,11 @@ INSTALL()
 	packageEntries "qt6" \
 		$libDir/*qt6*
 
+	# Tools
+	packageEntries tools \
+		$prefix/bin \
+		$manDir
+
 	# DEVEL
 	packageEntries devel \
 		$developDir