Version bump, removed most of complexity of multilib as tools are optional, multilib...

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

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 7f09e063f9650c68ea9fb2457683ee93f7b5b047..b4409d02f700d70773b419611436c3c42f15f4e5 100644 (file)
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.530 2015/04/03 17:21:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.531 2015/04/10 01:15:50 alonbl Exp $
+
+*gnutls-3.4.0 (10 Apr 2015)
+
+  10 Apr 2015; Alon Bar-Lev <alonbl@gentoo.org> +files/gnutls-3.4.0-build.patch,
+  +gnutls-3.4.0.ebuild, metadata.xml:
+  Version bump, removed most of complexity of multilib as tools are optional,
+  multilib is probably broken, we fix it fast once issue reported. removed
+  unknown undocumented complexity so we can document and fix, add subslot
 
   03 Apr 2015; Mike Frysinger <vapier@gentoo.org> gnutls-2.12.23-r6.ebuild:
   Fix cross-compiling by not searching the host paths directly.  The toolchain

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 4d48a5121ccc13412305fb9b64f28a8634858f0c..1da329a3d67c3134ec2bb6584e31f7e199bc5c2d 100644 (file)
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -14,30 +14,23 @@ AUX gnutls-2.12.23-CVE-2014-3469.patch 3461 SHA256 cc055dafc2bdfd1e0d0a6026fc0bf
 AUX gnutls-2.12.23-gdoc-perl-5.18.patch 4878 SHA256 a55a56b8faead4e7c369945d356190b59f16e57429fa20221f201b88e92dbef6 SHA512 2480cb3e9625eb6518958c8f4caa208957fc5a9e7c3ef84fa6345640ca7e65cba2f8043f8b6a05aceb80750748502e66dd6f5c55ebcbc750c54955baaad4d31b WHIRLPOOL 5ff3a01efb80fc8dee9ed77436afa70aa39e33fcecb8a9742fa431047e66055cffc4a07657a28485d3e2c75a5ea9bd7ebd1f72b9bed1ad7caaa468997c600d54
 AUX gnutls-2.12.23-gl-tests-getaddrinfo-skip-if-no-network.patch 1146 SHA256 0644a00f75987f8a8906ec536b4b29967c24ae22ece8dfee074af3f85be566b5 SHA512 ea3062f90ace33a6229fe10f9a1fb492e84905dce0231309d2c105386c45a151d99c140c66158435ebe4781defc5a536775f4d68b3552208885636e5ed4b7223 WHIRLPOOL ee131aa7709e717cf5e893d5073dbc7eeec569e2a6e48094534dcf8f0d3d17b8a4f75da0a2c91ed2d70e37ef4429d7759dffce4948fd508dcbc0e081a8d98aa0
 AUX gnutls-2.12.23-hppa.patch 1165 SHA256 68958ca9d05f6ffe89064488847d5e2ca615344abf7c9060f73f525a593716f0 SHA512 040507b973788dc2ca4aab19d69f45011e6509354e38ec875ab6fdec3f1c3be40272ea99cd53a5adfc8b52b30e29d86af80891d57b50068a4b3f2cc20246ac70 WHIRLPOOL c4d17452c22e81fdcbd6e14aaaf8294a90a67438ebcadcaab096a6d2f115643c2ce36cc503d186d2d2483366b890add3e9101c26998878817f7baed8589a8514
