Fix building with net-libs/gnutls >= 3 wrt #421407 by Diego Elio Pettenò

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 36 insertions, 11 deletions

diff --git a/xfce-extra/xfce4-mailwatch-plugin/ChangeLog b/xfce-extra/xfce4-mailwatch-plugin/ChangeLog
index 8a620801b3e1..50a34b68274d 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/ChangeLog
+++ b/xfce-extra/xfce4-mailwatch-plugin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-extra/xfce4-mailwatch-plugin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/ChangeLog,v 1.6 2012/05/05 07:17:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/ChangeLog,v 1.7 2012/06/16 14:52:16 ssuominen Exp $
+
+  16 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-mailwatch-plugin-1.1.0.ebuild,
+  +files/xfce4-mailwatch-plugin-1.1.0-gnutls-3.patch:
+  Fix building with net-libs/gnutls >= 3 wrt #421407 by Diego Elio Pettenò
 
   05 May 2012; Michał Górny <mgorny@gentoo.org>
   xfce4-mailwatch-plugin-1.1.0.ebuild:
diff --git a/xfce-extra/xfce4-mailwatch-plugin/Manifest b/xfce-extra/xfce4-mailwatch-plugin/Manifest
index c7e41e353845..c58bfa5ab182 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/Manifest
+++ b/xfce-extra/xfce4-mailwatch-plugin/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX xfce4-mailwatch-plugin-1.1.0-gnutls-3.patch 615 RMD160 ae358e5794628cf17049eba701e8554c063f58dd SHA1 776eadf736534d849428690064776afe4b094cb5 SHA256 dafb2b665afdcd7c91a6f04afd97eb4ca46b09a371e38ecfb607d335592fc214
 AUX xfce4-mailwatch-plugin-1.1.0-link_to_libgcrypt.patch 1201 RMD160 b1b312dcbc5777caa7b529c05ed6ed18bdbb08a3 SHA1 01c23a0c9688839fb4fa188e4a8e5ac3ec6c0871 SHA256 0f3aed2c16bb12682c6621f4ec5621cf6e0dc9c417d0ca546718b27dd5be8a44
 AUX xfce4-mailwatch-plugin-1.1.0-link_to_libxfcegui4.patch 811 RMD160 14d6a185d2ff724890a7b0c294a5f64bab849d5f SHA1 a75502fc77d064d263da77105ed04ea3c594b779 SHA256 482fa7e1e1e7d4cc7df96409ced8fe81dc89a1578169888aacc01550517adf18
 AUX xfce4-mailwatch-plugin-1.1.0-no-ssl.patch 918 RMD160 61403f8f7a4e4e35fcc97efe55f20330a3c7e854 SHA1 80c75c37f59f030a6b36bfcba75ddb0ed0196051 SHA256 632de0ae445eca63f5e66206beb47c2803f2cc4f3c6e1dd857ba03b2e1a3c465
 DIST xfce4-mailwatch-plugin-1.1.0.tar.bz2 662624 RMD160 81586a36f9da3509eb615b7e0ca033ed74812ded SHA1 fdca7a62a694146fc5cbe48dbaf4db4c60da5510 SHA256 ba6fe9fc8d20f317b968369bbc2802c91c4c7838823faee9304767db9f1a3799
