Fix building with x11-libs/libnotify >= 0.7. Pin gtk to slot 2 while at it

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

4 files changed, 43 insertions, 19 deletions

diff --git a/app-crypt/seahorse-plugins/ChangeLog b/app-crypt/seahorse-plugins/ChangeLog
index c06c07c6edb7..6a1e94d2c64e 100644
--- a/app-crypt/seahorse-plugins/ChangeLog
+++ b/app-crypt/seahorse-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/seahorse-plugins
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/ChangeLog,v 1.31 2010/11/24 14:06:41 eva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/ChangeLog,v 1.32 2011/02/06 12:58:10 ssuominen Exp $
+
+  06 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
+  seahorse-plugins-2.30.1-r1.ebuild,
+  +files/seahorse-plugins-2.30.1-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
   24 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
   -seahorse-plugins-2.28.1-r1.ebuild, metadata.xml:
diff --git a/app-crypt/seahorse-plugins/Manifest b/app-crypt/seahorse-plugins/Manifest
index a2af68b4d207..211578dd82f2 100644
--- a/app-crypt/seahorse-plugins/Manifest
+++ b/app-crypt/seahorse-plugins/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70-seahorse-agent 241 RMD160 d28490016ed259ef29416cb101ccddd76e195ed5 SHA1 2b40525f543741dc0a453a8241e3b7c83f45da6f SHA256 2e70cbb034fde8ddd5c69baf97570ad706bec2e04bd7dd2c86f462b9a594e3c6
 AUX seahorse-plugins-2.28.1-gpgme_check_version.patch 2515 RMD160 ee0bc86476404c990dbe32bde8bc9ef655c5c80d SHA1 a9d56918e3de90a97e86dfdbadce24dc440c93ab SHA256 a7f53b2ae76137490b910b82ca63be7186937f57832f448a9b788f8a8f06c4a4
+AUX seahorse-plugins-2.30.1-libnotify-0.7.patch 729 RMD160 c4ef0444fb654cbc2910fc977b82f79ad2d9e186 SHA1 606f6900a2a27bea52f6bf1557d9e345ca9eb935 SHA256 9da8c5552217a56f4b7d12e28a425b3980b20953d8312c3017378e5a71536905
 DIST seahorse-plugins-2.30.1.tar.bz2 1304864 RMD160 a493ccad1d25c7c112f33c30d141a241eaf71048 SHA1 d06c638e839024ab623dc001b3c4e43be293ede8 SHA256 1fdfed1aef2c22a29a9abc00eae67752854e466a66cee2a8c1c278277e832d66
-EBUILD seahorse-plugins-2.30.1-r1.ebuild 1760 RMD160 5f6f3dabe33f6c8d62c8c969858bd96a7736973a SHA1 a7dbabe815ad970e86e29a42902a7f8fd01a0f0f SHA256 0d2cd8d050346123c036ee866a56f84f07b5be2da82e029780252ca89feb680b
-MISC ChangeLog 5527 RMD160 1532ef0983159bf599930762e46f10253695e2b9 SHA1 92262a1a772d651a0e08e34badf1818f2459ffed SHA256 07af522a655b347a09471bfe4cf914f68ab16b90d9cd0e41418b110e09b6bb6c
+EBUILD seahorse-plugins-2.30.1-r1.ebuild 1812 RMD160 075c5c1015c0799a814bde27556c5e8b7497a80a SHA1 bb2552ea2919ddc9e159b7a12843688ea8fbc72d SHA256 4cd831c42182f5cf5e1b7a151f375478851d55e8036341480c05bee3c0dc13d6
+MISC ChangeLog 5726 RMD160 d0bf70d2f99f9e29566fc6f130e8a9b80c7c9c61 SHA1 55c07b53b759139e51ec966bb46b207b47ed87e1 SHA256 b927319512fb10eb4a96f33e293f8e1837b08b1608fef82df7ccc7d7cdb380e5
 MISC metadata.xml 505 RMD160 c2cc93dc9f42d222b9a53c4e1ecfefba520593a1 SHA1 83ad6c521422e970adc4ec7d8053622bbe7e405b SHA256 b11154448045cbb587c6d52580e6e66ee72bf61594edbb81e715f5eb8c685c4c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkztG/YACgkQ1fmVwcYIWAYGrgCdHZu0b5oLyLRoL/cn6HG/A719
-HNQAoMvG81mgBn8+oCc85Vw3WGlRQYdZ
-=hOjh
------END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse-plugins/files/seahorse-plugins-2.30.1-libnotify-0.7.patch b/app-crypt/seahorse-plugins/files/seahorse-plugins-2.30.1-libnotify-0.7.patch
new file mode 100644
index 000000000000..060340707bf9
--- /dev/null
+++ b/app-crypt/seahorse-plugins/files/seahorse-plugins-2.30.1-libnotify-0.7.patch
@@ -0,0 +1,26 @@
+--- libseahorse/seahorse-notification.c
++++ libseahorse/seahorse-notification.c
+@@ -34,6 +34,9 @@
+ 
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ /* -----------------------------------------------------------------------------
+@@ -213,7 +216,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-plugins/seahorse-plugins-2.30.1-r1.ebuild b/app-crypt/seahorse-plugins/seahorse-plugins-2.30.1-r1.ebuild
index e8458c48b05f..841c06e08e7e 100644
--- a/app-crypt/seahorse-plugins/seahorse-plugins-2.30.1-r1.ebuild
+++ b/app-crypt/seahorse-plugins/seahorse-plugins-2.30.1-r1.ebuild
@@ -1,6 +1,6 @@
-# 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-plugins/seahorse-plugins-2.30.1-r1.ebuild,v 1.7 2010/10/17 15:26:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/seahorse-plugins-2.30.1-r1.ebuild,v 1.8 2011/02/06 12:58:10 ssuominen Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ IUSE="applet debug gedit libnotify nautilus test"
 
 RDEPEND="
 	>=gnome-base/gconf-2.0
-	>=x11-libs/gtk+-2.18
+	>=x11-libs/gtk+-2.18:2
 	>=dev-libs/glib-2.16
 	>=dev-libs/dbus-glib-0.72
 	>=app-crypt/gpgme-1.0.0
@@ -53,10 +53,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
 
 	# Use gpgme_engine_check_version() before gpgm_new() due current gpgme, bug #281729
-	epatch "${FILESDIR}/${PN}-2.28.1-gpgme_check_version.patch"
+	epatch "${FILESDIR}"/${PN}-2.28.1-gpgme_check_version.patch
+
+	gnome2_src_prepare
 }
 
 src_install() {