Fix perl-5.18 compatibility, bug#504028, thanks to Kerin Millar

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

4 files changed, 268 insertions, 15 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index ec0f1b2cc3a2..822fd7b173e8 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.482 2014/03/24 14:29:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.483 2014/03/29 21:15:05 alonbl Exp $
+
+*gnutls-2.12.23-r5 (29 Mar 2014)
+
+  29 Mar 2014; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/gnutls-2.12.23-gdoc-perl-5.18.patch, +gnutls-2.12.23-r5.ebuild:
+  Fix perl-5.18 compatibility, bug#504028, thanks to Kerin Millar
 
   24 Mar 2014; Agostino Sarubbo <ago@gentoo.org> gnutls-2.12.23-r4.ebuild:
   Stable for ppc64, wrt bug #503394
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index b3a5d8ded839..440f79a2c2e3 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -8,6 +8,7 @@ AUX gnutls-2.12.20-libadd.patch 988 SHA256 b1f73ec17feb72817f39f109ec2e4dc69ea8d
 AUX gnutls-2.12.23-CVE-2013-2116.patch 855 SHA256 473663119e3c0c91677becc2982f6bddcbe44000f9530515ad2051982c8a7e57 SHA512 463add69c9db348e1e7b93ba2e7bff3ce62abc96731485955e36e6855e3e2a1fb53f082238cada537487285e15d94296cf3fd3d408a013c307ff195685896fc5 WHIRLPOOL 10576ef2591f8bf47148a37bc5690abca474691edab802cf46967b8695c838d1e477a5731f677c8951b0652981ba338c42e14479e33e8dfccfa7952ab56f04a9
 AUX gnutls-2.12.23-CVE-2014-0092.patch 2480 SHA256 c57b3a64541236028de71be567db27346c4fb0933f4fd71c8dc139ec88a96db5 SHA512 064abde218509e79ce4df03de1db1dbd4a1fd93fae0cf7c9efaa62cc6ca2dce4cb8576fcfcbc55b1e1712e4167a02567659a122b443b824e896e49237032e9b7 WHIRLPOOL 758a3378c0b53164e7d60416661f0530e33fc3344e77339f58d51e39dc721fa411a5bd80dbfe95be22f4389cf0779d75a27b9be5c4da577036c5f10702b874ed
 AUX gnutls-2.12.23-CVE-2014-1959.patch 584 SHA256 f1e6290cb19e517ba460ef359914c83afcbf5f884dd9556d0be52a6dde96f465 SHA512 827dd50c54a79e78c6d6f28856f548d9d7c766577a0613eadf95b0c8b5fc44545335f1dde5adfba7d019b842d16c2131bb780dc0228dd5b25ba45774b06f3188 WHIRLPOOL 86269f8d4e5dd5d7de3ad60cefe7df2227c6c49e474217f8e6d487e893db93d5447bef9261b74e388d461ff23d79068cdf512aa441f0aff19a256e2b6fbf9d4a
