Version bump. Simplify adding linguas use flags to IUSE.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 139 insertions, 10 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 169131528d40..6104ab8d1228 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,11 @@
 # 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.396 2012/12/30 11:58:43 flameeyes Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.397 2013/01/02 23:34:44 radhermit Exp $
+
+*gnutls-3.1.6 (02 Jan 2013)
+
+  02 Jan 2013; Tim Harder <radhermit@gentoo.org> +gnutls-3.1.6.ebuild:
+  Version bump. Simplify adding linguas use flags to IUSE.
 
   30 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   -files/gnutls-3.0.20-parallelmake.patch, -gnutls-3.1.3.ebuild,
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 17c7eb53a6f8..2507592e0e1c 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -8,18 +8,20 @@ AUX gnutls-2.12.20-libadd.patch 988 SHA256 b1f73ec17feb72817f39f109ec2e4dc69ea8d
 AUX gnutls-3.1.3-guile-parallelmake.patch 349 SHA256 f6c81df63b3dce52df7754cffe9dfae0b94fcb1bedd68cf99d5546b4f00a8c37 SHA512 2c92817e1ac43e301f0c39edca0991e832a875204e9232106f660157f1db91ce942569ef16193f6b1e80038f3a000836f4ac2bb3d728d4bbb602e09f46ba5efd WHIRLPOOL d578f81a0d645c7430301aa35fb15cc4fde3acc044758f28d6046742053965c0b27c0a2d738794bfb6ce27164331b11387402413b40abac8d95192741f1d710c
 DIST gnutls-2.12.20.tar.bz2 7231438 SHA256 4884eafcc8383ed23209199bbc72ad04f4eb94955a50a594125ff34c6889c564 SHA512 49fde72d049ca75d3df15744519296a5eb982560d739cf9b41033b758564df59698be857bc86825f1ae2dc71b3479208701482bfc085f22e9ff197a65a00d7d1 WHIRLPOOL 5117604a66e9ef30c96b81f3bc09c87f623a0d9aa8e983595b169f178947499c27eb50767375bb9e9ae6684c7670d5532bdff3c5a71e7a4093648d990cc3c230
 DIST gnutls-3.1.5.tar.xz 4959212 SHA256 2f095984dd9cbbf4dce417ecd81640fe47732322d025062b2c9a189d022de0d3 SHA512 388581faf377ea38b2050f70b2051f252fe6f2ac6c021f317e4ad0444a083ef89ae41779faf2f75a221368a24fc7e000123499a4045dd93cb7d0eea33b9f7a84 WHIRLPOOL 69e5e4a29d227ae8e8d2ba9accce7f8eafbf165a28cd08b7d71b4fe4a544aacf7bf747c4b5ac33902e8916320ffe5f5b1d409fe42988d99b0c726184e87bbfa8
+DIST gnutls-3.1.6.tar.xz 5023376 SHA256 83039b8c243ebaa4c31c96c823c88c8c1576de4a7d0d04e10d93527a535e5e7f SHA512 417d2fee727e163b967a5bcb43dcd846b645369d9c30785217062c25f617e67535a1efcf3ff1c8cbc3f2fc20fcc033eea48d57d827b502d270981275b6127417 WHIRLPOOL d34e88f45bc03cc4422507035edbcd906662d7b3d13758160133fe71a34565198af5d2c62fc241f83a5df8bebb41fb1dfb4b12b78a2eb78431f1f8ae192c0eec
 EBUILD gnutls-2.12.20.ebuild 3610 SHA256 785c319b735c8536cb34683fa863a6768cd04900dd83f5d1bfbcd69a11549e55 SHA512 6aa65bd7b955de2d84119c1d78d2c112bae99f90ff568b30ec2fa6c31fd659a2b8df7ec3a37fa11697d32d14bc8a7e12c2177b002863d272ee2c751adc259275 WHIRLPOOL 2f5547bab0891526543100f41e54eab92fbd4244f087e4e4ffa6014a6e0489930ae246583807402f510b1a262f79f00839153cb8a76d95773e7354f8da743528
 EBUILD gnutls-3.1.5-r1.ebuild 3127 SHA256 d841c0c1f1d58b1414a586b8b5473033b843271b755392d491243f41442ed224 SHA512 97104c210dbd4451dc78334132939972ad4c4963e94ad24f34d6ffce7270b5b205fa58f4c2d6fa3d4a267fe578a8657f244961dcee3b9359ea0caecc5d174d82 WHIRLPOOL c3b4e4a68b6e0f474035b9e74bf3dcd93e9f147d51bdf923b74107c0bcf28e8fa8717933ccc6df72dbca47411b4c57f716f45769c2984331cd293efc6f5ce08a
