gentoo resync 31.01.2019

2 files changed, 134 insertions, 0 deletions

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 45ed02dc2798..ae852f69cd26 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -3,7 +3,9 @@ AUX gnutls-3.6.5-build.patch 1039 BLAKE2B 68db1ec474c173086b3beac504aa5cb6966c96
 AUX gnutls-3.6.5-libressl.patch 1844 BLAKE2B b86f019f07cad8369a57cc829d45098be27feaef9898e0029ce3e953653ef0cb65b3b03c995fbd61eb5a2553044a08091a4a0cc0483ce2399bb5f94ab4c625cc SHA512 7a5831992a46c8a894ee4fa29c290fdb010407a749065c7dda1e67a1d2dda0940c03400f3fcb3c74dbea54835fa805575c749b43fcfd3121557ddd0bab95d142
 DIST gnutls-3.5.19.tar.xz 7239744 BLAKE2B c12578e79d3e96e1df7a5dc5f05fe9bc4bce4150f7440a73fda8e69d3f137a9ad1ace28b56e976bc319bd7be7305bf93af9c20087229e0b8fefee85b64e8261d SHA512 a78a59505e59c62ca671b34eacaeadcf070a943b12d964b7362962ba05636136638063491c37bb1883807014b8b6cf4f83f7d5b918ed02d5fbb52155679ce52f
 DIST gnutls-3.6.5.tar.xz 8192888 BLAKE2B 1d305d49c461657b921a51e6c3577e8aea76ba2a4ecbb0ba165ca1f452560b691f12733e3b3ef6d1206096a7393a6fdd05bedb5d5653c7e18e14c5c2f5993de2 SHA512 127f053ce45c63cd745fa5a654a2d8e4fbc322f5e17dcc3740fb2e7b376dd18dad59318d66e6e93e37d6a179fca4b35cf2ae62d13be5645cd2d06badd79d4dce
+DIST gnutls-3.6.6.tar.xz 8257612 BLAKE2B 1b201eedcad7e4424cc6f53d21de5c8105fdea3f0bbc2ea1eceac6fed20a45ad8009fc0f4d9bd7c3e8e3a4cd261d6c32a180a273b22494c4b2f1982244bd4698 SHA512 4ff34f38d7dc543bc5750d8fdfe9be84af60c66e8d41da45f6cffc11d6c6c726784fd2d471b3416604ca1f3f9efb22ff7a290d5c92c96deda38df6ae3e794cc1
 EBUILD gnutls-3.5.19-r1.ebuild 4076 BLAKE2B fc87e54e6220a9cd053aa99da22d0ea9510c2c08b09b6034d31a13e3629d091d454b23123b0b07bd8e2151f5b8748e2f611fb7a9db6a5e24753c8d8068a8208c SHA512 9631e193f752dcb8bcef414cea69672f09c3b1abc505fb27182c61808ad71f8a448555670fb12196b1781539fa5be05814aa8bdc5ede1d0981f31a0f30cda23c
 EBUILD gnutls-3.5.19.ebuild 4145 BLAKE2B 4da053f06d49a5e1e109cbb5691e51c7fe6c012a46bd68d7da329fbf5ce15080229013da2afe8d4f53ba91fb67fc511b64e71156dcb0282e03b09eae183d3811 SHA512 4856b74e9bcf1716c2202c94e075dbb2ac3f9077bd0d083dbd3a17f44d79a93e206de19b0f584b4bcc5f9436ab44cd6e88e2d828487edaa102fb2911905d3ff7
 EBUILD gnutls-3.6.5.ebuild 4178 BLAKE2B 5c96edf0869162b0c675b567827269e424fd7e6c32f2a15ec59cbcb2632eb830dfefc1445f0a64d5ae5e2ee6ffb79d43a5bb57b8ecc3de295bc732f6da6aaf09 SHA512 19f72f1e92ff14263397ef949065f4d536457e1b8a760cf7b736368d22cc1791ed9ffa4e8b4525efe0f84887905cc405b7d9e023c2b13324c7b680594e944fb1
+EBUILD gnutls-3.6.6.ebuild 4101 BLAKE2B 78c74a989d0e87a404201a6b1b4be336da54680dcf063c582bf8a0cffc76c7c687d9d9944b669ca7d3f3a3d6a355b789097ca905cbec7ad230005f79d3da1a50 SHA512 d6e92e7b045c8bcc1e8f1a0bff9e54a07d1c917d6fd93ec9e26c790ea7fec94f229a47958c4d2424b2322de6517f65211875ecb1fecb794e67d27d19fb52f1ad
 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
diff --git a/net-libs/gnutls/gnutls-3.6.6.ebuild b/net-libs/gnutls/gnutls-3.6.6.ebuild
new file mode 100644
index 000000000000..ea49105d00bb
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.6.6.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+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$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0/30" # libgnutls.so number
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
+
+REQUIRED_USE="
+	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
+	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.4.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-2:=[networking] )
+	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? (
+		seccomp? ( sys-libs/libseccomp )
+	)"
+BDEPEND=">=virtual/pkgconfig-0-r1
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	tools? ( sys-devel/autogen )
+	valgrind? ( dev-util/valgrind )
+	test-full? (
+		app-crypt/dieharder
+		>=app-misc/datefudge-1.22
+		dev-libs/softhsm:2[-bindist]
+		net-dialup/ppp
+		net-misc/socat
+	)"
+
+DOCS=(
+	README.md
+	doc/certtool.cfg
+)
+
+HTML_DOCS=()
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+
+	use doc && HTML_DOCS+=(
+		doc/gnutls.html
+	)
+}
+
+src_prepare() {
+	default
+
+	# 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
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+
+	# detect also guile-2.2, bug#676402
+	# aclocal/autoreconf will require more dependencies
+	# that we want to have
+	sed -i 's/_guile_required_version=2.2$/_guile_required_version=2.0/' configure || die
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	# TPM needs to be tested before being enabled
+	libconf+=( --without-tpm )
+
+	# 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
+	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	# Cygwin as does not understand these asm files at all
+	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	ECONF_SOURCE=${S} econf \
+		$(multilib_native_enable manpages) \
+		$(multilib_native_use_enable doc gtk-doc) \
+		$(multilib_native_use_enable doc) \
+		$(multilib_native_use_enable guile) \
+		$(multilib_native_use_enable seccomp seccomp-tests) \
+		$(multilib_native_use_enable test tests) \
+		$(multilib_native_use_enable test-full full-test-suite) \
+		$(multilib_native_use_enable tools) \
+		$(multilib_native_use_enable valgrind valgrind-tests) \
+		$(use_enable cxx) \
+		$(use_enable dane libdane) \
+		$(use_enable nls) \
+		$(use_enable openssl openssl-compatibility) \
+		$(use_enable sslv2 ssl2-support) \
+		$(use_enable sslv3 ssl3-support) \
+		$(use_enable static-libs static) \
+		$(use_enable tls-heartbeat heartbeat-support) \
+		$(use_with idn) \
+		$(use_with pkcs11 p11-kit) \
+		--disable-rpath \
+		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
+		--without-included-libtasn1 \
+		"${libconf[@]}" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}