+AUX gnutls-3.4.0-build.patch 760 SHA256 7a394b50077d01eb967c77f764460ad4cd2a7cb487b925b44ac04cde543b20bd SHA512 9410eda16dc102246ce5754d69b2de0ee80f63ac1a1efd0bbaa065ffb34464cca0d80a368fb6e32447ddd346d7be8c90dbad3d4c888d7512ac8af5df4b56b7cc WHIRLPOOL 68d6a3acf56108c4be11638422525460823e3f2d0ebddf99bc6e5580d23027e2912e8c8ac3ce67f9bbd54bdd3826c3c5ebd886be4d72bcd0520791f4c7360ea6
 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.12.tar.xz 6185624 SHA256 67ab3e92c5d48f3323b897d7c1aa0bb2af6f3a84f5bd9931cda163a7ff32299b SHA512 71c5ed7dee6c14581f675137b587173065c896040cb023b2910a3503a0f644abedc1f43c4e90c7a47ad4482215426788e272ba4b0b81c0475c2adcd62c4301a7 WHIRLPOOL 2e405e7edd52a828d16ae858d791809905ea02f27ee518847e43c3e56c5e92876d58e210513176c9424703dd65c8834a7516826db55e0eec5039a3d63b25b26e
 DIST gnutls-3.3.14.tar.xz 6286196 SHA256 0dfa0030faad8909c1e904105198232d6bc0123cae8cf4933b2bac85ee7cec52 SHA512 68f144baaf52c156a9b597701ac1afe04de8a6a646bcd48bb28be4ef33d259d1ade55bec6984d40c0ed5944ca3f8c9ce6243a617961e1de0a94b538e38230fed WHIRLPOOL f140d47d2b7eb2678245394efbb57e47eab58acceddb710b688b407792299d3e139afbd5946bfd5e10ceebae3892516d15753ca4bef17485c46aea07c1185584
+DIST gnutls-3.4.0.tar.xz 6453932 SHA256 b422544431bfb5c4e24a605b6c793ee34792cc791c1060562ab46eaf77f3472e SHA512 ab11bb46e69a689f275cc158d8bc031bb09287a2193a2d9ccb36c04a8e106d9204754bd148c67417e6d63ed0c75750bbe7b602424bb7dcd9af2e25d9275ef02d WHIRLPOOL 5871564934d1d13ad777bc47dc6ab2f04a916470030e8b844d9f376c049072277fbf351fad4bfb42b8680a6e01ffc79ebb9459887342e92a0af11569c105c47d
 EBUILD gnutls-2.12.23-r6.ebuild 3675 SHA256 fde1f48cfe231601626db9cfc21d148d9e4b5e843febdd44c23b1b163ae5be26 SHA512 7bdee9dc92f35159f03cda67f2143cb1ec0802ea18c6ba57b02fc8a4ad92f915725e3a11aa4a300a8b5eb7c4be4e8d769f8abf34855b2da67d34557dcfb79d1c WHIRLPOOL 280d35f2b1b96097e5dea680a588bedc063c6cbfe3ffab239a183b73ed94bcc5f86917ca52ec78c7969c388096167fe02b58ee28b3201eea8a331bcb78bd6f59
 EBUILD gnutls-3.3.10-r2.ebuild 4908 SHA256 fed591ca76f6059e1adc3ef6411fedb809b613cadbb131800adcc7248c796ac0 SHA512 6a8436c2f0ee3d72e7aab17b4fca79f071c540df4b9003fc9c24f2e29ba3bdab34eaa9dcce808d20e6c8949bd59718c261fba52c9854b78df896950d0dcb5ca3 WHIRLPOOL 6e83ec02107182b27f14f75f53521e0be9aa006f28282c4d3ee06998e5fb69b7681705728c581a938f2c671cc472c184fd335a58bd59146eefbd9a64caea0c06
 EBUILD gnutls-3.3.12.ebuild 4917 SHA256 0d666cafbdbb810f7ee81e7fd1572dab25977de926d30fb060967dde596edf01 SHA512 dc3bd26a1c317fee28a39b7617de1d9e83d3486a3af578c88b5186584ee3ee31d3807ca755dfa6f698a9edd29949a866c5951b44a68343cc8e87864ce0c542fb WHIRLPOOL e4c9e57a5062d4d5dad4aa391d3fa86d53ccb0d59a95d337ea4d5c62250e55e68eacc084bcd7cdc9ac2bc2275651b5b5df6f36979593e575962510fd30baba5e
 EBUILD gnutls-3.3.14.ebuild 4917 SHA256 23534e5c5ce53b155c15db696c59b6822f2ccdd06c0f37fa7f540b77f955141f SHA512 b545531f7094947892459844f4cbcac4118ec468f26015e0e550b7016f0e4f9f6c97da385fe8a6eed6a13d225e97120cce4520b5cecaccc28319c49c3c18c740 WHIRLPOOL 11b89eabe074e5ad22f284a22e05d34365c9cb29be4533e48598857927825f13ac163447b309c71523db9a4c9eb1dd53114184ef2b6ebf8dbda80539ff4e0592
