Bump to 2.22.1.1

	Add the attachments and draw the bar (Srinivasa Ragavan)

	(Novell Bugzilla) Internet Based Calendar Events Are Declined By
	Evolution/GroupWise (Chenthill Palanisamy)

	(Novell Bugzilla) Retracted groupwise appointments should disappear as
	soon as they are retracted. (Chenthill Palanisamy)

	Fix a crash at exit (Srinivasa Ragavan)

	Allow copy & paste of email addresses from an appointment to a mail
	message (Ashish Shrivastava)

	Return sanely if the path value is corrupted (Bharath Acharya)

	(Novell Bugzilla) Fixed a deadlock when downloading data on a rather
	loaded system (Srinivasa Ragavan)

	Try to find text/html part in multipart/alternative when in normal
	mode (Milan Crha)

	Do not inherit search filters when opening messages in new window
	(Milan Crha)

	Make Always carbon-copy (cc) option work again (Bharath Acharya)

	Fixed a crash when simultaneously pressing the "show" preview/arrow
	button on several very large image attachments in an e-mail. (Milan
	Crha)

	Check online status from NetworkManager at startup instead of using
	the last-used-state. (James Westby)

	Fixed a crash on paste event in calendar (Milan Crha)

	Fixed a typo (Milan Crha)

	Fix a typo in the logic that caused Exchange Operations disabled on
	startup (Matthew Barnes)

	Look up in local address book for addresses to exclude mail sent by
	known contacts from junk filtering if said so (Milan Crha)

	Properly set type hint on tooltip window. (Danny Baumann)

	Let searches work with labels again. (Milan Crha)

	Fix Evolution crash when viewing pgp-signed message (Shuai Liu)
Package-Manager: portage-2.1.5_rc6

3 files changed, 219 insertions, 5 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 3d74e4529f08..9972f34b2a2b 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,72 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.232 2008/04/08 13:51:34 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.233 2008/05/02 19:32:15 dang Exp $
+
+*evolution-2.22.1.1 (02 May 2008)
+
+  02 May 2008; Daniel Gryniewicz <dang@gentoo.org>
+  +evolution-2.22.1.1.ebuild:
+  Bump to 2.22.1.1
+
+  Add the attachments and draw the bar (Srinivasa Ragavan)
+
+  (Novell Bugzilla) Internet Based Calendar Events Are Declined By
+
+  Evolution/GroupWise (Chenthill Palanisamy)
+
+  (Novell Bugzilla) Retracted groupwise appointments should disappear as
+
+  soon as they are retracted. (Chenthill Palanisamy)
+
+  Fix a crash at exit (Srinivasa Ragavan)
+
+  Allow copy & paste of email addresses from an appointment to a mail
+
+  message (Ashish Shrivastava)
+
+  Return sanely if the path value is corrupted (Bharath Acharya)
+
+  (Novell Bugzilla) Fixed a deadlock when downloading data on a rather
+
+  loaded system (Srinivasa Ragavan)
+
+  Try to find text/html part in multipart/alternative when in normal
+
+  mode (Milan Crha)
+
+  Do not inherit search filters when opening messages in new window
+
+  (Milan Crha)
+
+  Make Always carbon-copy (cc) option work again (Bharath Acharya)
+
+  Fixed a crash when simultaneously pressing the "show" preview/arrow
+
+  button on several very large image attachments in an e-mail. (Milan
+
+  Crha)
+
+  Check online status from NetworkManager at startup instead of using
+
+  the last-used-state. (James Westby)
+
+  Fixed a crash on paste event in calendar (Milan Crha)
+
+  Fixed a typo (Milan Crha)
+
+  Fix a typo in the logic that caused Exchange Operations disabled on
+
+  startup (Matthew Barnes)
+
+  Look up in local address book for addresses to exclude mail sent by
+
+  known contacts from junk filtering if said so (Milan Crha)
+
+  Properly set type hint on tooltip window. (Danny Baumann)
+
+  Let searches work with labels again. (Milan Crha)
+
+  Fix Evolution crash when viewing pgp-signed message (Shuai Liu)
 
   08 Apr 2008; Daniel Gryniewicz <dang@gentoo.org> +evolution-2.22.1.ebuild:
   Bump evo to 2.22.1
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 091996fe2f6d..ed40cbda32bb 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -9,16 +9,18 @@ AUX evolution-2.22.0-e_profile_event_emit.patch 456 RMD160 cceb720be546d6fe16ee7
 AUX evolution-CVE-2008-0072.patch 2890 RMD160 8911d13efd9c86d1b95cd844ebeab695e2e80ab6 SHA1 f040da832c681efe7ac85c281ec54f3b991ff6bf SHA256 28a7cda8c1a3aab284d69a7142e74fc345f7130627e180b6de0ae8389e8adbc1
 DIST evolution-2.12.3.tar.bz2 25938535 RMD160 afe803833e213387fde3c180afc91bfc1e792262 SHA1 14861dd497e935074424269f2d1e6c11be56abfe SHA256 1703f6888c1549a1b9b89112bed73504f4ae2db5b2fb8f926adb5cf3a490d6bf
 DIST evolution-2.22.0.tar.bz2 29556434 RMD160 59b1ff729846e61b81e6957635d115485c3817ce SHA1 887cb6d261633508ba2d31ff9f90d4163f69c533 SHA256 03a6842c195d950b1273f7d492b274b40e03311161d5f68ef87f9c45bf2d1e63
