summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2010-11-14 22:43:27 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2010-11-14 22:43:27 +0000
commitf53cb4a456e59d4818feff8a11c487a5a20afcc5 (patch)
treef76ac4a926a61ac5949de9ac8588b080b3319d79 /mail-client
parentVersion bump for Gnome 2.32. Make weather component optional, bug #289796. Cl... (diff)
downloadhistorical-f53cb4a456e59d4818feff8a11c487a5a20afcc5.tar.gz
historical-f53cb4a456e59d4818feff8a11c487a5a20afcc5.tar.bz2
historical-f53cb4a456e59d4818feff8a11c487a5a20afcc5.zip
Version bump for Gnome 2.32. Clean up old revisions.
Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/evolution/ChangeLog20
-rw-r--r--mail-client/evolution/Manifest34
-rw-r--r--mail-client/evolution/evolution-2.26.3.ebuild145
-rw-r--r--mail-client/evolution/evolution-2.28.3.1.ebuild152
-rw-r--r--mail-client/evolution/evolution-2.30.3.ebuild4
-rw-r--r--mail-client/evolution/evolution-2.32.0.ebuild (renamed from mail-client/evolution/evolution-2.28.3.1-r1.ebuild)173
-rw-r--r--mail-client/evolution/files/evolution-2.21.3-fbsd.patch37
-rw-r--r--mail-client/evolution/files/evolution-2.23.3.1-delete-key.patch42
-rw-r--r--mail-client/evolution/files/evolution-2.26.3-automagic-plugins.patch176
-rw-r--r--mail-client/evolution/files/evolution-2.28.0-automagic-plugins.patch133
-rw-r--r--mail-client/evolution/files/evolution-2.28.0-delete-key.patch57
-rw-r--r--mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_1.patch170
-rw-r--r--mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_2.patch54
-rw-r--r--mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_3.patch54
-rw-r--r--mail-client/evolution/files/evolution-2.28.3.1-attachment-bar-RTL.patch34
-rw-r--r--mail-client/evolution/files/evolution-2.28.3.1-unknown-attachment-size.patch37
-rw-r--r--mail-client/evolution/files/evolution-2.32.0-wrong-lafile-usage.patch13
-rw-r--r--mail-client/evolution/metadata.xml8
18 files changed, 137 insertions, 1206 deletions
diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 57ceea1f7e59..56d49d91bd62 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,24 @@
# ChangeLog for mail-client/evolution
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.309 2010/10/17 15:34:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.310 2010/11/14 22:43:27 eva Exp $
+
+*evolution-2.32.0 (14 Nov 2010)
+
+ 14 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
+ -files/evolution-2.21.3-fbsd.patch,
+ -files/evolution-2.23.3.1-delete-key.patch, -evolution-2.26.3.ebuild,
+ -files/evolution-2.26.3-automagic-plugins.patch,
+ -files/evolution-2.28.0-automagic-plugins.patch,
+ -files/evolution-2.28.0-delete-key.patch, -evolution-2.28.3.1.ebuild,
+ -evolution-2.28.3.1-r1.ebuild,
+ -files/evolution-2.28.3.1-allow-setting-alarms_1.patch,
+ -files/evolution-2.28.3.1-allow-setting-alarms_2.patch,
+ -files/evolution-2.28.3.1-allow-setting-alarms_3.patch,
+ -files/evolution-2.28.3.1-attachment-bar-RTL.patch,
+ -files/evolution-2.28.3.1-unknown-attachment-size.patch,
+ evolution-2.30.3.ebuild, +evolution-2.32.0.ebuild,
+ +files/evolution-2.32.0-wrong-lafile-usage.patch, metadata.xml:
+ Version bump for Gnome 2.32. Clean up old revisions.
17 Oct 2010; Raúl Porcel <armin76@gentoo.org> evolution-2.30.2-r1.ebuild:
alpha/ia64/sparc stable wrt #324077
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index e222ef87cd84..cfe1664d6260 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,24 +1,22 @@
-AUX evolution-2.21.3-fbsd.patch 1107 RMD160 7dbbf08ed68124a398b9db64bac6a4b0cecfa9ef SHA1 05f581d030bb81aad2e0f734f432dd23add4b3c2 SHA256 942b81689f9e4b5a1896ec7c810c323bfaeb74d40c6c6683d8dfd8b670236e77
-AUX evolution-2.23.3.1-delete-key.patch 2382 RMD160 41e30f2f9e52c8a1a45db11d12fa5da8eb137c04 SHA1 2df3f06c427072d2de7bf379f6d0b6fedaf2a4e1 SHA256 37809a6b12cb93a6da0cf11a50e33d040380ac31b1377eba867e3a12f92d1cbc
-AUX evolution-2.26.3-automagic-plugins.patch 7022 RMD160 2e7279257e90c66abbfc4703ba0fbba015b6f484 SHA1 23602b5b73caf2b06235422042ae3e32c6b520c3 SHA256 acae2843c8068b298b0e54eb263b3b7582ddf272aae5c0ceffa3d4d095f40e91
-AUX evolution-2.28.0-automagic-plugins.patch 5196 RMD160 0c1c58267db1e8a1322c5bc162bae2d82bc245a1 SHA1 6d7feb27ad3fd467037c1a7d23b10ca13882ca56 SHA256 92823003300dbe32084498522a777f9b21437bea18761525342ef7e12aab42f0
-AUX evolution-2.28.0-delete-key.patch 2416 RMD160 e8ce7b415f7dba764c82fa11e19ffdbe4e209bc7 SHA1 7e82210d842d5a523fbcdcc4ab31fe29d2fe62ad SHA256 8d6d6b41d594aa48dc8d1fb8e422d01d23ec191cdd2ca5eb77e4d0e98d5b7ae8
-AUX evolution-2.28.3.1-allow-setting-alarms_1.patch 6441 RMD160 802c09d81e660d6f0d23f0b968f9a4794f987c3a SHA1 d0d5c52687274e6dacd241d876213180c3aa4fa1 SHA256 5a9dca63db80ef191b395ef7d5269cd66fac856c6eb0c77f6b0e53bae79c1e73
-AUX evolution-2.28.3.1-allow-setting-alarms_2.patch 2149 RMD160 a44c12bcdd3316a489563291544f50a38d568c38 SHA1 c0fdadb8b1a73a02035114e0e4429e4af8628b68 SHA256 74afc572a3e226b39bba41f6e23e73a3353e61b0a01e97e43da4feb657c6118e
-AUX evolution-2.28.3.1-allow-setting-alarms_3.patch 1890 RMD160 e42285e4817e98eb63c4cee7c02821636fc1c382 SHA1 e90cbd558c59bed177a69bc80d42357712f87564 SHA256 3a2dfb68917f9ca9d3a17a67eff3bc465d4527385c3e35d6aeefdbb4121a4ddf
-AUX evolution-2.28.3.1-attachment-bar-RTL.patch 1360 RMD160 e2f512542837dd47c820f2a23b936f5a065665b7 SHA1 f2df4a491ccea878232dd55747526b4f80a40ff8 SHA256 1afb9010a997be10e168dcd050d4d8cb3bb85544f5f9f37c9bd17eb698579f49
-AUX evolution-2.28.3.1-unknown-attachment-size.patch 1182 RMD160 4df9108c74c3b1b1d6d828502d26feab93db7dca SHA1 d248e9d07f6279539b1fa03a59e4005fa6a3aebe SHA256 ae8314004b7e0cfd4f285459a9bfabd864fbb3d3954417e0f5eed8b7e1944a4b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX evolution-2.30.1.2-configure.patch 1243 RMD160 f7cefb76592fff6e2fba441993b546b8c9a30ca6 SHA1 6ca2073ce735bf40c4ca403d695a16976a6c3360 SHA256 c757dd941f9b4798ed6c0b5c6d23517700c9c232c60aca3b6f09f2c4278885a2
AUX evolution-2.30.3-fix-linking-issues-in-libeshell.patch 870 RMD160 12d6fe68f2c91f5be97057a2324946eb4ce90a08 SHA1 f0e4310ca1124481373fb5760b15ccbada67cc41 SHA256 4ee4ca24cd3ff8bb27b03d262b0bb4ff8953a3973f04044984beaf2804c3d07c
-DIST evolution-2.26.3.tar.bz2 36427464 RMD160 f2b3aa2275095feb2af406022c0a6bc8a381e8d5 SHA1 d0e247ccb903a57a5e6fe23cfb04535ea141e9fb SHA256 e37f8d21a8aa201e9a3d91a110ec9d4dc3feae978be45b0c16cf93adacd5605b
-DIST evolution-2.28.3.1.tar.bz2 29765375 RMD160 442c7b472caf94ba0aa1abbe253b810d15911a4f SHA1 412c8be73e483444ad69a4ad8c15b0db9520fe0a SHA256 9fda41b0994b1bb8d119f594597f77bb4af1a883588a39f7a81ec7a2eb18f5fd
+AUX evolution-2.32.0-wrong-lafile-usage.patch 634 RMD160 e14b9b17faacc3590419f7f1de78cd0f76323d58 SHA1 221fbd2112d206e52e741018c7ff2a3434819d18 SHA256 79e169a86b658bbd339fe79585f908f0eee4cfeef972be0731faa742a769deb8
DIST evolution-2.30.2-patches.tar.bz2 12728 RMD160 d8058da75675a1990aad84348a40cd3f7be21aa3 SHA1 4bbb89f10ba893ef992af5fc32aad84b2ad46d2f SHA256 f3d6dcfba9ee7c21b415d04a545902cb5a28d1bcc00e579c6cc78aeac7650a45
DIST evolution-2.30.2.tar.bz2 32570501 RMD160 c1b5703bc241a2dee20f94e60e7c9995c8cce841 SHA1 14ddccbf33eb86c976899eccea6ae1fb565ea9ca SHA256 470d12c0de9cae2dc0275152a356150c7a57339e6feca77f43508bd7d1f04d83
DIST evolution-2.30.3.tar.bz2 32555386 RMD160 b79e3f6ba181033a9add979de8b6d518d451322c SHA1 f62e1dea59243242f626cc73ffdd68df28cedd57 SHA256 8c47e93ff5aedfad39d4224ae0751a938ccb7d2a2bcd407513cf1331c51b9cab
-EBUILD evolution-2.26.3.ebuild 4474 RMD160 969fc82fb9207a1b30710d0ceac59d44e58ff3a6 SHA1 2a34a86256377aece30bd133699aa4a0d112b549 SHA256 de6801a09682a57f663fa28610493df9d4dad22a2a2cc34f06c40f7e8f050bad
-EBUILD evolution-2.28.3.1-r1.ebuild 5387 RMD160 e167943f66806da942ee2d9e5b89b4459e5496ae SHA1 183e20832bd1649bfc09e0cbedf0d6459156f117 SHA256 c5ace5973e7867df9b9c7e37416a945b4fc53a706ea5e9e9bf4dd0713e33bc4a
-EBUILD evolution-2.28.3.1.ebuild 4776 RMD160 635a26b79e548eae0307f92ab414733043a271eb SHA1 38dc812719d7e59986ecb7d2c72c3a8daefe343d SHA256 dba152baf57204968e92ca6690967001a715104d0a20d1ef11a09231da6b3822
+DIST evolution-2.32.0.tar.bz2 31877012 RMD160 4dce514b135d51e1b7fdfa3f47082ad65ab434f4 SHA1 81f5b0dab5ae00516e1ad45bd75cc174a6f57295 SHA256 61d0e45a9f23292d41155332d57d325b44b198189133b64f929cd75e1dc98841
EBUILD evolution-2.30.2-r1.ebuild 4662 RMD160 745c1b7789a6aa9bf64a292d52c0c167d4e66dcb SHA1 8020dc9810e74eb1d5813419d3452ed1e9b8bc4f SHA256 824a386dd0e95d4273d9975c9c1c9959371cca9dd0058b9168fffc5e0e1e76ef
-EBUILD evolution-2.30.3.ebuild 4929 RMD160 d7ef62155b41eb114016aeae2828ba2773aa2baa SHA1 ce93be4f503ddbf851c62a0325059bf93ca1489b SHA256 9272cea9accf2df86d8e4c17e760e91d4a902f51e791d62101aaca25d9205ee4
-MISC ChangeLog 71989 RMD160 190b198953201ba56a021ef2eaaa1cdf3e23c079 SHA1 ebf1b54dc86cd7fdaf7928dacf677fba861e5c60 SHA256 ca795aa3ee495858a1a0856f86fcac62af4aae4a30000fb1dacaba0bc1fd34f0
-MISC metadata.xml 1461 RMD160 a54b702777b629e801eb07e83c3151d020b2db2c SHA1 1db2d57540fd6732e6ad356e746f8c14f7411750 SHA256 1768837d6848092351ece0bff37f4db820dcb9cf9efcd21e596a71ad97892035
+EBUILD evolution-2.30.3.ebuild 4932 RMD160 b3e547c0220034b6c4be670e43cb9eb0948b79e2 SHA1 9db1bc30ef28680930a0f51e8d0e4533c13a0417 SHA256 291a32a8b16cacc4246b6d5e2e6a909cb7657bd966348fae50acc0a9a2482588
+EBUILD evolution-2.32.0.ebuild 5143 RMD160 b37e13896f49b34642bc8a205b9e5f182d7d567e SHA1 bbf27dd83417e91eafa28a5f09167d9afbb739d1 SHA256 fd7c8b32674f1c206329aa2a3e0d3f29e7a568a95d4bb181ea2e707b987da64f
+MISC ChangeLog 72851 RMD160 2ed40e4b50091c2ab7567cc6700c3f0a4d81b0d4 SHA1 2a138c1202dcbab13b3105e38e7e60893e3003ed SHA256 4c544ddcaef62d1ca5180cdb4b9f0e4012bd9ea8faa535a266fd90ea16515d2a
+MISC metadata.xml 999 RMD160 b2e2b40520a0cc93c17457d16c130c73cb295654 SHA1 b2c3107d9eed02e9223af2f977979c7f242a7469 SHA256 673f1db6a598fa4069e4d42acaa073d60fbd6077484e3ce2d8192793bc8d75a8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzgZh0ACgkQ1fmVwcYIWAZKnwCg1h66RMIKw8Oj4UvJKf73M69e
+zd0AoJ25IJGQfJ4tWyX2XN1tTsU0UtMk
+=znLn
+-----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.26.3.ebuild b/mail-client/evolution/evolution-2.26.3.ebuild
deleted file mode 100644
index c96cb96610df..000000000000
--- a/mail-client/evolution/evolution-2.26.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.26.3.ebuild,v 1.17 2010/08/05 16:54:14 ssuominen Exp $
-
-EAPI="2"
-
-inherit autotools gnome2 flag-o-matic python
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="crypt dbus hal kerberos ldap mono networkmanager nntp pda profile python ssl gstreamer exchange"
-# pst
-
-# Pango dependency required to avoid font rendering problems
-# 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.18
- >=x11-libs/gtk+-2.14
- >=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-base/gconf-2
- >=gnome-base/libglade-2
- >=gnome-base/libgnomecanvas-2
- >=gnome-base/libgnomeui-2
- >=dev-libs/libxml2-2
- >=dev-libs/libgweather-2.25.3
- >=x11-misc/shared-mime-info-0.22
- dbus? ( dev-libs/dbus-glib )
- hal? ( >=sys-apps/hal-0.5.4 )
- x11-libs/libnotify
- pda? (
- >=app-pda/gnome-pilot-2.0.15
- >=app-pda/gnome-pilot-conduits-2 )
- dev-libs/atk
- ssl? (
- >=dev-libs/nspr-4.6.1
- >=dev-libs/nss-3.11 )
- networkmanager? ( net-misc/networkmanager )
- >=net-libs/libsoup-2.4
- kerberos? ( virtual/krb5 )
- >=gnome-base/orbit-2.9.8
- crypt? ( || (
- ( >=app-crypt/gnupg-2.0.1-r2
- app-crypt/pinentry[gtk] )
- =app-crypt/gnupg-1.4* ) )
- ldap? ( >=net-nds/openldap-2 )
- mono? ( >=dev-lang/mono-1 )
- python? ( >=dev-lang/python-2.4 )
- gstreamer? (
- >=media-libs/gstreamer-0.10
- >=media-libs/gst-plugins-base-0.10 )"
-# Disabled until API stabilizes
-# pst? ( >=net-mail/libpst-0.6 )
-
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.16
- >=dev-util/intltool-0.35.5
- sys-devel/gettext
- sys-devel/bison
- app-text/scrollkeeper
- >=gnome-base/gnome-common-2.12.0
- >=app-text/gnome-doc-utils-0.9.1
- app-text/docbook-xml-dtd:4.1.2"
-
-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}
- --without-kde-applnk-path
- --enable-plugins=experimental
- --with-weather
- $(use_enable ssl nss)
- $(use_enable ssl smime)
- $(use_enable mono)
- $(use_enable nntp)
- $(use_enable dbus)
- $(use_enable gstreamer audio-inline)
- $(use_enable exchange)
- --disable-pst-import
- $(use_enable pda pilot-conduits)
- $(use_enable profile profiling)
- $(use_enable python)
- $(use_with ldap openldap)
- $(use_with kerberos krb5 /usr)"
-
- # 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
- # is. This cleans up a ton of crap from this ebuild.
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- # Fix timezone offsets on fbsd. bug #183708
- epatch "${FILESDIR}/${PN}-2.21.3-fbsd.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.26.3-automagic-plugins.patch"
-
- intltoolize --force --copy --automake || die "intltoolize failed"
- eautoreconf
-
- # Use NSS/NSPR only if 'ssl' is enabled.
- if use ssl ; then
- sed -i -e "s|mozilla-nss|nss|
- s|mozilla-nspr|nspr|" "${S}"/configure || die "sed 1 failed"
- G2CONF="${G2CONF} --enable-nss=yes"
- else
- G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
- --without-nss-libs --without-nss-includes"
- fi
-
- # problems with -O3 on gcc-3.3.1
- replace-flags -O3 -O2
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- elog "To change the default browser if you are not using GNOME, do:"
- elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
- elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
- elog ""
- elog "Replace 'mozilla %s' with which ever browser you use."
- elog ""
- elog "Junk filters are now a run-time choice. You will get a choice of"
- elog "bogofilter or spamassassin based on which you have installed"
- elog ""
- elog "You have to install one of these for the spam filtering to actually work"
-}
diff --git a/mail-client/evolution/evolution-2.28.3.1.ebuild b/mail-client/evolution/evolution-2.28.3.1.ebuild
deleted file mode 100644
index 69a05a113501..000000000000
--- a/mail-client/evolution/evolution-2.28.3.1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.28.3.1.ebuild,v 1.8 2010/08/14 18:39:14 armin76 Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit autotools gnome2 flag-o-matic python
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="crypt dbus hal kerberos ldap mono networkmanager nntp pda profile python ssl gstreamer exchange"
-# pst
-
-# Pango dependency required to avoid font rendering problems
-# 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-${PV}
- >=x11-themes/gnome-icon-theme-2.20
- >=gnome-base/libbonobo-2.20.3
- >=gnome-base/libbonoboui-2.4.2
- >=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.7.3
- >=dev-libs/libgweather-2.25.3
- >=x11-misc/shared-mime-info-0.22
- >=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? (
- >=app-pda/gnome-pilot-2.0.15
- >=app-pda/gnome-pilot-conduits-2 )
- dev-libs/atk
- ssl? (
- >=dev-libs/nspr-4.6.1
- >=dev-libs/nss-3.11 )
- networkmanager? ( >=net-misc/networkmanager-0.7 )
- >=net-libs/libsoup-2.4
- kerberos? ( virtual/krb5 )
- >=gnome-base/orbit-2.9.8
- crypt? ( || (
- ( >=app-crypt/gnupg-2.0.1-r2
- app-crypt/pinentry[gtk] )
- =app-crypt/gnupg-1.4* ) )
- ldap? ( >=net-nds/openldap-2 )
- mono? ( >=dev-lang/mono-1 )
- python? ( >=dev-lang/python-2.4 )
- gstreamer? (
- >=media-libs/gstreamer-0.10
- >=media-libs/gst-plugins-base-0.10 )"
-# Disabled until API stabilizes
-# pst? ( >=net-mail/libpst-0.6.41 )
-
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.16
- >=dev-util/intltool-0.35.5
- sys-devel/gettext
- sys-devel/bison
- app-text/scrollkeeper
- >=gnome-base/gnome-common-2.12.0
- >=app-text/gnome-doc-utils-0.9.1
- app-text/docbook-xml-dtd:4.1.2"
-
-PDEPEND="exchange? ( >=gnome-extra/evolution-exchange-2.26.1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --without-kde-applnk-path
- --enable-plugins=experimental
- --with-weather
- $(use_enable ssl nss)
- $(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)
- --disable-pst-import
- $(use_enable pda pilot-conduits)
- $(use_enable profile profiling)
- $(use_enable python)
- $(use_with ldap openldap)
- $(use_with kerberos krb5 /usr)"
-
- # 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
- # is. This cleans up a ton of crap from this ebuild.
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- # Fix timezone offsets on fbsd. bug #183708
- # 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 multiple automagic plugins, bug #204300 & bug #271451
- epatch "${FILESDIR}/${PN}-2.28.0-automagic-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
-
- # Use NSS/NSPR only if 'ssl' is enabled.
- if use ssl ; then
- sed -i -e "s|mozilla-nss|nss|
- s|mozilla-nspr|nspr|" "${S}"/configure || die "sed 1 failed"
- G2CONF="${G2CONF} --enable-nss=yes"
- else
- G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
- --without-nss-libs --without-nss-includes"
- fi
-
- # problems with -O3 on gcc-3.3.1
- replace-flags -O3 -O2
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- elog "To change the default browser if you are not using GNOME, do:"
- elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
- elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
- elog ""
- elog "Replace 'mozilla %s' with which ever browser you use."
- elog ""
- elog "Junk filters are now a run-time choice. You will get a choice of"
- elog "bogofilter or spamassassin based on which you have installed"
- elog ""
- elog "You have to install one of these for the spam filtering to actually work"
-}
diff --git a/mail-client/evolution/evolution-2.30.3.ebuild b/mail-client/evolution/evolution-2.30.3.ebuild
index 238b22178f46..92ad782c6528 100644
--- a/mail-client/evolution/evolution-2.30.3.ebuild
+++ b/mail-client/evolution/evolution-2.30.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.30.3.ebuild,v 1.2 2010/09/30 18:52:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.30.3.ebuild,v 1.3 2010/11/14 22:43:27 eva Exp $
EAPI="2"
GCONF_DEBUG="no"
@@ -24,7 +24,7 @@ IUSE="crypt doc gstreamer kerberos ldap networkmanager nntp pda profile python s
PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] app-crypt/pinentry[qt3] )"
RDEPEND=">=dev-libs/glib-2.22
>=x11-libs/gtk+-2.18
- >=gnome-extra/evolution-data-server-$(get_version_component_range 1-2)
+ >=gnome-extra/evolution-data-server-$(get_version_component_range 1-2)[weather]
>=gnome-base/gnome-desktop-2.26
>=gnome-extra/gtkhtml-3.29.6
>=gnome-base/gconf-2
diff --git a/mail-client/evolution/evolution-2.28.3.1-r1.ebuild b/mail-client/evolution/evolution-2.32.0.ebuild
index f94ec3470fa8..44eb1d1ddd2d 100644
--- a/mail-client/evolution/evolution-2.28.3.1-r1.ebuild
+++ b/mail-client/evolution/evolution-2.32.0.ebuild
@@ -1,68 +1,68 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.28.3.1-r1.ebuild,v 1.5 2010/09/30 18:52:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.0.ebuild,v 1.1 2010/11/14 22:43:27 eva Exp $
EAPI="2"
GCONF_DEBUG="no"
+PYTHON_DEPEND="python? 2:2.4"
-inherit autotools gnome2 flag-o-matic python
+inherit autotools flag-o-matic gnome2 python versionator
+
+MY_MAJORV=$(get_version_component_range 1-2)
DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
HOMEPAGE="http://www.gnome.org/projects/evolution/"
-LICENSE="GPL-2 FDL-1.1"
+LICENSE="GPL-2 LGPL-2 OPENLDAP"
SLOT="2.0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="crypt dbus hal kerberos ldap mono networkmanager nntp pda profile python ssl gstreamer exchange"
+IUSE="crypt doc gstreamer kerberos ldap networkmanager profile python ssl"
# pst
+# mono - disabled because it just crashes on startup :S
# Pango dependency required to avoid font rendering problems
-# We need a graphical pinentry frontend to be able to ask for the GPG
+# We need a graphical pinentry frontend to be able to ask for the GPG.
+# Note that separate pinenetry-qt is actually newer than USE=qt4 in pinentry.
# password from inside evolution, bug 160302
PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] app-crypt/pinentry[qt3] )"
-RDEPEND=">=dev-libs/glib-2.20
- >=x11-libs/gtk+-2.16
- >=gnome-extra/evolution-data-server-${PV}
- >=x11-themes/gnome-icon-theme-2.20
- >=gnome-base/libbonobo-2.20.3
- >=gnome-base/libbonoboui-2.4.2
- >=gnome-extra/gtkhtml-3.27.90
+
+# TODO: enable champlain support
+# TODO: enable glade-3 support
+RDEPEND=">=dev-libs/glib-2.25.12:2
+ >=x11-libs/gtk+-2.20:2
+ >=dev-libs/libunique-1.1.2
+ >=gnome-base/gnome-desktop-2.26:2
+ >=dev-libs/libgweather-2.25.3
+ media-libs/libcanberra[gtk]
+ >=x11-libs/libnotify-0.3
+ >=gnome-extra/evolution-data-server-${MY_MAJORV}[weather]
+ >=gnome-extra/gtkhtml-3.31.90
>=gnome-base/gconf-2
- >=gnome-base/libglade-2
>=gnome-base/libgnomecanvas-2
- >=gnome-base/libgnomeui-2
+ dev-libs/atk
+ >=dev-libs/dbus-glib-0.74
>=dev-libs/libxml2-2.7.3
- >=dev-libs/libgweather-2.25.3
+ >=net-libs/libsoup-2.4:2.4
+ >=media-gfx/gtkimageview-1.6
>=x11-misc/shared-mime-info-0.22
- >=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? (
- >=app-pda/gnome-pilot-2.0.15
- >=app-pda/gnome-pilot-conduits-2 )
- dev-libs/atk
- ssl? (
- >=dev-libs/nspr-4.6.1
- >=dev-libs/nss-3.11 )
- networkmanager? (
- >=net-misc/networkmanager-0.7
- >=dev-libs/dbus-glib-0.74 )
- >=net-libs/libsoup-2.4
- kerberos? ( virtual/krb5 )
- >=gnome-base/orbit-2.9.8
+ >=x11-themes/gnome-icon-theme-2.30.2.1
+
crypt? ( || (
- ( >=app-crypt/gnupg-2.0.1-r2
- ${PINENTRY_DEPEND} )
- =app-crypt/gnupg-1.4* ) )
- ldap? ( >=net-nds/openldap-2 )
- mono? ( >=dev-lang/mono-1 )
- python? ( >=dev-lang/python-2.4 )
+ ( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
+ =app-crypt/gnupg-1.4* ) )
gstreamer? (
>=media-libs/gstreamer-0.10
- >=media-libs/gst-plugins-base-0.10 )"
-# Disabled until API stabilizes
-# pst? ( >=net-mail/libpst-0.6.41 )
+ >=media-libs/gst-plugins-base-0.10 )
+ kerberos? ( virtual/krb5 )
+ ldap? ( >=net-nds/openldap-2 )
+ networkmanager? ( >=net-misc/networkmanager-0.7 )
+ ssl? (
+ >=dev-libs/nspr-4.6.1
+ >=dev-libs/nss-3.11 )
+
+ !<gnome-extra/evolution-exchange-2.32"
+# champlain, geoclue, clutter, gtkimageview
+# mono? ( >=dev-lang/mono-1 )
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.16
@@ -70,84 +70,85 @@ DEPEND="${RDEPEND}
sys-devel/gettext
sys-devel/bison
app-text/scrollkeeper
- >=gnome-base/gnome-common-2.12.0
>=app-text/gnome-doc-utils-0.9.1
- app-text/docbook-xml-dtd:4.1.2"
-
-PDEPEND="exchange? ( >=gnome-extra/evolution-exchange-2.26.1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
+ app-text/docbook-xml-dtd:4.1.2
+ >=gnome-base/gnome-common-2.12
+ >=dev-util/gtk-doc-am-1.9
+ doc? ( >=dev-util/gtk-doc-1.9 )"
+# eautoreconf needs:
+# >=gnome-base/gnome-common-2.12
+# >=dev-util/gtk-doc-am-1.9
pkg_setup() {
+ DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+ ELTCONF="--reverse-deps"
G2CONF="${G2CONF}
--without-kde-applnk-path
--enable-plugins=experimental
- --with-weather
+ --enable-image-inline
+ --enable-canberra
+ --enable-weather
+ --disable-gtk3
$(use_enable ssl nss)
$(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)
--disable-pst-import
- $(use_enable pda pilot-conduits)
$(use_enable profile profiling)
$(use_enable python)
$(use_with ldap openldap)
- $(use_with kerberos krb5 /usr)"
+ $(use_with kerberos krb5 /usr)
+ --disable-contacts-map"
- # DBUS is required for NetworkManager support (Bug #317841)
- use networkmanager && G2CONF="${G2CONF} --enable-dbus"
+# $(use_enable mono)
# 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
# is. This cleans up a ton of crap from this ebuild.
+
+ # Use NSS/NSPR only if 'ssl' is enabled.
+ if use ssl ; then
+ G2CONF="${G2CONF} --enable-nss=yes"
+ else
+ G2CONF="${G2CONF}
+ --without-nspr-libs
+ --without-nspr-includes
+ --without-nss-libs
+ --without-nss-includes"
+ fi
+
+ python_set_active_version 2
}
src_prepare() {
gnome2_src_prepare
- # Fix timezone offsets on fbsd. bug #183708
- # 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 multiple automagic plugins, bug #204300 & bug #271451
- epatch "${FILESDIR}/${PN}-2.28.0-automagic-plugins.patch"
-
- # Apply all current 2.28.3.1 upstream fixes:
- epatch "${FILESDIR}/${P}-attachment-bar-RTL.patch"
- epatch "${FILESDIR}/${P}-unknown-attachment-size.patch"
- # Bug #317765
- epatch "${FILESDIR}/${P}-allow-setting-alarms_1.patch"
- epatch "${FILESDIR}/${P}-allow-setting-alarms_2.patch"
- epatch "${FILESDIR}/${P}-allow-setting-alarms_3.patch"
+ # Fix invalid use of la file in contact-editor
+ epatch "${FILESDIR}/${PN}-2.32.0-wrong-lafile-usage.patch"
# FIXME: Fix compilation flags crazyness
- sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
+ sed -e 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
-i configure.ac configure || die "sed 1 failed"
- intltoolize --force --copy --automake || die "intltoolize failed"
- eautoreconf
-
# Use NSS/NSPR only if 'ssl' is enabled.
if use ssl ; then
- sed -i -e "s|mozilla-nss|nss|
- s|mozilla-nspr|nspr|" "${S}"/configure || die "sed 1 failed"
- G2CONF="${G2CONF} --enable-nss=yes"
- else
- G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
- --without-nss-libs --without-nss-includes"
+ sed -e 's|mozilla-nss|nss|' \
+ -e 's|mozilla-nspr|nspr|' \
+ -i configure.ac configure || die "sed 2 failed"
fi
- # problems with -O3 on gcc-3.3.1
- replace-flags -O3 -O2
+ intltoolize --force --copy --automake || die "intltoolize failed"
+ eautoreconf
+}
+
+src_install() {
+ gnome2_src_install
+
+ find "${ED}"/usr/$(get_libdir)/evolution/${MY_MAJORV}/plugins \
+ -name "*.la" -delete || die "la files removal failed 1"
+ find "${ED}"/usr/$(get_libdir)/evolution/${MY_MAJORV}/modules \
+ -name "*.la" -delete || die "la files removal failed 2"
}
pkg_postinst() {
diff --git a/mail-client/evolution/files/evolution-2.21.3-fbsd.patch b/mail-client/evolution/files/evolution-2.21.3-fbsd.patch
deleted file mode 100644
index d619a2d09734..000000000000
--- a/mail-client/evolution/files/evolution-2.21.3-fbsd.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-2.21.3.orig/widgets/e-timezone-dialog/e-timezone-dialog.c evolution-2.21.3/widgets/e-timezone-dialog/e-timezone-dialog.c
---- evolution-2.21.3.orig/widgets/e-timezone-dialog/e-timezone-dialog.c 2007-11-29 23:24:05.000000000 -0500
-+++ evolution-2.21.3/widgets/e-timezone-dialog/e-timezone-dialog.c 2007-12-04 15:33:32.000000000 -0500
-@@ -82,7 +82,9 @@ struct _ETimezoneDialogPrivate {
-
- #ifndef G_OS_WIN32 /* Declared properly in time.h already */
- extern char *tzname[2];
-+#ifndef __BSD_VISIBLE
- extern long timezone;
-+#endif
- extern int daylight;
- #endif
-
-@@ -326,9 +328,20 @@ static icaltimezone*
- get_local_timezone(void)
- {
- icaltimezone *zone;
--
-- tzset();
-- zone = icaltimezone_get_builtin_timezone_from_offset (-timezone, tzname[0]);
-+ long offset;
-+#ifdef __BSD_VISIBLE
-+ time_t tt;
-+ struct tm tm;
-+#endif
-+
-+ tzset();
-+#ifdef __BSD_VISIBLE
-+ localtime_r (&tt, &tm);
-+ offset = tm.tm_gmtoff;
-+#else
-+ offset = -timezone;
-+#endif
-+ zone = icaltimezone_get_builtin_timezone_from_offset (offset, tzname[0]);
-
- return zone;
- }
diff --git a/mail-client/evolution/files/evolution-2.23.3.1-delete-key.patch b/mail-client/evolution/files/evolution-2.23.3.1-delete-key.patch
deleted file mode 100644
index 5dea769bb971..000000000000
--- a/mail-client/evolution/files/evolution-2.23.3.1-delete-key.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-2.23.3.1.orig/mail/em-folder-view.c evolution-2.23.3.1/mail/em-folder-view.c
---- evolution-2.23.3.1.orig/mail/em-folder-view.c 2008-06-02 03:51:43.000000000 -0400
-+++ evolution-2.23.3.1/mail/em-folder-view.c 2008-06-03 11:16:19.000000000 -0400
-@@ -175,7 +175,6 @@ static const EMFolderViewEnable emfv_ena
- { "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 },
-@@ -2063,7 +2062,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 --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-2.23.3.1.orig/ui/evolution-mail-message.xml evolution-2.23.3.1/ui/evolution-mail-message.xml
---- evolution-2.23.3.1.orig/ui/evolution-mail-message.xml 2008-06-02 03:51:43.000000000 -0400
-+++ evolution-2.23.3.1/ui/evolution-mail-message.xml 2008-06-03 11:16:19.000000000 -0400
-@@ -58,6 +58,7 @@
-
- <cmd name="MessageDelete"
- _tip="Mark the selected messages for deletion"
-+ accel="*Control*d"
- pixtype="pixbuf"/>
-
- <cmd name="MessageFollowUpFlag"
-@@ -243,9 +244,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>
diff --git a/mail-client/evolution/files/evolution-2.26.3-automagic-plugins.patch b/mail-client/evolution/files/evolution-2.26.3-automagic-plugins.patch
deleted file mode 100644
index 30634b1441f9..000000000000
--- a/mail-client/evolution/files/evolution-2.26.3-automagic-plugins.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-Fix automagic dependencies for PST [1] and gtreamer [2]
-
-[1] https://bugs.gentoo.org/show_bug.cgi?id=271451
-[2] https://bugs.gentoo.org/show_bug.cgi?id=204300
-
----
-
- configure.in | 127 +++++++++++++++++++++++++++++++++-------------------------
- 1 files changed, 73 insertions(+), 54 deletions(-)
-
-
-diff --git a/configure.in b/configure.in
-index 4e36e01..fe03ff8 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1773,9 +1773,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 import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates pst-import"
-+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates"
-
- plugins_standard="$plugins_standard_always"
- all_plugins_standard="$plugins_standard"
-@@ -1830,53 +1830,89 @@ 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)
-+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 echo ${plugins_enabled} | grep "audio-inline" > /dev/null
-+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)
-+ 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
-- 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."
-+ AC_MSG_WARN([gstreamer was not found, audio-inline plugin will not be built.
-+You are probably missing gstreamer-devel package.])
- fi
- fi
-
--if ${PKG_CONFIG} --exists dbus-glib-1 ; then
-+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
-+ 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)
-+
-+AC_ARG_ENABLE([dbus],
-+ AC_HELP_STRING([--disable-dbus], [Disable mail notification DBus messages plugin @<:@default=yes@:>@]),
-+ [enable_dbus="$enableval"], [enable_dbus=yes])
-+
-+if test "x$enable_dbus" = "xyes"; then
- dnl **************************************************
- dnl * Mail Notification plugin's DBus messages
- dnl **************************************************
-- PKG_CHECK_MODULES(NMN, dbus-glib-1)
-- AC_SUBST(NMN_CFLAGS)
-- AC_SUBST(NMN_LIBS)
--
-- # Get the version of the DBus API, so we can hack around API changes until the API stabilises:
-- # multiply by 1000 to convert decimal to integer; so e.g. 0.31 become 310
-- # since preprocessor values must be integral
-- FOUND_DBUS_VERSION="`$PKG_CONFIG --modversion dbus-1 | $AWK '{print 1000 * $1}'`"
-- AC_SUBST(FOUND_DBUS_VERSION)
-- AC_DEFINE(HAVE_DBUS,1,[Define if you have DBUS support])
-- AC_SUBST(HAVE_DBUS)
-- AM_CONDITIONAL(ENABLE_DBUS, true)
--
--else
-- echo "warning: dbus-glib-1 was not found, Mail notification plugins's dbus message support not built"
-- AM_CONDITIONAL(ENABLE_DBUS, false)
-+ if $PKG_CONFIG --exists dbus-glib-1; then
-+ PKG_CHECK_MODULES(NMN, dbus-glib-1)
-+ AC_SUBST(NMN_CFLAGS)
-+ AC_SUBST(NMN_LIBS)
-+
-+ # Get the version of the DBus API, so we can hack around API changes until the API stabilises:
-+ # multiply by 1000 to convert decimal to integer; so e.g. 0.31 become 310
-+ # since preprocessor values must be integral
-+ FOUND_DBUS_VERSION="`$PKG_CONFIG --modversion dbus-1 | $AWK '{print 1000 * $1}'`"
-+ AC_SUBST(FOUND_DBUS_VERSION)
-+ AC_DEFINE(HAVE_DBUS,1,[Define if you have DBUS support])
-+ AC_SUBST(HAVE_DBUS)
-+ else
-+ echo "warning: dbus-glib-1 was not found, Mail notification plugins's dbus message support not built"
-+ fi
-
- fi
-
--if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then
-- PKG_CHECK_MODULES(LIBEXCHANGESTORAGE, libexchange-storage-$EDS_PACKAGE >= eds_minimum_version, have_libexchange="yes", have_libexchange="no")
-+AM_CONDITIONAL(ENABLE_DBUS, test x$enable_dbus = xyes)
-+
-+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 **************************************************
- dnl * Exchange Operations plugin
-@@ -1890,23 +1926,6 @@ if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then
- fi
- fi
-
--if echo ${plugins_enabled} | grep "pst-import" > /dev/null
--then
-- if ${PKG_CONFIG} --exists libpst
-- then
-- dnl *********************
-- dnl libpst
-- dnl *********************
-- PKG_CHECK_MODULES(LIBPST, libpst)
-- 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
--fi
--
- dnl ***********
- dnl GConf stuff
- dnl ***********
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
deleted file mode 100644
index 533d950b42d2..000000000000
--- a/mail-client/evolution/files/evolution-2.28.0-automagic-plugins.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-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
deleted file mode 100644
index 621477adb7c2..000000000000
--- a/mail-client/evolution/files/evolution-2.28.0-delete-key.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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/files/evolution-2.28.3.1-allow-setting-alarms_1.patch b/mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_1.patch
deleted file mode 100644
index d6eb4581b0a6..000000000000
--- a/mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_1.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 63fb1857b99f53fbd2506799049b645fce1c1f0c Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <i.am@jimramsay.com>
-Date: Tue, 18 May 2010 16:39:47 -0400
-Subject: [PATCH 12/14] Bug 594153 (1/3) - Allow setting alarms on any meeting
-
-This introduces a new action_group called "editable" in the comp-editor
-that can be used by other components to assign actions that should be
-sensitized separately from the existing "individual" group, such as the
-"Alarms" and "Show Time as Busy" event actions.
-
-This fixes a bug introduced in 0597b877c5bf4d21ac4048742ddf6b11e24877ba
-where these two actions were accidentally grouped with other actions that
-should legitimately be in the "individual" group.
----
- calendar/gui/dialogs/comp-editor.c | 15 +++++++++++----
- calendar/gui/dialogs/event-editor.c | 32 +++++++++++++++++++++++---------
- calendar/gui/dialogs/event-page.c | 3 +++
- calendar/gui/dialogs/memo-page.c | 3 +++
- calendar/gui/dialogs/task-page.c | 3 +++
- 5 files changed, 43 insertions(+), 13 deletions(-)
-
-diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
-index 6fc01ca..46e340f 100644
---- a/calendar/gui/dialogs/comp-editor.c
-+++ b/calendar/gui/dialogs/comp-editor.c
-@@ -1091,7 +1091,7 @@ static GtkActionEntry individual_entries[] = {
- G_CALLBACK (action_attach_cb) }
- };
-
--static GtkToggleActionEntry individual_toggle_entries[] = {
-+static GtkToggleActionEntry personal_toggle_entries[] = {
-
- { "view-categories",
- NULL,
-@@ -1603,9 +1603,6 @@ comp_editor_init (CompEditor *editor)
- gtk_action_group_add_actions (
- action_group, individual_entries,
- G_N_ELEMENTS (individual_entries), editor);
-- gtk_action_group_add_toggle_actions (
-- action_group, individual_toggle_entries,
-- G_N_ELEMENTS (individual_toggle_entries), editor);
- gtk_action_group_add_radio_actions (
- action_group, classification_radio_entries,
- G_N_ELEMENTS (classification_radio_entries),
-@@ -1615,6 +1612,16 @@ comp_editor_init (CompEditor *editor)
- priv->ui_manager, action_group, 0);
- g_object_unref (action_group);
-
-+ action_group = gtk_action_group_new ("editable");
-+ gtk_action_group_set_translation_domain (
-+ action_group, GETTEXT_PACKAGE);
-+ gtk_action_group_add_toggle_actions (
-+ action_group, personal_toggle_entries,
-+ G_N_ELEMENTS (personal_toggle_entries), editor);
-+ gtk_ui_manager_insert_action_group (
-+ priv->ui_manager, action_group, 0);
-+ g_object_unref (action_group);
-+
- action_group = gtk_action_group_new ("coordinated");
- gtk_action_group_set_translation_domain (
- action_group, GETTEXT_PACKAGE);
-diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
-index 7251123..3b9a8d0 100644
---- a/calendar/gui/dialogs/event-editor.c
-+++ b/calendar/gui/dialogs/event-editor.c
-@@ -195,7 +195,7 @@ action_show_time_busy_cb (GtkToggleAction *action,
- event_page_set_show_time_busy (editor->priv->event_page, active);
- }
-
--static GtkActionEntry event_entries[] = {
-+static GtkActionEntry editable_entries[] = {
-
- { "alarms",
- "appointment-soon",
-@@ -203,6 +203,20 @@ static GtkActionEntry event_entries[] = {
- NULL,
- N_("Click here to set or unset alarms for this event"),
- G_CALLBACK (action_alarms_cb) },
-+};
-+
-+static GtkToggleActionEntry editable_toggle_entries[] = {
-+
-+ { "show-time-busy",
-+ GTK_STOCK_DIALOG_ERROR,
-+ N_("Show Time as _Busy"),
-+ NULL,
-+ N_("Toggles whether to show time as busy"),
-+ G_CALLBACK (action_show_time_busy_cb),
-+ FALSE }
-+};
-+
-+static GtkActionEntry event_entries[] = {
-
- { "recurrence",
- "stock_task-recurring",
-@@ -228,14 +242,6 @@ static GtkToggleActionEntry event_toggle_entries[] = {
- N_("Toggles whether to have All Day Event"),
- G_CALLBACK (action_all_day_event_cb),
- FALSE },
--
-- { "show-time-busy",
-- GTK_STOCK_DIALOG_ERROR,
-- N_("Show Time as _Busy"),
-- NULL,
-- N_("Toggles whether to show time as busy"),
-- G_CALLBACK (action_show_time_busy_cb),
-- FALSE }
- };
-
- static GtkActionEntry meeting_entries[] = {
-@@ -481,6 +487,14 @@ event_editor_init (EventEditor *ee)
- action_group, event_toggle_entries,
- G_N_ELEMENTS (event_toggle_entries), ee);
-
-+ action_group = comp_editor_get_action_group (editor, "editable");
-+ gtk_action_group_add_actions (
-+ action_group, editable_entries,
-+ G_N_ELEMENTS (editable_entries), ee);
-+ gtk_action_group_add_toggle_actions (
-+ action_group, editable_toggle_entries,
-+ G_N_ELEMENTS (editable_toggle_entries), ee);
-+
- action_group = comp_editor_get_action_group (editor, "coordinated");
- gtk_action_group_add_actions (
- action_group, meeting_entries,
-diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
-index eb95245..fcc1ea9 100644
---- a/calendar/gui/dialogs/event-page.c
-+++ b/calendar/gui/dialogs/event-page.c
-@@ -806,6 +806,9 @@ sensitize_widgets (EventPage *epage)
- gtk_widget_set_sensitive (priv->invite, (!read_only && sens) || delegate);
- gtk_widget_set_sensitive (GTK_WIDGET (priv->list_view), !read_only);
-
-+ action_group = comp_editor_get_action_group (editor, "editable");
-+ gtk_action_group_set_sensitive (action_group, !read_only);
-+
- action_group = comp_editor_get_action_group (editor, "individual");
- gtk_action_group_set_sensitive (action_group, sensitize);
-
-diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
-index 83cd00a..511f483 100644
---- a/calendar/gui/dialogs/memo-page.c
-+++ b/calendar/gui/dialogs/memo-page.c
-@@ -373,6 +373,9 @@ sensitize_widgets (MemoPage *mpage)
- }
- }
-
-+ action_group = comp_editor_get_action_group (editor, "editable");
-+ gtk_action_group_set_sensitive (action_group, !read_only);
-+
- action_group = comp_editor_get_action_group (editor, "individual");
- gtk_action_group_set_sensitive (action_group, sensitize);
- }
-diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
-index 8b5c028..175e218 100644
---- a/calendar/gui/dialogs/task-page.c
-+++ b/calendar/gui/dialogs/task-page.c
-@@ -365,6 +365,9 @@ sensitize_widgets (TaskPage *tpage)
- gtk_widget_set_sensitive (priv->invite, (!read_only && sens));
- gtk_widget_set_sensitive (GTK_WIDGET (priv->list_view), !read_only);
-
-+ action_group = comp_editor_get_action_group (editor, "editable");
-+ gtk_action_group_set_sensitive (action_group, !read_only);
-+
- action_group = comp_editor_get_action_group (editor, "individual");
- gtk_action_group_set_sensitive (action_group, sensitize);
-
---
-1.7.1
-
diff --git a/mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_2.patch b/mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_2.patch
deleted file mode 100644
index cdda0dd3d6b4..000000000000
--- a/mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_2.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From ff323fa4ae85fb293e0f419a5364823b90562216 Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <i.am@jimramsay.com>
-Date: Tue, 18 May 2010 16:50:20 -0400
-Subject: [PATCH 13/14] Bug 594153 (2/3) - Allow setting alarms on any meeting
-
-The "view-time-zone" and "view-categories" actions should not have
-been grouped with the "individual" action group but rather the "core"
-action group, as they should always be available regardless of whether
-or not the element being edited is read-only/owned, as they simply
-affect visibility of various widgets.
-
-This fixes a bug introduced in 0597b877c5bf4d21ac4048742ddf6b11e24877ba
-where these two actions were accidentally grouped with other actions
-that should legitimately be in the "individual" group.
----
- calendar/gui/dialogs/comp-editor.c | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
-index 46e340f..7d27474 100644
---- a/calendar/gui/dialogs/comp-editor.c
-+++ b/calendar/gui/dialogs/comp-editor.c
-@@ -1091,7 +1091,7 @@ static GtkActionEntry individual_entries[] = {
- G_CALLBACK (action_attach_cb) }
- };
-
--static GtkToggleActionEntry personal_toggle_entries[] = {
-+static GtkToggleActionEntry core_toggle_entries[] = {
-
- { "view-categories",
- NULL,
-@@ -1593,6 +1593,9 @@ comp_editor_init (CompEditor *editor)
- gtk_action_group_add_actions (
- action_group, core_entries,
- G_N_ELEMENTS (core_entries), editor);
-+ gtk_action_group_add_toggle_actions (
-+ action_group, core_toggle_entries,
-+ G_N_ELEMENTS (core_toggle_entries), editor);
- gtk_ui_manager_insert_action_group (
- priv->ui_manager, action_group, 0);
- g_object_unref (action_group);
-@@ -1615,9 +1618,6 @@ comp_editor_init (CompEditor *editor)
- action_group = gtk_action_group_new ("editable");
- gtk_action_group_set_translation_domain (
- action_group, GETTEXT_PACKAGE);
-- gtk_action_group_add_toggle_actions (
-- action_group, personal_toggle_entries,
-- G_N_ELEMENTS (personal_toggle_entries), editor);
- gtk_ui_manager_insert_action_group (
- priv->ui_manager, action_group, 0);
- g_object_unref (action_group);
---
-1.7.1
-
diff --git a/mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_3.patch b/mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_3.patch
deleted file mode 100644
index 84ab8d0676e8..000000000000
--- a/mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_3.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 22e540a225da939e9de02912d638402d2353b129 Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <i.am@jimramsay.com>
-Date: Wed, 28 Apr 2010 10:46:15 -0400
-Subject: [PATCH 14/14] Bug 594153 (3/3) - Allow setting alarms on any meeting
-
-By tying the attachment view "editable" action group to comp-editor
-"individual" group, these add/remove actions are marked sensitive /
-insensitive in sync with the existing "Insert" menu items which are
-already in the "individual" group.
-
-Though not introduced with the other symptoms of this bug
-(0597b877c5bf4d21ac4048742ddf6b11e24877ba), the descreptency fixed
-here is integrally related.
----
- calendar/gui/dialogs/comp-editor.c | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
-index 7d27474..10390e6 100644
---- a/calendar/gui/dialogs/comp-editor.c
-+++ b/calendar/gui/dialogs/comp-editor.c
-@@ -36,6 +36,7 @@
- #include <glib/gstdio.h>
- #include <gdk/gdkkeysyms.h>
- #include <e-util/e-util.h>
-+#include <e-util/e-binding.h>
- #include <e-util/e-dialog-utils.h>
- #include <e-util/e-util-private.h>
- #include <e-util/gconf-bridge.h>
-@@ -1553,6 +1554,7 @@ comp_editor_init (CompEditor *editor)
- GtkTargetList *target_list;
- GtkTargetEntry *targets;
- GtkActionGroup *action_group;
-+ GtkActionGroup *action_group_2;
- GtkAction *action;
- GtkWidget *container;
- GtkWidget *widget;
-@@ -1746,6 +1748,13 @@ comp_editor_init (CompEditor *editor)
- gtk_window_set_type_hint (
- GTK_WINDOW (editor), GDK_WINDOW_TYPE_HINT_NORMAL);
-
-+ action_group = comp_editor_get_action_group (editor, "individual");
-+ action_group_2 = e_attachment_view_get_action_group (view, "editable");
-+
-+ e_binding_new (
-+ action_group, "sensitive",
-+ action_group_2, "sensitive");
-+
- /* Listen for attachment store changes. */
-
- store = e_attachment_view_get_store (view);
---
-1.7.1
-
diff --git a/mail-client/evolution/files/evolution-2.28.3.1-attachment-bar-RTL.patch b/mail-client/evolution/files/evolution-2.28.3.1-attachment-bar-RTL.patch
deleted file mode 100644
index 23477b285e6c..000000000000
--- a/mail-client/evolution/files/evolution-2.28.3.1-attachment-bar-RTL.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From ff2553440bd1f7d76667e71479d50efa1a537e96 Mon Sep 17 00:00:00 2001
-From: Matthew Barnes <mbarnes@redhat.com>
-Date: Mon, 29 Mar 2010 11:22:23 -0400
-Subject: [PATCH 05/14] Bug 614049 - Attachment bar causes drawing issues in RTL locales
-
----
- widgets/misc/e-attachment-paned.c | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c
-index 8e25098..aefd9fa 100644
---- a/widgets/misc/e-attachment-paned.c
-+++ b/widgets/misc/e-attachment-paned.c
-@@ -614,10 +614,15 @@ attachment_paned_init (EAttachmentPaned *paned)
-
- /* Request the width to be as large as possible, and let the
- * GtkExpander allocate what space there is. This effectively
-- * packs the widget to expand. */
-+ * packs the widget to expand.
-+ *
-+ * XXX This hack causes nasty side-effects in RTL locales,
-+ * so check the reading direction before applying it.
-+ * See GNOME bug #614049 for details + screenshot. */
- widget = gtk_hbox_new (FALSE, 6);
- gtk_size_group_add_widget (size_group, widget);
-- gtk_widget_set_size_request (widget, G_MAXINT, -1);
-+ if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL)
-+ gtk_widget_set_size_request (widget, G_MAXINT, -1);
- gtk_expander_set_label_widget (GTK_EXPANDER (container), widget);
- gtk_widget_show (widget);
-
---
-1.7.1
-
diff --git a/mail-client/evolution/files/evolution-2.28.3.1-unknown-attachment-size.patch b/mail-client/evolution/files/evolution-2.28.3.1-unknown-attachment-size.patch
deleted file mode 100644
index 4212afbd0835..000000000000
--- a/mail-client/evolution/files/evolution-2.28.3.1-unknown-attachment-size.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 02007387a6104aa1d7c7bdc351189cd055a02a58 Mon Sep 17 00:00:00 2001
-From: Matthew Barnes <mbarnes@redhat.com>
-Date: Tue, 11 May 2010 13:13:10 -0500
-Subject: [PATCH 11/14] Bug 616640 - Don't display attachment size if it's unknown
-
----
- widgets/misc/e-attachment-tree-view.c | 7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/widgets/misc/e-attachment-tree-view.c b/widgets/misc/e-attachment-tree-view.c
-index 42876e4..5729a68 100644
---- a/widgets/misc/e-attachment-tree-view.c
-+++ b/widgets/misc/e-attachment-tree-view.c
-@@ -100,15 +100,18 @@ attachment_tree_view_render_size (GtkTreeViewColumn *column,
- GtkTreeModel *model,
- GtkTreeIter *iter)
- {
-- gchar *display_size;
-+ gchar *display_size = NULL;
- gint column_id;
- guint64 size;
-
- column_id = E_ATTACHMENT_STORE_COLUMN_SIZE;
- gtk_tree_model_get (model, iter, column_id, &size, -1);
-
-- display_size = g_format_size_for_display ((goffset) size);
-+ if (size > 0)
-+ display_size = g_format_size_for_display ((goffset) size);
-+
- g_object_set (renderer, "text", display_size, NULL);
-+
- g_free (display_size);
- }
-
---
-1.7.1
-
diff --git a/mail-client/evolution/files/evolution-2.32.0-wrong-lafile-usage.patch b/mail-client/evolution/files/evolution-2.32.0-wrong-lafile-usage.patch
new file mode 100644
index 000000000000..9f0993d43ecc
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.32.0-wrong-lafile-usage.patch
@@ -0,0 +1,13 @@
+diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
+index 486d71e..763808b 100644
+--- a/addressbook/gui/contact-editor/Makefile.am
++++ b/addressbook/gui/contact-editor/Makefile.am
+@@ -33,7 +33,7 @@ libecontacteditor_la_LIBADD = \
+ $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
+ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
+ $(top_builddir)/addressbook/printing/libecontactprint.la \
+- $(top_builddir)/widgets/menus/.libs/libmenus.la \
++ $(top_builddir)/widgets/menus/libmenus.la \
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
+
diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml
index 0bf53d072891..488280de5867 100644
--- a/mail-client/evolution/metadata.xml
+++ b/mail-client/evolution/metadata.xml
@@ -5,16 +5,8 @@
<use>
<flag name="crypt">Enable GPG encryption support using
<pkg>app-crypt/gnupg</pkg> and <pkg>app-crypt/pinentry</pkg></flag>
- <flag name="dbus">Allow the Mail Notification plugin to notify you about
- new messages via an icon in the tray using
- <pkg>sys-apps/dbus</pkg></flag>
- <flag name="exchange">Build optional Microsoft Exchange support</flag>
- <flag name="hal">Enable support for auto-detection of inserted iPods and
- syncing data with them using <pkg>sys-apps/hal</pkg></flag>
<flag name="ldap">Enable support for fetching contacts from an LDAP or
Active Directory server using <pkg>net-nds/openldap</pkg></flag>
- <flag name="mono">Build the <pkg>dev-lang/mono</pkg> plugins included in
- Evolution</flag>
<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>