3 files changed, 4 insertions, 140 deletions
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index d4c98b7b2943..974ce88077f2 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,10 +1,8 @@
-DIST gnutls-3.5.13.tar.xz 7226468 SHA256 79f5480ad198dad5bc78e075f4a40c4a315a1b2072666919d2d05a08aec13096 SHA512 e98f23a589042f879936c3f8b474535e695fb7dd68a9e81323668c013241f765c2d3af6c6a072ecf867acc1e551ec46e15bb842144d3a06bdd5d2f4fc3d828a7 WHIRLPOOL 89439e7adba634698642a247c418569c0ea6ca6155bfb5dce17c8ed69d2506a37d9ad793122aaaec92adffefa75cb23a857c49ef722c5cf506700fe0c34b6028
-DIST gnutls-3.5.15.tar.xz 7238928 SHA256 046081108b8b1fe455a13a4c5a4eaa0368e185b678f1670fe09a11a2d7ecfad5 SHA512 046cf3adf6cc3d38fd431f2ff28ddabb65f3c13379516d105316a04c7128be89c5f7ed3df6a034fc06e9ab2e154c2cde2f5cbe8530a1e58cc4b4fb72e158134b WHIRLPOOL 811cca49bdd144107b6c25de31b3209694a8590107953fc3c4ecafddba48339e98cf1dc8e489addb04f0ac525411e96e505fd8edb342dca4e02f97dde3f26ffe
-DIST gnutls-3.5.16.tar.xz 7559812 SHA256 0924dec90c37c05f49fec966eba3672dab4d336d879e5c06e06e13325cbfec25 SHA512 451d3167be599ed8e0333dd7c9f8501fcb47b7aa871aeb461c368381c0b7ecd7e2026ec35dbbb2aa685cb2c3a22e9296e0a0699409e3744b731c1bb7e7e69f07 WHIRLPOOL aeda2b36dc339bd3282368bdc3d4af849a294c901b0ca816b32552d4bc61ef1d9920400e7f49e5f0fbe6798becd1d21047b26f93001dd8b29df2a777add0d662
+DIST gnutls-3.5.15.tar.xz 7238928 BLAKE2B d9a081ec0f956cabe0e0a240c6f20bd2f2855ca8b692b22322f4c80b521cfc8a9bf45da32518225550f289bb0db7010f40a3b371a9e79e394c6ec88004a15fab SHA512 046cf3adf6cc3d38fd431f2ff28ddabb65f3c13379516d105316a04c7128be89c5f7ed3df6a034fc06e9ab2e154c2cde2f5cbe8530a1e58cc4b4fb72e158134b
+DIST gnutls-3.5.16.tar.xz 7559812 BLAKE2B 5b2fded412823b3f947c000f71bb816e2e248c8f740c2e678ec1e8289dd0b4af73a4f4ab46012c7430aa2a5c57dc7fed532eb1666c13328ec90ed159d1ee48a8 SHA512 451d3167be599ed8e0333dd7c9f8501fcb47b7aa871aeb461c368381c0b7ecd7e2026ec35dbbb2aa685cb2c3a22e9296e0a0699409e3744b731c1bb7e7e69f07
 DIST gnutls-3.6.0.tar.xz 8024972 SHA256 2ab9e3c0131fcd9142382f37ba9c6d20022b76cba83560cbcaa8e4002d71fb72 SHA512 e5f36d7e8d64e8432098e30549c321745d3605eeb85aba2a04bfa92146ca771961f0e2f3682bcae36be5b6095acd25996104a4213ce7b3466d61332a5188dc03 WHIRLPOOL e8e479d7a0adc14c969b7364f58505f68ed92054fb8d8ba862f59d9ab64578e83ae02309ec9b5da2e63fc5dec799d86e434abc32394dbf414dc46bf46b15b0c8
 DIST gnutls-3.6.1.tar.xz 8064408 SHA256 20b10d2c9994bc032824314714d0e84c0f19bdb3d715d8ed55beb7364a8ebaed SHA512 1f2bd3203ea96844c531be700b44623b79f46743143edf97011aab07895ca18d62f1659c7fafc5e1c4b0686fde490836f00358bdd60d6ac0b842526db002da23 WHIRLPOOL aa859108083d7b6580b6e9c6dd2f4cbf43bb444114339ca68bc7bc45a1238b7793b50e95fdd26fa9592a8892881fedd79697999111f568f3a56e32be91996e65
