drop textinfo and enforce UTC timezone, bug#520818

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

3 files changed, 180 insertions, 5 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index c71b9b6d4edc..7b5a120cb318 100644
--- 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.517 2014/11/23 18:56:21 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.518 2014/11/23 23:13:33 alonbl Exp $
+
+*gnutls-3.3.10-r2 (23 Nov 2014)
+
+  23 Nov 2014; Alon Bar-Lev <alonbl@gentoo.org> +gnutls-3.3.10-r2.ebuild:
+  drop textinfo and enforce UTC timezone, bug#520818
 
 *gnutls-3.3.10-r1 (23 Nov 2014)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 673764106ef8..b1a49a5b4556 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -20,12 +20,13 @@ DIST gnutls-3.3.10.tar.xz 6173572 SHA256 e27553981d48d9211a7e5e94f6e78c575205202
 EBUILD gnutls-2.12.23-r6.ebuild 3552 SHA256 b4a141ff1d0788c8dbf1be66fdca6e7b9fb1fffeb54d44a3c3852133cf9d754d SHA512 cdffb4af5421fac4a72116868b18da98b1c1ca16356c9210ea3127b3c16e171777a013021b1575208bfa873b7bed7d5a3107689d0f2f3dce0c5fd1cd31d2ed17 WHIRLPOOL 8237f17fa94fea35393d6bfdbab319caa43e598744402f43c3b3a483bb580e6c85ee1e4cdfa996688f1cd5e23888a8558eff91bd158cd047f65cbc3d754776d8
 EBUILD gnutls-3.2.20.ebuild 3486 SHA256 015e88770e35facab5330b6605cb894be56d6dad00dad366a2ba894d3384c716 SHA512 86d0d799bb09b785cc161709b4d593a0edf8a93445d2ee97dbf0443e9a828c046b64e008ad54bd37f4cda25a82c24df0cab8c0912eb19d25cea57f8c3c78acc9 WHIRLPOOL 3c3edb3b66b830b14a7376b9e6f4240621999acc8ee0195b41b3e0758eb937e0a58dfc0a9b1f63a2f39ec6eec30a02ba2d5d8421eb96fc01eb76148a8a642d0b
 EBUILD gnutls-3.3.10-r1.ebuild 4800 SHA256 387f2a208384adcdf4ad3460b48a586133d373488a6abe5daad8a024e16f751d SHA512 23ca14ae69f03642c82a19efed704963f777b54da7d7b31a4bf0cd17892a8e1b90917937f0747181edf65c3e399daf54739867ea867a02e3e230e410b5cf3b39 WHIRLPOOL 838bfe0e9bba5fa942af55ac52e51ab999fc987a9c69eac909683cb4227d68ab1bcc6d3de801912baac8e2451ef3ac3e22c2461557bb10665ac130d343c839ff
-MISC ChangeLog 77633 SHA256 4658ff7953349173f1e4dce14c4f0d9ca8eed976b882f1dd236d2e0f4531c680 SHA512 8ce26f2f1805351d9c384cbe57a613c21ad38037c34695ed61d176f732cca6629eae5664b9cff6b18e923d46cebec6265f45a074fee888faf5492e39f7e7f9bd WHIRLPOOL 4008f07742b29c0da0dc1909b4f57e4aee4f166e1496c8dd17f925df53b36d7518eb75c72bd8931534bd22a758856df3f8c5633b0a129456a2639b6efb5fbde9
+EBUILD gnutls-3.3.10-r2.ebuild 4822 SHA256 aaff0126e16ea51ed90cc0bbcb658b7ac5b80a9d784b752e16599f9d2188e4d2 SHA512 a053b3394d0c2b75d0b13257a959885935a5d2678304d567c2691e43f0c9212c501421283ddcb6cc76f2aeb69a72192f37cc8e5be74f44dac65c757722d29520 WHIRLPOOL 9583d44e33e1f3018802beaf417f870630987153f84f8053c798cddfc8db34de6b00ddf03d6d29afc8d5dd028c6c0feb024c6fe812ed512d48c87e201889f3ea
+MISC ChangeLog 77794 SHA256 b83c9655af011079698d17ebf7686c7b3f9c431cd951a668b1ee82241a5e5a5c SHA512 60464a0d6f182dfb65c91a0c57cc098a48691334840518d71a1d11257a1796fa8dede5aea26f849b56c51e3b5e0f069ad6ea64336c22f721e2fe5e8a3cf0e7b8 WHIRLPOOL 0f33e503e4797a77becb548371f957468abce53a17d1a3ca1adf3710cde2100ccf13f489d6a16ddb3e94c20877f3506a4924fbae378c3db1aeb0f4fd3ac50bcd
 MISC metadata.xml 875 SHA256 a0a8b100321cd3bfc4458cdd37570fafbe7270bce36b15ec8f17ece2232a5906 SHA512 1cd6b55fc3fe2460a6fad153190a95bb97a3baf7c2ae153a4548be9922f4775518acb9dd858f98191f3972dced8e8ccc1da9309871ffbf4ccdc7bc394d343bd2 WHIRLPOOL 4fd8f09f0f43c80ee037785de47b67bb9ae8a6e7928008290beec977a64ca8744c7d15b96eec0dbcc142e1dc753eab850b72f4182330ae25c6f29001ccb06637
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRyLdoACgkQXYk9GL8g3FE6nQD/bAhKffDx60susYClcscvuxMV
-bbY8dMUgyAMnbKwKZbsA/RbNdAyRQeDJH/lV0XyHGt/SWnKA0iWMPhCq/INRvqK6
-=ifVw
+iF4EAREIAAYFAlRyaiIACgkQXYk9GL8g3FGRcwD+LaQklegm3HTSTYyOvckfq55c
+h9/8psAHz4L7XxPgp/0A/Ax0kNgS6ineCWpUbnUbi0Va5nm0a/JzitVkkkiAT1vD
+=hzyh
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-3.3.10-r2.ebuild b/net-libs/gnutls/gnutls-3.3.10-r2.ebuild
new file mode 100644
index 000000000000..844758964c39
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.3.10-r2.ebuild
@@ -0,0 +1,169 @@
+# 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.10-r2.ebuild,v 1.1 2014/11/23 23:13:33 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)
+}
+
+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
+}