Bump to 2.22.1.1

	Also copy user tags when copying messages between folders (Milan Crha)
	(Novell Bugzilla) Internet Based Calendar Events Are Declined By
	Evolution/GroupWise (Chenthill Palanisamy)
	(Novell Bugzilla) Fix a severe memory leak in evolution-data-server
	(Chenthill Palanisamy)
	(Novell Bugzilla) Display of web calendars ignores timezones
	(Chenthill Palanisamy)
	(Novell Bugzilla) Retracted groupwise appointments should disappear as
	soon as they are retracted. (Chenthill Palanisamy)
	(Novell Bugzilla) International clock applet is crashing (Chenthill
	Palanisamy)
	Run a single delta-thread to fetch changes from the server, instead of
	spawning multiple threads (Ashish Shrivastava)
	Fixed a few compiler warnings (Suman Manjunath)
	Use recursive mutex (Milan Crha)
	Fix a crash (Milan Crha)
	Make sure we do the Inbox -> INBOX translation at the right place
	(Christian Kellner)
	Support migration from password file to keyring (Matthew Barnes)
	Fixed a crash when searching with an expression (Milan Crha)
	Do not ship .svn files (Matthew Barnes)
	Don't free the same variable twice (Sebastien Bacher)
	Load addressbook conditionally (Srinivasa Ragavan)
Package-Manager: portage-2.1.5_rc6

3 files changed, 179 insertions, 2 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 79dd5c458bf6..436f20e71c62 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,58 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.177 2008/04/21 17:13:30 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.178 2008/05/02 18:45:42 dang Exp $
+
+*evolution-data-server-2.22.1.1 (02 May 2008)
+
+  02 May 2008; Daniel Gryniewicz <dang@gentoo.org>
+  +evolution-data-server-2.22.1.1.ebuild:
+  Bump to 2.22.1.1
+
+  Also copy user tags when copying messages between folders (Milan Crha)
+
+  (Novell Bugzilla) Internet Based Calendar Events Are Declined By
+
+  Evolution/GroupWise (Chenthill Palanisamy)
+
+  (Novell Bugzilla) Fix a severe memory leak in evolution-data-server
+
+  (Chenthill Palanisamy)
+
+  (Novell Bugzilla) Display of web calendars ignores timezones
+
+  (Chenthill Palanisamy)
+
+  (Novell Bugzilla) Retracted groupwise appointments should disappear as
+
+  soon as they are retracted. (Chenthill Palanisamy)
+
+  (Novell Bugzilla) International clock applet is crashing (Chenthill
+
+  Palanisamy)
+
+  Run a single delta-thread to fetch changes from the server, instead of
+
+  spawning multiple threads (Ashish Shrivastava)
+
+  Fixed a few compiler warnings (Suman Manjunath)
+
+  Use recursive mutex (Milan Crha)
+
+  Fix a crash (Milan Crha)
+
+  Make sure we do the Inbox -> INBOX translation at the right place
+
+  (Christian Kellner)
+
+  Support migration from password file to keyring (Matthew Barnes)
+
+  Fixed a crash when searching with an expression (Milan Crha)
+
+  Do not ship .svn files (Matthew Barnes)
+
+  Don't free the same variable twice (Sebastien Bacher)
+
+  Load addressbook conditionally (Srinivasa Ragavan)
 
   21 Apr 2008; <welp@gentoo.org> evolution-data-server-1.12.1.ebuild,
   evolution-data-server-1.12.3.ebuild, evolution-data-server-2.22.0.ebuild,
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 4a0f854af3e6..c3f0a29061e4 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX evolution-data-server-1.11.3-as-needed.patch 1942 RMD160 1db5815026e06a47c91295f4b502b94692dbe115 SHA1 0f94fb16e14ed685154cd0ad1211095431e179ca SHA256 95b1d4a23e801a36c7027080347e8fcb1ad90bc1d4040e9bdab8d00eb1f27986
 AUX evolution-data-server-1.11.3-no-libdb.patch 570 RMD160 404dfda7aac4e9ff6504ecd9ee5b7af6efafc969 SHA1 411f311317439bf20643491d2b7d1cbee99c561e SHA256 992602fd04cfa8afba084238f62f765b1d5caf29cc10ad739c7e63ea78291905
 AUX evolution-data-server-1.12.1-icaltz-util.patch 839 RMD160 58b17c2bed830ccabf4682fada9e5bd22d3fae48 SHA1 cd9aa108ba32d38ecc46b1749ff378faff4dc870 SHA256 8d7c5c5abab727eecd5cff1980e9987bf0dcadf0324288775c347e0da4f81175
