Fix build with gnutls-3. Bug #421455

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 32 insertions, 4 deletions

diff --git a/dev-games/libggz/ChangeLog b/dev-games/libggz/ChangeLog
index f6bc80b8d0dd..a1f5698ba3f7 100644
--- a/dev-games/libggz/ChangeLog
+++ b/dev-games/libggz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/libggz
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/libggz/ChangeLog,v 1.32 2012/02/19 13:37:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/libggz/ChangeLog,v 1.33 2012/08/25 07:30:28 tupone Exp $
+
+  25 Aug 2012; Alfredo Tupone <tupone@gentoo.org> libggz-0.0.14.1.ebuild,
+  +files/libggz-0.0.14.1-gnutls3.patch:
+  Fix build with gnutls-3. Bug #421455 by Diego Elio Pettenò
 
   19 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org> libggz-0.0.14.1.ebuild:
   Do not install static-libs unless requested and remove not-required .la
diff --git a/dev-games/libggz/Manifest b/dev-games/libggz/Manifest
index dc27eeacf921..48d17adecb65 100644
--- a/dev-games/libggz/Manifest
+++ b/dev-games/libggz/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX libggz-0.0.14.1-gnutls3.patch 657 SHA256 6d3ea58f6b4ecfbfa9da2b427fbc84093c46fef68613b1be8346229ec288c40e SHA512 5a3268d33a7b5e379b522936beeb1df6d6f11a40f1c5b06b1f1deae6605d89c644a15c2e586acd4a8f93fd623cea9d6a9eb206a904d9add89567b5076bcfc157 WHIRLPOOL 9cb81dc6990d5d40555ad41024a03d07649c9a631582cf07dc7851bfbc20a927360723f7d8e39f2743d802441f91cf5e5ab728e7bc6fa5146b85b9485113a530
 DIST libggz-0.0.14.1.tar.gz 477382 SHA256 54301052a327f2ff3f2d684c5b1d7920e8601e13f4f8d5f1d170e5a7c9585e85 SHA512 ca034d8196c151a59d3afec6d37270a974b2f9d9c380f46ef01238077b7c3c1b5686cb5252754523d985963e14c88e27b39da3c362e7accfbe550bdd5837634d WHIRLPOOL 9db00d2604ada74f15bea792fcc3e1e14d7faa85be1dafdd82c6d824a3d4ae4a698b6c331a917f10175c68a6a37cb5935b98ffcbf17ef0f8dcd2878daf21050e