+AUX gnutls-2.12.23-gdoc-perl-5.18.patch 4878 SHA256 a55a56b8faead4e7c369945d356190b59f16e57429fa20221f201b88e92dbef6 SHA512 2480cb3e9625eb6518958c8f4caa208957fc5a9e7c3ef84fa6345640ca7e65cba2f8043f8b6a05aceb80750748502e66dd6f5c55ebcbc750c54955baaad4d31b WHIRLPOOL 5ff3a01efb80fc8dee9ed77436afa70aa39e33fcecb8a9742fa431047e66055cffc4a07657a28485d3e2c75a5ea9bd7ebd1f72b9bed1ad7caaa468997c600d54
 AUX gnutls-2.12.23-gl-tests-getaddrinfo-skip-if-no-network.patch 1146 SHA256 0644a00f75987f8a8906ec536b4b29967c24ae22ece8dfee074af3f85be566b5 SHA512 ea3062f90ace33a6229fe10f9a1fb492e84905dce0231309d2c105386c45a151d99c140c66158435ebe4781defc5a536775f4d68b3552208885636e5ed4b7223 WHIRLPOOL ee131aa7709e717cf5e893d5073dbc7eeec569e2a6e48094534dcf8f0d3d17b8a4f75da0a2c91ed2d70e37ef4429d7759dffce4948fd508dcbc0e081a8d98aa0
 AUX gnutls-2.12.23-hppa.patch 1165 SHA256 68958ca9d05f6ffe89064488847d5e2ca615344abf7c9060f73f525a593716f0 SHA512 040507b973788dc2ca4aab19d69f45011e6509354e38ec875ab6fdec3f1c3be40272ea99cd53a5adfc8b52b30e29d86af80891d57b50068a4b3f2cc20246ac70 WHIRLPOOL c4d17452c22e81fdcbd6e14aaaf8294a90a67438ebcadcaab096a6d2f115643c2ce36cc503d186d2d2483366b890add3e9101c26998878817f7baed8589a8514
 DIST gnutls-2.12.23.tar.bz2 7279415 SHA256 dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2 SHA512 7780e9ca7b592350ce9b11e53a63d3212320402d8ad2462bfbc0e69aec4a48bb372a1925627abb7996535c87c90e3d79537ea118c8bb36d26aae8e19eaae3a06 WHIRLPOOL 8cab909c961760c72b478d5cbe75633ce0d26190fdece018e9f33b171879753ed38348c33c00fda7b5f3a6b596a5439fb62f1c82a891e9e62fee5bb784cf7e11
@@ -16,25 +17,16 @@ DIST gnutls-3.2.12.1.tar.xz 5137552 SHA256 29069907546f6b9e134aafcaa52a030f51783
 DIST gnutls-3.2.12.tar.xz 5136220 SHA256 74c1698a7f6c5ef4938f86285e4fb3929e5f9c6826521b5f2df8ebac22b52505 SHA512 e028ad6b7170571c348523aef30cc16b583198d72d3486f2881bf9b77594e7ecb75568c429159e76cd578efa4e16703d2b845f7c0e8be445072fc33af9d6c3ea WHIRLPOOL b250e8b56f6753a31cbd04cb254d04a4b4d0b410135fc027bd922b7d079b1ca4030d44ae240c75d437745a6b01cbded1fb36e3065afaeaf20513023e5e9b294a
 EBUILD gnutls-2.12.23-r1.ebuild 3359 SHA256 c88fd4a86b949d54b205623443c1067bdd0a10617a8f334786996db27687a424 SHA512 b69a76433ef5d6d5c9ac74649e3af46c5736691c9f15202689e372db9796b0d6adbddeaa3446cb7e2f61463bca81f604818923189b5cfca3be693746dfbe6f8a WHIRLPOOL e46e169ce4a3c0b89cae72466e2ad420c232588366f3498994021682342853e0aecfd72ea906f57e997688897f14c4f34cf2f25e8b685a6fcba90a7b24bdb81a
 EBUILD gnutls-2.12.23-r4.ebuild 3368 SHA256 75eb7867b4de6c6714ee56a28a4e14fe35810b88d738a5b3c6742e283e90ef08 SHA512 8c88242faf9c6a5e6f2ff488717ee9e41451a99d06bfe1982aea2394a7c46de571f56ebc57b8a1228a2635102b0da9bc9931a6ce4557173fe21bc61cd0af873f WHIRLPOOL 26f423e8dd5fae2cb328363a6cf871e9a1feecef15ae33bb33da10c42cdac407b0406e37790f9c30f2f1035fd2cde78b439f390214254bb9b6f9b9259d728242
