Fix building with x11-libs/libnotify >= 0.7.

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

4 files changed, 80 insertions, 14 deletions

diff --git a/mail-client/claws-mail-notification/ChangeLog b/mail-client/claws-mail-notification/ChangeLog
index f3cb045d4d23..2e131fa08aa9 100644
--- a/mail-client/claws-mail-notification/ChangeLog
+++ b/mail-client/claws-mail-notification/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/claws-mail-notification
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-notification/ChangeLog,v 1.56 2011/01/15 14:37:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-notification/ChangeLog,v 1.57 2011/01/31 18:00:59 ssuominen Exp $
+
+  31 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
+  claws-mail-notification-0.26.ebuild,
+  +files/claws-mail-notification-0.26-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
   15 Jan 2011; Markus Meier <maekke@gentoo.org>
   claws-mail-notification-0.26.ebuild:
diff --git a/mail-client/claws-mail-notification/Manifest b/mail-client/claws-mail-notification/Manifest
index 1db1719d55cf..be68ecb32ce7 100644
--- a/mail-client/claws-mail-notification/Manifest
+++ b/mail-client/claws-mail-notification/Manifest
@@ -1,4 +1,5 @@
+AUX claws-mail-notification-0.26-libnotify-0.7.patch 1427 RMD160 d6cbd7cf729b530e7d1d8306d81aadacbafc91d4 SHA1 f6994923956733ad6f43c6b01a13c217941cb611 SHA256 cf251624951f40dd9e9fa0b58ab6d270772db2c50b23d7bd28b8cd6c49c94bee
 DIST notification_plugin-0.26.tar.gz 532171 RMD160 c0b24a04a3e8e024a0b61f68f8163cf5f9d85228 SHA1 6bfd7100f82a7d1d1ea06a2213028dd211aaf068 SHA256 869f5ffd1f75d1d0ab862526580fd881598499a447ef099239c86bd465b94ce1
-EBUILD claws-mail-notification-0.26.ebuild 948 RMD160 cd092059847c86c4e92777174f4101bf82d01139 SHA1 3e124c1ccc847378162f6296e0708ad7f0760bb1 SHA256 9b1248669a15a3a30f0b54314d254641633ce28476a31c29c0a1b0c1bfedcbdd
-MISC ChangeLog 8811 RMD160 5d017d0c4fd666c2749450de56b4d10c81c8673f SHA1 134c686ebd0262e67c0ba5a8155b2ea23940b1ff SHA256 aeeb7398538c9ff5b652e220c9753abb8811573ac34cf7f5b23867538ba73ed7
+EBUILD claws-mail-notification-0.26.ebuild 1067 RMD160 541121ba865319c0d6e40f86a43148ffaa184fbe SHA1 e0f58531fad580a71345fafba9c7617fe372ca34 SHA256 420e52dd8bdde018952f00e3912a92d24b8262bad59af90fa80b2a6e17dfb1a6
+MISC ChangeLog 9014 RMD160 442e1369897e5fad1e8196e6c841664ceb11b5fa SHA1 d5f632435a057832bb8ac8f0163944d8e01fb724 SHA256 59218a1a169248db369e50386867db062374411314baa35b23850ec02755b1a8
 MISC metadata.xml 360 RMD160 7920ed280d15221eb0ffeb146c46481217c52087 SHA1 8976b5970f041847569731ebdc091ce0dc512b3a SHA256 fa45d98c4738cc095b45028ffabf31fc70c553c9075b6c53ca931237666ef19e
diff --git a/mail-client/claws-mail-notification/claws-mail-notification-0.26.ebuild b/mail-client/claws-mail-notification/claws-mail-notification-0.26.ebuild
index 2b30962422cb..d6fb0c795f3b 100644
--- a/mail-client/claws-mail-notification/claws-mail-notification-0.26.ebuild
+++ b/mail-client/claws-mail-notification/claws-mail-notification-0.26.ebuild
@@ -1,33 +1,43 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-notification/claws-mail-notification-0.26.ebuild,v 1.4 2011/01/15 14:37:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-notification/claws-mail-notification-0.26.ebuild,v 1.5 2011/01/31 18:00:59 ssuominen Exp $
 
-MY_P="${PN#claws-mail-}_plugin-${PV}"
+EAPI=2
+inherit eutils multilib
+
+MY_P=${PN#claws-mail-}_plugin-${PV}
 
 DESCRIPTION="Plugin providing various ways to notify user of new and unread mail"
 HOMEPAGE="http://www.claws-mail.org/"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="libnotify"
+
 RDEPEND=">=mail-client/claws-mail-3.7.7
-		>=x11-libs/gtk+-2.10
-		libnotify? ( x11-libs/libnotify )"
+	>=x11-libs/gtk+-2.10
+	libnotify? ( x11-libs/libnotify )"
 DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
+	dev-util/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+}
 
-src_compile() {
-	econf $(use_enable libnotify) || die
-	emake || die
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(use_enable libnotify)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog README
 
-	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+	rm -f "${D}"/usr/$(get_libdir)/claws-mail/plugins/*.la
 }
diff --git a/mail-client/claws-mail-notification/files/claws-mail-notification-0.26-libnotify-0.7.patch b/mail-client/claws-mail-notification/files/claws-mail-notification-0.26-libnotify-0.7.patch
new file mode 100644
index 000000000000..6159d139cdb5
--- /dev/null
+++ b/mail-client/claws-mail-notification/files/claws-mail-notification-0.26-libnotify-0.7.patch
@@ -0,0 +1,50 @@
+--- src/notification_popup.c
++++ src/notification_popup.c
+@@ -339,7 +339,16 @@
+     break;
+   }
+ 
++#ifdef NOTIFY_CHECK_VERSION
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++  ppopup->notification = notify_notification_new(summary, utf8_str, NULL);
++#else
+   ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL);
++#endif
++#else
++  ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL);
++#endif
++
+   g_free(utf8_str);
+   if(ppopup->notification == NULL) {
+     debug_print("Notification Plugin: Failed to create a new "
+--- src/notification_trayicon.c
++++ src/notification_trayicon.c
+@@ -61,6 +61,10 @@
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ typedef struct {
+   gint count;
+   gint num_mail;
+@@ -601,8 +605,17 @@
+   summary  = notification_trayicon_popup_assemble_summary();
+   utf8_str = notification_trayicon_popup_assemble_body(msginfo);
+ 
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++  popup.notification = notify_notification_new(summary, utf8_str, NULL);
++#else
+   popup.notification = notify_notification_new(summary, utf8_str, NULL, NULL);
++#endif
++
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++  /* notify_notification_attach_to_status_icon function was removed */
++#else
+   notify_notification_attach_to_status_icon(popup.notification, trayicon);
++#endif
+ 
+   g_free(summary);
+   g_free(utf8_str);