-EBUILD libggz-0.0.14.1.ebuild 828 SHA256 2c79d0c8da3c420013686341ab7e06455d833ff8345bdbb26e078f21078e3009 SHA512 5222a490eb7c559803283a81bf199fb5442586d07fabf434246bbe60c2540cce366b9e8512d9e74fd4ca3583b32beb4ea3ec774448d526bde2077591c4969d22 WHIRLPOOL ae7b6fa0360512d165091887d2c8efd860be9e3eb7a5456ba570ba933788b9a06452babd67920f2a07a94fb3bb3b425340244449a8398470f1fa11bd1383759a
-MISC ChangeLog 3982 SHA256 fee150314f1bcd232646a246b91a015106051079a2e5a9251e79b877be6507ac SHA512 6ec4a6e3f7214c65f08446039fc0aed0be81e2a6827823c2aebb7a20a4f937517a461f104657fc0da5a50a8d5f735edd28696d5e9aa0774981da6844fc93f974 WHIRLPOOL 3fc31c402e2c0d23aa9e518e04ca91b347eec062ee8e1b474641eac2ef55e3c9c39b88d73e02e851dbfed5b071bf9be329b222201a4ec4e7658563e0b17c07e6
+EBUILD libggz-0.0.14.1.ebuild 871 SHA256 ff5c153dfab466c717b02729db2d5fb30000ee7966f1a8763c90867be04d0273 SHA512 fb00811d5ca0226f47982333f5699e48ea0d9561e1a4f68c7e30e567151d2d659461f028c01da2b1e2ee84f8b3eaa58efb5c5f33e4abf73871ed73b0a602e17b WHIRLPOOL f3d8b0a375facd230c0192ac241fee1795098ca1d966ea63994806b6fc8a91fcefa2fca168218a23510675b1bad24a30104c57ae83641428c8dd8beb70dc115e
+MISC ChangeLog 4156 SHA256 0b35a06612394c4895fedac677cd31fff4c95b1eb125fc0bc9bb26193339df51 SHA512 72277f3e9320209ea586edc58f0a4ee50bcd84d62b1e7774b62f7fb0474b5d6803acce8f9e31aa652cf20af6eab0038655744ef659e1c80aa6e546d7d4e2aa67 WHIRLPOOL 77586be356d9c072ef08084e47b7f3ecd5d5d9ae00c2facc53f596ec56938822ad2328029d58ed99155dae2597d4d9cbaf79058748a43917a8c5ab5a706e79ec
 MISC metadata.xml 428 SHA256 ca242ceeaf7a146b8ce0ad3ce0a7f1761edaf7324b735a2e910619ad9c6d29af SHA512 9ac8e1a091bf9ab8397039eb45dee04bd7a98fab3498a3fa720c1def4ac551c42336b3de22e208f77d11de2f1654f1b0daa6781c0402f11293c302c0e1a803b9 WHIRLPOOL 9231e0b6203750297f0ce5a5df921229679e2d1b51cae41c44ede48a79bb425894ce0c2ea8d9144a01f80711973f853a8f211ac1719d2f51aa745a7160ff2a0a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlA4fx8ACgkQIY77eQFFFC2fnwCfej3LICc6qeWwoIwoUsxDqkGF
+8+kAoO6vRFD1uDADaUBkEM3AD+D4/3oA
+=bhSj
+-----END PGP SIGNATURE-----
diff --git a/dev-games/libggz/files/libggz-0.0.14.1-gnutls3.patch b/dev-games/libggz/files/libggz-0.0.14.1-gnutls3.patch
new file mode 100644
index 000000000000..221ef59c8b29
--- /dev/null
+++ b/dev-games/libggz/files/libggz-0.0.14.1-gnutls3.patch
@@ -0,0 +1,11 @@
+--- src/security/ggz_tls_gnutls.c.old	2012-08-25 09:16:59.000000000 +0200
++++ src/security/ggz_tls_gnutls.c	2012-08-25 09:17:20.000000000 +0200
+@@ -56,7 +56,7 @@
+ const int mac_priority[] = {GNUTLS_MAC_NULL, GNUTLS_MAC_MD5, GNUTLS_MAC_SHA, 0};
+ const int kx_priority[] = {GNUTLS_KX_ANON_DH, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0};
+ const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0};
+-const int compression_priority[] = {GNUTLS_COMP_NULL, GNUTLS_COMP_ZLIB, GNUTLS_COMP_LZO, 0};
++const int compression_priority[] = {GNUTLS_COMP_NULL, GNUTLS_COMP_ZLIB, 0};
+ 
+ void ggz_tls_init(const char *certfile, const char *keyfile, const char *password)
+ {
diff --git a/dev-games/libggz/libggz-0.0.14.1.ebuild b/dev-games/libggz/libggz-0.0.14.1.ebuild
index d4edc6aad4b6..7fd56e946658 100644
--- a/dev-games/libggz/libggz-0.0.14.1.ebuild
+++ b/dev-games/libggz/libggz-0.0.14.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/libggz/libggz-0.0.14.1.ebuild,v 1.14 2012/02/19 13:37:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/libggz/libggz-0.0.14.1.ebuild,v 1.15 2012/08/25 07:30:28 tupone Exp $
 
 EAPI=4
 
@@ -18,6 +18,8 @@ DEPEND="dev-libs/libgcrypt
 	!gnutls? ( dev-libs/openssl )"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-gnutls3.patch )
+
 src_configure() {
 	games-ggz_src_configure \
 		--with-gcrypt \