commit:     80e075dd2fe1c594ba1ba83f1aafaedc222a3253
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 25 22:19:29 2017 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Fri Aug 25 22:21:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80e075dd

net-libs/gnutls: version bump

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 net-libs/gnutls/Manifest             |   2 +
 net-libs/gnutls/gnutls-3.5.15.ebuild | 133 +++++++++++++++++++++++++++++++++++
 net-libs/gnutls/gnutls-3.6.0.ebuild  | 129 +++++++++++++++++++++++++++++++++
 3 files changed, 264 insertions(+)

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 6d1a566b412..9fc72d07f4d 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -4,3 +4,5 @@ DIST gnutls-3.3.28.tar.xz 6369560 SHA256 
608f63441abc209c5bd5f61e35f2b6128c22e06
 DIST gnutls-3.5.12.tar.xz 7212652 SHA256 
63cb39a5eaa029381df2e49a74cfb7be89fc4a592445191818ffe1e66bde57cb SHA512 
8fec23e7e494a2e15e0f938115cae1ba3fee952d634db387f983b01096f68ca4313b23bc4c439d3c7fdd07c861eac4913a7c2343c8704961588ae195886ec90c
 WHIRLPOOL 
f7309aa89e75ed75371893ba4e4ac89f9f8bc7a61ef10ae4c4986aec290ae2dc5108cd3cc6463af6700ddab3754c6fcbd10ac95d3c40c4549cfdf6b3289f8a72
 DIST gnutls-3.5.13.tar.xz 7226468 SHA256 
79f5480ad198dad5bc78e075f4a40c4a315a1b2072666919d2d05a08aec13096 SHA512 
e98f23a589042f879936c3f8b474535e695fb7dd68a9e81323668c013241f765c2d3af6c6a072ecf867acc1e551ec46e15bb842144d3a06bdd5d2f4fc3d828a7
 WHIRLPOOL 
89439e7adba634698642a247c418569c0ea6ca6155bfb5dce17c8ed69d2506a37d9ad793122aaaec92adffefa75cb23a857c49ef722c5cf506700fe0c34b6028
 DIST gnutls-3.5.14.tar.xz 7228200 SHA256 
4aa12dec92f42a0434df794aca3d02f6f2a35b47b48c01252de65f355c051bda SHA512 
c55384bdf835c0f7715bfb10b7fa0ac30d26d53ffa5f32af78844cf27985407eed034af77413fb2e94e3a0c0a5fb0597d66f5dbbbe72e5e0658bfeeafa6f7829
 WHIRLPOOL 
c6ae68898983184d00dde78a38a3398b677541ae6316a25544668f183423da1f6c3c7f3709f896f6c135e6907d832d6980f102d77b40758f9cf81c25f68cb086
+DIST gnutls-3.5.15.tar.xz 7238928 SHA256 
046081108b8b1fe455a13a4c5a4eaa0368e185b678f1670fe09a11a2d7ecfad5 SHA512 
046cf3adf6cc3d38fd431f2ff28ddabb65f3c13379516d105316a04c7128be89c5f7ed3df6a034fc06e9ab2e154c2cde2f5cbe8530a1e58cc4b4fb72e158134b
 WHIRLPOOL 
811cca49bdd144107b6c25de31b3209694a8590107953fc3c4ecafddba48339e98cf1dc8e489addb04f0ac525411e96e505fd8edb342dca4e02f97dde3f26ffe
+DIST gnutls-3.6.0.tar.xz 8024972 SHA256 
2ab9e3c0131fcd9142382f37ba9c6d20022b76cba83560cbcaa8e4002d71fb72 SHA512 
e5f36d7e8d64e8432098e30549c321745d3605eeb85aba2a04bfa92146ca771961f0e2f3682bcae36be5b6095acd25996104a4213ce7b3466d61332a5188dc03
 WHIRLPOOL 
e8e479d7a0adc14c969b7364f58505f68ed92054fb8d8ba862f59d9ab64578e83ae02309ec9b5da2e63fc5dec799d86e434abc32394dbf414dc46bf46b15b0c8

diff --git a/net-libs/gnutls/gnutls-3.5.15.ebuild 
b/net-libs/gnutls/gnutls-3.5.15.ebuild
new file mode 100644
index 00000000000..78dd42e46b5
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.5.15.ebuild
@@ -0,0 +1,133 @@
+# 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 seccomp 
sslv2 sslv3 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 \
+               $(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 openpgp openpgp-authentication) \
+               $(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 libidn2) \
+               $(use_with idn) \
+               $(use_with pkcs11 p11-kit) \
+               $(use_with zlib) \
+               
--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
+               --without-included-libtasn1 \
+               --without-tpm \
+               "${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.6.0.ebuild 
b/net-libs/gnutls/gnutls-3.6.0.ebuild
new file mode 100644
index 00000000000..bca21f05616
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.6.0.ebuild
@@ -0,0 +1,129 @@
+# 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=""
+IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
+IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 
sslv3 static-libs test test-full +tls-heartbeat tools valgrind ${IUSE_LINGUAS// 
/ linguas_}"
+
+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.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}] )
+       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 \
+               $(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) \
+               
--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
+               --without-included-libtasn1 \
+               --without-tpm \
+               "${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
+}

Reply via email to