libgpg_error: bump to 1.29, add debuginfo. PROVIDES += cmd:yat2m (#2444)

* Add LIBS="-lnetwork" for the logging API, added in 1.28.
* Move $manDir/man1/gpg-error-config.1 to the devel package.
* Remove $manDir and $infoDir when building for a secondary arch.

dev-libs/libgpg_error/libgpg_error-1.27.recipe

@@ -1,67 +0,0 @@
-SUMMARY="A library that defines common error values"
-DESCRIPTION="This is a library that defines common error values for all GnuPG \
-components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, Libksba, \
-DirMngr, Pinentry, SmartCard Daemon and more."
-HOMEPAGE="https://www.gnupg.org/related_software/libraries.en.html#lib-libgpg-error"
-COPYRIGHT="2003-2016 g10 Code GmbH"
-LICENSE="GNU LGPL v2.1"
-REVISION="4"
-SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-$portVersion.tar.bz2"
-CHECKSUM_SHA256="4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"
-SOURCE_DIR="libgpg-error-$portVersion"
-PATCHES="libgpg_error-$portVersion.patchset"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-
-PROVIDES="
-	libgpg_error$secondaryArchSuffix = $portVersion compat >= 1
-	lib:libgpg_error$secondaryArchSuffix = 0.22.0 compat >= 0
-	cmd:gpg_error$secondaryArchSuffix = $portVersion compat >= 1
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	libgpg_error${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	cmd:gpg_error_config$secondaryArchSuffix = $portVersion compat >= 1
-	devel:libgpg_error$secondaryArchSuffix = 0.22.0 compat >= 0
-	"
-REQUIRES_devel="
-	libgpg_error$secondaryArchSuffix == $portVersion
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:awk
-	cmd:make
-	cmd:gcc$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	MAKEINFO=true runConfigure ./configure
-	make
-}
-
-INSTALL()
-{
-	make install
-
-	rm $libDir/libgpg-error.la
-
-	prepareInstalledDevelLib libgpg-error
-
-	packageEntries devel \
-		$developDir \
-		$binDir/gpg-error-config \
-		$dataDir
-}
-
-TEST()
-{
-	make check
-}

dev-libs/libgpg_error/libgpg_error-1.29.recipe

@@ -0,0 +1,91 @@
+SUMMARY="A library that defines common error values"
+DESCRIPTION="This is a library that defines common error values for all GnuPG \
+components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, Libksba, \
+DirMngr, Pinentry, SmartCard Daemon and more."
+HOMEPAGE="https://www.gnupg.org/related_software/libraries.en.html#lib-libgpg-error"
+COPYRIGHT="2003-2018 g10 Code GmbH"
+LICENSE="GNU LGPL v2.1"
+REVISION="1"
+SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-$portVersion.tar.bz2"
+CHECKSUM_SHA256="ece926fa5719d17a7ad8da618712cfa2f8a796ab2f2af9d544c5bb093383b1ea"
+SOURCE_DIR="libgpg-error-$portVersion"
+PATCHES="libgpg_error-$portVersion.patchset"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+libVersion="0.24.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVersionCompat="$portVersion compat >= 1"
+
+PROVIDES="
+	libgpg_error$secondaryArchSuffix = $portVersion
+	cmd:gpg_error$secondaryArchSuffix = $portVersionCompat
+	cmd:yat2m$secondaryArchSuffix = $portVersionCompat
+	lib:libgpg_error$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libgpg_error${secondaryArchSuffix}_devel = $portVersion
+	cmd:gpg_error_config$secondaryArchSuffix = $portVersionCompat
+	cmd:gpgrt_config$secondaryArchSuffix = $portVersionCompat
+	devel:libgpg_error$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	libgpg_error$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:awk
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+defineDebugInfoPackage libgpg_error$secondaryArchSuffix \
+	"$binDir"/gpg-error \
+	"$binDir"/yat2m \
+	"$libDir"/libgpg-error.so.$libVersion
+
+BUILD()
+{
+	MAKEINFO=true runConfigure ./configure
+	make LIBS="-lnetwork"
+}
+
+INSTALL()
+{
+	make install
+
+	rm -f "$libDir"/libgpg-error.la
+
+	prepareInstalledDevelLib libgpg-error
+
+	if [ -n "$secondaryArchSuffix" ]; then
+		maybe_manDir=
+		rm -rf "$infoDir" "$manDir"
+	else
+		maybe_manDir="$manDir"
+	fi
+
+	packageEntries devel \
+		"$developDir" \
+		"$binDir"/gpg-error-config \
+		"$binDir"/gpgrt-config \
+		"$dataDir" \
+		${maybe_manDir:+"$maybe_manDir"/man1/gpg-error-config.1}
+
+	if [ -n "$maybe_manDir" ]; then
+		rmdir "$maybe_manDir"/man1 && rmdir "$maybe_manDir" || true
+	fi
+}
+
+TEST()
+{
+	make check
+}

dev-libs/libgpg_error/patches/libgpg_error-1.29.patchset

@@ -28,7 +28,7 @@ Subject: Do not use __GNUC_PATCHLEVEL__ if it's not defined.
 
 
 diff --git a/doc/yat2m.c b/doc/yat2m.c
-index 9b76f19..6cda15a 100644
+index a509d1b..21c1b2e 100644
 --- a/doc/yat2m.c
 +++ b/doc/yat2m.c
 @@ -105,9 +105,14 @@
@@ -47,12 +47,12 @@ index 9b76f19..6cda15a 100644
  # define MY_GCC_VERSION 0
  #endif
 diff --git a/src/gpg-error.h.in b/src/gpg-error.h.in
-index 988898e..222a9b7 100644
+index ce7d278..d3cffe3 100644
 --- a/src/gpg-error.h.in
 +++ b/src/gpg-error.h.in
-@@ -142,9 +142,14 @@ typedef unsigned int gpg_error_t;
- 
- /* GCC feature test.  */
+@@ -153,9 +153,14 @@ typedef unsigned int gpg_error_t;
+  * GCC feature test.
+  */
  #if __GNUC__
 +# ifdef __GNUC_PATCHLEVEL__
  # define _GPG_ERR_GCC_VERSION (__GNUC__ * 10000 \
@@ -66,5 +66,5 @@ index 988898e..222a9b7 100644
  # define _GPG_ERR_GCC_VERSION 0
  #endif
 -- 
-2.15.1
+2.17.0