New version for GNOME 2.28. Clean up old revision.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

5 files changed, 228 insertions, 26 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index a20974a0cd0b..d101500fd693 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.278 2009/10/27 10:31:59 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.279 2009/10/29 23:16:36 eva Exp $
+
+*evolution-2.28.1 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -evolution-2.26.2.ebuild, +files/evolution-2.28.0-automagic-plugins.patch,
+  +files/evolution-2.28.0-delete-key.patch, +evolution-2.28.1.ebuild,
+  metadata.xml:
+  New version for GNOME 2.28. Clean up old revision.
 
   27 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> evolution-2.26.2.ebuild:
   Re-Keywording for ppc, bug 271002
diff --git a/mail-client/evolution/evolution-2.26.2.ebuild b/mail-client/evolution/evolution-2.28.1.ebuild
index 6626c9177f47..6cfd6301ca9d 100644
--- a/mail-client/evolution/evolution-2.26.2.ebuild
+++ b/mail-client/evolution/evolution-2.28.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.26.2.ebuild,v 1.8 2009/10/27 10:31:59 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.28.1.ebuild,v 1.1 2009/10/29 23:16:36 eva Exp $
 
 EAPI="2"
+GCONF_DEBUG="no"
 
 inherit autotools gnome2 flag-o-matic python
 
@@ -16,21 +17,24 @@ IUSE="crypt dbus hal kerberos krb4 ldap mono networkmanager nntp pda profile pyt
 # pst
 
 # Pango dependency required to avoid font rendering problems
-RDEPEND=">=dev-libs/glib-2.18
-	>=x11-libs/gtk+-2.14
-	>=gnome-extra/evolution-data-server-2.26.1
+# We need a graphical pinentry frontend to be able to ask for the GPG
+# password from inside evolution, bug 160302
+RDEPEND=">=dev-libs/glib-2.20
+	>=x11-libs/gtk+-2.16
+	>=gnome-extra/evolution-data-server-2.26.3
 	>=x11-themes/gnome-icon-theme-2.20
 	>=gnome-base/libbonobo-2.20.3
 	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-extra/gtkhtml-3.25.4
+	>=gnome-extra/gtkhtml-3.27.90
 	>=gnome-base/gconf-2
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnomecanvas-2
 	>=gnome-base/libgnomeui-2
-	>=dev-libs/libxml2-2
+	>=dev-libs/libxml2-2.7.3
 	>=dev-libs/libgweather-2.25.3
 	>=x11-misc/shared-mime-info-0.22
-	dbus? ( dev-libs/dbus-glib )
+	>=gnome-base/gnome-desktop-2.26.0
+	dbus? ( >=dev-libs/dbus-glib-0.74 )
 	hal? ( >=sys-apps/hal-0.5.4 )
 	x11-libs/libnotify
 	pda? (
@@ -40,12 +44,15 @@ RDEPEND=">=dev-libs/glib-2.18
 	ssl? (
 		>=dev-libs/nspr-4.6.1
 		>=dev-libs/nss-3.11 )
-	networkmanager? ( net-misc/networkmanager )
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	>=net-libs/libsoup-2.4
 	kerberos? ( virtual/krb5 )
 	krb4? ( app-crypt/mit-krb5[krb4] )
 	>=gnome-base/orbit-2.9.8
-	crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) )
+	crypt? ( || (
+				  ( >=app-crypt/gnupg-2.0.1-r2
+					|| ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt3] ) )
+				  =app-crypt/gnupg-1.4* ) )
 	ldap? ( >=net-nds/openldap-2 )
 	mono? ( >=dev-lang/mono-1 )
 	python? ( >=dev-lang/python-2.4 )
@@ -53,7 +60,7 @@ RDEPEND=">=dev-libs/glib-2.18
 		>=media-libs/gstreamer-0.10
 		>=media-libs/gst-plugins-base-0.10 )"
 # Disabled until API stabilizes
-#	pst? ( >=net-mail/libpst-0.6 )
+#	pst? ( >=net-mail/libpst-0.6.41 )
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.16
@@ -68,7 +75,6 @@ PDEPEND="exchange? ( >=gnome-extra/evolution-exchange-2.26.1 )"
 
 DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
 ELTCONF="--reverse-deps"
