Fix guile build, bug#508454, thanks to Ed Catmur

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

4 files changed, 44 insertions, 7 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index fb6f83dbb5c9..a6ca45f13df9 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,10 @@
 # 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.486 2014/04/22 17:36:58 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.487 2014/04/25 19:05:35 alonbl Exp $
+
+  25 Apr 2014; Alon Bar-Lev <alonbl@gentoo.org> +files/gnutls-3.3.1-guile.patch,
+  gnutls-3.3.1.ebuild:
+  Fix guile build, bug#508454, thanks to  Ed Catmur
 
 *gnutls-3.3.1 (22 Apr 2014)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 3a8fcf17b1b5..2f2b6747d132 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -11,6 +11,7 @@ AUX gnutls-2.12.23-CVE-2014-1959.patch 584 SHA256 f1e6290cb19e517ba460ef359914c8
 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.3.1-guile.patch 870 SHA256 ce8d4cdd9245e9aee19ccf2f6f29041ac81d1457034d70313ea343857cc4aa6d SHA512 33f2ef6ec5ea5e139220844a9e3360ce67a2f9a7a321ead33335eeb7bb5482c7b4515c80473a864194e24cd82cb60a86b8dd7a7339026152456091929fbb4ad6 WHIRLPOOL 9674c9521e527fe6a0e32d0d19e075a4c97c996091294e6cb2d768ac14dac80c67c81b424d6bc739fcfbe89738df029aad1bfd25f4b07c5ab5afaf977a50413c
 DIST gnutls-2.12.23.tar.bz2 7279415 SHA256 dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2 SHA512 7780e9ca7b592350ce9b11e53a63d3212320402d8ad2462bfbc0e69aec4a48bb372a1925627abb7996535c87c90e3d79537ea118c8bb36d26aae8e19eaae3a06 WHIRLPOOL 8cab909c961760c72b478d5cbe75633ce0d26190fdece018e9f33b171879753ed38348c33c00fda7b5f3a6b596a5439fb62f1c82a891e9e62fee5bb784cf7e11
 DIST gnutls-3.2.11.tar.xz 5135168 SHA256 b844c58a72d6930abbda42129f4051dbf97f91754bea3514931173e3d01cf3c1 SHA512 a373c807a23d427ad721c35efe98b46352a9a7f4cf4ca25193a7b91b7b6a5675b0ac071f8c782691c1a449a3bf1bd6e37c3eb003f2487c802a82f5e8caf417b8 WHIRLPOOL 9f6b0f160c5f0109febbf1ca500ddc764d59c30e8e632868190034dd829c5b6439346bca8ad3f593f7f39f5e5f3a77adc53f1e216aa256d92974f82048a8a222
 DIST gnutls-3.2.12.1.tar.xz 5137552 SHA256 29069907546f6b9e134aafcaa52a030f517835c83de9ffc38b51ab33c31adf12 SHA512 f9fd9fff46a0fb46e46a0d44288c8c4984f1d3688415a71aeb1518007b11d51bd7280d7e6f0d9d0b4d514a702b42d351a0a6a185feb7931f5696eafa87251871 WHIRLPOOL 66fdc44a37cfd40faffcd46634fa2b9894fcdf98e8549773b7a68ebad49a838bbbb7b331e64fee43a7399b85af29df74d9373c5e835c391a274862b4652fa99a
@@ -24,13 +25,13 @@ EBUILD gnutls-3.2.11.ebuild 3348 SHA256 19fe0e801fed34dd2933f0ff358c7963e09e9778
 EBUILD gnutls-3.2.12.1.ebuild 3488 SHA256 44031e77b877a5330943bf2cfb4c678d32cd76cc2e3f3e6bc01dfbe83763a5ce SHA512 6ff0f202b10ad72fcb1573bd0cd5efe7826b021183dabec543f366d0913d78b7e761b18a9a3b5636def2398e0cf9e64bb9a03ca6456fb46218cc1410b579e634 WHIRLPOOL 2f61690ebfbced159583ba64d61abf20d19e8da612f00b3a43bb0181a0de7b719289a33ee50ff3b15d405a943f7ffa92bda8c8a27cd0c0cfffd1dbe5b6854d6a
 EBUILD gnutls-3.2.12.ebuild 3351 SHA256 8151cb5985a9f11f92d917f319c961119797fd58ce25363af97752f29ceba225 SHA512 4de834f1dc456aa9013e8195293a507f00e35748075bdb518a97ea79a2d7d7ed6f6a71abe913a2b9e26bca60b24112e94c2c4507c208a7c7cbeff3eacf69be83 WHIRLPOOL 22a02bdcb0269dea008a576d8c53fab99458e1a7dda9d627f26fde14e4c1fdfc16a9bb4df5b0a95e9370c05b04b37d7746672086c9fe89dfb433a9784f0f12a2
 EBUILD gnutls-3.2.13.ebuild 3489 SHA256 aec8283c28edd60d9b4ce203b0650c18dd35fa3f22734dbb3752e7d43a4c26c5 SHA512 ac79d1273b0b6dcd79ed57f4687df4e2755c8233b4e5428e43d4bcbbfbdb5d189e8bbd8983f4bd5197338a532caf4ffad49fbd12fe675a6c0223511116db4a96 WHIRLPOOL 0f2c9749a6f91cf91b95af07cb70be05d0ae706fb8b512a526ece4e64e14921a4b27f9b73eddc698fe576e8acf98f953481295ca74ce450936748ebd085f9cdd
