Fix bug 194597: compatibility with evolution 2.12

(Portage version: 2.1.3.9)

6 files changed, 74 insertions, 21 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/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 ""
-}