Fix underlinking (bug #369457)

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

4 files changed, 52 insertions, 8 deletions

diff --git a/xfce-extra/xfce4-mailwatch-plugin/ChangeLog b/xfce-extra/xfce4-mailwatch-plugin/ChangeLog
index bf297e7d5a00..0e9964c39b38 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/ChangeLog,v 1.3 2010/08/07 12:33:44 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/ChangeLog,v 1.4 2011/05/31 11:08:37 angelos Exp $
+
+  31 May 2011; Christoph Mende <angelos@gentoo.org>
+  xfce4-mailwatch-plugin-1.1.0.ebuild,
+  +files/xfce4-mailwatch-plugin-1.1.0-link_to_libgcrypt.patch:
+  Fix underlinking (bug #369457)
 
   07 Aug 2010; Samuli Suominen <ssuominen@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 e7bdbca0e0d3..e440b4649397 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/Manifest
+++ b/xfce-extra/xfce4-mailwatch-plugin/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+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 1027 RMD160 3bdfe2a3c4e61e9ea4167a208b8e051b3c511a1a SHA1 4a4fff88d07723155d375c595fed2de716ddebf4 SHA256 a9f66c4e452910a8da66d3a10171e61af52131fd8f0ade8b5b5f71b0344b2549
-MISC ChangeLog 893 RMD160 393d68a3c039e01c22b982d03670022ff27b1bf8 SHA1 1efb5c14c897cf8fb61685718a559297381b6ecc SHA256 b08648090090cb6b3dad80b555c8dc64d27f35ce933e0fe44c6c2b234cd96793
+EBUILD xfce4-mailwatch-plugin-1.1.0.ebuild 1070 RMD160 6511f41ca8c89a9f82c4a6b0870dbf0d76397d71 SHA1 556cbb285b82c521a79fb513004e2dd92c0793d9 SHA256 05df9958e1f7a4a8be828b72a949dfa7b3e440f15812d4f340c541b56004ca0a
+MISC ChangeLog 1079 RMD160 618beca38134db3dd0020465f5f67074ea23c3a3 SHA1 72b10b495f192f4d0ae256d7f0dc822f5b52fcc5 SHA256 116880244ffc07f03abbf12600db6e6a28f467d86c3d98349ce89e6b12594249
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3VjoAACgkQXkR9YqOcLPG8lAEAmPkLKcEXDWhhqu7msuiKk1Q1
-qdns/m/Y6YjCjDHDZe8BAKYYmWntyVXf3nRvGDlzURBSZ1CYUB+liqIiH03SjPey
-=fJVE
+iF4EAREIAAYFAk3kzDsACgkQmWq1bYTyC0NeBQD/WP+wC9RWeothMPeph1oo47oE
+xtbBfw8cEtDmMWL8EOAA/1/cDFpSWQa9+nEFzL5zevB0KbWxJ3CpgQ/ygXlU4pNe
+=zIxB
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-link_to_libgcrypt.patch b/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-link_to_libgcrypt.patch
new file mode 100644
index 000000000000..4e9d5e8a0730
--- /dev/null
+++ b/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-link_to_libgcrypt.patch
@@ -0,0 +1,37 @@
+diff --git a/configure.ac b/configure.ac
+index df02271..e17375f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,6 +82,7 @@ XDT_CHECK_OPTIONAL_PACKAGE([GNUTLS], [gnutls], [1.2.0], [ssl],
+ 	[gnutls support for secure IMAP/POP3 connections], [yes])
+ if test "x$GNUTLS_FOUND" = "xyes"; then
+ 	AC_DEFINE([HAVE_SSL_SUPPORT], [1], [Define if SSL support is enabled])
++	AM_PATH_LIBGCRYPT()
+ fi
+ AM_CONDITIONAL([HAVE_SSL_SUPPORT], [test "x$GNUTLS_FOUND" = "xyes"])
+ 
+diff --git a/libmailwatch-core/Makefile.am b/libmailwatch-core/Makefile.am
+index 181992e..03a8675 100644
+--- a/libmailwatch-core/Makefile.am
++++ b/libmailwatch-core/Makefile.am
+@@ -20,10 +20,6 @@ libmailwatch_core_la_SOURCES = \
+ 	mailwatch.c \
+ 	mailwatch.h
+ 
+-if HAVE_SSL_SUPPORT
+-libmailwatch_core_la_SOURCES += mailwatch-mailbox-gmail.c
+-endif
+-
+ libmailwatch_core_la_CFLAGS = \
+ 	@GTHREAD_CFLAGS@ \
+ 	@GTK_CFLAGS@ \
+@@ -31,3 +27,9 @@ libmailwatch_core_la_CFLAGS = \
+ 	@GNUTLS_CFLAGS@ \
+ 	-DDATADIR=\"$(datadir)\" \
+ 	-DLOCALEDIR=\"$(localedir)\"
++
++if HAVE_SSL_SUPPORT
++libmailwatch_core_la_SOURCES += mailwatch-mailbox-gmail.c
++libmailwatch_core_la_CFLAGS += @LIBGCRYPT_CFLAGS@
++libmailwatch_core_la_LIBADD = @LIBGCRYPT_LIBS@
++endif
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 540b9435cdca..76356842ec0c 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,6 +1,6 @@
 # Copyright 1999-2011 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.5 2011/05/19 21:42:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild,v 1.6 2011/05/31 11:08:37 angelos Exp $
 
 EAPI=4
 EAUTORECONF=yes
@@ -27,6 +27,7 @@ pkg_setup() {
 	PATCHES=(
 		"${FILESDIR}"/${P}-no-ssl.patch
 		"${FILESDIR}"/${P}-link_to_libxfcegui4.patch
+		"${FILESDIR}"/${P}-link_to_libgcrypt.patch
 		)
 
 	XFCONF=(