From 62f67115b5c46134c34f88f4b1cbdacc19384c0a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Sep 2018 11:19:18 +0100 Subject: gentoo resync : 30.09.2018 --- net-libs/gnutls/Manifest | 5 +- net-libs/gnutls/gnutls-3.5.19-r1.ebuild | 133 ++++++++++++++++++++++++++++++++ net-libs/gnutls/gnutls-3.5.19.ebuild | 2 +- net-libs/gnutls/gnutls-3.6.3.ebuild | 22 +++--- 4 files changed, 148 insertions(+), 14 deletions(-) create mode 100644 net-libs/gnutls/gnutls-3.5.19-r1.ebuild (limited to 'net-libs/gnutls') diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest index ecbd60ddd8cd..6b99c9d42e30 100644 --- a/net-libs/gnutls/Manifest +++ b/net-libs/gnutls/Manifest @@ -1,5 +1,6 @@ DIST gnutls-3.5.19.tar.xz 7239744 BLAKE2B c12578e79d3e96e1df7a5dc5f05fe9bc4bce4150f7440a73fda8e69d3f137a9ad1ace28b56e976bc319bd7be7305bf93af9c20087229e0b8fefee85b64e8261d SHA512 a78a59505e59c62ca671b34eacaeadcf070a943b12d964b7362962ba05636136638063491c37bb1883807014b8b6cf4f83f7d5b918ed02d5fbb52155679ce52f DIST gnutls-3.6.3.tar.xz 8010284 BLAKE2B 3cbfcfc90b5bbcdcf01ef13b4a306b05e471e6cd14bb5b0c37e1e7358f2b223605901c0495c7ac3227f48ab77db30481050bf1f38de5e18659d7b91b8907aaa9 SHA512 6238502464d229a9777e3076f4c745d16deaada83c9da756ecdcd370947576e0446bda3a7f85d5a099b745bbf8c0134ebdf6632e4b26d61daf170792fb4f5abe -EBUILD gnutls-3.5.19.ebuild 4103 BLAKE2B d8c21b25fbddec8a3d208b7166fa38fe48a7ddad1d91eadf29589f0d2c87be396787c6063c1b52c54fc4cdc05d0d48444fe790cfa73676779f236899cda09c0f SHA512 1e93fdcea631b13856302bc385c904d63f1932c550aaac8d2ddf84d7de31a29a13ad68def39a49c97dd4ff9c1c7008384b84498fd983194dd2db26ac282c0c6d -EBUILD gnutls-3.6.3.ebuild 3760 BLAKE2B b29ffc0c7cefec448af0f1fd4796b40525003da16f76f4acd60c6b5b79c7ef09145eb94aa35fff22b3eba92740961187d1d65ac1a0c4c2feb8a98058943df3f9 SHA512 d6ceae3ddec152c161eff5a9737a5024fb5f71f0319f27de2cb853fee3059910d3496f8c78723db36ce4466c1f1a3ce8f10e8ed9c84c1a9ccae4ad0c1012d904 +EBUILD gnutls-3.5.19-r1.ebuild 4090 BLAKE2B e3436c057d92753371e1b274dcb05a2b170befe90e89ba507bacc09c7d2d7b308e7a0c97967797355c653be492eb6c0187fcc69338cccc2e6aeee877ac11f321 SHA512 368f32b66c4e750b06a81dfd74b9e5d58c1cde20d244e326bd7471f1209bdfaae2a84ce241b01630453fff6d447e812c9d82e539adb6139dac4a63ee00d9b902 +EBUILD gnutls-3.5.19.ebuild 4102 BLAKE2B 8b4eec009a005860f2b138ceca61ce81e59263c640c2214d9729a3dce4c20df09da82c9a9f56b7e44c7f48d70c44c974bef1597f9d97531c03a716bf372e1a10 SHA512 09257ab61c491b99910db2b8b3a39ce4fb9d484d0d5e1a19006b0ee0073f6261b4c6f18d9a86bfe53a2472c4e285c829a256354676c380fa48cff05bcead0e6e +EBUILD gnutls-3.6.3.ebuild 3737 BLAKE2B 8b3bec0c5ce869114ae0a148d324c149e8b41b0a5c031dc67d5558fda8510421dd8376724d7683641dc940175794c5f61f5634591ee03c77e7862abeaca482f8 SHA512 05e8bfb984fe359973b3f7c6720d9df76c7e2db00cb44bfa602dc042cd2516f43e0275ceeb04123b5bf2ba7cd89b8904464c4ff5e22674a80e2f738b6d716247 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992 diff --git a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild new file mode 100644 index 000000000000..1635d976bdf4 --- /dev/null +++ b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib" + +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-2:=[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}] )" +DEPEND="${RDEPEND} + test? ( + seccomp? ( sys-libs/libseccomp ) + )" +BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + tools? ( sys-devel/autogen ) + valgrind? ( dev-util/valgrind ) + doc? ( dev-util/gtk-doc ) + nls? ( sys-devel/gettext ) + test-full? ( + 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 + 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 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 \ + "${libconf[@]}" +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die + + if use examples; then + docinto examples + dodoc doc/examples/*.c + fi +} diff --git a/net-libs/gnutls/gnutls-3.5.19.ebuild b/net-libs/gnutls/gnutls-3.5.19.ebuild index 2b57e94b6b85..39244f5c2a32 100644 --- a/net-libs/gnutls/gnutls-3.5.19.ebuild +++ b/net-libs/gnutls/gnutls-3.5.19.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 ~x86-fbsd ~amd64-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 ~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 openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib" REQUIRED_USE=" diff --git a/net-libs/gnutls/gnutls-3.6.3.ebuild b/net-libs/gnutls/gnutls-3.6.3.ebuild index fd1664469d06..fefc8766f6af 100644 --- a/net-libs/gnutls/gnutls-3.6.3.ebuild +++ b/net-libs/gnutls/gnutls-3.6.3.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit libtool ltprune multilib-minimal versionator +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$(get_version_component_range 1-2)/${P}.tar.xz" +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 @@ -25,20 +25,20 @@ RDEPEND=">=dev-libs/libtasn1-4.9:=[${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] ) + 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} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - doc? ( dev-util/gtk-doc ) - nls? ( sys-devel/gettext ) - valgrind? ( dev-util/valgrind ) test? ( seccomp? ( sys-libs/libseccomp ) - ) + )" +BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + tools? ( sys-devel/autogen ) + valgrind? ( dev-util/valgrind ) + doc? ( dev-util/gtk-doc ) + nls? ( sys-devel/gettext ) test-full? ( - guile? ( >=dev-scheme/guile-2 ) app-crypt/dieharder >=app-misc/datefudge-1.22 dev-libs/softhsm:2[-bindist] @@ -120,7 +120,7 @@ multilib_src_configure() { multilib_src_install_all() { einstalldocs - prune_libtool_files --all + find "${D}" -name '*.la' -delete || die if use examples; then docinto examples -- cgit v1.2.3