From 0216313b06ddc618c4d02ce3c2293e520a995e3b Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Tue, 9 Oct 2018 10:41:27 +0000
Subject: [PATCH] GnuTLS: bump to 3.6.4, fix CONFLICTS_{bin,devel}, add
 REPLACES*.

* Install the runtimes in bin, even for secondary arch builds.
* Don't create the gnutls_bin subpackage on secondary arches,
  except if we're building for x86 secondary arch on x86_gcc2h.
* Drop $documentationDir on secondary arches, except if we're
  building for x86 secondary arch on x86_gcc2h.
* Include the runtimes in the debuginfo package.
---
 ...nutls-3.6.3.recipe => gnutls-3.6.4.recipe} | 90 ++++++++++++++-----
 ...s-3.6.3.patchset => gnutls-3.6.4.patchset} |  0
 2 files changed, 66 insertions(+), 24 deletions(-)
 rename net-libs/gnutls/{gnutls-3.6.3.recipe => gnutls-3.6.4.recipe} (67%)
 rename net-libs/gnutls/patches/{gnutls-3.6.3.patchset => gnutls-3.6.4.patchset} (100%)

diff --git a/net-libs/gnutls/gnutls-3.6.3.recipe b/net-libs/gnutls/gnutls-3.6.4.recipe
similarity index 67%
rename from net-libs/gnutls/gnutls-3.6.3.recipe
rename to net-libs/gnutls/gnutls-3.6.4.recipe
index 6a097c4af..fc0ae7553 100644
--- a/net-libs/gnutls/gnutls-3.6.3.recipe
+++ b/net-libs/gnutls/gnutls-3.6.4.recipe
@@ -12,15 +12,22 @@ COPYRIGHT="2000-2018 Free Software Fundation Inc.
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
 SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz"
-CHECKSUM_SHA256="ed642b66a4ecf4851ab2d809cd1475c297b6201d8e8bd14b4d1c08b53ffca993"
+CHECKSUM_SHA256="c663a792fbc84349c27c36059181f2ca86c9442e75ee8b0ad72f5f9b35deab3a"
 SOURCE_DIR="gnutls-$portVersion"
 PATCHES="gnutls-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="x86"
 
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 libgnutls_opensslVersion="27.0.2"
-libgnutlsVersion="30.21.0"
+libgnutlsVersion="30.22.0"
 libgnutlsxxVersion="28.1.0"
 
 libgnutls_opensslVersionCompat="$libgnutls_opensslVersion compat >= ${libgnutls_opensslVersion%%.*}"
@@ -51,16 +58,20 @@ CONFLICTS="
 	gnutls35$secondaryArchSuffix
 	gnutls36$secondaryArchSuffix
 	"
+REPLACES="
+	gnutls36$secondaryArchSuffix
+	"
 
+if [ -z "$commandSuffix" ]; then
 PROVIDES_bin="
 	gnutls${secondaryArchSuffix}_bin = $portVersion
-	cmd:certtool$secondaryArchSuffix
-	cmd:gnutls_cli$secondaryArchSuffix
-	cmd:gnutls_cli_debug$secondaryArchSuffix
-	cmd:gnutls_serv$secondaryArchSuffix
-	cmd:ocsptool$secondaryArchSuffix
-	cmd:psktool$secondaryArchSuffix
-	cmd:srptool$secondaryArchSuffix
+	cmd:certtool
+	cmd:gnutls_cli
+	cmd:gnutls_cli_debug
+	cmd:gnutls_serv
+	cmd:ocsptool
+	cmd:psktool
+	cmd:srptool
 	"
 REQUIRES_bin="
 	gnutls$secondaryArchSuffix == $portVersion base
@@ -77,10 +88,14 @@ REQUIRES_bin="
 	lib:libz$secondaryArchSuffix
 	"
 CONFLICTS_bin="
-	gnutls${secondaryArchSuffix}_bin
 	gnutls34${secondaryArchSuffix}_bin
 	gnutls35${secondaryArchSuffix}_bin
+	gnutls36${secondaryArchSuffix}_bin
 	"
+REPLACES_bin="
+	gnutls36${secondaryArchSuffix}_bin
+	"
+fi
 
 PROVIDES_devel="
 	gnutls${secondaryArchSuffix}_devel = $portVersion
@@ -97,9 +112,12 @@ REQUIRES_devel="
 	devel:libz$secondaryArchSuffix
 	"
 CONFLICTS_devel="
-	gnutls${secondaryArchSuffix}_devel
 	gnutls34${secondaryArchSuffix}_devel
 	gnutls35${secondaryArchSuffix}_devel
+	gnutls36${secondaryArchSuffix}_devel
+	"
+REPLACES_devel="
+	gnutls36${secondaryArchSuffix}_devel
 	"
 
 BUILD_REQUIRES="
@@ -135,14 +153,28 @@ TEST_REQUIRES="
 	cmd:git
 	"
 
-defineDebugInfoPackage gnutls$secondaryArchSuffix \
-	$libDir/libgnutls-openssl.so.$libgnutls_opensslVersion \
-	$libDir/libgnutls.so.$libgnutlsVersion \
-	$libDir/libgnutlsxx.so.$libgnutlsxxVersion
+debugList=(
+	"$libDir"/libgnutls-openssl.so.$libgnutls_opensslVersion
+	"$libDir"/libgnutls.so.$libgnutlsVersion
+	"$libDir"/libgnutlsxx.so.$libgnutlsxxVersion
+	)
+if [ -z "$commandSuffix" ]; then
+debugList+=(
+	"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/certtool
+	"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/gnutls-cli
+	"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/gnutls-cli-debug
+	"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/gnutls-serv
+	"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/ocsptool
+	"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/psktool
+	"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/srptool
+	)
+fi
+defineDebugInfoPackage gnutls$secondaryArchSuffix "${debugList[@]}"
 
 BUILD()
 {
-	runConfigure ./configure --without-p11-kit --disable-nls \
+	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" \
+		--without-p11-kit --disable-nls \
 		--enable-openssl-compatibility
 	make $jobArgs
 }
@@ -151,19 +183,29 @@ INSTALL()
 {
 	make install
 
-	rm -f $infoDir/dir
-	rm -f $libDir/libgnutls*.la
+	rm -f "$infoDir"/dir
+	rm -f "$libDir"/libgnutls*.la
 
 	prepareInstalledDevelLibs libgnutls-openssl libgnutls libgnutlsxx
 	fixPkgconfig
 
-	packageEntries devel \
-		$developDir \
-		$manDir/man3
+	if [ -n "$commandSuffix" ]; then
+		rm -rf "$commandBinDir" "$documentationDir"
+		maybe_manDir_man3=
+	else
+		maybe_manDir_man3="$manDir"/man3
+	fi
 
-	packageEntries bin \
-		$binDir \
-		$documentationDir
+	packageEntries devel \
+		"$developDir" \
+		${maybe_manDir_man3:+"$maybe_manDir_man3"}
+
+	if [ -z "$commandSuffix" ]; then
+		packageEntries bin \
+			"$commandBinDir" \
+			"$manDir"/man1
+		rmdir "$manDir"
+	fi
 }
 
 TEST()
diff --git a/net-libs/gnutls/patches/gnutls-3.6.3.patchset b/net-libs/gnutls/patches/gnutls-3.6.4.patchset
similarity index 100%
rename from net-libs/gnutls/patches/gnutls-3.6.3.patchset
rename to net-libs/gnutls/patches/gnutls-3.6.4.patchset