Fix bug 194597: compatibility with evolution 2.12

Package-Manager: portage-2.1.3.9

7 files changed, 96 insertions, 36 deletions

diff --git a/mail-client/mail-notification/ChangeLog b/mail-client/mail-notification/ChangeLog
index b8678095c75e..9802abf9d7ad 100644
--- a/mail-client/mail-notification/ChangeLog
+++ b/mail-client/mail-notification/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for mail-client/mail-notification
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.47 2007/10/03 19:03:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.48 2007/10/25 09:27:32 graaff Exp $
+
+*mail-notification-4.1-r1 (25 Oct 2007)
+
+  25 Oct 2007; Hans de Graaff <graaff@gentoo.org>
+  +files/mail-notification-4.1-evo-2.12-api-change.patch,
+  +files/mail-notification-4.1-find-evo-2.12.patch,
+  -mail-notification-3.0.ebuild, +mail-notification-4.1-r1.ebuild:
+  Fix compatibility with evolution 2.12 with some patches found in upstream's
+  bug tracker. Fixes #194597.
+
+  25 Oct 2007; Hans de Graaff <graaff@gentoo.org>
+  -mail-notification-3.0.ebuild:
+  Remove old version
 
   03 Oct 2007; Hans de Graaff <graaff@gentoo.org>
   -mail-notification-1.0.ebuild:
diff --git a/mail-client/mail-notification/Manifest b/mail-client/mail-notification/Manifest
index 504083dd4017..9c348437dcf1 100644
--- a/mail-client/mail-notification/Manifest
+++ b/mail-client/mail-notification/Manifest
@@ -17,42 +17,49 @@ AUX mail-notification-2.0-gmail-properties-fix.diff 508 RMD160 bf15014f598fb7315
 MD5 7e2243b625802214a46bce8d633b94dc files/mail-notification-2.0-gmail-properties-fix.diff 508
 RMD160 bf15014f598fb7315cb1c5f14729a640e93f8c7f files/mail-notification-2.0-gmail-properties-fix.diff 508
 SHA256 e33432eb0ee1ef63eaceb4ea2391b04cc2f9c473d562fe9a92e3d8921c508ca9 files/mail-notification-2.0-gmail-properties-fix.diff 508
-DIST mail-notification-3.0.tar.gz 914814 RMD160 6269a842458b525782595efdbd4a7f05fb77432b SHA1 efa84676134338d379df511a53044082ae296c6e SHA256 a5bf3f5857cc8895dfe4d356a14a3ac8407d5623a97e361ba3ba7316bfba8055
+AUX mail-notification-4.1-evo-2.12-api-change.patch 622 RMD160 36d58e59ce8a88e2dd8da3e84c4bb0ef18062555 SHA1 95ba0a1e3b1c80af1ff1c3f69d6a62f0b5305176 SHA256 23aae8ca76d7654acdb8f2feadc4ac6b93c2ceda1263c6ee81cb8876a84836d8
+MD5 8da5d1a0ccee677932cdf87dd7693abe files/mail-notification-4.1-evo-2.12-api-change.patch 622
+RMD160 36d58e59ce8a88e2dd8da3e84c4bb0ef18062555 files/mail-notification-4.1-evo-2.12-api-change.patch 622
+SHA256 23aae8ca76d7654acdb8f2feadc4ac6b93c2ceda1263c6ee81cb8876a84836d8 files/mail-notification-4.1-evo-2.12-api-change.patch 622
+AUX mail-notification-4.1-find-evo-2.12.patch 1212 RMD160 08202b50d5bad3095acdf78c176d3397adcd8469 SHA1 8e93d648142bd33005437e25bfe3f1f20e737d3e SHA256 0807c1ad9b45e9ab44483915a143453e60dee47b2d74590c6ddf7523c8c45a2a
+MD5 2c1eb8c36220495e1025ee851c24a1e7 files/mail-notification-4.1-find-evo-2.12.patch 1212
+RMD160 08202b50d5bad3095acdf78c176d3397adcd8469 files/mail-notification-4.1-find-evo-2.12.patch 1212
+SHA256 0807c1ad9b45e9ab44483915a143453e60dee47b2d74590c6ddf7523c8c45a2a files/mail-notification-4.1-find-evo-2.12.patch 1212
 DIST mail-notification-4.0.tar.gz 956007 RMD160 67804814f82a8048c5887dcf4e3c2d827790dc80 SHA1 9cc832ff75913a80198e5b3d6a51c282e422a20f SHA256 e8f462420d1398d293ee3b9451e854c4ca9bf030111c38e3e4247cf2813db378
 DIST mail-notification-4.1.tar.bz2 713068 RMD160 2c261dd53c4f1142cd2744bbdf45e687fbf1f11a SHA1 6c1d480aa2f33e5e3790d0b0970018dc0ddd94a0 SHA256 c3dea02bf7060e3e30851adb629b3b3b78e163371c4001028d011d81976d9193