-EBUILD xfce4-mailwatch-plugin-1.1.0.ebuild 1146 RMD160 d435e871032bd95dc6a407f36421e9cc852562c1 SHA1 eee49aa41498ea6b4d0b4872d4fa0d05e33eb4b9 SHA256 68ee7b4aa4df0369b45a1ede05fc7368235be67dbe8851e172e6d609c2cc5267
-MISC ChangeLog 1347 RMD160 619bb5c82ae2de9e4d9e5eb0bfc7095e60acef9f SHA1 fa03186c2bb4db57dd668afb558d9b850e397ad0 SHA256 b29a9d93e26e8fb7c38f9b561474277fd93852b0732ded1735637bc1cff6237c
+EBUILD xfce4-mailwatch-plugin-1.1.0.ebuild 1222 RMD160 83905bbc9f6d371c8fed346a58555a17b061ff71 SHA1 375ebc6fc0b30a27942df05a1c7f80bb2918579b SHA256 e0ec8f62f7c8ed9bb866e29b8fcfe9efef2e5021ffd978ada21ff813ffb47be9
+MISC ChangeLog 1574 RMD160 7268feea33d463fc040aa63519f9ee8aadaa62f6 SHA1 e4f0f42b7fbbdb5ba5e597e15a62418b7c65db19 SHA256 8c1eeb9470004da5447b6a001116ec6f3d701572a806b096f3bde5c215960766
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk+k1DIACgkQfXuS5UK5QB2hIQP+JX7t4ef1JLGUzVvD+zWkjU2J
-ang5v8qDErGC+XCyQAAUndItsc7tZoC1qXdjAMnsDV9y+Rluf6sFQ5iklOs6PRu4
-hfoa5lP32pTmAe8S+ykOE6GEvRMUiWCyEij1WMabsT7bGSEpOHUHIQ2G/K4/l1lx
-nt3MPIMmzZ7DOvx4PNU=
-=obhv
+iQEcBAEBAgAGBQJP3JyeAAoJEEdUh39IaPFNR58H/2YRe1SXnX9tnaY+f3F5Pkky
+SqulTBAnyzCMYpEHrGunKTmbscE1RcM5yBsw9lFa+4gZJ9mHTXKR/Rv6DaI5j955
+xCx3hLdFPxTf0kOJ4B9tjHJl0gZAUjvaR4T32m+pEB9aS0M4gPMbqModkVLBeThz
+NgxD1yA6A7jgJO7TXV1wAXRbFapaQ13raniI7FvBELH8MHMW2Su29j4R61sJaWFn
+XWETvu//eAUltt6BxftREl/cOQ6eOU/cHq7LllHLZ9gopMgYWXzEOlUjbBvChXXR
+J+vFrsezqhD8o7NooAtvCgi93yIzNSLcqBQQPfBVTAspC0f0bcEOk3JWsoY81pY=
+=nQW5
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-gnutls-3.patch b/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-gnutls-3.patch
new file mode 100644
index 000000000000..6737538d367a
--- /dev/null
+++ b/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-gnutls-3.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/421407
+http://bugzilla.xfce.org/show_bug.cgi?id=7998
+
+--- libmailwatch-core/mailwatch-net-conn.c
++++ libmailwatch-core/mailwatch-net-conn.c
+@@ -621,8 +621,10 @@
+                            net_conn->gt_creds);
+     gnutls_transport_set_ptr(net_conn->gt_session,
+                              (gnutls_transport_ptr_t)net_conn->fd);
++#if GNUTLS_VERSION_MAJOR == 2 && GNUTLS_VERSION_MINOR < 12
+     if(fcntl(net_conn->fd, F_GETFL) & O_NONBLOCK)
+         gnutls_transport_set_lowat(net_conn->gt_session, 0);
++#endif
+     
+     if(!xfce_mailwatch_net_conn_tls_handshake(net_conn, error)) {
+ #if 0
diff --git a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild
index f4eeac0269bb..0825f2f53ac9 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild
+++ b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild,v 1.8 2012/05/05 07:17:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild,v 1.9 2012/06/16 14:52:16 ssuominen Exp $
 
 EAPI=4
 EAUTORECONF=yes
 inherit multilib xfconf
 
-DESCRIPTION="Mail notification panel plugin"
+DESCRIPTION="An mail notification panel plug-in for the Xfce desktop environment"
 HOMEPAGE="http://spuriousinterrupt.org/projects/mailwatch"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
@@ -31,6 +31,7 @@ pkg_setup() {
 		"${FILESDIR}"/${P}-no-ssl.patch
 		"${FILESDIR}"/${P}-link_to_libxfcegui4.patch
 		"${FILESDIR}"/${P}-link_to_libgcrypt.patch
+		"${FILESDIR}"/${P}-gnutls-3.patch
 		)
 
 	XFCONF=(