Version bump; disable TPM support for now until it can be tested by somebody with a TPM device.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 131 insertions, 9 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 1610f6c1ee40..f9074565972e 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.375 2012/08/05 02:43:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.376 2012/08/15 23:03:04 flameeyes Exp $
+
+*gnutls-3.1.0 (15 Aug 2012)
+
+  15 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> +gnutls-3.1.0.ebuild:
+  Version bump; disable TPM support for now until it can be tested by somebody
+  with a TPM device.
 
 *gnutls-3.0.22 (05 Aug 2012)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 71531dffb5df..6597cce1c83e 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -9,22 +9,24 @@ DIST gnutls-2.12.20.tar.bz2 7231438 SHA256 4884eafcc8383ed23209199bbc72ad04f4eb9
 DIST gnutls-3.0.20.tar.xz 4426520 SHA256 7e3f431a43e5366ff5a9b7646d2a79892a905237ef18cb147b945ec99012686d SHA512 6761f024908710b6c8c5d4a718410c7aa6dad8d92fb7668c6e2fc07a41f230ca18c1b6ffcc7fb098fdb4fa3635d33a52aec58ae784e52cb1bc12f040124dc933 WHIRLPOOL 85952ac5c2bb3444b71dc2b04833083fb2d2b8c7b5dd3429cf307402ec8a828661be99209a2dcf51af9aa09ac940f18ba4815007c2e6d84348d033360cffec39
 DIST gnutls-3.0.21.tar.xz 4664124 SHA256 6901b0203a613869cf475f18d44acd47b36adf714c67d1f9ad29c26ab7bec410 SHA512 a3ca7c0d59203fda18beb63a6abeae8d716538f95cd0c770278ebe3a72c7c66725a54ec5f1cd13abdbca2cc71afda263008f54e46751d3e7c71458381f8e1552 WHIRLPOOL 9d6a6f9945ff308ab772ba55db5e36c1d62f1d95f222bfee9673df36a423929281905ed22c634f33d1481bec5f68943d891397936cb97df7b111ccd542a08a9d
 DIST gnutls-3.0.22.tar.xz 4613608 SHA256 99dd867dde60f3107b788b14d6b95baca7436d651d057c416325e223aa03e9de SHA512 b75d6dd35be17e6a804c3303d1baf181c58ed3e4cfc8823613a1d0b3350780090fe21e61f510eded5624ecf7c4594bc24e4b5a82cbf7dab3bf26944efefe9af5 WHIRLPOOL 6a78a517b7a9301c142f5577e593368f23ab1ca99591982c03df08185037f1537f103a6603be82d028287a962c5a658e8aba39df63f62e4cc2197b3b88cdcdc6