-EBUILD mail-notification-3.0.ebuild 2451 RMD160 d3def20c2b10d8ee1b8962d1cbb47160414bf0ea SHA1 e5535e0312781f9052f029ffe2e97372e10e3bad SHA256 97d3bedb628493f9731723ccab15e2336f6beb3c831c69ab1a604df3818deaac
-MD5 e0ad3718ff9f6853a3ec4832e5fb4705 mail-notification-3.0.ebuild 2451
-RMD160 d3def20c2b10d8ee1b8962d1cbb47160414bf0ea mail-notification-3.0.ebuild 2451
-SHA256 97d3bedb628493f9731723ccab15e2336f6beb3c831c69ab1a604df3818deaac mail-notification-3.0.ebuild 2451
 EBUILD mail-notification-4.0.ebuild 2298 RMD160 9b14bce0e17fe11a8015e8b6a951075562d5c0c9 SHA1 1308b19daa3697f8b3cc2b0c13eac9e2d194565e SHA256 5f642ee11b32e3464d98b75da7dc2a66a8715fe827043d32fc062e0eccb70916
 MD5 37abdca6a1047412eca20ca52005c6a6 mail-notification-4.0.ebuild 2298
 RMD160 9b14bce0e17fe11a8015e8b6a951075562d5c0c9 mail-notification-4.0.ebuild 2298
 SHA256 5f642ee11b32e3464d98b75da7dc2a66a8715fe827043d32fc062e0eccb70916 mail-notification-4.0.ebuild 2298
+EBUILD mail-notification-4.1-r1.ebuild 2500 RMD160 0dc79cb4d847eefeb65d80f82c8fabd2e8cc2086 SHA1 917bc22a1493de9e1691cc5493a6605ba60b118e SHA256 cddea0b18d6d4ab43674679ed30c538ae29fd8f9fbc0c31dffe8bd9649cb8051
+MD5 5734725580437d48bccd6f3125f63be4 mail-notification-4.1-r1.ebuild 2500
+RMD160 0dc79cb4d847eefeb65d80f82c8fabd2e8cc2086 mail-notification-4.1-r1.ebuild 2500
+SHA256 cddea0b18d6d4ab43674679ed30c538ae29fd8f9fbc0c31dffe8bd9649cb8051 mail-notification-4.1-r1.ebuild 2500
 EBUILD mail-notification-4.1.ebuild 2323 RMD160 1b995e21d44b372afe4cb62ec21890635eb61fb2 SHA1 d123a1c046925362c5a9f4caa21399827036d817 SHA256 4a818168a33020388f6bd1aa4ffc729ff70f4bbffdd37168b88131aaefd05d12
 MD5 c43f37a4c30e067d943623d0a73a3346 mail-notification-4.1.ebuild 2323
 RMD160 1b995e21d44b372afe4cb62ec21890635eb61fb2 mail-notification-4.1.ebuild 2323
 SHA256 4a818168a33020388f6bd1aa4ffc729ff70f4bbffdd37168b88131aaefd05d12 mail-notification-4.1.ebuild 2323