+DIST evolution-2.22.1.1.tar.bz2 30907929 RMD160 6331696fcb67dcf0ba9ded5da4dda2fa038f3732 SHA1 ea058e3b0885246bdf6628c47d807b49f14b4abd SHA256 5c5d387a9bdd8f89f46a49bbf2b7bf63b2a117e15e2c7472fe4dc365cbb2c1f9
 DIST evolution-2.22.1.tar.bz2 30951821 RMD160 45c75971c2bbc91d3bb0cbc6be96d67c76d9c6ab SHA1 e9014dee660c7a34aeabd9cb1902394b954eb7ec SHA256 58faeba0039a935f39aa1ab6e58adc3a4f2182486afcc6f1cace3402181a70dc
 EBUILD evolution-2.12.3-r1.ebuild 5969 RMD160 8cf10d034ef92e4b986e9b9a15ad766d33584ed0 SHA1 d3e88be18390a08ba1e894bdaa1a3617524557a5 SHA256 189b8bdbeb7b0403f2bb29122ae89ed90b66e434f64cf26427814295cf910c21
 EBUILD evolution-2.22.0.ebuild 4608 RMD160 a76079d938ee0587d5e020e9a5be904616808913 SHA1 b3d6e99624d27fc0eb0befa1114f40081996374c SHA256 ae9560b145c31a5c584ebfb8323e2ca8657bc1382f84e68a8f8f41d00d60f672
+EBUILD evolution-2.22.1.1.ebuild 4512 RMD160 3a10e014946c3dc9688aa51e7e983ccfa11137d2 SHA1 694543a37711603d6cd3a653385103f6b2d6b59f SHA256 dd30e7165d0bc74e2030c571f013af9edadebb9fa671c30bbf8a675673fcc90c
 EBUILD evolution-2.22.1.ebuild 4510 RMD160 9e55b9db5c8bb561f884c0a810386bcf85c6f368 SHA1 a7f1b6a6f4e9b56e30a778883b516b73f71918fe SHA256 b574f729adac86e5e3cb1df9200d8ae7f6e34172eedec85fb6a37eaad9000f0b