+DIST gnutls-3.1.0.tar.xz 4768996 SHA256 4fdb58572fb91fc0afbdfcd7845d4467d4b13ef2f9141bdaa955b959a319f8cc SHA512 2ac3102d9204388ce232f4393d7ce4e9c5ef3e3b38b86fa83c61b2bc06e3be086a3e1936e7e335d3190ae274c17adb5127b0c4c8815c68c0f3dd6611c8ac96e3 WHIRLPOOL 745f1acc291163e215c814e5b09aad6f8adecc19860d6faf564763cc1819b7f68a304d3f5fd359cc85103bb89170f13861b3c071753916da685be9a36271fbab
 EBUILD gnutls-2.12.18.ebuild 3294 SHA256 1c4de12c81ba08be32c906ee0a1eedcd07158a012c0d589577d6bcdd897eeb4e SHA512 bf19d45ba9d4688aadd9298a4773367e1508dc2bc8360ef81fe3c35045a49c22878dc1749b21011e30a380af1838318d05363ce9277fc405cd7e50530ab5f0a0 WHIRLPOOL f98289fbf8a31574e8b7edf5ef6a46329f929e65e02a65fb9bc9c4e1e8045b696ad67dd3bdd06f8fdda1d2d7b36e5c204b7ff16d8321198e139ab78555c80db7
 EBUILD gnutls-2.12.19.ebuild 3421 SHA256 d3549ecd272f778372cf65845e056e5fbf8367c473affadf4f0b30f726161fcc SHA512 5afd35bf19080ce59c5e1e42a08f9cf3f9b7a36f693edfb88440f468aa4c7a4f29ae7ae85d20bab06372991a594b30df7d723130c40aa6c5b515850af9e57ef6 WHIRLPOOL 8d04fb8cb09b01244e8f1942b316b1ef9b0d748eae07112ea937f481d693f3b33b5f1d19d3707fb34a7d2f536233f4105b94f6cbb1615118504317287335bc5a
 EBUILD gnutls-2.12.20.ebuild 3463 SHA256 61b2e73199f23364ea9db6932c4cdddb745f31295d25d855e7fa437846529d84 SHA512 bb42cb8e5c8c015da99563e4cfed0edb399aea099817fae80df5f3aecec4e9090f84eb5f6f2b2e0ce5b233383e290e31d417b3f4b220c85c42f7e606f947415a WHIRLPOOL a4fdfbcb640ec2165a88cbf44ab17e74ba321bf540fcaddaf838cdf2f6b4bbaee53fe1a30da4dd15fa0b2b69674ad6d402f3e207c9540d1a219904e5bf20b6be
 EBUILD gnutls-3.0.20.ebuild 3050 SHA256 5e144aa10c9a0d2d18b2274160ed4718105411900dab88636a4e759f9565d20e SHA512 b57dd5b856961fa5af85365ac716c86ddf5f1cce799b1e310fb836d3a53f765bd9121555c768e75fbedf5ec1203acaba18c8c2883f713ed0838c173e9fe7518b WHIRLPOOL 2d0473ab131407cb2237e44839a45826bf7403b4f14d5ab7a7e792603a0b9bdcced095b0ecc3cfc7170b9f87e01426987ec5abf77a213e5ec632132360ce7b3b
 EBUILD gnutls-3.0.21.ebuild 3003 SHA256 74df8406969748b3410f2fa02bd70c27d91f0deae1b3057fb7e20fe506237da3 SHA512 bded2f8eff1a261b286a0b7cb19da71116b3db6bdd8da8646e9cc6891d238c0d72965a07e81af53805f054369156cb7dc63376e85c4315054a5873a4058946d5 WHIRLPOOL fc19ebafe999955c2d11e45cc43ff32d371539820ef36483c83d4a54ff30e801ebfb016e7b41199b0e677f84743d6e2017daff0dcf50e2de1e2b794b073fb60a
 EBUILD gnutls-3.0.22.ebuild 3003 SHA256 1bb635ccb99157719cbf2439a56b5564fff7d1ee41908cd97f7fc36dd06ab29a SHA512 c3a7c2b8c4d760b7ff5a87aef28a2aa0cdfa047de427b47bee93eca0aa51377fccef93d512374558291c7ce967cb3397688d2e2d1e4a47567a7e3eb289123d9e WHIRLPOOL c58f20b8d8dcaed93410a5c574d061fd5f234579a0c3f453e06fe396faa952e260904df2c85095b34d544cd68261e9b2ac0e38e37a0ca34a308e3810d41c364b