-MISC ChangeLog 8819 RMD160 cb5d8da7f414d24583b444ca5948c02f33ec0b6b SHA1 929c06e2a0f131a75e4c720755164e5a974424c8 SHA256 b94812cb52032ade0d5110d93bfaa98240c22216b0dd88968e84ddd7e8fd78a2
-MD5 68b06b9e9b86d116a24aaa54e7d4f80a ChangeLog 8819
-RMD160 cb5d8da7f414d24583b444ca5948c02f33ec0b6b ChangeLog 8819
-SHA256 b94812cb52032ade0d5110d93bfaa98240c22216b0dd88968e84ddd7e8fd78a2 ChangeLog 8819
+MISC ChangeLog 9301 RMD160 c653426d5dcebd8b4d317f0e16eb73e39280f43c SHA1 73b7dc9523d1fe31a3eadca9c487ea14851a4732 SHA256 c73f4b0cc3559767e6184b056f4bd0820a0f7e47bee129bef360f21860627ccb
+MD5 a4a158e13626ca22bebe57fe623c4c95 ChangeLog 9301
+RMD160 c653426d5dcebd8b4d317f0e16eb73e39280f43c ChangeLog 9301
+SHA256 c73f4b0cc3559767e6184b056f4bd0820a0f7e47bee129bef360f21860627ccb ChangeLog 9301
 MISC metadata.xml 249 RMD160 04d89c188271eaa50c1cc0d6da917ab82ebf2575 SHA1 f2e6db3ef2b8f01a573bdcadecd66ef0e559a8da SHA256 3fda5e8d8d26f5c30c584a3bcbd2cbbfddacb94ed6522d71d8047bf7503ac78c
 MD5 19ab74103e1e821c48fc9e46d9adce4d metadata.xml 249
 RMD160 04d89c188271eaa50c1cc0d6da917ab82ebf2575 metadata.xml 249
 SHA256 3fda5e8d8d26f5c30c584a3bcbd2cbbfddacb94ed6522d71d8047bf7503ac78c metadata.xml 249
-MD5 4d9f3930078d05940433119ad509c801 files/digest-mail-notification-3.0 265
-RMD160 41d08bff867069fff1431787241ace9d35b80507 files/digest-mail-notification-3.0 265
-SHA256 e322ac0f54954356d182797dc55b967664668951da99f743f57de81bb61b0e7b files/digest-mail-notification-3.0 265
 MD5 cc025cf8b5cb0e7fb9578c891f9782ea files/digest-mail-notification-4.0 265
 RMD160 67508dfbcbded5307ed461553eeac1d8b85b9977 files/digest-mail-notification-4.0 265
 SHA256 1c59c77e88dd6bbef302586859f7ab5f4462da96f4981ff6ba2fa834717a972a files/digest-mail-notification-4.0 265
 MD5 23ad45905a1e2ecbd406c733fd7b7cb0 files/digest-mail-notification-4.1 268
 RMD160 fdfff97abf539b820e772b6c0c494d3db966b02e files/digest-mail-notification-4.1 268
 SHA256 74682bc3195b5afed994f05ee30f393a1315155ed76a843c936ee4ab54ac19dd files/digest-mail-notification-4.1 268