@@ -12,10 +15,19 @@ AUX evolution-data-server-no_lazy_bindings.patch 551 RMD160 d86bf9a9ed25615bcb3d
 DIST evolution-data-server-1.12.1.tar.bz2 7465117 RMD160 ea24f2e3a77e16dccd4c398d558688418a0613b2 SHA1 3d91c87c257ee080baf0f182dd46079752f427ed SHA256 1a9317da445dd09d7109f96b3b3a6a7bfa962117dd632ff9735bf7f730ff0079
 DIST evolution-data-server-1.12.3.tar.bz2 7447166 RMD160 c7102c38af4888f3f8933c9d28981d1809d504f8 SHA1 12b8b23fb77ff6436def3cc5ea472886c8e0350e SHA256 e2d9038e3cd115ea5af2f3b7d381f5803c62d1ec36206e5a1bea0f823d25fab5
 DIST evolution-data-server-2.22.0.tar.bz2 7575575 RMD160 ab034a6805928509e0fc0bd306caf95392b7f275 SHA1 1d6ad21849c479be56476cc69a43ea1fa30f69bc SHA256 ff1b3540234296e1ffe52ddde48b67d93a261ee06f2eef865a47c4fbcfdc8724
+DIST evolution-data-server-2.22.1.1.tar.bz2 7612898 RMD160 b955e2e0284ca48459319e6f1e33b5d63047d52d SHA1 aef33e349c747309edcb535cc89dbd13dfc70e0d SHA256 d962cba11605c01bdfdb573032bdda8bca07878026ab3d2dfa5723002d12f8dc
 DIST evolution-data-server-2.22.1.tar.bz2 7602166 RMD160 d0082d45c40d8a76897343778dcca00df4f511e6 SHA1 b78f6865db1358c1dbece6c09f92e9ba6a523d6d SHA256 c68cdbfa960068adb76bd3e14affcc7f919435b4b17e12306e641f2a0aceed11
 EBUILD evolution-data-server-1.12.1.ebuild 4834 RMD160 f78c8bbb00c5dfbed9e2995e640757ff193fd2ad SHA1 9f86372f6e909a9e957437bfaf269b99ca1c1dfc SHA256 f3cdec88724e42cb4894597fa79c6d7b69203f94d85ed5731618af9a0ee54fa5
 EBUILD evolution-data-server-1.12.3.ebuild 5048 RMD160 2248e0e6103877ccbd95723d2a103cebb6b1271d SHA1 201ecb8f361dd0b575a31766f5e84a18fcffd21e SHA256 1f6c66b412e9ae200ddb40df410aab558556c80a13a6faeda578babe36d2e458
 EBUILD evolution-data-server-2.22.0.ebuild 3124 RMD160 1cedad5ae6403fa03940342ac668465f0dfa3649 SHA1 f7e27b65d6453bdda71aa2bca58a20bedd96fde8 SHA256 8310f57af36138d2db35109348e2a0274bfb2e0466252818332e067100a6f431