-EBUILD gnutls-3.5.13.ebuild 4239 BLAKE2B 2fb33fce560710ce059ffabc03753a313a6cc2bf63b31a0c5d8082d95e42fa660e0ff4c62b6be728e709fce4e3bca1975249348e6fdb59b0c47877e9a585ed97 SHA512 7a3ab4ada4edc640dac61f6fa7054d4ef1b8e3c434634cbe6edfbc1d7a99694e9612c5d2f6bf39c57389ef55f73f602b90c3a4e472ae3a0e571d83d6bc54fd42
-EBUILD gnutls-3.5.15.ebuild 4340 BLAKE2B 456c54c00e70629811acec64c54f114fb1e2e17f98048ad911ba01c28f3d1688ad4afd2d3ea2c4374c49cc5cc5cda1c1bb8753b93987e8b67335121ddc1ee4a6 SHA512 a014fe4d78c5c76ca379f95be2588ea54c373feeb4269866e7d79b6d10c22e3b063e0e7fea50c44ab3ea491d7a435ee223f92356a9e7260788c8495894e436da
+EBUILD gnutls-3.5.15.ebuild 4339 BLAKE2B 5d7adaa41117dc060e510aebeec06e615660b58eac49d7eda03e610c97f072b5197481d383f89355da72ddc39bb17f86d3191048eba30be2446e8ce503710b9e SHA512 ea828600ac95c512e894e2b01f0663cc919d4c62b11f53de96202c5377a36c7cf63b8d842ace77af4964a0a32499624132ae31c00090162b3368a32ba1698129
 EBUILD gnutls-3.5.16.ebuild 4348 BLAKE2B c9cbb4da0042db61735dd92c6857375b30137a540e54375109d6428ce01bd812896976703f4490794e9a4de8ae190ee9709c59663f8302c19525a99176a322c7 SHA512 9937ce68b1e6322a60ad8e03b1e75dbdce825444aa879e563a77002040ac0d26b6b98739ac5b1f70827d93621f873e1f822cf5bc58f1766a7d70207781e75b83
 EBUILD gnutls-3.6.0.ebuild 3965 BLAKE2B 481d54c5e0cf83cfa1194a8a3a4f427228812b3a02681e3b689b37f7436d94e4daaf12984d6e717fcae260bc556702a06e2240d0427c47d0a791a94eef0d02be SHA512 87f609adfed0b553b68dac75a4a89a17b6e51a28be4ebb8a4ba810bfa1f984ee6d57a5f0a7c91f32a5af3c0e7548b7abe9ec471352b905227a8897ffbc435f29
 EBUILD gnutls-3.6.1.ebuild 3965 BLAKE2B 481d54c5e0cf83cfa1194a8a3a4f427228812b3a02681e3b689b37f7436d94e4daaf12984d6e717fcae260bc556702a06e2240d0427c47d0a791a94eef0d02be SHA512 87f609adfed0b553b68dac75a4a89a17b6e51a28be4ebb8a4ba810bfa1f984ee6d57a5f0a7c91f32a5af3c0e7548b7abe9ec471352b905227a8897ffbc435f29
diff --git a/net-libs/gnutls/gnutls-3.5.13.ebuild b/net-libs/gnutls/gnutls-3.5.13.ebuild
deleted file mode 100644
index d927832a49a0..000000000000
--- a/net-libs/gnutls/gnutls-3.5.13.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune 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"
-
-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-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 +idn nls openpgp +openssl pkcs11 sslv2 sslv3 seccomp static-libs test test-full +tls-heartbeat tools valgrind zlib ${IUSE_LINGUAS// / linguas_}"
-
-REQUIRED_USE="
-	test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )"
-
-# 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.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}] )
-	idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	valgrind? ( dev-util/valgrind )
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)
-	test-full? (
-		guile? ( >=dev-scheme/guile-2 )
-		app-crypt/dieharder
-		app-misc/datefudge
-		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
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# remove magic of library detection
-	# bug#438222
-	local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
-
-	# 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 \
-		--without-included-libtasn1 \
-		$(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) \
-		$(multilib_native_use_enable seccomp seccomp-tests) \
-		$(multilib_native_use_enable valgrind valgrind-tests) \
-		$(multilib_native_use_enable test-full full-test-suite) \
-		$(use_enable nls) \
-		$(use_enable openpgp openpgp-authentication) \
-		$(use_enable openssl openssl-compatibility) \
-		$(use_enable openssl openssl-compatibility) \
-		$(use_enable tls-heartbeat heartbeat-support) \
-		$(use_enable sslv2 ssl2-support) \
-		$(use_enable sslv3 ssl3-support) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		$(use_with idn) \
-		$(use_with idn libidn2) \
-		--without-tpm \
-		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
-		"${libconf[@]}" \
-		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.5.15.ebuild b/net-libs/gnutls/gnutls-3.5.15.ebuild
index 78d20075ee59..4fe2b39ff767 100644
--- a/net-libs/gnutls/gnutls-3.5.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-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 +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib ${IUSE_LINGUAS// / linguas_}"