-EBUILD gnutls-3.3.1.ebuild 3218 SHA256 f8b253783b26a6bafbd2af9069f76ddb0864237a4ca3a88c896b84ebb015c69a SHA512 654a61b6e75855dd14a8db82f69e57c009b7500214b6c58ad2aa82e7c1d609a7273caa58358326dd4f2de6daf91f576f897f487b5208de9f3975dc396060f9ef WHIRLPOOL b69566ce964effc3e13036e5eff3fbdb5f9ebccb75040854123b2b105f7a713980a541ca52527ca771f74e8b5f45ccb7d28b4eba49270660c3e8badbb864b233
-MISC ChangeLog 72111 SHA256 0eae2dc711845643e668852f90c0b615d82422e81028da9796783af3891c553f SHA512 e37338cc2280019391361266c45a8ed77c4416ca544e03c5eada150a6a2ab29623493f8d7fca78a35a8cca5b7a8b9be16dfb556115bf4808f5d048011cc55dab WHIRLPOOL 38dd1792e9febeb2eb79c06f7f434f0685a5a4bb4436819e65c2c03236a81e795768b0b86ab38df19e056df6873dbb81acf8c9356cd6e7f0f23a82de9c8c034a
+EBUILD gnutls-3.3.1.ebuild 3258 SHA256 49529f5e126920b950377047ceae4a0dc494a935b195d08530005f9b2b416216 SHA512 1ae66b8c1a0b2e604d5c277fae83cbf4ae6fdb09b6ebc19e608450b9df63e89577461eebfd7e3c854f98a2cedcb8fe8b046f0d2462e5f4954afc13589b3a9be8 WHIRLPOOL b57f7bbc9581fd64890a2f1af4355c98b87b5e349e91c194c0e1a172492d9108a1e2697a69ab9b64c68e342287ee46d9c3bc82bc83660fb6778792c0bfd62d93
+MISC ChangeLog 72268 SHA256 ef92084346fd047df2bceb10196547515008a21d98f5b21d398614b6107172e7 SHA512 e5cace7b92085b1e5cc34c82f7edb8ed35362bb82aad3c21ffac115f9752a2ae99e3c97b628bc5598b62ffe7a304acc45d58ba3282c14834204ebbbab0335e0e WHIRLPOOL 5e812811bc349345cdf775c0775058c6d2af6b1c5a8c436e9e3856e4faab74764fc5bcccf8696a95b198a682fb373ebc93ca95cfd3d59b4670741c0ee301e701
 MISC metadata.xml 875 SHA256 a0a8b100321cd3bfc4458cdd37570fafbe7270bce36b15ec8f17ece2232a5906 SHA512 1cd6b55fc3fe2460a6fad153190a95bb97a3baf7c2ae153a4548be9922f4775518acb9dd858f98191f3972dced8e8ccc1da9309871ffbf4ccdc7bc394d343bd2 WHIRLPOOL 4fd8f09f0f43c80ee037785de47b67bb9ae8a6e7928008290beec977a64ca8744c7d15b96eec0dbcc142e1dc753eab850b72f4182330ae25c6f29001ccb06637
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNWqL4ACgkQXYk9GL8g3FH0egD/Z46QTnfnvsfXu5sR0aL/qU5k
-PzbcWTmpv+AdgLyJ7KsBAJc9EAWTQ0Am1eVfLxEzWulUg3Zdc6HhaPD3mtLDwdKy
-=95Dd
+iF4EAREIAAYFAlNasgMACgkQXYk9GL8g3FG6XwD/TXam3DesBquL1J+rIXTk5kFQ
+YQkMknV1396TJJZPS8EA/1fSu6yQ421+ehX8Tdj8OEbrO+P49PHLJXj3vH4+ptp0
+=bB2G
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/files/gnutls-3.3.1-guile.patch b/net-libs/gnutls/files/gnutls-3.3.1-guile.patch
new file mode 100644
index 000000000000..e0cf96af54c4
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.3.1-guile.patch
@@ -0,0 +1,30 @@
+From 872409857351f28b1e3c21526bfa6606c918b176 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Sat, 19 Apr 2014 15:04:54 +0200
+Subject: [PATCH] do not override gnutls' allocation functions
+
+That was not being done using the API, and overriding them
+is no longer possible in 3.3.x.
+---
+ guile/src/core.c |    5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+diff --git a/guile/src/core.c b/guile/src/core.c
+index 6940eae..b40e93e 100644
+--- a/guile/src/core.c
++++ b/guile/src/core.c
+@@ -3364,11 +3364,6 @@ scm_init_gnutls (void)
+ #include "core.x"
+ 
+   /* Use Guile's allocation routines, which will run the GC if need be.  */
+-  gnutls_malloc = scm_malloc;
+-  gnutls_realloc = scm_realloc;
+-  gnutls_secure_malloc = scm_malloc;
+-  gnutls_free = free;
+-
+   (void) gnutls_global_init ();
+ 
+   scm_gnutls_define_enums ();
+-- 
+1.7.1
+
diff --git a/net-libs/gnutls/gnutls-3.3.1.ebuild b/net-libs/gnutls/gnutls-3.3.1.ebuild
index b88d842c8db7..e132665598cc 100644
--- a/net-libs/gnutls/gnutls-3.3.1.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.1.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.1.ebuild,v 1.1 2014/04/22 17:36:58 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.1.ebuild,v 1.2 2014/04/25 19:05:35 alonbl Exp $
 
 EAPI=5
 
@@ -53,6 +53,8 @@ src_prepare() {
 		rm src/$(basename ${file} .c).{c,h} || die
 	done
 
+	epatch "${FILESDIR}/${P}-guile.patch"
+
 	# support user patches
 	epatch_user