+EBUILD evolution-data-server-2.22.1.1.ebuild 3126 RMD160 5bcfd82639d87d0b3853affbbbfb22b00cab24ee SHA1 5ce29b12ea3120f2c0f6bde392848c2d68a84d20 SHA256 1a2022d967f45936335135214300c2dfd4b829dcc33b8b82532d15f2efe6e966
 EBUILD evolution-data-server-2.22.1.ebuild 3124 RMD160 22640d47b2241dea64bff879e45bab91fbe8a226 SHA1 b59aac19962e6fd30cb6a21e4d77dfa86d9fb60b SHA256 e5474da673d150ffe399ecbb7acab22662a2613d46582b7366da256c8ad4dcfe
-MISC ChangeLog 32089 RMD160 ce8dcca3ceec987742a596e4289b5659fc540090 SHA1 bb5571c9716f9acb96b02088f0504633cc0ca383 SHA256 ec7f521010c1b7e183283c15b29627e417561765663a94d34ee3a8dd09f5a4c3
+MISC ChangeLog 33455 RMD160 37986419dfe612ccce55f5d8551e36beb72cdd35 SHA1 3f495edf703e11d6aa6336d047c5993795ce3331 SHA256 18a335ed554347fd76fbdde14f167f3eec13bb5d456ca2543f95a70645518259
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iD8DBQFIG2G3omPajV0RnrERApXxAJ0V/L9DN3BQK//+CNJ9lzIGcdflhwCbBHek
+M9ovJieCjtp3ToKVZF/ryT8=
+=80HL
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.22.1.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.22.1.1.ebuild
new file mode 100644
index 000000000000..15bc9df4641e
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.22.1.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.22.1.1.ebuild,v 1.1 2008/05/02 18:45:42 dang Exp $
+
+inherit db-use eutils flag-o-matic gnome2 autotools
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+
+LICENSE="LGPL-2 Sleepycat"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc ipv6 kerberos gnome-keyring krb4 ldap ssl"
+
+RDEPEND=">=dev-libs/glib-2.15.3
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/orbit-2.9.8
+	>=gnome-base/gnome-vfs-2.4
+	>=gnome-base/libbonobo-2.20.3
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2
+	>=dev-libs/libxml2-2
+	>=net-libs/libsoup-2.4
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20 )
+	ssl? (
+		>=dev-libs/nspr-4.4
+		>=dev-libs/nss-3.9 )
+	>=gnome-base/libgnomeui-2
+	sys-libs/zlib
+	=sys-libs/db-4*
+	ldap? ( >=net-nds/openldap-2.0 )
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35.5
+	>=gnome-base/gnome-common-2
+	>=dev-util/gtk-doc-am-1.9
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+
+DOCS="ChangeLog MAINTAINERS NEWS TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_with ldap openldap)
+		$(use_with kerberos krb5 /usr)
+		$(use_enable ssl nss)
+		$(use_enable ssl smime)
+		$(use_enable ipv6)
+		$(use_enable gnome-keyring)
+		--with-libdb=/usr/$(get_libdir)"
+
+	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
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Adjust to gentoo's /etc/service
+	epatch "${FILESDIR}"/${PN}-1.2.0-gentoo_etc_services.patch
+
+	# Fix broken libdb build
+	epatch "${FILESDIR}"/${PN}-1.11.3-no-libdb.patch
+
+	# Resolve symbols at execution time for setgid binaries
+	epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
+
+	# Rewind in camel-disco-diary to fix a crash
+	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
+
+	# Don't assume that endian.h and byteswap.h exist on all non sun os's
+	epatch "${FILESDIR}"/${PN}-2.21.90-icaltz-util.patch
+
+	# Don't error out if gtkdoc-rebase doesn't exist.
+	epatch "${FILESDIR}"/${PN}-2.21.4-gtkdoc-rebase.patch
+
+	# Fix building evo-exchange with --as-needed
+	epatch "${FILESDIR}"/${PN}-2.21.4-as-needed.patch
+
+	# gtk-doc-am and gnome-common needed for this
+	eautoreconf
+}
+
+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
+
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	append-cppflags "-I$(db_includedir)"
+
+	cd "${S}"
+	gnome2_src_compile
+}