Bump to 2.0, bug #102091.

Package-Manager: portage-2.0.53_rc7

7 files changed, 168 insertions, 11 deletions

diff --git a/mail-client/mail-notification/ChangeLog b/mail-client/mail-notification/ChangeLog
index 56f759ab9b0f..a8a0c5fdf6ea 100644
--- a/mail-client/mail-notification/ChangeLog
+++ b/mail-client/mail-notification/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for mail-client/mail-notification
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.22 2005/08/24 20:43:08 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.23 2005/11/28 18:30:00 slarti Exp $
+
+*mail-notification-2.0 (28 Nov 2005)
+
+  28 Nov 2005; Tom Martin <slarti@gentoo.org>
+  +files/mail-notification-2.0-buildfix.diff,
+  +files/mail-notification-2.0-evolution-2.4.diff,
+  +files/mail-notification-2.0-gmail-properties-fix.diff,
+  +mail-notification-2.0.ebuild:
+  Version bump to 2.0. Thanks to Machiel Groeneveld <michiel@ideus.nl>, Leo
+  Laursen <ll_news@stofanet.dk> and Dave Shanker <dshanker@gmail.com> in bug
+  #102091.
 
   24 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   mail-notification-1.1.ebuild:
diff --git a/mail-client/mail-notification/Manifest b/mail-client/mail-notification/Manifest
index ba1ac52422f7..26e8b5383f66 100644
--- a/mail-client/mail-notification/Manifest
+++ b/mail-client/mail-notification/Manifest
@@ -1,18 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5d240c2111a6535d744ec8bbc7cc692c metadata.xml 249
-MD5 22f5243044ad07ca9879dcb34c461492 mail-notification-1.0.ebuild 1554
-MD5 e77332c825d2c72566117f6f3117182e mail-notification-0.8.1.ebuild 1548
-MD5 4ec34f3718248e51520bb199155a10aa mail-notification-1.1.ebuild 1814
-MD5 3912c96a6ca1b4cb83686e0df9b655e9 ChangeLog 4026
-MD5 a5717a3f9a4857a66a2884232fd6f42c files/digest-mail-notification-1.1 73
+MD5 a14079a1afda1329f475cc40f22c6a77 ChangeLog 4461
 MD5 4f3f62c7c6d7b58791bba1c52b9dcc52 files/digest-mail-notification-0.8.1 75
 MD5 a1ac4da13eaa2be84f10c4c769682253 files/digest-mail-notification-1.0 73
