summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs/gnutls')
-rw-r--r--net-libs/gnutls/ChangeLog6
-rw-r--r--net-libs/gnutls/Manifest16
-rw-r--r--net-libs/gnutls/gnutls-3.2.8.ebuild8
3 files changed, 17 insertions, 13 deletions
diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 184ca84884f1..d4ca0d9512ee 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/gnutls
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.457 2013/12/21 09:14:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.458 2013/12/21 12:30:42 grobian Exp $
+
+ 21 Dec 2013; Fabian Groffen <grobian@gentoo.org> gnutls-3.2.8.ebuild:
+ Disable hardware accelleration on Darwin because that causes misc compilation
+ problems for now
*gnutls-3.2.8 (21 Dec 2013)
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 9e810dc24c3a..482b66be41ed 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -13,17 +13,13 @@ DIST gnutls-3.2.7.tar.xz 5098572 SHA256 7ca3e261402e90344585cbd5cc54379f4e294697
DIST gnutls-3.2.8.tar.xz 5135984 SHA256 144156f4140400df2bd9303dab69f44099113a3b46780737734affe93782d94d SHA512 a5bb23a13a55ab4238099bbca4c7eaea66b2ac3b4382f5710654f8714fb33ca81449dbcecb2ac604ee435c4c219f2bdd14371cd4440ae2afb26999585dcef0cf WHIRLPOOL eb10da7b22a125587c42312dd8b586eff726a922db222bab0a5838cbfcab2afaf40a42a3e4cad0a05e350af4575b43343264f731459e163ba4961a0fb9678754
EBUILD gnutls-2.12.23-r1.ebuild 3357 SHA256 da49a8d4219dd293e6016b0f9896db1f36a20f44f89766cd502c034a0920b8a1 SHA512 5c4fc5eebdc5480c873e1ea081c6ff87dbc83405d366459186f6ea0ec1ba6e9152403ae50406a934e5dc7a82920cbd0ee964d44217e1ec2f97b3fd546c8d68aa WHIRLPOOL d1adb02419f85d30b7cdc235279bd56b82764f9a314b64353baf408dde99ab9ab9afa050433cfdb9bbaf1951403d24425c76a22b85d59a946c591298c6e054cf
EBUILD gnutls-3.2.7.ebuild 3067 SHA256 2c8efa654d33a9c1898a8a71781f625cc16db904369a1dcd90482adb03591042 SHA512 90840af136784334567229e8ddd317fb58574c5c8ec5a6ac062b4d890bff7a3dd6593dc7c9abc0f928c47f3e47239a0e9ade274cbec8ef2b7bdb790f9b44cec6 WHIRLPOOL dda43789c132ff42f9385fcf2088399a2b5f466f59419a06a3d2e75d258b548193c87c8bca5b2cac7681951f5b58cf265a490db1b532fc81565ebb2da48e0282
-EBUILD gnutls-3.2.8.ebuild 3067 SHA256 f15c44a0df853e9cbeb1bcec4f2125b39dfc73b0af66eab87bf210f7b337e441 SHA512 bce20b9a5d8beeee77983e4c4adb3b29e757363f3c08bb1a1ad319a171686058c38d15b94058a68b9d8eb7aa9a8b12ebadabf9664b6f9f3e5d8600d7921d7360 WHIRLPOOL 6b1062027699e93c258a174cd18d009d0b20d90da371bc00911638c474fba5f8f0192102fbc43710b11dfa5e2f85126a08bd864d69fbbbb453710693e4e3173f
-MISC ChangeLog 67861 SHA256 7bd0d38f03258231e7ff9de96cab84a7e718569cd321dcd00a2a56527e26ad53 SHA512 05f3b163a7c0c0526813f70e167ecb48c5a4092e40dc468f2d86c353106797c9404f3abfa13b5e7fd173a3697449691c04e9e5d9d56c5933f2adadbb9eccf06e WHIRLPOOL c49d8fdbce9806eded857fecc64e77258a1453d3e9303a768f8083a91c21d8e6b48dcedfe74e445769ae3648925d777012dc0d8ec1cf11e545c84fc9b06b2c61
+EBUILD gnutls-3.2.8.ebuild 3313 SHA256 cb404cbb771c194cc68c9402e676df1f3b5a4888361d3f0111684ff55b2d14f2 SHA512 f073127de4fcf30a559c6342c9f545a283767940ea4854e140bf6891783a4c095c85e452744464c2ca825fdc6dba58b5ed74d1d7685c438547e278dd39ad487c WHIRLPOOL 4da92a5ca5d75b9d097e808e275826c331b158307edda5a5fbc1515cb764557b7da8fba10726016074bb06904313f0dd77db825940e43b6f94e1436cf618d590
+MISC ChangeLog 68031 SHA256 ce9abf3de21524742f0ef9b0f77c29a3f072974dc825046b5b35ba4455844cb1 SHA512 c0bdb602cfb838614a85518b58ec4239233913fd77eba0ed7c62e5407256831ba4bcc380a7c2ba49a3cf417884ff5657373cd4cb790b76c3a315936b153bbd70 WHIRLPOOL f6552ba899f799793c4c668a6b0249621b74439012e0e8c916af8971e71d481481c338f84a709ec99f0eeb280e49946631a2d52d66d9e26b05298aeb34b298ed
MISC metadata.xml 756 SHA256 508edf0b40fd5b36f9e173fc16c9f8983e2fa11d71fcfb427c09be33f09e5aeb SHA512 c752dce48775632e1ad674f2a3f3195c6c68bc3130d5bf38ac63835763181f18105b932b2b65d143872f6eea0de1166f039e280d8b34e340500cef81fa4adbd4 WHIRLPOOL 5f95630b2551b6661a157a0c232f190f7b9647b8f526b6ee4812e36858fcf11ec0452e0519edbfef8591452ac20c68c95d3315511ed42bc7366f48baec76716c
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0.22 (Darwin)
-iQEcBAEBCAAGBQJStVvyAAoJEEqz6FtPBkyjE2EH/jDi1bJomO6p0sSVRHTyyKL3
-hje1raUebuaC8o1OSBvKll9br8mnofsdDWC/kZYc8nu8lRN1tBwv8X89QHOLmjF5
-F/13D+n50RHpG95j9P20rjLdTH9eMxOMs3JsHLbQl++0CtRCEqAl/75RpCwuMeyt
-rvqBeluuqJDO+jSdP+yvzxwM4i/AYzGSwe70a+aOvkD0tXrOJhau4S5Yo4DKjURS
-EO/lPKhu8OmJz0Qg+Op9SQ7ssyePZFagHjDJaKfVl/iB+e/zUJHJHAsCVuTXc5+A
-WWIBKLNOO2vTKqwOKClwf5iVIhLXsk9sa9jfmTdADb1eha+M9TApzL1RtYrZ6vw=
-=2ipv
+iEYEAREIAAYFAlK1ifMACgkQX3X2B8XHTok6WwCdG+zmTLwTy/iiu3LKXAJE0pEQ
+OUsAnAtYBvDa9g3uGxwmLNYCi8STnmyC
+=HGhX
-----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-3.2.8.ebuild b/net-libs/gnutls/gnutls-3.2.8.ebuild
index 43f9215c62ec..9337567b3460 100644
--- a/net-libs/gnutls/gnutls-3.2.8.ebuild
+++ b/net-libs/gnutls/gnutls-3.2.8.ebuild
@@ -1,6 +1,6 @@
# 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.2.8.ebuild,v 1.1 2013/12/21 09:14:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.8.ebuild,v 1.2 2013/12/21 12:30:42 grobian Exp $
EAPI=5
@@ -72,6 +72,9 @@ 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 \
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
--disable-valgrind-tests \
@@ -85,7 +88,8 @@ src_configure() {
$(use_enable static-libs static) \
$(use_with pkcs11 p11-kit) \
$(use_with zlib) \
- --without-tpm
+ --without-tpm \
+ $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
}
src_test() {