From 65bd33e39f44ebec9ac4015655f4bf5249f0b1e6 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Fri, 13 Jul 2018 01:29:34 +0000
Subject: [PATCH] libgcrypt: bump to 1.8.3, tweak configure, enable x86_gcc2.

* Unlike 1.8.2, which passed all tests, 1.8.3 was failing one
  test, "version", with the following error message:

  Fatal: failed to acquire the Jent RNG lock: Resource deadlock

* Pass "--disable-jent-support" to configure, in order to avoid
  the test failure described above.
* Drop the call to autoreconf, as it is not needed.
* Sort PROVIDES_devel.
---
 ...pt-1.8.2.recipe => libgcrypt-1.8.3.recipe} | 26 ++++++++++---------
 ....8.2.patchset => libgcrypt-1.8.3.patchset} |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)
 rename dev-libs/libgcrypt/{libgcrypt-1.8.2.recipe => libgcrypt-1.8.3.recipe} (74%)
 rename dev-libs/libgcrypt/patches/{libgcrypt-1.8.2.patchset => libgcrypt-1.8.3.patchset} (98%)

diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.2.recipe b/dev-libs/libgcrypt/libgcrypt-1.8.3.recipe
similarity index 74%
rename from dev-libs/libgcrypt/libgcrypt-1.8.2.recipe
rename to dev-libs/libgcrypt/libgcrypt-1.8.3.recipe
index 8075dac22..138bc9da3 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.2.recipe
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3.recipe
@@ -2,17 +2,17 @@ SUMMARY="GNU's basic cryptographic library"
 DESCRIPTION="Libgcrypt is a general purpose crypto library based on the code \
 used in GnuPG."
 HOMEPAGE="https://gnupg.org/related_software/libgcrypt/"
-COPYRIGHT="2000-2017 Free Software Foundation, Inc."
+COPYRIGHT="2000-2018 Free Software Foundation, Inc."
 LICENSE="GNU LGPL v3"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$portVersion.tar.bz2"
-CHECKSUM_SHA256="c8064cae7558144b13ef0eb87093412380efa16c4ee30ad12ecb54886a524c07"
+CHECKSUM_SHA256="66ec90be036747602f2b48f98312361a9180c97c68a690a5f376fa0f67d0af7c"
 PATCHES="libgcrypt-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-libVersion=20.2.2
+libVersion=20.2.3
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
@@ -27,10 +27,10 @@ REQUIRES="
 PROVIDES_devel="
 	libgcrypt${secondaryArchSuffix}_devel = $portVersion
 	devel:libgcrypt$secondaryArchSuffix = $libVersion
-	cmd:dumpsexp$secondaryArchSuffix
-	cmd:libgcrypt_config$secondaryArchSuffix
-	cmd:hmac256$secondaryArchSuffix
-	cmd:mpicalc$secondaryArchSuffix
+	cmd:dumpsexp$secondaryArchSuffix = $portVersion
+	cmd:hmac256$secondaryArchSuffix = $portVersion
+	cmd:libgcrypt_config$secondaryArchSuffix = $portVersion
+	cmd:mpicalc$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_devel="
 	libgcrypt$secondaryArchSuffix == $portVersion base
@@ -56,8 +56,9 @@ defineDebugInfoPackage libgcrypt$secondaryArchSuffix \
 
 BUILD()
 {
-	autoreconf -vfi
-	runConfigure ./configure
+	runConfigure ./configure \
+		--disable-jent-support \
+
 	make $jobArgs
 }
 
@@ -89,5 +90,6 @@ INSTALL()
 
 TEST()
 {
+	LIBRARY_PATH="$sourceDir/src/.libs${LIBRARY_PATH:+:$LIBRARY_PATH}" \
 	make check
 }
diff --git a/dev-libs/libgcrypt/patches/libgcrypt-1.8.2.patchset b/dev-libs/libgcrypt/patches/libgcrypt-1.8.3.patchset
similarity index 98%
rename from dev-libs/libgcrypt/patches/libgcrypt-1.8.2.patchset
rename to dev-libs/libgcrypt/patches/libgcrypt-1.8.3.patchset
index 22a5a7e13..12f74a8c5 100644
--- a/dev-libs/libgcrypt/patches/libgcrypt-1.8.2.patchset
+++ b/dev-libs/libgcrypt/patches/libgcrypt-1.8.3.patchset
@@ -5,7 +5,7 @@ Subject: haiku patch
 
 
 diff --git a/configure.ac b/configure.ac
-index 672396c..1915737 100644
+index dfcd4ef..132fa7b 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -761,6 +761,7 @@ fi