+MD5 23ad45905a1e2ecbd406c733fd7b7cb0 files/digest-mail-notification-4.1-r1 268
+RMD160 fdfff97abf539b820e772b6c0c494d3db966b02e files/digest-mail-notification-4.1-r1 268
+SHA256 74682bc3195b5afed994f05ee30f393a1315155ed76a843c936ee4ab54ac19dd files/digest-mail-notification-4.1-r1 268
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHA+eM0BM77Tkv120RAjWBAKD1ezbrpMG1qdnCC4M/2QkwXgmZ1QCfUAMc
-1ZHIC/VOYScy57Ym+zJRySg=
-=iTqX
+iD8DBQFHIGGK0BM77Tkv120RAgRNAJ9qI4rgC8IJKj23jmQle1V6thallwCdEG7u
+WzS6ugPJFClxn+v/3ck3GxE=
+=BEI5
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mail-notification/files/digest-mail-notification-3.0 b/mail-client/mail-notification/files/digest-mail-notification-3.0
deleted file mode 100644
index 3082c2f9eda5..000000000000
--- a/mail-client/mail-notification/files/digest-mail-notification-3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d19fb5c96a0f54d1b1541fbddf73488e mail-notification-3.0.tar.gz 914814
-RMD160 6269a842458b525782595efdbd4a7f05fb77432b mail-notification-3.0.tar.gz 914814
-SHA256 a5bf3f5857cc8895dfe4d356a14a3ac8407d5623a97e361ba3ba7316bfba8055 mail-notification-3.0.tar.gz 914814
diff --git a/mail-client/mail-notification/files/digest-mail-notification-4.1-r1 b/mail-client/mail-notification/files/digest-mail-notification-4.1-r1
new file mode 100644
index 000000000000..b0ce7998f6d5
--- /dev/null
+++ b/mail-client/mail-notification/files/digest-mail-notification-4.1-r1
@@ -0,0 +1,3 @@
+MD5 4d9617ad0e7eded0953ac6d152f06a46 mail-notification-4.1.tar.bz2 713068
+RMD160 2c261dd53c4f1142cd2744bbdf45e687fbf1f11a mail-notification-4.1.tar.bz2 713068
+SHA256 c3dea02bf7060e3e30851adb629b3b3b78e163371c4001028d011d81976d9193 mail-notification-4.1.tar.bz2 713068
diff --git a/mail-client/mail-notification/files/mail-notification-4.1-evo-2.12-api-change.patch b/mail-client/mail-notification/files/mail-notification-4.1-evo-2.12-api-change.patch
new file mode 100644
index 000000000000..938c5e72ead6
--- /dev/null
+++ b/mail-client/mail-notification/files/mail-notification-4.1-evo-2.12-api-change.patch
@@ -0,0 +1,12 @@
+diff -Nur mail-notification-4.1.dfsg.1/src/mn-evolution-folder-tree-control.gob mail-notification-4.1.dfsg.1.new/src/mn-evolution-folder-tree-control.gob
+--- mail-notification-4.1.dfsg.1/src/mn-evolution-folder-tree-control.gob	2007-06-26 13:36:57.000000000 +0200
++++ mail-notification-4.1.dfsg.1.new/src/mn-evolution-folder-tree-control.gob	2007-08-15 16:54:28.000000000 +0200
+@@ -126,7 +126,7 @@
+     switch (arg_id)
+       {
+       case PROP_SELECTED_URI:
+-	em_folder_tree_set_selected(tree, BONOBO_ARG_GET_STRING(arg));
++	em_folder_tree_set_selected(tree, BONOBO_ARG_GET_STRING(arg), TRUE);
+ 	break;
+ 
+       default:
diff --git a/mail-client/mail-notification/files/mail-notification-4.1-find-evo-2.12.patch b/mail-client/mail-notification/files/mail-notification-4.1-find-evo-2.12.patch
new file mode 100644
index 000000000000..052b29cba6c1
--- /dev/null
+++ b/mail-client/mail-notification/files/mail-notification-4.1-find-evo-2.12.patch
@@ -0,0 +1,22 @@
+--- mail-notification-4.1/m4/evolution-plugin.m4.evo2.12	2006-11-02 18:18:23.000000000 +0100
++++ mail-notification-4.1/m4/evolution-plugin.m4	2007-06-26 16:06:22.000000000 +0200
+@@ -13,12 +13,17 @@ AC_DEFUN([AM_PATH_EVOLUTION_PLUGIN],
+ 
+ evolution_branch=ifelse([$1],, [2.4], [$1])
+ evolution_plugin_min_version=ifelse([$2],,, [>= $2])
++evolution_plugin_pkgconf=evolution-plugin-$evolution_branch
+ 
+-PKG_CHECK_MODULES(EVOLUTION_PLUGIN, [evolution-plugin-$evolution_branch $evolution_plugin_min_version], [found=yes], [found=no])
++PKG_CHECK_MODULES(EVOLUTION_PLUGIN, [$evolution_plugin_pkgconf $evolution_plugin_min_version], [found=yes], [found=no])
++
++if test $found = no; then
++PKG_CHECK_MODULES(EVOLUTION_PLUGIN, [evolution-plugin $evolution_plugin_min_version], [found=yes;evolution_plugin_pkgconf=evolution-plugin], [found=no])
++fi
+ 
+ if test $found = yes; then
+ 	AC_MSG_CHECKING([for the Evolution plugin directory])
+-	evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-$evolution_branch 2>/dev/null`
++	evolution_plugindir=`$PKG_CONFIG --variable=plugindir $evolution_plugin_pkgconf 2>/dev/null`
+ 	if test -n "$evolution_plugindir"; then
+ 		AC_MSG_RESULT([$evolution_plugindir])
+ 	else
diff --git a/mail-client/mail-notification/mail-notification-3.0.ebuild b/mail-client/mail-notification/mail-notification-4.1-r1.ebuild
index 365181d79381..e1c45a2b9e9b 100644
--- a/mail-client/mail-notification/mail-notification-3.0.ebuild
+++ b/mail-client/mail-notification/mail-notification-4.1-r1.ebuild
@@ -1,36 +1,37 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-3.0.ebuild,v 1.7 2007/08/30 16:08:54 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-4.1-r1.ebuild,v 1.1 2007/10/25 09:27:32 graaff Exp $
 
-inherit eutils gnome2 multilib flag-o-matic versionator
+inherit autotools eutils gnome2 multilib flag-o-matic versionator
 
 DESCRIPTION="A GNOME trayicon which checks for email. Supports mbox, MH,
 Maildir, IMAP, Sylpheed, POP3, Gmail and Evolution.  Authenticates via
 apop, ssl, sasl."
 HOMEPAGE="http://www.nongnu.org/mailnotify/"
-SRC_URI="http://savannah.nongnu.org/download/mailnotify/${P}.tar.gz"
+SRC_URI="http://savannah.nongnu.org/download/mailnotify/${P}.tar.bz2"
 
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-IUSE="imap ipv6 ssl sasl gmail evo sylpheed mbox maildir pop"
+IUSE="imap ipv6 ssl sasl gmail evo sylpheed mbox maildir pop mozilla"
 
 # gmime is actually optional, but it's used by so much of the package it's
 # pointless making it optional.
 DEPEND=">=x11-libs/gtk+-2.6
-	>=dev-util/gob-2
+	>=dev-util/gob-2.0.13
 	>=gnome-base/gnome-panel-2.6
 	>=gnome-base/eel-2.6
 	>=gnome-base/gconf-2.6
-	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/libgnomeui-2.14
 	>=gnome-base/libglade-2.0
 	>=gnome-base/orbit-2.6
 	>=dev-libs/gmime-2.1
+	x11-libs/libnotify
 	dev-perl/XML-Parser
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	evo? ( >=mail-client/evolution-2.4 )
+	evo? ( >=mail-client/evolution-2.6 )
 	sylpheed? ( virtual/sylpheed )"
 
 pkg_setup() {
@@ -51,6 +52,20 @@ pkg_setup() {
 	G2CONF="${G2CONF} $(use_enable evo evolution)"
 	G2CONF="${G2CONF} --with-evolution-source-dir=/usr/include/evolution-${EVO_VERSION}"
 	G2CONF="${G2CONF} $(use_enable sylpheed)"
+	G2CONF="${G2CONF} $(use_enable mozilla)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	sed -i -e 's:gtk-update-icon-cache:true:' ./art/Makefile.in
+
+	if [ "${EVO_VERSION}" == "2.12" ]; then
+		epatch "${FILESDIR}/${P}-evo-2.12-api-change.patch"
+	fi
+
+	epatch "${FILESDIR}/${P}-find-evo-2.12.patch"
+	eautoconf
 }
 
 src_compile() {
@@ -64,12 +79,3 @@ src_install() {
 
 	dodoc README NEWS AUTHORS TODO
 }
-
-pkg_postinst() {
-	ewarn ""
-	ewarn "Due to a bug in bonobo-activation, your GNOME/X11 session must"
-	ewarn "be restarted for mail-notification to work. If you don't do"
-	ewarn "this, this program will crash during the setup phase."
-	ewarn "See http://bugzilla.gnome.org/show_bug.cgi?id=151082"
-	ewarn ""
-}