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

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

4 files changed, 41 insertions, 18 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index b178429ccb64..f02cca4a99ae 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/seahorse
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.141 2010/11/24 14:02:43 eva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.142 2011/02/06 12:50:14 ssuominen Exp $
+
+  06 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> seahorse-2.32.0.ebuild,
+  +files/seahorse-2.32.0-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
   24 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
   -files/seahorse-2.28.0-as-needed.patch, -seahorse-2.28.1.ebuild:
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 0d8961c3c501..5815ae6ef76c 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX seahorse-2.32.0-libnotify-0.7.patch 729 RMD160 46b862933cc62e76dea72a397179bb8f48162de5 SHA1 400153b2f277ef753320adeeb992cf7586c67c0e SHA256 8f7b2fc0ad1cb572de3c31ed694e5131e8ec6373e9f3e202d98858a12902c467
 DIST seahorse-2.30.1.tar.bz2 2422214 RMD160 70cdcc18798e405deb0164d098c57d22adc2f5f5 SHA1 1754a447d48837bc8a0a657a6bcdd65666704ccb SHA256 1b97064ee91f87494040313a0a2fe813473ec4dba15b5781245080e8fea8e7c3
 DIST seahorse-2.32.0.tar.bz2 2491230 RMD160 5599cf02321be038d8aa5bc96174e2cf05c62945 SHA1 1469884b67483c876cfe5b986a76495739927a99 SHA256 f55468237246a485317d59e2fbc1b1ef5f5bd4c5a7b9ff6f40c3d921af0ed52d
 EBUILD seahorse-2.30.1.ebuild 2015 RMD160 daef14b8669e64f024d8ae83a771f6bdb3fe181d SHA1 cb01c2679450a5cc3f96d63436b021adb2745cfd SHA256 60fb90c54d1bb2fd5f47312f736ffeb04299150519651c7d6c3fb0491105eee1
-EBUILD seahorse-2.32.0.ebuild 2119 RMD160 dfff24dc2aa92d8cd768077c2256bf6b8861f2f8 SHA1 385bd0b494c0eea190623eba09fc0eb7b6756daf SHA256 5c6454b508d4f996241356bbba7e4843e342beee47a2f789bc7e9218ab608352
-MISC ChangeLog 20384 RMD160 633eb4aa9361e1390b71d30e061c68737425c72d SHA1 53768cf58046e9b19935d23e9319d8bf1c078080 SHA256 e0fe976ae98536629571cf1b362eae04e83809fae69ae14a12ccab37e7bbedbd
+EBUILD seahorse-2.32.0.ebuild 2178 RMD160 d9baaafe41ba333eab1e45f1c7341513df4be4fa SHA1 ff8c44717e132b9dd366a5eeab24c4dc80485b37 SHA256 c7484e1d3f7f5360ede7dacc31460349f22897767b5886c8b0eb80bef0f80d7a
+MISC ChangeLog 20562 RMD160 b5282a48f744b6b2a494b9501facc4c836606fe1 SHA1 8dc06d2cb39ccca294ac155ca272a6fe7e2176f3 SHA256 9d66b3c2d1aa720229299aadad09705d5b7be472d25c69825211eb3d2ca79f77
 MISC metadata.xml 880 RMD160 c2fb2252ba2952f117e79ee62804d9cab52e4d31 SHA1 5de53e7b87d57d12d56b8b142eafa5fd22e79977 SHA256 8e007848eb55d49181d2e31de6fa2db55ebbf2d8bd5da3274dc7ecdae1d9367c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkztGwgACgkQ1fmVwcYIWAb+kQCgqkac3hNpIk5DkJlgVz+p17wn
-mmsAoJjijk7lUPz1TT1wzhj6qs2zW/Dy
-=SxVq
------END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse/files/seahorse-2.32.0-libnotify-0.7.patch b/app-crypt/seahorse/files/seahorse-2.32.0-libnotify-0.7.patch
new file mode 100644
index 000000000000..1a6b478acf0f
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-2.32.0-libnotify-0.7.patch
@@ -0,0 +1,26 @@
+--- libseahorse/seahorse-notification.c
++++ libseahorse/seahorse-notification.c
+@@ -37,6 +37,9 @@
+ 
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ /* -----------------------------------------------------------------------------
+@@ -231,7 +234,12 @@
+     heading = format_key_text (snotif->heading);
+     message = format_key_text (snotif->message);
+     
+-    notif = notify_notification_new (heading, message, snotif->icon, attachto);
++    notif = notify_notification_new (heading, message, snotif->icon
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++    );
++#else
++    , attachto);
++#endif
+     
+     g_free (heading);
+     g_free (message);
diff --git a/app-crypt/seahorse/seahorse-2.32.0.ebuild b/app-crypt/seahorse/seahorse-2.32.0.ebuild
index 923e54a709db..13d5de9969b3 100644
--- a/app-crypt/seahorse/seahorse-2.32.0.ebuild
+++ b/app-crypt/seahorse/seahorse-2.32.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.32.0.ebuild,v 1.1 2010/10/17 19:12:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.32.0.ebuild,v 1.2 2011/02/06 12:50:14 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="A GNOME application for managing encryption keys"
 HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
@@ -61,12 +61,14 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
 
 	# Do not mess with CFLAGS with USE="debug"
 	sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
 		-e 's/-Werror//' \
 		-i configure.in configure || die "sed failed"
+
+	gnome2_src_prepare
 }
 
 src_install() {