Version bump, bug#533298

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 24a200f8c82a033b570261a7d8e81fe9be8c9a1c..1d3b2602ee59b129262eed2d0324828bcb31d3bd 100644 (file)
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.521 2014/12/15 20:05:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.522 2014/12/30 11:05:17 alonbl Exp $
+
+*gnutls-3.3.11 (30 Dec 2014)
+
+  30 Dec 2014; Alon Bar-Lev <alonbl@gentoo.org> +gnutls-3.3.11.ebuild:
+  Version bump, bug#533298
 
   15 Dec 2014; Jeroen Roovers <jer@gentoo.org> gnutls-3.3.10-r2.ebuild:
   Stable for HPPA (bug #492522).

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index b0d6fa74fe5e8e59f086346cb5d85c099e560db6..b9ad740400bf4bc1917e9364fcfd0e013a1e16ba 100644 (file)
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -16,14 +16,16 @@ AUX gnutls-2.12.23-gl-tests-getaddrinfo-skip-if-no-network.patch 1146 SHA256 064
 AUX gnutls-2.12.23-hppa.patch 1165 SHA256 68958ca9d05f6ffe89064488847d5e2ca615344abf7c9060f73f525a593716f0 SHA512 040507b973788dc2ca4aab19d69f45011e6509354e38ec875ab6fdec3f1c3be40272ea99cd53a5adfc8b52b30e29d86af80891d57b50068a4b3f2cc20246ac70 WHIRLPOOL c4d17452c22e81fdcbd6e14aaaf8294a90a67438ebcadcaab096a6d2f115643c2ce36cc503d186d2d2483366b890add3e9101c26998878817f7baed8589a8514
 DIST gnutls-2.12.23.tar.bz2 7279415 SHA256 dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2 SHA512 7780e9ca7b592350ce9b11e53a63d3212320402d8ad2462bfbc0e69aec4a48bb372a1925627abb7996535c87c90e3d79537ea118c8bb36d26aae8e19eaae3a06 WHIRLPOOL 8cab909c961760c72b478d5cbe75633ce0d26190fdece018e9f33b171879753ed38348c33c00fda7b5f3a6b596a5439fb62f1c82a891e9e62fee5bb784cf7e11
 DIST gnutls-3.3.10.tar.xz 6173572 SHA256 e27553981d48d9211a7e5e94f6e78c575205202a181c2345a1c8466ebf1d2219 SHA512 3f73af238c48322d1df59b8c27c2bcc5e03f25e632792279a1e25a3712d71108f83b6e135bf1766917e84ec9499f4419c266c2a43a8e2ccd8dd9efd6f15d85ec WHIRLPOOL 1ef664b763acaff9292f96db86f5ad441a4c49141d1d3529ea970cba67fc5714b509be1350250bb01bfd7a863e466b7f4d5590caa5236dddc680b6ca709ec93e
+DIST gnutls-3.3.11.tar.xz 6176080 SHA256 aef28d629b6ba824bd435f9b23506525e657e3746d4aa021296b13cbaaa6ae71 SHA512 2c61b2cfcfe36a921034020edb712c05ee185d14984295ef32efd763c9ddaa3f064e2348c9925c87e6323bbe42d7e5d7eadeb8ab48da3af84c6f01fa090b08d2 WHIRLPOOL 6c5ca32771d1e6c3ba06e2bbf791240b6333b827bce5c4dda116f69bcbb04be1a2301c69deb71aa7e928d59b5bf36a3b5fd4d3b10292c7dfd8bf080d92af85f3
 EBUILD gnutls-2.12.23-r6.ebuild 3552 SHA256 b4a141ff1d0788c8dbf1be66fdca6e7b9fb1fffeb54d44a3c3852133cf9d754d SHA512 cdffb4af5421fac4a72116868b18da98b1c1ca16356c9210ea3127b3c16e171777a013021b1575208bfa873b7bed7d5a3107689d0f2f3dce0c5fd1cd31d2ed17 WHIRLPOOL 8237f17fa94fea35393d6bfdbab319caa43e598744402f43c3b3a483bb580e6c85ee1e4cdfa996688f1cd5e23888a8558eff91bd158cd047f65cbc3d754776d8
 EBUILD gnutls-3.3.10-r2.ebuild 4916 SHA256 0ffebe58aee0fe41feec331ab449e2ba7bac2592e2bb62f6fff74f466401e000 SHA512 65cd907e09a873976412d8a22beeb59696e8596870d1ede8c3f018f61a7da9c63e2d0679a25bf914394227201f8b3052dfbbabab9aebc1be69fd0ca59af78901 WHIRLPOOL ef48605cf1cc6d31458c278a8fed47676aefd7cd1fc22f4126403c54ce13af2c8f4a5367f64b0b34eb85e83f9f92dae84f47796ea047f220bc9e1061b3e59d02
-MISC ChangeLog 78154 SHA256 dfb57399b4cbbe70c891905464b8dd14c4a067d28a857c873ba5bc1885aabef6 SHA512 f9963e64f3fe4d1cc482e6712706864cbb51232d693f5a7f50cdb6cf3b42276ef2c80a1dbe59cdaade729c6270dd615bc53522d502306bd4062fc973aabd6385 WHIRLPOOL 897fdd2e61aed9ac307a31db4bf50d654bfe5b9ceeb40af041e6f34d7ee0b8c8742b8cd9ce12360a9c11232f61ff08628a893e0f02fae468183d411fab5e2724
+EBUILD gnutls-3.3.11.ebuild 4917 SHA256 e885a74f9fe4f628f6793cb7fce2d3af0314b1281e019c836a2290dd43b19bd6 SHA512 0954657a3cb2c927ce6ca6dc00ec98ec39a1f22aa0c9f9d2b3466228b70b2fa55981f2e43eb1bc90e988ffdefa9d56bcc0cb4de60a819ba632471058a72c4841 WHIRLPOOL 0caf43138346efb1d420649317c291d07c6eeeae81565f54ccb5e9e7a999c8f7f2435c34b1a87a55574f09bb9a99213660166c67c939a9e164891c3befeda1fb
+MISC ChangeLog 78286 SHA256 f626cac02b27688b53e1080c4e5a6b09295befc0f3dd15a895d82805b17890bc SHA512 e2e4ade3a1a5b5e403520332f6d25df0b80a2691440ff800b3052689a13a7886dfb5a695e6a5555ca4109486f3b38af9f248d978b16e9a381609a7b3693e62da WHIRLPOOL 1d89a9e737de4a88cdb2f1511adfe7642e45fad2ce5fca22b1eeaf7a2767a24162869173caa48704f5c065098d2cafabb67ce07ed0da1dae50c93dcdef8c417a
 MISC metadata.xml 875 SHA256 a0a8b100321cd3bfc4458cdd37570fafbe7270bce36b15ec8f17ece2232a5906 SHA512 1cd6b55fc3fe2460a6fad153190a95bb97a3baf7c2ae153a4548be9922f4775518acb9dd858f98191f3972dced8e8ccc1da9309871ffbf4ccdc7bc394d343bd2 WHIRLPOOL 4fd8f09f0f43c80ee037785de47b67bb9ae8a6e7928008290beec977a64ca8744c7d15b96eec0dbcc142e1dc753eab850b72f4182330ae25c6f29001ccb06637
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSPPvcACgkQVWmRsqeSphPbeACcDWYSvLEmXLAxlCrlsocIWQlt
-r9QAnj6OVTRIKngYI4DYY20AMvQZhfXU
-=iew+
+iF4EAREIAAYFAlSihvUACgkQXYk9GL8g3FFCsQD+P1hmzKA905U79vs0xKSvwgyp
+sQzMr52NIEtCJsS6+GQA/0Vj2bcEpcfr6Dy7rvmsDlDu83WLABlWwpZTbh8BwA7p
+=CPN+
 -----END PGP SIGNATURE-----

diff --git a/net-libs/gnutls/gnutls-3.3.11.ebuild b/net-libs/gnutls/gnutls-3.3.11.ebuild
new file mode 100644 (file)
index 0000000..1e94e9c
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.3.11.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.11.ebuild,v 1.1 2014/12/30 11:05:17 alonbl Exp $
+
+EAPI=5
+
+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"
+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 +crywrap dane doc examples guile nls pkcs11 static-libs test 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-3.9[${MULTILIB_USEDEP}]
+       >=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
+       >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
+       sys-devel/autogen
+       crywrap? ( net-dns/libidn )
+       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.20.7[${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? ( dev-util/gtk-doc )
+       nls? ( sys-devel/gettext )
+       test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+pkg_setup() {
+       # bug#520818
+       export TZ=UTC
+}
+
+src_prepare() {
+       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
+
+       # support user patches
+       epatch_user
+
+       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 \
+               --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+               --disable-valgrind-tests \
+               --without-included-libtasn1 \
+               --enable-heartbeat-support \
+               $(use_enable cxx) \
+               $(use_enable dane libdane) \
+               $(multilib_native_use_enable doc gtk-doc) \
+               $(multilib_native_use_enable doc gtk-doc-pdf) \
+               $(multilib_native_use_enable guile) \
+               $(multilib_native_use_enable crywrap) \
+               $(use_enable nls) \
+               $(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)
+
+       if multilib_is_native_abi; then
+               ln -s "${S}"/doc/reference/html doc/reference/html || die
+       fi
+}
+
+multilib_src_compile() {
+       if multilib_is_native_abi; then
+               default
+
+               # symlink certtool for use in other ABIs
+               if use test; then
+                       ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die
+               fi
+       else
+               emake -C gl
+               emake -C lib
+               emake -C extra
+               use dane && emake -C libdane
+       fi
+}
+
+multilib_src_test() {
+       if multilib_is_native_abi; then
+               # parallel testing often fails
+               emake -j1 check
+       else
+               # use native ABI tools
+               ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \
+                       "${BUILD_DIR}"/src/ || die
+
+               emake -C gl -j1 check
+               emake -C tests -j1 check
+       fi
+}
+
+multilib_src_install() {
+       if multilib_is_native_abi; then
+               emake DESTDIR="${D}" install
+       else
+               emake -C lib DESTDIR="${D}" install
+               emake -C extra DESTDIR="${D}" install
+               use dane && emake -C libdane DESTDIR="${D}" install
+       fi
+}
+
+multilib_src_install_all() {
+       einstalldocs
+       prune_libtool_files --all
+
+       dodoc doc/certtool.cfg
+
+       if use doc; then
+               dodoc doc/gnutls.pdf
+               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
+}