+EBUILD gnutls-2.12.23-r5.ebuild 3427 SHA256 e0f2f2342fad36c098229b66e2029bf16cdf2e38ab8c83ff48237d7c561c524f SHA512 f803599ea6c01a7afef1becb082865b13ae6662c32b82225b195102f9813df7f5f89edd5cf3571cfd89796bb3237570bb345bed79ecf940d21fd479b313f68d6 WHIRLPOOL fec1ffd875507bdf0d738ae2683e9d495b7e59078255dd9e19bf41fd47a6c813f2cdc2dd41b0b66a744113fd80c87067cb95391ac9efcd6c09e911f99ce8ab1e
 EBUILD gnutls-3.2.11.ebuild 3348 SHA256 19fe0e801fed34dd2933f0ff358c7963e09e97784c47863a360a20752cab94fc SHA512 df5033d5842b60e883ac7fd8fb7d412188d820dffb18d898aa3f5d81e1671760b9af2fdc2241467f172bc1ef1c4d28861d0882cdf012094b4cd7e2eaf09fa291 WHIRLPOOL 19faa81d1134f8f4d965dd4626567c5322fc53cd2d943a63165f0e61a0d0d88283ccb65ffdf91ed8d920eb4b396d7a307c7d260ad1f8c9a0a6c1c54b9d7186cd
 EBUILD gnutls-3.2.12.1.ebuild 3488 SHA256 44031e77b877a5330943bf2cfb4c678d32cd76cc2e3f3e6bc01dfbe83763a5ce SHA512 6ff0f202b10ad72fcb1573bd0cd5efe7826b021183dabec543f366d0913d78b7e761b18a9a3b5636def2398e0cf9e64bb9a03ca6456fb46218cc1410b579e634 WHIRLPOOL 2f61690ebfbced159583ba64d61abf20d19e8da612f00b3a43bb0181a0de7b719289a33ee50ff3b15d405a943f7ffa92bda8c8a27cd0c0cfffd1dbe5b6854d6a
 EBUILD gnutls-3.2.12.ebuild 3351 SHA256 8151cb5985a9f11f92d917f319c961119797fd58ce25363af97752f29ceba225 SHA512 4de834f1dc456aa9013e8195293a507f00e35748075bdb518a97ea79a2d7d7ed6f6a71abe913a2b9e26bca60b24112e94c2c4507c208a7c7cbeff3eacf69be83 WHIRLPOOL 22a02bdcb0269dea008a576d8c53fab99458e1a7dda9d627f26fde14e4c1fdfc16a9bb4df5b0a95e9370c05b04b37d7746672086c9fe89dfb433a9784f0f12a2