-GCONF_DEBUG="no"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
@@ -79,6 +85,7 @@ pkg_setup() {
 		$(use_enable ssl smime)
 		$(use_enable mono)
 		$(use_enable nntp)
+		$(use_enable networkmanager nm)
 		$(use_enable dbus)
 		$(use_enable gstreamer audio-inline)
 		$(use_enable exchange)
@@ -90,14 +97,6 @@ pkg_setup() {
 		$(use_with kerberos krb5 /usr)
 		$(use_with krb4 krb4 /usr)"
 
-	# We need a graphical pinentry frontend to be able to ask for the GPG
-	# password from inside evolution, bug 160302
-	if use crypt && has_version '>=app-crypt/gnupg-2.0.1-r2'; then
-		if ! built_with_use -o app-crypt/pinentry gtk qt3; then
-			die "You must build app-crypt/pinentry with GTK or QT3 support"
-		fi
-	fi
-
 	# dang - I've changed this to do --enable-plugins=experimental.  This will
 	# autodetect new-mail-notify and exchange, but that cannot be helped for the
 	# moment.  They should be changed to depend on a --enable-<foo> like mono
@@ -108,13 +107,18 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# Fix timezone offsets on fbsd.  bug #183708
-	epatch "${FILESDIR}/${PN}-2.21.3-fbsd.patch"
+	# FIXME: bsd needs to be more active at pushing stuff upstream
+	#epatch "${FILESDIR}/${PN}-2.21.3-fbsd.patch"
+
+	# Fix delete keyboard shortcut, bug #????
+	epatch "${FILESDIR}/${PN}-2.28.0-delete-key.patch"
 
-	# Fix delete keyboard shortcut
-	epatch "${FILESDIR}/${PN}-2.23.3.1-delete-key.patch"
+	# Fix multiple automagic plugins, bug #204300 & bug #271451
+	epatch "${FILESDIR}/${PN}-2.28.0-automagic-plugins.patch"
 
-	# Fix multiple automagics plugins
-	epatch "${FILESDIR}/${PN}-2.26.1.1-automagics-plugins.patch"
+	# FIXME: Fix compilation flags crazyness
+	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
+		-i configure.ac configure || die "sed 1 failed"
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
diff --git a/mail-client/evolution/files/evolution-2.28.0-automagic-plugins.patch b/mail-client/evolution/files/evolution-2.28.0-automagic-plugins.patch
new file mode 100644
index 000000000000..533d950b42d2
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.28.0-automagic-plugins.patch
@@ -0,0 +1,133 @@
+From 350f9cef12d6395d9d006d3101e251e035eb701b Mon Sep 17 00:00:00 2001
+From: Romain Perier <mrpouet@gentoo.org>
+Date: Sat, 3 Oct 2009 10:54:26 +0200
+Subject: [PATCH] Fix automagic dependencies for PST[1] and GStreamer[2]
+
+[1] https://bugs.gentoo.org/show_bug.cgi?id=271451
+[2] https://bugs.gentoo.org/show_bug.cgi?id=204300
+
+---
+ configure.ac |   86 +++++++++++++++++++++++++++++++++------------------------
+ 1 files changed, 50 insertions(+), 36 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 92dc7cf..97b9895 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1704,9 +1704,9 @@ dnl Add any new plugins here
+ plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup webdav-account-setup"
+ 
+ plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN "
+-all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono"
++all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin mono"
+ 
+-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates pst-import vcard-inline"
++plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates vcard-inline"
+ 
+ plugins_standard="$plugins_standard_always"
+ all_plugins_standard="$plugins_standard"
+@@ -1762,29 +1762,31 @@ if test "x${enable_python}" = "xyes"; then
+ 	msg_plugins="$msg_plugins (and python)"
+ fi
+ 
+-AC_SUBST(plugins_enabled)
+-AC_SUBST(all_plugins_base)
+-AC_SUBST(all_plugins_standard)
+-AC_SUBST(all_plugins_experimental)
+-
+-if echo ${plugins_enabled} | grep "audio-inline" > /dev/null
++dnl *********************
++dnl gstreamer
++dnl *********************
++AC_ARG_ENABLE([audio-inline],
++ 	AC_HELP_STRING([--disable-audio-inline],
++ 		[Disable audio-inline plugin @<:@default=yes@:>@]),
++ 	[enable_audio_inline="$enableval"], [enable_audio_inline=yes])
++  
++if test "x$enable_audio_inline" = "xyes"
+ then
+-	if ${PKG_CONFIG} --exists gstreamer-0.10
+-	then
+-		dnl *********************
+-		dnl gstreamer
+-		dnl *********************
+-		PKG_CHECK_MODULES([GSTREAMER], [gstreamer-0.10])
+-		AC_SUBST(GSTREAMER_CFLAGS)
+-		AC_SUBST(GSTREAMER_LIBS)
+-	else
+-		plugins_enabled=`echo $plugins_enabled | sed -e "s/audio-inline//g"`
+-		echo "warning: gstreamer was not found, audio-inline plugin will not be built."
+-		echo "you are probably missing gstreamer-devel package."
+-	fi
++ 	PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10, have_gst=yes, have_gst=no)
++ 	AC_SUBST(GSTREAMER_CFLAGS)
++ 	AC_SUBST(GSTREAMER_LIBS)
++ 
++ 	if test "$have_gst" = "yes"; then
++ 		plugins_enabled="$plugins_enabled audio-inline"
++ 		msg_plugins="$msg_plugins (audio-inline)"
++  	else
++ 		AC_MSG_WARN([gstreamer was not found, audio-inline plugin will not be built.
++ 		You are probably missing gstreamer-devel package.])
++  	fi
+ fi
+ 
+-if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then
++
++if test "x$enable_exchange" = "xyes"; then
+ 	PKG_CHECK_MODULES([LIBEXCHANGESTORAGE], [libexchange-storage-$EDS_PACKAGE >= eds_minimum_version], [have_libexchange="yes"], [have_libexchange="no"])
+ 	if test "x$have_libexchange" = "xyes"; then
+ 		dnl **************************************************
+@@ -1799,23 +1801,35 @@ if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then
+ 	fi
+ fi
+ 
+-if echo ${plugins_enabled} | grep "pst-import" > /dev/null
++dnl *********************
++dnl libpst
++dnl *********************
++ 
++AC_ARG_ENABLE([pst-import],
++ 	AC_HELP_STRING([--disable-pst-import],
++ 		[Disable pst import plugin @<:@default=yes@:>@]),
++ 	[enable_pst="$enableval"], [enable_pst=yes])
++ 
++if test "x$enable_pst" = "xyes"
+ then
+-	if ${PKG_CONFIG} --exists libpst
+-	then
+-		dnl *********************
+-		dnl libpst
+-		dnl *********************
+-		PKG_CHECK_MODULES([LIBPST], [libpst >= libpst_minimum_version])
+-		AC_SUBST(LIBPST_CFLAGS)
+-		AC_SUBST(LIBPST_LIBS)
+-	else
+-		plugins_enabled=`echo $plugins_enabled | sed -e "s/pst-import//g"`
+-		echo "warning: libpst was not found, pst-import plugin will not be built."
+-		echo "you are probably missing libpst-devel package."
+-	fi
++ 	PKG_CHECK_MODULES(LIBPST, libpst, have_pst=yes, have_pst=no)
++ 	AC_SUBST(LIBPST_CFLAGS)
++ 	AC_SUBST(LIBPST_LIBS)
++ 
++ 	if test "$have_pst" = "yes"; then
++ 		plugins_enabled="$plugins_enabled pst-import"
++ 		msg_plugins="$msg_plugins (pst-import)"
++ 	else
++ 		AC_MSG_WARN([libpst was not found, pst-import plugin will not be built.
++ 		You are probably missing libpst-devel package.])
++ 	fi
+ fi
+ 
++AC_SUBST(plugins_enabled)
++AC_SUBST(all_plugins_base)
++AC_SUBST(all_plugins_standard)
++AC_SUBST(all_plugins_experimental)
++
+ dnl ***********
+ dnl GConf stuff
+ dnl ***********
+-- 
+1.6.5.rc2
+
diff --git a/mail-client/evolution/files/evolution-2.28.0-delete-key.patch b/mail-client/evolution/files/evolution-2.28.0-delete-key.patch
new file mode 100644
index 000000000000..621477adb7c2
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.28.0-delete-key.patch
@@ -0,0 +1,57 @@
+From 76f6959d381774924ce872c0318c1459234168ce Mon Sep 17 00:00:00 2001
+From: Romain Perier <mrpouet@gentoo.org>
+Date: Fri, 2 Oct 2009 23:54:41 +0200
+Subject: [PATCH] Delete keyboard shortcut
+
+---
+ mail/em-folder-view.c         |    2 --
+ ui/evolution-mail-message.xml |    6 +++---
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
+index 5923e6e..8931d2e 100644
+--- a/mail/em-folder-view.c
++++ b/mail/em-folder-view.c
+@@ -167,7 +167,6 @@ static const EMFolderViewEnable emfv_enable_map[] = {
+ 	{ "MessageFilterJunk",        EM_POPUP_SELECT_MANY },
+ 	{ "MessageCopy",              EM_POPUP_SELECT_MANY },
+ 	{ "MessageDelete",            EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_DELETE },
+-	{ "MessageDeleteKey",         EM_POPUP_SELECT_MANY},
+ 	{ "MessageForward",           EM_POPUP_SELECT_MANY },
+ 	{ "MessageForwardAttached",   EM_POPUP_SELECT_MANY },
+ 	{ "MessageForwardInline",     EM_POPUP_SELECT_ONE },
+@@ -2034,7 +2033,6 @@ static BonoboUIVerb emfv_message_verbs[] = {
+ 	BONOBO_UI_UNSAFE_VERB ("MessageFilterJunk", emfv_message_filter_junk),
+ 	BONOBO_UI_UNSAFE_VERB ("MessageCopy", emfv_message_copy),
+ 	BONOBO_UI_UNSAFE_VERB ("MessageDelete", emfv_message_delete),
+-	BONOBO_UI_UNSAFE_VERB ("MessageDeleteKey", emfv_message_delete),
+ 	BONOBO_UI_UNSAFE_VERB ("MessageForward", emfv_message_forward),
+ 	BONOBO_UI_UNSAFE_VERB ("MessageForwardAttached", emfv_message_forward_attached),
+ 	BONOBO_UI_UNSAFE_VERB ("MessageForwardInline", emfv_message_forward_inline),
+diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
+index f90e737..65ba88d 100644
+--- a/ui/evolution-mail-message.xml
++++ b/ui/evolution-mail-message.xml
+@@ -58,6 +58,7 @@
+ 
+     <cmd name="MessageDelete"
+      _tip="Mark the selected messages for deletion"
++     accel="*Control*d"
+      pixtype="pixbuf"/>
+ 
+     <cmd name="MessageFollowUpFlag"
+@@ -232,9 +233,8 @@
+     <accel verb="MailNextUnread"     name="*Control*period"/>
+     <accel verb="MailNextUnread"     name="period"/>
+     <accel verb="MailNextUnread"     name="bracketright"/>
+-    <accel verb="MessageDeleteKey"   name="Delete"/>
+-    <accel verb="MessageDeleteKey"   name="KP_Delete"/>
+-    <accel verb="MessageDeleteKey"   name="*Control*d"/>
++    <accel verb="MessageDelete"      name="Delete"/>
++    <accel verb="MessageDelete"      name="KP_Delete"/>
+   </keybindings>
+ 
+   <menu>
+-- 
+1.6.5.rc2
+
diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml
index 915dfd59d47b..0bf53d072891 100644
--- a/mail-client/evolution/metadata.xml
+++ b/mail-client/evolution/metadata.xml
@@ -18,7 +18,7 @@
 		<flag name="networkmanager">Allows Evolution to automagically toggle
 			online/offline mode by talking to <pkg>net-misc/networkmanager</pkg>
 			and getting the current network state</flag>
-		<flag name="pst">Build optional plugin for PST file format import</flag>
+		<!-- <flag name="pst">Build optional plugin for PST file format import</flag> -->
 		<flag name="pda">Enable support for syncing Evolution Calendar and
 			Addressbooks with PDAs using <pkg>app-pda/gnome-pilot</pkg> and
 			<pkg>app-pda/gnome-pilot-conduit</pkg></flag>