+MD5 a5717a3f9a4857a66a2884232fd6f42c files/digest-mail-notification-1.1 73
+MD5 08760188e6900a0b64683d8f277f53eb files/digest-mail-notification-2.0 73
+MD5 9b632ffa3d886c3829752ea656adf8f1 files/mail-notification-2.0-buildfix.diff 281
+MD5 7dd1180fe96bd0bf9a9ccad1ffe2fe7a files/mail-notification-2.0-evolution-2.4.diff 3130
+MD5 7e2243b625802214a46bce8d633b94dc files/mail-notification-2.0-gmail-properties-fix.diff 508
+MD5 e77332c825d2c72566117f6f3117182e mail-notification-0.8.1.ebuild 1548
+MD5 22f5243044ad07ca9879dcb34c461492 mail-notification-1.0.ebuild 1554
+MD5 4ec34f3718248e51520bb199155a10aa mail-notification-1.1.ebuild 1814
+MD5 d698d96c28b884f0dff9aa4577913435 mail-notification-2.0.ebuild 2216
+MD5 5d240c2111a6535d744ec8bbc7cc692c metadata.xml 249
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDDNv7KRy60XGEcJIRAvitAJ9HYePQfBwnIPqOKJw1sz7iVzP9KACggbbk
-EBJU8q/zXtn7F/siXhH6n3s=
-=0z/Z
+iD8DBQFDi0y2CHk4+ZoBpvsRAj8BAKCjqGWH5bcchM+d/yNrq6ioyV/4rQCeM0yD
+AIgwIQTsRqFmh/FAJQilRFo=
+=fBtx
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mail-notification/files/digest-mail-notification-2.0 b/mail-client/mail-notification/files/digest-mail-notification-2.0
new file mode 100644
index 000000000000..60ec71f64aec
--- /dev/null
+++ b/mail-client/mail-notification/files/digest-mail-notification-2.0
@@ -0,0 +1 @@
+MD5 56ef7401aba1cb27d881fb0f33a3248d mail-notification-2.0.tar.gz 869151
diff --git a/mail-client/mail-notification/files/mail-notification-2.0-buildfix.diff b/mail-client/mail-notification/files/mail-notification-2.0-buildfix.diff
new file mode 100644
index 000000000000..10f21050628f
--- /dev/null
+++ b/mail-client/mail-notification/files/mail-notification-2.0-buildfix.diff
@@ -0,0 +1,10 @@
+--- src/mn-mailboxes.c.orig	Tue Aug  9 22:01:57 2005
++++ src/mn-mailboxes.c	Wed Aug 10 08:32:55 2005
+@@ -28,6 +28,7 @@
+ #include "config.h"
+ #include <unistd.h>
+ #include <stdarg.h>
++#include <errno.h>
+ #include <glib/gi18n.h>
+ #include <libxml/parser.h>
+ #include <libxml/tree.h>
diff --git a/mail-client/mail-notification/files/mail-notification-2.0-evolution-2.4.diff b/mail-client/mail-notification/files/mail-notification-2.0-evolution-2.4.diff
new file mode 100644
index 000000000000..d957f9826f37
--- /dev/null
+++ b/mail-client/mail-notification/files/mail-notification-2.0-evolution-2.4.diff
@@ -0,0 +1,52 @@
+--- configure.orig	Mon Oct 24 10:40:20 2005
++++ configure	Mon Oct 24 10:40:46 2005
+@@ -24784,12 +24784,12 @@
+   if test "x$ac_cv_env_EVOLUTION_PLUGIN_CFLAGS_set" = "xset"; then
+ 	pkg_cv_EVOLUTION_PLUGIN_CFLAGS=$ac_cv_env_EVOLUTION_PLUGIN_CFLAGS_value
+ elif test -n "$PKG_CONFIG"; then
+-	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
+-  ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
++	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.4 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
++  ($PKG_CONFIG --exists "evolution-plugin-2.4 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-		pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null`
++		pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.4 $evolution_plugin_min_version" 2>/dev/null`
+ 	else
+ 		pkg_failed=yes
+ 	fi
+@@ -24807,12 +24807,12 @@
+   if test "x$ac_cv_env_EVOLUTION_PLUGIN_LIBS_set" = "xset"; then
+ 	pkg_cv_EVOLUTION_PLUGIN_LIBS=$ac_cv_env_EVOLUTION_PLUGIN_LIBS_value
+ elif test -n "$PKG_CONFIG"; then
+-	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
+-  ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
++	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.4 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
++  ($PKG_CONFIG --exists "evolution-plugin-2.4 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-		pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null`
++		pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.4 $evolution_plugin_min_version" 2>/dev/null`
+ 	else
+ 		pkg_failed=yes
+ 	fi
+@@ -24824,7 +24824,7 @@
+ echo "${ECHO_T}$pkg_cv_EVOLUTION_PLUGIN_LIBS" >&6
+ 
+ if test $pkg_failed = yes; then
+-	EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.2 $evolution_plugin_min_version"`
++	EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.4 $evolution_plugin_min_version"`
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EVOLUTION_PLUGIN_PKG_ERRORS" 1>&5
+ 
+@@ -24841,7 +24841,7 @@
+ if test $found = yes; then
+ 	echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5
+ echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6
+-	evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.2 2>/dev/null`
++	evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.4 2>/dev/null`
+ 	if test -n "$evolution_plugindir"; then
+ 		echo "$as_me:$LINENO: result: $evolution_plugindir" >&5
+ echo "${ECHO_T}$evolution_plugindir" >&6
diff --git a/mail-client/mail-notification/files/mail-notification-2.0-gmail-properties-fix.diff b/mail-client/mail-notification/files/mail-notification-2.0-gmail-properties-fix.diff
new file mode 100644
index 000000000000..1ae37750b18c
--- /dev/null
+++ b/mail-client/mail-notification/files/mail-notification-2.0-gmail-properties-fix.diff
@@ -0,0 +1,11 @@
+--- src/mn-gmail-mailbox-properties.c.orig	Tue Aug  9 22:01:56 2005
++++ src/mn-gmail-mailbox-properties.c	Wed Aug 10 14:29:05 2005
+@@ -180,7 +180,7 @@
+ 				      GTK_ENTRY(auth->password_entry),
+ 				      NULL);
+ 
+-    g_signal_connect(auth->username_entry, "changed", G_CALLBACK(mn_mailbox_properties_notify_default_name), self);
++    g_signal_connect_swapped(auth->username_entry, "changed", G_CALLBACK(mn_mailbox_properties_notify_default_name), self);
+   
+ #line 186 "mn-gmail-mailbox-properties.c"
+  }
diff --git a/mail-client/mail-notification/mail-notification-2.0.ebuild b/mail-client/mail-notification/mail-notification-2.0.ebuild
new file mode 100644
index 000000000000..aad2dcf063fb
--- /dev/null
+++ b/mail-client/mail-notification/mail-notification-2.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-2.0.ebuild,v 1.1 2005/11/28 18:30:00 slarti Exp $
+
+inherit eutils gnome2 multilib
+
+DESCRIPTION="A GNOME trayicon which checks for mail. 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"
+
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+LICENSE="GPL-2"
+
+IUSE="imap ipv6 ssl sasl gmail evolution sylpheed mbox maildir pop"
+
+# 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
+	>=gnome-base/gnome-panel-2.6
+	>=gnome-base/eel-2.6
+	>=gnome-base/gconf-2.6
+	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/libglade-2.0
+	>=gnome-base/orbit-2.6
+	>=dev-libs/gmime-2.1
+	dev-perl/XML-Parser
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	evolution? ( >=mail-client/evolution-2.4 )
+	sylpheed? ( virtual/sylpheed )"
+
+G2CONF="${G2CONF} $(use_enable ssl)"
+G2CONF="${G2CONF} $(use_enable sasl)"
+G2CONF="${G2CONF} $(use_enable ipv6)"
+# ssl, sasl and ipv6 requires either pop3 or imap, else they will be disabled
+G2CONF="${G2CONF} $(use_enable imap)"
+G2CONF="${G2CONF} $(use_enable pop pop3)"
+G2CONF="${G2CONF} $(use_enable gmail)"
+G2CONF="${G2CONF} $(use_enable evolution)"
+G2CONF="${G2CONF} --with-evolution-source-dir=/usr/include/evolution-2.4/"
+G2CONF="${G2CONF} $(use_enable sylpheed)"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-evolution-2.4.diff
+	epatch ${FILESDIR}/${P}-buildfix.diff
+	epatch ${FILESDIR}/${P}-gmail-properties-fix.diff
+}
+
+src_install() {
+	gnome2_src_install evolution_plugindir="${D}/usr/$(get_libdir)/evolution/2.2/plugins"
+}
+
+pkg_postinst() {
+	echo
+	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"
+	echo
+}