-MISC ChangeLog 55305 SHA256 b6fb07c009f1092a20ceade8e5a65f993681fe06cce5ab0e35a18b956f5c5e2d SHA512 171e28fd6b0ccfb3674bcb6565c406d5afab33e15c13bccfb4d3d4fb02ea96c5b0fc17baf17eebbcb5b3cf39fcef4abdbe1cde2403ccbcf21de68922a2f4ae19 WHIRLPOOL 853539ea24eb5ff7879d52c74e62e6573e00e9c5e17f62046923db9f740d75da04a531504681f199a1a2603a282cdf846c98e6e3980a747db253bc8bcbc113f1
+EBUILD gnutls-3.1.0.ebuild 2815 SHA256 22b989f8b4aa3fbcab3d92cf2d39b88502856381231e0849a6861b89059ffc12 SHA512 b4918a9c3bae74c59acb06942aaeffcfd501cace4966e97ab56c86611f2c30cad4d356d6ba866cb79b601715ff5284f618723249e0f714f11ef506bfbcb3d304 WHIRLPOOL 58c63a0b06aa50c6da65053a78618744e6501dcd6b772cffcc538a75ebd2313b7684fc6e5a8fd0b7fbdf90d49eaa94e228d5d6f76587d942f517841a3ba624c3
+MISC ChangeLog 55513 SHA256 f81c9335a31b5238ff15921596f725dd92261fc014be3cdc587227b924c36bcb SHA512 e8658fedb45d9f4d22cda61855476322f7d81304c62d3265b9f203de534b844143d871b49c391de7404ee38215b406a9498b33967b463e85c2337a7a668fd22b WHIRLPOOL 594fef8fb5ca1fb2191a94beb56593cd692b6ed3b61f2bf0bd08dfaa3fa2f2c29fc8da2013273ffb0dedbc391f32d9a66fa52363967c26f3f5ed82b2137d77fb
 MISC metadata.xml 340 SHA256 a2bf9aefe44513df9e611a974c08d7f26b987c0c48c134a0d6f5177ca6a8676d SHA512 e6f962a94a01ac15a3ab3e83995597248a3216d518635b1a62dd9e118f1650ce23fa553ea7841f177ac5d002acd38f386edbd8e9b93b45f92dc9486358cd39d8 WHIRLPOOL 6567da2c2e38955d3be7acf8586488a843e575d2de2c4ac5442fa337bfb88b51a7f8982193e56840c650e5cee8d1ac40a375ad5589f0fba0953600141d1f0532
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQHeFsAAoJEBzRPIrUMBNCITEIAIVYq11xcraeO8rHvFxGlJgf
-GypvoGep8n4NysYX+Fx21uTylrsQGFl8bztHDnrCU5H6FWacm37scfO69wTvyFea
-umuddXsRfHQWK+ga6SXMO7arTnKd3Kp5KZd2J2E6gf8b3d/S1QWpDSGhT1WI8POl
-Ap5dLWygGhHISFWsmHo9tF5CFlj4wEMB1V0nXEMfCO/b9vDWMIopwgMDTYmwLsqA
-2AIqQxAvAjUAnFSAr1K6M78+bF+MFwYfA6cTAyJJrnZ3Lz+RLZRM8NSTmpJ/vY+y
-44RYgMOs6pMICUIMyrwXqQKSATYa+PXO65dQTxnDwgNi+uiDT38wK93fafjhbqg=
-=MwVg
+iQEcBAEBCAAGBQJQLCr/AAoJEBzRPIrUMBNCLEoIAIRg+pHOkl0E81yusQl4OOnv
+SGBluUNWsA2dzGIt6Qc8sxbo9GptYSiyznPqe3Xn4uCiuvlw3uBuSocCtoTaGPsw
+zKeE8yZ9JFEiBnMNw8PQdTNmll2ABsf49sfHOUDhSZh4LnCPBiQ49eJKZYzrfGCw
+/kRavxrG2G9qsTE5ZWzZsoRmJlH734smOfOx1ZZdNAVdT4XU1hdsl/4yx6lhtsdF
+HUV6jbW9lXaQeWPICcEZeAwjhUQNzYUTCHx+qmnPUQa2qhLAoBsyLujsBTxASBq6
+5p6KCXdYe+IytMG4iwlMO5EXR9Fg10WefZuTxBplyPNwq6D+gWrNVJi1FS8Woe8=
+=E0Uo
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-3.1.0.ebuild b/net-libs/gnutls/gnutls-3.1.0.ebuild
new file mode 100644
index 000000000000..abf63dfa5524
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.1.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.0.ebuild,v 1.1 2012/08/15 23:03:04 flameeyes Exp $
+
+EAPI=4
+
+inherit autotools libtool eutils
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+
+if [[ "${PV}" == *pre* ]]; then
+	SRC_URI="http://daily.josefsson.org/${P%.*}/${P%.*}-${PV#*pre}.tar.gz"
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+fi
+
+# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+cxx doc examples guile nls pkcs11 static-libs test zlib"
+
+RDEPEND=">=dev-libs/libtasn1-0.3.4
+	>=dev-libs/nettle-2.5[gmp]
+	sys-devel/autogen
+	guile? ( >=dev-scheme/guile-1.8[networking] )
+	nls? ( virtual/libintl )
+	pkcs11? ( >=app-crypt/p11-kit-0.11 )
+	zlib? ( >=sys-libs/zlib-1.2.3.1 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/libtool
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	test? ( app-misc/datefudge )"
+
+S=${WORKDIR}/${P%_pre*}
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+src_prepare() {
+	local dir file
+
+	# tests/suite directory is not distributed.
+	sed -i \
+		-e ':AC_CONFIG_FILES(\[tests/suite/Makefile\]):d' \
+		-e '/^AM_INIT_AUTOMAKE/s/-Werror//' \
+		configure.ac || die
+
+	sed -i \
+		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+		doc/Makefile.am || die
+
+	for dir in m4 gl/m4; do
+		rm -f "${dir}/lt"* "${dir}/libtool.m4"
+	done
+	find . -name ltmain.sh -exec rm {} \;
+
+	# use system libopts
+	sed -i -e "/^enable_local_libopts/s/yes/no/" configure.ac || die
+
+	# force regeneration of autogen-ed files
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# support user patches
+	epatch_user
+
+	eautoreconf
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+src_configure() {
+	# TPM needs to be tested before being enabled
+	econf \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--disable-silent-rules \
+		--disable-valgrind-tests \
+		$(use_enable cxx) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable doc gtk-doc-pdf) \
+		$(use_enable guile) \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		$(use_with pkcs11 p11-kit) \
+		$(use_with zlib) \
+		${myconf} \
+		--without-tpm
+}
+
+src_test() {
+	# let it build in parallel
+	emake check
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	if use doc; then
+		dodoc doc/gnutls.{pdf,ps}
+		dohtml doc/gnutls.html
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}