Fix build failure with USE=-libnotify, bug #314123.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 48 insertions, 7 deletions

diff --git a/mail-client/balsa/ChangeLog b/mail-client/balsa/ChangeLog
index 3c91d311a64a..55ebd422b108 100644
--- a/mail-client/balsa/ChangeLog
+++ b/mail-client/balsa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/balsa
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.95 2010/03/26 16:42:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.96 2010/04/14 21:45:24 eva Exp $
+
+  14 Apr 2010; Gilles Dartiguelongue <eva@gentoo.org> balsa-2.4.7.ebuild,
+  +files/balsa-2.4.7-build-failure-notify.patch:
+  Fix build failure with USE=-libnotify, bug #314123.
 
   26 Mar 2010; Pacho Ramos <pacho@gentoo.org> -balsa-2.3.28.ebuild,
   -balsa-2.4.1.ebuild:
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index cc64cfd74e8a..2194107e9d91 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX balsa-2.4.1-vcard.patch 581 RMD160 9efe72c102d8746c1f53ebde04b52b9dd6497775 SHA1 3e75bfebd6110bb85bdc2f2d7a93550feb2a1877 SHA256 c3c8ed63deb660b3f8cafbcc996f369fc2e1f766060e3ba9801865e616188ba9
+AUX balsa-2.4.7-build-failure-notify.patch 946 RMD160 756119e9f4f7f0877b3b43a1778a7b4cb9b0a7ce SHA1 14e6ee41935c282900aee89010f38d8ef530aa7c SHA256 a40003889650f4d91e75cc44376f47c40a53a78b72f18825fdb646a4fedc1873
 DIST balsa-2.4.1.tar.bz2 3057983 RMD160 846905d9754fb5c4d3438c81078e79d61989cc99 SHA1 fc8a0ee154b22505607a82c886ccb074c28ac499 SHA256 06d9807c4135a468a5def531585ead9ea0948b206794e848efe234aa02df39d5
 DIST balsa-2.4.2.tar.bz2 3079414 RMD160 711f1c270f6c78fbd4b7be656035bbec75a29e7f SHA1 c1dcc907ef2d8f51adcd0257f374a322dadb7ce8 SHA256 48bde6ff926fcc5d47853b87242cc890bdb21b5c74a2454a2b5c0269e9340090
 DIST balsa-2.4.7.tar.bz2 2926482 RMD160 4679e66423387fe16f6e3192aa61f60740c9a18a SHA1 def4bd033c0f0bfbfb8f1b2a748cabe420e57038 SHA256 581326a68a52f8344c900ca47d862536821bc5864c38b09cb6c333722a212952
 EBUILD balsa-2.4.1-r1.ebuild 2559 RMD160 a83ff8142f91f79e1ca9a4a468002f02fe209bb4 SHA1 20fdfa335d74a3dde99240b67fd5c73e67d2ffe0 SHA256 282b428fc1b91f5e6cf67f5cb569c67b99a5d446319e7c8e01eb550b0878ff39
 EBUILD balsa-2.4.2.ebuild 2366 RMD160 a71a8640b9e3a8e4a11cb4443fb93a3016a4cf60 SHA1 6a6946a9088183926c020739cac36abc99e81c42 SHA256 969699abee5d96120988d82661deeef6ef7c4d7c88cd2e76cc8774d5b5adbbdd
