From 48e4cf696bf903973143701710062b143edac6f8 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 26 Oct 2017 14:36:06 +0200
Subject: [PATCH] gnutls: bump 3.6 version.

---
 ...gnutls36-3.6.0.recipe => gnutls36-3.6.1.recipe} | 14 ++++++++------
 ...gnutls-3.6.0.patchset => gnutls-3.6.1.patchset} |  0
 2 files changed, 8 insertions(+), 6 deletions(-)
 rename net-libs/gnutls/{gnutls36-3.6.0.recipe => gnutls36-3.6.1.recipe} (92%)
 rename net-libs/gnutls/patches/{gnutls-3.6.0.patchset => gnutls-3.6.1.patchset} (100%)

diff --git a/net-libs/gnutls/gnutls36-3.6.0.recipe b/net-libs/gnutls/gnutls36-3.6.1.recipe
similarity index 92%
rename from net-libs/gnutls/gnutls36-3.6.0.recipe
rename to net-libs/gnutls/gnutls36-3.6.1.recipe
index 377e54a24..e22c54245 100644
--- a/net-libs/gnutls/gnutls36-3.6.0.recipe
+++ b/net-libs/gnutls/gnutls36-3.6.1.recipe
@@ -10,9 +10,9 @@ COPYRIGHT="2000-2017 Free Software Fundation Inc.
 	2004-2008 Simon Josefsson
 	2000-2004 Nikos Mavrogiannopoulos"
 LICENSE="GNU LGPL v2.1"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz"
-CHECKSUM_SHA256="2ab9e3c0131fcd9142382f37ba9c6d20022b76cba83560cbcaa8e4002d71fb72"
+CHECKSUM_SHA256="20b10d2c9994bc032824314714d0e84c0f19bdb3d715d8ed55beb7364a8ebaed"
 SOURCE_DIR="gnutls-$portVersion"
 PATCHES="gnutls-$portVersion.patchset"
 
@@ -22,7 +22,7 @@ SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 PROVIDES="
 	gnutls36$secondaryArchSuffix = $portVersion
 	lib:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27
-	lib:libgnutls$secondaryArchSuffix = 30.20.0 compat >= 30
+	lib:libgnutls$secondaryArchSuffix = 30.20.1 compat >= 30
 	lib:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28
 	"
 REQUIRES="
@@ -32,6 +32,7 @@ REQUIRES="
 	lib:libnettle$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
 	lib:libtasn1$secondaryArchSuffix
 	lib:libunistring$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -59,6 +60,7 @@ REQUIRES_bin="
 	lib:libnettle$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
 	lib:libtasn1$secondaryArchSuffix
 	lib:libunistring$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -72,7 +74,7 @@ CONFLICTS_bin="
 PROVIDES_devel="
 	gnutls36${secondaryArchSuffix}_devel = $portVersion
 	devel:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27
-	devel:libgnutls$secondaryArchSuffix = 30.20.0 compat >= 30
+	devel:libgnutls$secondaryArchSuffix = 30.20.1 compat >= 30
 	devel:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28
 	"
 REQUIRES_devel="
@@ -103,9 +105,8 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
-	cmd:autoheader
-	cmd:autom4te
 	cmd:automake
+	cmd:autopoint
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -118,6 +119,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
+	autoreconf -fi
 	runConfigure ./configure --without-p11-kit --disable-nls \
 		--enable-openssl-compatibility
 	make $jobArgs
diff --git a/net-libs/gnutls/patches/gnutls-3.6.0.patchset b/net-libs/gnutls/patches/gnutls-3.6.1.patchset
similarity index 100%
rename from net-libs/gnutls/patches/gnutls-3.6.0.patchset
rename to net-libs/gnutls/patches/gnutls-3.6.1.patchset