From 03c7fb2b8ab18f9cffba9e2e4f9bb639c7b46840 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Tue, 6 Aug 2024 11:38:30 +0200
Subject: [PATCH] gettext, bump version (#10777)

---
 ...xt-0.21.1.recipe => gettext-0.22.5.recipe} | 78 ++++++++++++++-----
 1 file changed, 57 insertions(+), 21 deletions(-)
 rename sys-devel/gettext/{gettext-0.21.1.recipe => gettext-0.22.5.recipe} (71%)

diff --git a/sys-devel/gettext/gettext-0.21.1.recipe b/sys-devel/gettext/gettext-0.22.5.recipe
similarity index 71%
rename from sys-devel/gettext/gettext-0.21.1.recipe
rename to sys-devel/gettext/gettext-0.22.5.recipe
index e924327ae..d79c0a2b1 100644
--- a/sys-devel/gettext/gettext-0.21.1.recipe
+++ b/sys-devel/gettext/gettext-0.22.5.recipe
@@ -14,20 +14,24 @@ parties in preparing these sets, or bringing them up to date."
 HOMEPAGE="https://www.gnu.org/software/gettext/"
 COPYRIGHT="1998-2020 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
-REVISION="5"
+REVISION="1"
 SOURCE_URI="https://ftpmirror.gnu.org/gettext/gettext-$portVersion.tar.gz"
-CHECKSUM_SHA256="e8c3650e1d8cee875c4f355642382c1df83058bd5a11ee8555c0cf276d646d45"
+CHECKSUM_SHA256="ec1705b1e969b83a9f073144ec806151db88127f5e40fe5a94cb6c8fa48996a0"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+libasprintfVersion="0.0.0"
+libasprintfVersionCompat="$libasprintfVersion compat >= ${libasprintfVersion%%.*}"
+libgettextpoVersion="0.5.10"
+libgettextpoVersionCompat="$libgettextpoVersion compat >= ${libgettextpoVersion%%.*}"
+libtextstyleVersion="0.2.1"
+libtextstyleVersionCompat="$libtextstyleVersion compat >= ${libtextstyleVersion%%.*}"
+libintlVersion="8.4.0"
+libintlVersionCompat="$libintlVersion compat >= ${libintlVersion%%.*}"
+
 PROVIDES="
-	gettext$secondaryArchSuffix = $portVersion compat >= 0.19.8.1
-	lib:libasprintf$secondaryArchSuffix = 0.0.0 compat >= 0
-	lib:libgettextlib_$portVersion$secondaryArchSuffix
-	lib:libgettextpo$secondaryArchSuffix = 0.5.7 compat >= 0
-	lib:libgettextsrc_$portVersion$secondaryArchSuffix
-	lib:libtextstyle$secondaryArchSuffix = 0.1.1 compat >= 0
+	gettext$secondaryArchSuffix = $portVersion compat >= 0.22
 	cmd:autopoint$secondaryArchSuffix = $portVersion compat >= 0
 	cmd:envsubst$secondaryArchSuffix = $portVersion compat >= 0
 	cmd:gettext$secondaryArchSuffix = $portVersion compat >= 0
@@ -50,11 +54,16 @@ PROVIDES="
 	cmd:ngettext$secondaryArchSuffix = $portVersion compat >= 0
 	cmd:recode_sr_latin$secondaryArchSuffix = $portVersion compat >= 0
 	cmd:xgettext$secondaryArchSuffix = $portVersion compat >= 0
+	lib:libasprintf$secondaryArchSuffix = $libasprintfVersionCompat
+	lib:libgettextlib_$portVersion$secondaryArchSuffix
+	lib:libgettextpo$secondaryArchSuffix = $libgettextpoVersionCompat
+	lib:libgettextsrc_$portVersion$secondaryArchSuffix
+	lib:libtextstyle$secondaryArchSuffix = $libtextstyleVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	gettext${secondaryArchSuffix}_libintl == $portVersion base
 	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix == $libintlVersion
 	lib:libncurses$secondaryArchSuffix
 	"
 if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
@@ -65,24 +74,31 @@ fi
 
 SUMMARY_libintl="The gettext internationalization library"
 PROVIDES_libintl="
-	gettext${secondaryArchSuffix}_libintl = $portVersion compat >= 0.21
-	lib:libintl$secondaryArchSuffix = 8.2.0 compat >= 8
+	gettext${secondaryArchSuffix}_libintl = $portVersion compat >= 0.22
+	lib:libintl$secondaryArchSuffix = $libintlVersionCompat
 	"
 REQUIRES_libintl="
 	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	"
+SUMMARY_libintl_devel="The gettext internationalization library (development files)"
+PROVIDES_libintl_devel="
+	gettext${secondaryArchSuffix}_libintl_devel = $portVersion compat >= 0.22
+	devel:libintl$secondaryArchSuffix = $libintlVersionCompat
+	"
+REQUIRES_libintl_devel="
+	gettext${secondaryArchSuffix}_libintl == $portVersion
+	"
 
 PROVIDES_devel="
-	gettext${secondaryArchSuffix}_devel = $portVersion compat >= 0.21
-	devel:libasprintf$secondaryArchSuffix = 0.0.0 compat >= 0
+	gettext${secondaryArchSuffix}_devel = $portVersion compat >= 0.22
+	devel:libasprintf$secondaryArchSuffix = $libasprintfVersionCompat
 	devel:libgettextlib$secondaryArchSuffix = $portVersion
 	devel:libgettextlib_$portVersion$secondaryArchSuffix
-	devel:libgettextpo$secondaryArchSuffix = 0.5.7 compat >= 0
+	devel:libgettextpo$secondaryArchSuffix = $libgettextpoVersionCompat
 	devel:libgettextsrc$secondaryArchSuffix = $portVersion
 	devel:libgettextsrc_$portVersion$secondaryArchSuffix
-	devel:libintl$secondaryArchSuffix = 8.2.0 compat >= 8
-	devel:libtextstyle$secondaryArchSuffix = 0.1.1 compat >= 0
+	devel:libtextstyle$secondaryArchSuffix = $libtextstyleVersionCompat
 	"
 REQUIRES_devel="
 	gettext$secondaryArchSuffix == $portVersion base
@@ -137,17 +153,37 @@ INSTALL()
 	prepareInstalledDevelLib libgettextlib '*.so' '*'
 	prepareInstalledDevelLib libgettextsrc '*.so' '*'
 
-	# devel package
-	packageEntries devel \
-		$developDir \
-		$docDir
-
 	# libintl package
 	packageEntries libintl \
 		$libDir/libintl*
+
+	# libintl_devel package
+	packageEntries libintl_devel \
+		$developLibDir/*libintl* \
+		$includeDir/libintl.h
+
+	# devel package
+	packageEntries devel \
+		$developDir \
+		$docDir \
+		$manDir/man3
+
+	# cleanup
+	rmdir $documentationDir/packages
 }
 
 TEST()
 {
+#============================================================================
+#Testsuite summary for gettext-tools 0.22.5
+#============================================================================
+# TOTAL: 395
+# PASS:  311
+# SKIP:  74
+# XFAIL: 0
+# FAIL:  10
+# XPASS: 0
+# ERROR: 0
+
 	make check
 }