-MISC ChangeLog 79334 SHA256 41907c36ddbba3d5eaab4ea0ec1f665a05b0da0d819cb58d3747d4e6d339f319 SHA512 c164099565700ac53b3163cc2568f8cbd8902ab948ebd97ddb1f5936487081a12c98c3dabb15f88fae9d86bb466fb74aa1e348dd1b7dbc7713b53b68e679362b WHIRLPOOL c52f9d9b25a2f3fcf59f9568bb0037b55c0d7b8bb29b358378418d6d58bc0329d1f61edef11183320ea6b4e2315c7e33b3943a87f82616353351b31a1bdc9e6b
-MISC metadata.xml 875 SHA256 a0a8b100321cd3bfc4458cdd37570fafbe7270bce36b15ec8f17ece2232a5906 SHA512 1cd6b55fc3fe2460a6fad153190a95bb97a3baf7c2ae153a4548be9922f4775518acb9dd858f98191f3972dced8e8ccc1da9309871ffbf4ccdc7bc394d343bd2 WHIRLPOOL 4fd8f09f0f43c80ee037785de47b67bb9ae8a6e7928008290beec977a64ca8744c7d15b96eec0dbcc142e1dc753eab850b72f4182330ae25c6f29001ccb06637
+EBUILD gnutls-3.4.0.ebuild 4187 SHA256 0132b206524ffb138c80c7fac0fbcd48cad749a12ea93f5f345e1a137617220f SHA512 618c6e5cfed3cc7af07005f056bd09b7bc845b00c6a9f2e05635fb1873245ab1c74df9bf2133794cd928ca570dc0f81aa5c8fd3d4b132ecc7884ace9ad0c9d13 WHIRLPOOL a501dd3e76195e491db04d843dbe8dde4cd121c1520ec80342cc10bdfefb0fc46cf55a9a49b337ba502e166c503c00d1002e7d78b88f6ce1e5868a89d4dbc745
+MISC ChangeLog 79710 SHA256 d9e8e6a0d01e32d9724961d4923c093d3d978446284f97f9323cc9ff5b084992 SHA512 81d45bbbf0bc86e0ab0f8f55300e78eecb8b0d65982ca1fe2e3f79c907159b05253d421016752da441de6eaa022f8a6d1360c789be480ac0a864248b7c02aa61 WHIRLPOOL 1b2d6e072458eee1d6755376d96b9b399da9b5b624a46554c39fbda6dd2f84be255e319dd0d1d9a2b6555570239483eb963ff0082c1f67de7ea84f0cf15402aa
+MISC metadata.xml 936 SHA256 0eade7b78d1cc49b7d8079223333117ba75bf0d240e0e315378128961a6f6260 SHA512 c6be65846e94888b1d4c3fe835580b035d7219e1ed5b006cca81165f5af34f5a6fccfba6bd2ecbcdcac5d3cc0765dec097ec881b4cd79d63a34b4d8a0dcc3664 WHIRLPOOL 84f61ffb7952bde75927f21d5f0964607801671083aa9012c902bc0b92b377b8607f8697f5f72eb3e592098034341b3609b09e9938764c9fd618106e486da2d5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVHswfAAoJEPGu1DbS6WIAVBQP/i8O/P13uv+esEitCMBv6KoF
-hib/dgFYYtwjl0rTVwZ5mI2yygEMQ4BC+xPHqbTQPcsvaZDWUQnU+xuwsIVY48iC
-1UipbcJEFvQnqu4cyPhTpWYw0i3EqYZ1oonZuqr7CTV9RUxM3R6ayiIvc2rNRmSM
-6TlkjMXuNA4S/Z/F1L92LWVfEYgAd9Na9g07umQKlxdhwzobDG00iUcuhinztf/k
-+i0hl4xdjm5HfA9y9/0qer8R11YiVmx2dJt+W6dhbqmkeWb+INhEmiBJN4tnzaCP
-4whoAu0Dznzqljs5wi800HGpBo7Icaog4/QMkmVsvqoNvKy/EYH4A0ZAntUJaJBf
-r6ScHVmDum4JH4j6+oePDn/BnPFkatjGnala7TuMGNITS+N81RoiH4IIAYrC9vTo
-Zy2Y5P04SNjYzICBBt0HS5Djdl2jAIZxPhPxmlRPi1p4QnexLg4pNtEMHaGhFUAp
-gPwx95FmI0mHFpBpQxg8cDvjmaNFu1DRq51m/7zoHRd/Ko2iUYRABJ4Zx9OIJeto
-YznslK1V6FBFuEzPd5s6Rm3SxerN9QJDE45fYcVmaeRRE6ae8Uz27goUzCygU6i9
-GRwvJPA+Q7vvyecbYdfQcD+QUX8KW5t6rGPsL9pqPoDIOV9KrEFndAMidfESBnOm
-yL1NpHtrptGy3ZoNkp/3
-=X3GX
+iF4EAREIAAYFAlUnJEoACgkQXYk9GL8g3FG8xgD+Jc7ul/B2GnB+kVMPmsRyj5+T
+zn0KSBH09/cV6wsXRGwA/imikpeVCCcIxpBkc07hkOeAm1xxJAUcGONbJrcNXCOn
+=nsHs
 -----END PGP SIGNATURE-----