-MISC ChangeLog 71489 SHA256 175f77dbfb2c79e3d1d9d6c5fb24f082ec467f67762acd4d8a96c60838ce1d40 SHA512 ea399774644c6485ed06080dbfc25aed881b97b0bc7edb96192e6025be0b37cae7e81980a320abb4b04346b09896442265ae7d3511c3ae36ebdcef4f1f15c183 WHIRLPOOL 4030cb6571b0ddb68e2351130435974488f5db14de5bf6c83081f873b63cb635aa0a5622a22b693b92777d8cca0279c09dee4c08ed208be7cda860fb5b9bd21a
+MISC ChangeLog 71714 SHA256 ff5435b09f419082907cb88beffa72a75a28c7b039c49ea43e8e67bc33ff47f6 SHA512 04fb6419dbe7bbc87efeb24ec6411941981acbf3f6d3f1efcfbc29954007f0448f8b3ad8dae8d4ab120b3c40d3021dbe046de94b3ca27d0a7d6fdc5cc6937422 WHIRLPOOL 4ef39c703e3a71b92ef10e221ecf91d159693b2909b77d528292294e30e8360f563e92822bca1894050753fff2f251dc619a6182497079dfa0319d70d20e29f4
 MISC metadata.xml 875 SHA256 a0a8b100321cd3bfc4458cdd37570fafbe7270bce36b15ec8f17ece2232a5906 SHA512 1cd6b55fc3fe2460a6fad153190a95bb97a3baf7c2ae153a4548be9922f4775518acb9dd858f98191f3972dced8e8ccc1da9309871ffbf4ccdc7bc394d343bd2 WHIRLPOOL 4fd8f09f0f43c80ee037785de47b67bb9ae8a6e7928008290beec977a64ca8744c7d15b96eec0dbcc142e1dc753eab850b72f4182330ae25c6f29001ccb06637
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTMEE4AAoJELp701BxlEWfYSkQAMamTZpWl+q1Z93rz+Mw/OYK
-iexM/26F+859ahNc+mcA5ELIc51f1UWb5T9vs5HGXosdoWvbu1YWuoN8gQTMtatz
-VJ2bPxiHAEJOn6kTh5gcg7vfpeaFmJ6FzyGTpwStIMYhdfymXJC64WaSJL+YFHb4
-xoIsHlHgxi5sx1SjK/IgQx+/THVZEkT3lDTGHWiEEzwVNCsaWLc0lr3y/5pUbcF0
-+5+wYe5HBkA6zjOzz8X+gHJxMiVx7VLkcX7VN/QJo4ullfov6oAd0edt5OsoKA81
-RfljJOML+PT2EEo8zyCSm0MLr9H2Ey4U/ZxYvgXtOycForLt4vlXfFL5/ePu2fC8
-mzSimnWh396hjjeSsk4GSUy58nVeSLmNT5iIwM6ZSj4/nFJQIvrhQWJibJ4/Zx4g
-nRIDvpSHjqzTMd6U2Ql9YgG6glbsZB6gij02GywDamhdWEtJmbRfMENzMFu8zlSh
-QeJ1qCxVrbyp6cZTLBsubgzLrzvevf0jnxdZb/1fdp5SsTmKS7GKO400dLTOcM/1
-f01omjGaEzj3S3MGOhwOmkt5qva5rA59pGZPmYUt5LqHO7oyfKUT67OfAPRrSKs0
-GmJkOUG9wluSwVn2OODSvxu8TzPy5n2JwpCp9LAg6PQSiU0YMDBF6yZPQuqtx7It
-Yk0ekZQU3WlXBQFX1EAv
-=8CNT
+iF4EAREIAAYFAlM3N90ACgkQXYk9GL8g3FFtIgD/VK8KgJnF1ULVyR73w0sDq60w
+x/HG3AVGMF2PZPouGeIA+wZzYv/cVPbDsluGdEW6HjEErahKG84kjnDFOgIb8wZo
+=kE66
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/files/gnutls-2.12.23-gdoc-perl-5.18.patch b/net-libs/gnutls/files/gnutls-2.12.23-gdoc-perl-5.18.patch
new file mode 100644
index 000000000000..a89e8f253058
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.23-gdoc-perl-5.18.patch
@@ -0,0 +1,137 @@
+--- gnutls-2.12.23.orig/doc/scripts/gdoc	2011-04-08 02:30:44.000000000 +0200
++++ gnutls-2.12.23/doc/scripts/gdoc	2014-03-10 01:53:28.899566076 +0200
+@@ -7,6 +7,8 @@
+ ## Copyright (c) 2001, 2002 Nikos Mavrogiannopoulos
+ ##                    added -tex
+ ## Copyright (c) 1998 Michael Zucchi
++## Copyright (c) 2013 Adam Sampson
++##                    made highlighting not depend on hash order, for Perl 5.18
+ 
+ # This program is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -143,44 +145,44 @@
+ #  One for each output format
+ 
+ # these work fairly well
+-%highlights_html = ( $type_constant, "<i>\$2</i>",
+-		     $type_func, "<b>\$1</b>",
+-		     $type_struct, "<i>\$1</i>",
+-		     $type_param, "<tt><b>\$1</b></tt>" );
++@highlights_html = ( [$type_constant, "<i>\$2</i>"],
++		     [$type_func, "<b>\$1</b>"],
++		     [$type_struct, "<i>\$1</i>"],
++		     [$type_param, "<tt><b>\$1</b></tt>"] );
+ $blankline_html = "<p>";
+ 
+-%highlights_texinfo = ( $type_constant, "\\\@code{\$2}",
+-			$type_func, "\\\@code{\$1}",
+-			$type_struct, "\\\@code{\$1}",
+-			$type_param, "\\\@code{\$1}" );
++@highlights_texinfo = ( [$type_constant, "\\\@code{\$2}"],
++			[$type_func, "\\\@code{\$1}"],
++			[$type_struct, "\\\@code{\$1}"],
++			[$type_param, "\\\@code{\$1}"] );
+ $blankline_texinfo = "";
+ 
+-%highlights_tex = ( $type_constant, "{\\\\it \$2}",
+-		     $type_func, "{\\\\bf \$1}",
+-		     $type_struct, "{\\\\it \$1}",
+-		     $type_param, "{\\\\bf \$1}" );
++@highlights_tex = ( [$type_constant, "{\\\\it \$2}"],
++		     [$type_func, "{\\\\bf \$1}"],
++		     [$type_struct, "{\\\\it \$1}"],
++		     [$type_param, "{\\\\bf \$1}"] );
+ $blankline_tex = "\\\\";
+ 
+ # sgml, docbook format
+-%highlights_sgml = ( $type_constant, "<replaceable class=\"option\">\$2</replaceable>",
+-		     $type_func, "<function>\$1</function>",
+-		     $type_struct, "<structname>\$1</structname>",
+-		     $type_env, "<envar>\$1</envar>",
+-		     $type_param, "<parameter>\$1</parameter>" );
++@highlights_sgml = ( [$type_constant, "<replaceable class=\"option\">\$2</replaceable>"],
++		     [$type_func, "<function>\$1</function>"],
++		     [$type_struct, "<structname>\$1</structname>"],
++		     [$type_env, "<envar>\$1</envar>"],
++		     [$type_param, "<parameter>\$1</parameter>"] );
+ $blankline_sgml = "</para><para>\n";
+ 
+ # these are pretty rough
+-%highlights_man = ( $type_constant, "\\\\fB\$2\\\\fP",
+-		    $type_func, "\\\\fB\$1\\\\fP",
+-		    $type_struct, "\\\\fB\$1\\\\fP",
+-		    $type_param, "\\\\fI\$1\\\\fP" );
++@highlights_man = ( [$type_constant, "\\\\fB\$2\\\\fP"],
++		    [$type_func, "\\\\fB\$1\\\\fP"],
++		    [$type_struct, "\\\\fB\$1\\\\fP"],
++		    [$type_param, "\\\\fI\$1\\\\fP"] );
+ $blankline_man = "";
+ 
+ # text-mode
+-%highlights_text = ( $type_constant, "\$2",
+-		     $type_func, "\$1",
+-		     $type_struct, "\$1",
+-		     $type_param, "\$1" );
++@highlights_text = ( [$type_constant, "\$2"],
++		     [$type_func, "\$1"],
++		     [$type_struct, "\$1"],
++		     [$type_param, "\$1"] );
+ $blankline_text = "";
+ 
+ 
+@@ -201,7 +203,7 @@
+ 
+ $verbose = 0;
+ $output_mode = "man";
+-%highlights = %highlights_man;
++@highlights = @highlights_man;
+ $blankline = $blankline_man;
+ $modulename = "API Documentation";
+ $sourceversion = strftime "%Y-%m-%d", localtime;
+@@ -210,27 +212,27 @@
+     $cmd = shift @ARGV;
+     if ($cmd eq "-html") {
+ 	$output_mode = "html";
+-	%highlights = %highlights_html;
++	@highlights = @highlights_html;
+ 	$blankline = $blankline_html;
+     } elsif ($cmd eq "-man") {
+ 	$output_mode = "man";
+-	%highlights = %highlights_man;
++	@highlights = @highlights_man;
+ 	$blankline = $blankline_man;
+     } elsif ($cmd eq "-tex") {
+ 	$output_mode = "tex";
+-	%highlights = %highlights_tex;
++	@highlights = @highlights_tex;
+ 	$blankline = $blankline_tex;
+     } elsif ($cmd eq "-texinfo") {
+ 	$output_mode = "texinfo";
+ 	%highlights = %highlights_texinfo;
+-	$blankline = $blankline_texinfo;
++	@blankline = @blankline_texinfo;
+     } elsif ($cmd eq "-text") {
+ 	$output_mode = "text";
+ 	%highlights = %highlights_text;
+-	$blankline = $blankline_text;
++	@blankline = @blankline_text;
+     } elsif ($cmd eq "-docbook") {
+ 	$output_mode = "sgml";
+-	%highlights = %highlights_sgml;
++	@highlights = @highlights_sgml;
+ 	$blankline = $blankline_sgml;
+     } elsif ($cmd eq "-listfunc") {
+ 	$output_mode = "listfunc";
+@@ -322,9 +324,10 @@
+     my $line;
+     my $ret = "";
+ 
+-    foreach $pattern (keys %highlights) {
++    foreach $highlight (@highlights) {
++    	my ($pattern, $replace) = @$highlight;
+ #	print "scanning pattern $pattern ($highlights{$pattern})\n";
+-	$contents =~ s:$pattern:repstr($pattern, $highlights{$pattern}, $1, $2, $3, $4):gse;
++	$contents =~ s:$pattern:repstr($pattern, $replace, $1, $2, $3, $4):gse;
+     }
+     foreach $line (split "\n", $contents) {
+ 	if ($line eq ""){
diff --git a/net-libs/gnutls/gnutls-2.12.23-r5.ebuild b/net-libs/gnutls/gnutls-2.12.23-r5.ebuild
new file mode 100644
index 000000000000..acab22340c82
--- /dev/null
+++ b/net-libs/gnutls/gnutls-2.12.23-r5.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.23-r5.ebuild,v 1.1 2014/03/29 21:15:05 alonbl Exp $
+
+EAPI=5
+
+inherit autotools libtool eutils versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v$(get_version_component_range 1-2)/${P}.tar.bz2"
+
+# LGPL-2.1 for libgnutls library and GPL-3 for libgnutls-extra library.
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bindist +cxx doc examples guile lzo +nettle nls pkcs11 static-libs test zlib"
+
+RDEPEND=">=dev-libs/libtasn1-0.3.4
+	<dev-libs/libtasn1-3
+	guile? ( >=dev-scheme/guile-1.8[networking] )
+	nettle? ( >=dev-libs/nettle-2.1[gmp] )
+	!nettle? ( >=dev-libs/libgcrypt-1.4.0:0 )
+	nls? ( virtual/libintl )
+	pkcs11? ( >=app-crypt/p11-kit-0.11 )
+	zlib? ( >=sys-libs/zlib-1.2.3.1 )
+	!bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/libtool
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+pkg_setup() {
+	if use lzo && use bindist; then
+		ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
+	fi
+}
+
+src_prepare() {
+	# tests/suite directory is not distributed
+	sed -i -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' \
+		configure.ac || die
+
+	sed -i -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+		doc/Makefile.am || die
+
+	for dir in . lib libextra; do
+		sed -i -e '/^AM_INIT_AUTOMAKE/s/-Werror//' "${dir}/configure.ac" || die
+	done
+
+	epatch "${FILESDIR}"/${PN}-2.12.20-AF_UNIX.patch
+	epatch "${FILESDIR}"/${PN}-2.12.20-libadd.patch
+	epatch "${FILESDIR}"/${PN}-2.12.20-guile-parallelmake.patch
+	epatch "${FILESDIR}"/${PN}-2.12.23-CVE-2013-2116.patch
+	epatch "${FILESDIR}"/${PN}-2.12.23-hppa.patch
+	epatch "${FILESDIR}"/${PN}-2.12.23-CVE-2014-0092.patch
+	epatch "${FILESDIR}"/${PN}-2.12.23-CVE-2014-1959.patch
+	epatch "${FILESDIR}"/${P}-gl-tests-getaddrinfo-skip-if-no-network.patch
+	epatch "${FILESDIR}"/${P}-gdoc-perl-5.18.patch
+
+	# support user patches
+	epatch_user
+
+	eautoreconf
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+src_configure() {
+	local myconf
+	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
+	[[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
+
+	econf \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		$(use_enable cxx) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable doc gtk-doc-pdf) \
+		$(use_enable guile) \
+		$(use_with !nettle libgcrypt) \
+		$(use_enable nls) \
+		$(use_with pkcs11 p11-kit) \
+		$(use_enable static-libs static) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_test() {
+	if has_version dev-util/valgrind && [[ ${VALGRIND_TESTS} != 1 ]]; then
+		elog
+		elog "You can set VALGRIND_TESTS=\"1\" to enable Valgrind tests."
+		elog
+	fi
+
+	# parallel testing often fails
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+
+	if use doc; then
+		dodoc doc/gnutls.{pdf,ps}
+		dohtml doc/gnutls.html
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}