-EBUILD balsa-2.4.7.ebuild 2693 RMD160 54892e5616bafc88a40af280ce8d739107a618f6 SHA1 1688cfa1e94c2810e4ea045d01d2cc37f1199623 SHA256 ec0e7dd855cd23b492bc3d0e95a12b0931c5d1c1493474ea4b8fafbabec3e9d4
-MISC ChangeLog 22939 RMD160 1cdc6c21f7763fbd262d0874d83f407df8b43b48 SHA1 ec54b4d00fee4a9a2e33ff98d2f868b0858d46da SHA256 321287c56f8692ec6f27da2766dc3efa96dcb24873a34afc317c8bb92f5542e6
+EBUILD balsa-2.4.7.ebuild 2843 RMD160 bea11f150c3c84d56ba40a37223ec241a067d779 SHA1 9d6cf5676badb2ca0d8953dc65b5b98b9e3c4bd4 SHA256 1769e8135950889fdc886373e4e8698d6d909bc06374a5cf42d1a7dc296917ef
+MISC ChangeLog 23115 RMD160 5a15c59faabd035de1276f3d90c8f1475ab4ff41 SHA1 13eb9833a168f1aaa09da73dca977a3c077c4ef8 SHA256 fcc8e1f96f380f6ab289dba10e22a3c2d784af7361b040ff896d42ad897306bf
 MISC metadata.xml 458 RMD160 75720f401492866e5d0c5659c53779856f6a47e9 SHA1 c678d1933c2161e59e783520548d7c69bb505049 SHA256 fe906fdde4dd35e9815a37479abbec9a15bd2854bbaa7bc648645ed3c73663ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkus5BkACgkQCaWpQKGI+9TH2ACghr23ieKbQHQh4N2hTY3MVKQq
-FTAAnj/A0Q0SBCpQijdUKhrBc8ED4DXu
-=aerZ
+iEYEARECAAYFAkvGN4AACgkQ1fmVwcYIWAaDpQCgzm3uTlFgia3aFyXGtZWXnDQO
+5bEAmwVT9a46aEsy+JN4vlG1Wuf2XQUK
+=0j3/
 -----END PGP SIGNATURE-----
diff --git a/mail-client/balsa/balsa-2.4.7.ebuild b/mail-client/balsa/balsa-2.4.7.ebuild
index dec717970ee3..4369e9c2954d 100644
--- a/mail-client/balsa/balsa-2.4.7.ebuild
+++ b/mail-client/balsa/balsa-2.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.4.7.ebuild,v 1.1 2010/03/10 23:46:25 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.4.7.ebuild,v 1.2 2010/04/14 21:45:24 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -98,3 +98,10 @@ pkg_setup() {
 		$(use_with ssl)
 		$(use_with xface compface)"
 }
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix build failure with USE="-libnotify", bug #314123
+	epatch "${FILESDIR}/${P}-build-failure-notify.patch"
+}
diff --git a/mail-client/balsa/files/balsa-2.4.7-build-failure-notify.patch b/mail-client/balsa/files/balsa-2.4.7-build-failure-notify.patch
new file mode 100644
index 000000000000..b4bd7d2c8808
--- /dev/null
+++ b/mail-client/balsa/files/balsa-2.4.7-build-failure-notify.patch
@@ -0,0 +1,29 @@
+From 45e0d4d656079f572a9fc39688705ede2eba15c8 Mon Sep 17 00:00:00 2001
+From: Peter Bloomfield <PeterBloomfield@bellsouth.net>
+Date: Tue, 16 Feb 2010 18:59:21 -0500
+Subject: [PATCH] Build when libnotify is not available
+
+	* libbalsa/information.c: build when libnotify is not available.
+---
+ libbalsa/information.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libbalsa/information.c b/libbalsa/information.c
+index e752200..7f3c8fe 100644
+--- a/libbalsa/information.c
++++ b/libbalsa/information.c
+@@ -41,10 +41,10 @@ static gboolean libbalsa_information_idle_handler(struct information_data*);
+ 
+ LibBalsaInformationFunc libbalsa_real_information_func;
+ 
++#ifdef HAVE_NOTIFY
+ static void lbi_notification_closed_cb(NotifyNotification * note,
+                                        gpointer data);
+ 
+-#ifdef HAVE_NOTIFY
+ static void
+ lbi_notification_parent_weak_notify(gpointer data, GObject * parent)
+ {
+-- 
+1.7.0.4
+