[gentoo-commits] repo/gentoo:master commit in: net-libs/gnutls/files/, net-libs/gnutls/

["Alon Bar-Lev" <alonbl@gentoo.org>]

commit:     7557fe901507a5a3b8ccd405cd4d785ce30a4e22
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 18:28:51 2016 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Mon May  9 18:29:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7557fe90

net-libs/gnutls: version bump

Package-Manager: portage-2.2.26

 net-libs/gnutls/Manifest                       |   1 +
 net-libs/gnutls/files/gnutls-3.5.0-build.patch |  26 +++++
 net-libs/gnutls/gnutls-3.5.0.ebuild            | 133 +++++++++++++++++++++++++
 3 files changed, 160 insertions(+)

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 28ed5d9..a43b0a9 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -11,3 +11,4 @@ DIST gnutls-3.4.6.tar.xz 6591628 SHA256 feb559ed7fffa24d5aa40527054fae5cb7f7b66e
 DIST gnutls-3.4.7.tar.xz 6613096 SHA256 c1be9e4b30295d7b5f96fa332c6a908e6fa2254377b67811301fca92eb882e5a SHA512 fdfca4c37292ee07d2d1e398380afe79a20f56040a7c84deb7a5b5221f3bcb4080471b9644c7f2bacb42247c3cc62e32a511f1e2ec6e31c15d9b08b20e8050b6 WHIRLPOOL b56e54c13c33fd74076caf29062cb0c6b38afecfe044a6d7db9b3eef3379a133fb327527ddf07c333783266f00b970aec33b2bb2a21e8b35ceaee0d934456aee
 DIST gnutls-3.4.8.tar.xz 6631528 SHA256 e07c05dea525c6bf0dd8017fc5b89d886954f04fedf457ecd1ce488ac3b86ab7 SHA512 b3b445ecbd8eae312183eee4f5087a33011236061fe1fe1f0db20239c4e281f5cacd818d62a992ef3011eb9fdc8459d0ed6faca6ea55012b152b5ac5907648bc WHIRLPOOL 97fc97a9f15b51ca91a06cc745397447a7f6b1d986f44f227d0e1aa970f48ca269c8527ff7320f072f555fcd7a1b34dfe115123e96bf45884c2e5357e02c9021
 DIST gnutls-3.4.9.tar.xz 6627640 SHA256 48594fadba33d450f796ec69526cf2bce6ff9bc3dc90fbd7bf38dc3601f57c3f SHA512 3ec5349f1418bf9f8ac492e93d2e8967c2011f9aaea262e0acb40db124ec19c269a9de49b1c9c994e9039929cd03d75f77a40580a1d7eb4b3db0e1d2b9d40f86 WHIRLPOOL 9b440e33a20e76c5fa9d9252136c5667562681d6e28e0c182d3befdf49abb753b9aab2193774334b5570aec0b58961193f27f2395898ba6664cb2749dd8c344e
+DIST gnutls-3.5.0.tar.xz 6716848 SHA256 fc6b3b544d411e6ca54dd6167541770559070ea15e6868946cf56a621d58ae25 SHA512 0b53b8084972e9b47e71c47ca9a42d0413c781641f4da640a1016aa0c1a736863a57eadbd9bb81248d3fdf723796edbb1424b14f9846b2300ad7650925f2ac27 WHIRLPOOL 0f1b3e07f94f101b004ecb1024424a10826d32bab0168076e412cd8d3881af8d77b440395b1811a910188d950ed71a2eb13e87dae029ee4c8c461a3d71077ba3

diff --git a/net-libs/gnutls/files/gnutls-3.5.0-build.patch b/net-libs/gnutls/files/gnutls-3.5.0-build.patch
new file mode 100644
index 0000000..3e0ca33
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.5.0-build.patch
@@ -0,0 +1,26 @@
+diff --git a/extra/openssl_compat.c b/extra/openssl_compat.c
+index 399df90..4cee4cd 100644
+--- a/extra/openssl_compat.c
++++ b/extra/openssl_compat.c
+@@ -26,8 +26,6 @@
+ 
+ #include "gnutls_int.h"
+ 
+-#include <gnutls_global.h>
+-#include <gnutls_errors.h>
+ #include <string.h>		/* memset */
+ #include <x509/x509_int.h>
+ #include <libtasn1.h>
+diff --git a/tests/windows/cng-windows.c b/tests/windows/cng-windows.c
+index f435afb..e92f7b0 100644
+--- a/tests/windows/cng-windows.c
++++ b/tests/windows/cng-windows.c
+@@ -31,6 +31,8 @@
+ 
+ #ifndef _WIN32
+ 
++#include <stdlib.h>
++
+ void doit()
+ {
+ 	exit(77);

diff --git a/net-libs/gnutls/gnutls-3.5.0.ebuild b/net-libs/gnutls/gnutls-3.5.0.ebuild
new file mode 100644
index 0000000..0f42068
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.5.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools libtool eutils multilib-minimal versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
+LICENSE="GPL-3 LGPL-3"
+SLOT="0/30" # libgnutls.so number
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
+IUSE="+cxx dane doc examples guile nls +openssl pkcs11 static-libs test +tools zlib ${IUSE_LINGUAS// / linguas_}"
+# heartbeat support is not disabled until re-licensing happens fullyf
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.3[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
+	tools? ( sys-devel/autogen )
+	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-1.8:*[networking] )
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.11.6
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	doc? (
+		sys-apps/texinfo
+		dev-util/gtk-doc
+	)
+	nls? ( sys-devel/gettext )
+	test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+		doc/Makefile.am || die
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# force regeneration of makeinfo files
+	# have no idea why on some system these files are not
+	# accepted as-is, see bug#520818
+	for file in $(grep -l "produced by makeinfo" doc/*.info) ; do
+		rm "${file}" || die
+	done
+
+	eautoreconf
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+
+	# bug 497472
+	use cxx || epunt_cxx
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	# TPM needs to be tested before being enabled
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-valgrind-tests \
+		--without-included-libtasn1 \
+		--enable-heartbeat-support \
+		$(use_enable cxx) \
+		$(use_enable dane libdane) \
+		$(multilib_native_enable manpages) \
+		$(multilib_native_use_enable tools) \
+		$(multilib_native_use_enable doc) \
+		$(multilib_native_use_enable doc gtk-doc) \
+		$(multilib_native_use_enable guile) \
+		$(multilib_native_use_enable test tests) \
+		$(use_enable nls) \
+		$(use_enable openssl openssl-compatibility) \
+		$(use_enable static-libs static) \
+		$(use_with pkcs11 p11-kit) \
+		$(use_with zlib) \
+		--without-tpm \
+		--with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
+		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	dodoc doc/certtool.cfg
+
+	if use doc; then
+		dohtml doc/gnutls.html
+	else
+		rm -fr "${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}