-MISC ChangeLog 54822 RMD160 03603eab7c50ac117be2b831958dda29a8731f3f SHA1 1456f931bddd7e3ab6a08715fc73204b1f88a174 SHA256 50c74770d79c5c39ce8795e0a9d9320a93b145c4c5044900018cb5fecddc2659
+MISC ChangeLog 56585 RMD160 61234c84aefbad69b64c0d32b768006b2444246f SHA1 9bce9699f49f414a810415d4da0ac1c3512f0b04 SHA256 63b3bca46f75f8cf8f4e22065256fb0c6c7df4008db0feb330df311933ad38a3
 MISC metadata.xml 159 RMD160 488f58f504e5c2e7b10e253fd9db5f1e6f9d3a21 SHA1 16c86b590ee3d78c8ccd5b5044835ed4a4038d93 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH+3hAomPajV0RnrERAhiSAJ4uAaEmTNpTuMsIOCWTQ3fqeHmhbQCeNo9W
-3E15M09Pr4/I0W1OzCFwsPI=
-=Sf6+
+iD8DBQFIG2xJomPajV0RnrERAnC7AJ4pJpzFdEZORqwaDlvM01x2YCv60QCfQX7j
+zU6P6MI3Zujds0MMRByMFuo=
+=aiAX
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.22.1.1.ebuild b/mail-client/evolution/evolution-2.22.1.1.ebuild
new file mode 100644
index 000000000000..7c871a08d168
--- /dev/null
+++ b/mail-client/evolution/evolution-2.22.1.1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.22.1.1.ebuild,v 1.1 2008/05/02 19:32:15 dang Exp $
+
+inherit gnome2 flag-o-matic
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+SRC_URI="${SRC_URI}"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt dbus debug hal ipv6 kerberos krb4 ldap mono networkmanager nntp pda profile spell ssl"
+
+# Pango dependency required to avoid font rendering problems
+RDEPEND=">=dev-libs/glib-2.15.3
+	>=x11-libs/gtk+-2.12
+	>=gnome-extra/evolution-data-server-2.21.92
+	>=x11-themes/gnome-icon-theme-2.20
+	>=gnome-base/gnome-vfs-2.4
+	>=gnome-base/libbonobo-2.20.3
+	>=gnome-base/libbonoboui-2.4.2
+	>=gnome-extra/gtkhtml-3.17.5
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomecanvas-2
+	>=gnome-base/libgnomeui-2
+	>=dev-libs/libxml2-2
+	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 )
+	krb4? ( virtual/krb5 )
+	>=gnome-base/orbit-2.9.8
+	spell? ( >=app-text/gnome-spell-1.0.5 )
+	crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) )
+	ldap? ( >=net-nds/openldap-2 )
+	mono? ( >=dev-lang/mono-1 )"
+#	gstreamer? (
+#		>=media-libs/gstreamer-0.10
+#		>=media-libs/gst-plugins-base-0.10 )
+
+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"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+ELTCONF="--reverse-deps"
+
+pkg_setup() {
+	G2CONF="--without-kde-applnk-path
+		--enable-plugins=experimental
+		$(use_enable ssl nss)
+		$(use_enable ssl smime)
+		$(use_enable ipv6)
+		$(use_enable mono)
+		$(use_enable nntp)
+		$(use_enable pda pilot-conduits)
+		$(use_enable profile profiling)
+		$(use_with ldap openldap)
+		$(use_with kerberos krb5 /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
+
+	if use krb4 && ! built_with_use virtual/krb5 krb4; then
+		ewarn
+		ewarn "In order to add kerberos 4 support, you have to emerge"
+		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
+		ewarn
+		ewarn "Skipping for now."
+		ewarn
+		G2CONF="${G2CONF} --without-krb4"
+	else
+		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
+	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
+	# is.  This cleans up a ton of crap from this ebuild.
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix timezone offsets on fbsd.  bug #183708
+	epatch "${FILESDIR}"/${PN}-2.21.3-fbsd.patch
+}
+
+src_compile() {
+	# 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
+		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
+
+	if [ "${ARCH}" = "hppa" ]; then
+		append-flags "-fPIC -ffunction-sections"
+		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
+	fi
+
+	gnome2_src_compile
+}
+
+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"
+}