From e8526d6698c9c2d002c8492ebefce637aa4784bb Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 3 Jan 2013 22:20:26 +0100
Subject: [PATCH] gnutls: update to 3.1.6.

---
 srcpkgs/gnutls/gnutls-devel.template |  3 ---
 srcpkgs/gnutls/gnutls-tools.template |  5 +----
 srcpkgs/gnutls/template              | 31 +++++++---------------------
 3 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/srcpkgs/gnutls/gnutls-devel.template b/srcpkgs/gnutls/gnutls-devel.template
index 150fae1ac5..1733ded11e 100644
--- a/srcpkgs/gnutls/gnutls-devel.template
+++ b/srcpkgs/gnutls/gnutls-devel.template
@@ -4,9 +4,6 @@ noarch=yes
 depends="zlib-devel libtasn1-devel p11-kit-devel nettle-devel
  libgcrypt-devel ${sourcepkg}>=${version}"
 short_desc="${short_desc} -- development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/gnutls/gnutls-tools.template b/srcpkgs/gnutls/gnutls-tools.template
index 5b9f9cd4c4..b4ca2638f0 100644
--- a/srcpkgs/gnutls/gnutls-tools.template
+++ b/srcpkgs/gnutls/gnutls-tools.template
@@ -1,9 +1,6 @@
 # Template file for 'gnutls-tools'.
 #
-short_desc="${short_desc} (bundled tools)"
-long_desc="${long_desc}
-
- This package contains the tools that come with gnutls."
+short_desc="${short_desc} -- bundled tools"
 
 do_install() {
 	vmove usr/bin usr
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index df6b4d328d..303ecf044c 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,7 +1,10 @@
 # Template build file for 'gnutls'.
 pkgname=gnutls
-version=3.1.5
-revision=3
+version=3.1.6
+revision=1
+subpackages="${pkgname}-devel ${pkgname}-tools"
+makedepends="pkg-config lzo-devel readline-devel libgpg-error-devel
+ libtasn1-devel>=3.2 libgcrypt-devel p11-kit-devel nettle-devel"
 build_style=gnu-configure
 configure_args="--with-zlib --disable-guile --disable-static
  --disable-valgrind-tests"
@@ -9,25 +12,5 @@ short_desc="GNU Transport Layer Security library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/gnutls/"
 license="GPL-3, LGPL-2.1"
-distfiles="http://ftp.gnu.org/gnu/gnutls/gnutls-${version}.tar.xz"
-checksum=2f095984dd9cbbf4dce417ecd81640fe47732322d025062b2c9a189d022de0d3
-long_desc="
- GnuTLS is a portable ANSI C based library which implements the TLS 1.0 and
- SSL 3.0 protocols. The library does not include any patented algorithms and
- is available under the GNU Lesser GPL license.
-
- Important features of the GnuTLS library include:
-  - Thread safety
-  - Support for both TLS 1.0 and SSL 3.0 protocols
-  - Support for both X.509 and OpenPGP certificates
-  - Support for basic parsing and verification of certificates
-  - Support for SRP for TLS authentication
-  - Support for TLS Extension mechanism
-  - Support for TLS Compression Methods
-
- Additionally GnuTLS provides an emulation API for the widely used OpenSSL
- library, to ease integration with existing applications."
-
-subpackages="${pkgname}-devel ${pkgname}-tools"
-makedepends="pkg-config lzo-devel readline-devel libgpg-error-devel
- libtasn1-devel>=3.2 libgcrypt-devel p11-kit-devel nettle-devel"
+distfiles="ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-${version}.tar.xz"
+checksum=83039b8c243ebaa4c31c96c823c88c8c1576de4a7d0d04e10d93527a535e5e7f