-MISC ChangeLog 59221 SHA256 e4e8ab81f3e457222c31ddeb3bd4ea0cb59441cc9c50c3c5408132a8731a15fe SHA512 eec22bcbb7fb9b5b228b21a2593c6a51c086d7a08fcdcf44609dbff1a373d6b079421ef78182e6d4be49205820acb1542770fcc29ea83e882be2b5915ffba053 WHIRLPOOL 704be9cecf7723250e5be68159eb34e33d58ed6d83ec6c557e2b2ef26e4f01cfa127f017ada93e4a8f87e5db0ec4c8d07b9024ff53de667f56b90c0fa64832e0
+EBUILD gnutls-3.1.6.ebuild 3077 SHA256 612d9e33159d7c9f57246e3e29efc13a286ecc25fe8448b81de3b5304103225a SHA512 00d52adc4a7d3dbcda74126bc8d355439f057e89763b91342b911cd5926170bed45376ddbc1c0904075cd1fd7a0980a5e1899bd21dcce9deeb18caeeb01a4aba WHIRLPOOL 6e653e1752a660682691990e7adc437b84234cd4b23f25826a50387acf5f50c0aff60c5985089d39335b88610e8264ae7b3a4bc2bc831f1f17172a77e2e9a12b
+MISC ChangeLog 59381 SHA256 fb2d8f37d9f0e51eb65da25c05b9ed54f778ba7dee6799c9fec5af4c1a5a11ee SHA512 49fb9438756040fdfbce46c51a3ec34d0dd4ece4af16915a29213a63ce86a9aab80458af0a506d461ce9a764907fd8173c6263d3b70a076c3c49a42a48c9fd7e WHIRLPOOL b1e7a7b7cfecb05f52bf3cb1a7daea2617cf313a59e20c2798e3b43ad3d3e2e1009b575da34f5827e8972c45a87a3316eb020141b07a6f7e7104ed2d82539a8b
 MISC metadata.xml 756 SHA256 508edf0b40fd5b36f9e173fc16c9f8983e2fa11d71fcfb427c09be33f09e5aeb SHA512 c752dce48775632e1ad674f2a3f3195c6c68bc3130d5bf38ac63835763181f18105b932b2b65d143872f6eea0de1166f039e280d8b34e340500cef81fa4adbd4 WHIRLPOOL 5f95630b2551b6661a157a0c232f190f7b9647b8f526b6ee4812e36858fcf11ec0452e0519edbfef8591452ac20c68c95d3315511ed42bc7366f48baec76716c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ4CzFAAoJEBzRPIrUMBNCjZsH/jWKX3D13gwXv2YDksCxQY8o
-Q7uJ+a9/opa9uudB6lU47Y1xzvpOenvj80AGNlL4q3ZtKadkbzs5OB8tMtVSA+/o
-IYtH/OcgWI2B9rreKJz9YPrNHh+To24ppqm9dVwUQRXsiGHNh6ICOCmzY+9Y277y
-PUEWVubF0tkKFR+PhOGmmORq4JjPWoDfIW5JzOA5EQXwHSNUdwNOz8DZWhQR6bNh
-ApHRH53oJjJPl/rDoBHmp8E0i0d+f2XIiFav776V1xPqSj/JrWDLTeoYMtAqrYeC
-MHpTduDrgctwNG/wQx1LETQOVm7w/27X0NDo3aEpcE3jjixboiqEuu9AGFsxsgs=
-=Gg9u
+iQEcBAEBCAAGBQJQ5MQYAAoJEEqz6FtPBkyjjSgH/0TLBQFzRBxyMjSAY1PkcXZ5
+/EMkaWXEzhY0Xfl9qAnuIx1/PCp0Ua3IS6o6AFxRGWwGQT1XAhF2LAeDFoiCwzy0
+3k3xyFao9y10Zl1h5KPBD/wRjiWE+ClwR/bUP5iQ15agVENPVKPBHhj1WOvA9wkf
+sqLMY5XH0sm7FgWsl5FSerMyecs1A5VbSg/npUSm2qHssHNxwJ67CcsRKylLK0za
+3ES/NgUIT+5+qfKw4Liei5abpaaLtoaeeH74M4gmzE8tPgdIDaQaeaw7T3kQDCDd
+P4o1VAKsYuzn5+NAgYyGSHK0eOeWxjtITHVoohI8DdMKv/KkU0euPLo2lzWJwYc=
+=zhQY
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-3.1.6.ebuild b/net-libs/gnutls/gnutls-3.1.6.ebuild
new file mode 100644
index 000000000000..5a5c0b98c7ec
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.1.6.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.6.ebuild,v 1.1 2013/01/02 23:34:44 radhermit 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_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
+IUSE="+cxx dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
+
+RDEPEND=">=dev-libs/libtasn1-2.14
+	>=dev-libs/nettle-2.5[gmp]
+	sys-devel/autogen
+	dane? ( net-dns/unbound )
+	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
+
+	epatch "${FILESDIR}"/${PN}-3.1.3-guile-parallelmake.patch
+
+	# support user patches
+	epatch_user
+
+	eautoreconf
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	# 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 dane libdane) \
+		$(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) \
+		--without-tpm
+}
+
+src_test() {
+	# let it build in parallel
+	emake check
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	dodoc doc/certtool.cfg
+
+	if use doc; then
+		dodoc doc/gnutls.pdf
+		dohtml doc/gnutls.html
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}