Fix libtasn1 dependency, bug#530060, thanks to Harvey Mittens

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

3 files changed, 15 insertions, 8 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 09ac0ce4b69a..c71b9b6d4edc 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # 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.516 2014/11/10 18:39:07 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.517 2014/11/23 18:56:21 alonbl Exp $
+
+*gnutls-3.3.10-r1 (23 Nov 2014)
+
+  23 Nov 2014; Alon Bar-Lev <alonbl@gentoo.org> +gnutls-3.3.10-r1.ebuild,
+  -gnutls-3.3.10.ebuild:
+  Fix libtasn1 dependency, bug#530060, thanks to Harvey Mittens
 
 *gnutls-3.3.10 (10 Nov 2014)
 *gnutls-3.2.20 (10 Nov 2014)
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 91ef9a3a938e..673764106ef8 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -19,13 +19,13 @@ DIST gnutls-3.2.20.tar.xz 5160184 SHA256 7967057e78c3ed968e524a07ab262681219b730
 DIST gnutls-3.3.10.tar.xz 6173572 SHA256 e27553981d48d9211a7e5e94f6e78c575205202a181c2345a1c8466ebf1d2219 SHA512 3f73af238c48322d1df59b8c27c2bcc5e03f25e632792279a1e25a3712d71108f83b6e135bf1766917e84ec9499f4419c266c2a43a8e2ccd8dd9efd6f15d85ec WHIRLPOOL 1ef664b763acaff9292f96db86f5ad441a4c49141d1d3529ea970cba67fc5714b509be1350250bb01bfd7a863e466b7f4d5590caa5236dddc680b6ca709ec93e
 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.ebuild 4765 SHA256 59164cfb5d0cd3fd16b05c514fbacfd81ed95392f06675494e72370c7cb13fef SHA512 559627c4165658a8ea84b35f2d5abbab15e34faf1976ce411a142a53fd07c1e68a6d08739ed9decddeef425ea21e42766b1c41a5fadb06c866b394f446ef62d9 WHIRLPOOL 4d9bcfe04086c539f247d3e458542eb71abb6a7b86834e7e62fcaa4f8446ffde5ef2d96f3f76dd7e168ce45b436400465d3148f2782f2667c09da8c4f0752d33
-MISC ChangeLog 77436 SHA256 313e2b89aff39e61bf1bc8a0f3ec430c3ad578f0606157b476773159a0dcf167 SHA512 398a657cab3444c72716ac63eb493a4840d827921172d6f42b03f2aa26e35267e210946f52d204d7611caf1df289c6e52021424f0195b5bbd52ed1f2934ac3d5 WHIRLPOOL ea1d6b31bfdb8fa1860120c89c129f2a0125a5c9bac395674c6aa0b24a1a58e23e29c495994f1956decd984e119b43619d8a250cdee3f07abf1f26ac824c3963
+EBUILD gnutls-3.3.10-r1.ebuild 4800 SHA256 387f2a208384adcdf4ad3460b48a586133d373488a6abe5daad8a024e16f751d SHA512 23ca14ae69f03642c82a19efed704963f777b54da7d7b31a4bf0cd17892a8e1b90917937f0747181edf65c3e399daf54739867ea867a02e3e230e410b5cf3b39 WHIRLPOOL 838bfe0e9bba5fa942af55ac52e51ab999fc987a9c69eac909683cb4227d68ab1bcc6d3de801912baac8e2451ef3ac3e22c2461557bb10665ac130d343c839ff
+MISC ChangeLog 77633 SHA256 4658ff7953349173f1e4dce14c4f0d9ca8eed976b882f1dd236d2e0f4531c680 SHA512 8ce26f2f1805351d9c384cbe57a613c21ad38037c34695ed61d176f732cca6629eae5664b9cff6b18e923d46cebec6265f45a074fee888faf5492e39f7e7f9bd WHIRLPOOL 4008f07742b29c0da0dc1909b4f57e4aee4f166e1496c8dd17f925df53b36d7518eb75c72bd8931534bd22a758856df3f8c5633b0a129456a2639b6efb5fbde9
 MISC metadata.xml 875 SHA256 a0a8b100321cd3bfc4458cdd37570fafbe7270bce36b15ec8f17ece2232a5906 SHA512 1cd6b55fc3fe2460a6fad153190a95bb97a3baf7c2ae153a4548be9922f4775518acb9dd858f98191f3972dced8e8ccc1da9309871ffbf4ccdc7bc394d343bd2 WHIRLPOOL 4fd8f09f0f43c80ee037785de47b67bb9ae8a6e7928008290beec977a64ca8744c7d15b96eec0dbcc142e1dc753eab850b72f4182330ae25c6f29001ccb06637
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRhBlEACgkQXYk9GL8g3FGOUwEAm0Mqa/hQeHJ8SYERAn4V7mXr
-e2om8++VVP8Jf5ASqyQBAItli7HOPiVutCFYVmTO7eErlDcTJJFAzqTGTdzIwgxv
-=vsVF
+iF4EAREIAAYFAlRyLdoACgkQXYk9GL8g3FE6nQD/bAhKffDx60susYClcscvuxMV
+bbY8dMUgyAMnbKwKZbsA/RbNdAyRQeDJH/lV0XyHGt/SWnKA0iWMPhCq/INRvqK6
+=ifVw
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-3.3.10.ebuild b/net-libs/gnutls/gnutls-3.3.10-r1.ebuild
index acafbf80fde8..19ebeb6d7297 100644
--- a/net-libs/gnutls/gnutls-3.3.10.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.10-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2014/11/10 18:39:07 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.10-r1.ebuild,v 1.1 2014/11/23 18:56:21 alonbl Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ IUSE="+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test zlib ${I
 
 # NOTICE: sys-devel/autogen is required at runtime as we
 # use system libopts
-RDEPEND=">=dev-libs/libtasn1-3.4[${MULTILIB_USEDEP}]
+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
@@ -88,6 +88,7 @@ multilib_src_configure() {
 	econf \
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		--disable-valgrind-tests \
+		--without-included-libtasn1 \
 		--enable-heartbeat-support \
 		$(use_enable cxx) \
 		$(use_enable dane libdane) \