diff --git a/net-libs/gnutls/files/gnutls-3.4.0-build.patch b/net-libs/gnutls/files/gnutls-3.4.0-build.patch
new file mode 100644 (file)
index 0000000..1962cc3
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.4.0-build.patch
@@ -0,0 +1,16 @@
+diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
+index 8e793d3..1bce3f5 100644
+--- a/doc/manpages/Makefile.am
++++ b/doc/manpages/Makefile.am
+@@ -134,11 +134,8 @@ APIMANS += gnutls_certificate_get_peers.3
+ APIMANS += gnutls_certificate_get_peers_subkey_id.3
+ APIMANS += gnutls_certificate_get_trust_list.3
+ APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_key.3
+-APIMANS += gnutls_certificate_get_x509_key.3
+ APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
+ APIMANS += gnutls_certificate_server_set_request.3
+ APIMANS += gnutls_certificate_set_dh_params.3

diff --git a/net-libs/gnutls/gnutls-3.4.0.ebuild b/net-libs/gnutls/gnutls-3.4.0.ebuild
new file mode 100644 (file)
index 0000000..2dda3b3
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.4.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.4.0.ebuild,v 1.1 2015/04/10 01:15:50 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/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 ~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 +tools 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-3.1[gmp,${MULTILIB_USEDEP}]
+       >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
+       tools? ( 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.23.1[${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
+
+       epatch "${FILESDIR}/${P}-build.patch"
+
+       # 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 tools) \
+               $(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) \
+               $(multilib_native_use_enable test tests) \
+               $(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)
+}
+
+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
+}

diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index 79283e4046783da543806b03db45d6877e489990..f1f8e2e7732b36c0f6ed9bf7c867040ab98d0410 100644 (file)
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -20,5 +20,8 @@
     <flag name="pkcs11">
       Add support for PKCS#11 through <pkg>app-crypt/p11-kit</pkg>
     </flag>
+    <flag name="tools">
+      Build extra tools.
+    </flag>
   </use>
 </pkgmetadata>