New series for Gnome 2.20

Package-Manager: portage-2.1.3.10

6 files changed, 227 insertions, 5 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 59d2490bc604..f3ddc4faee48 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.150 2007/09/22 08:34:08 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.151 2007/09/30 15:16:23 dang Exp $
+
+*evolution-data-server-1.12.0 (30 Sep 2007)
+
+  30 Sep 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/evolution-data-server-1.11.3-as-needed.patch,
+  +files/evolution-data-server-1.11.3-no-libdb.patch,
+  +evolution-data-server-1.12.0.ebuild:
+  New series for Gnome 2.20
 
   22 Sep 2007; Tom Gall <tgall@gentoo.org>
   evolution-data-server-1.10.3.1.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index e911c247049f..a4f4b059a0aa 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.10-fix-maildir-account.patch 5436 RMD160 abc9da362f59793e5eedecee65c049ed7b5f3b04 SHA1 51aacf392594f80d0e50d012a265d281dafb8821 SHA256 45560ce1c0565103e07a9b8402139a9af945813ae19533a63027ff129cb9913f
 MD5 a3d26c871abd48ce5d0d292ef165102d files/evolution-data-server-1.10-fix-maildir-account.patch 5436
 RMD160 abc9da362f59793e5eedecee65c049ed7b5f3b04 files/evolution-data-server-1.10-fix-maildir-account.patch 5436
@@ -10,6 +13,14 @@ AUX evolution-data-server-1.10.1-imap-overflow.patch 1075 RMD160 6a821a9b430b77a
 MD5 fb05cd9c78028f5155ac111d9d7da403 files/evolution-data-server-1.10.1-imap-overflow.patch 1075
 RMD160 6a821a9b430b77a989bc17ef95e48f8f2b566223 files/evolution-data-server-1.10.1-imap-overflow.patch 1075
 SHA256 4f0589d492185991ad46c1c4f48b60c23cc5d3b7616da8c8fb0b05d9ab1d464f files/evolution-data-server-1.10.1-imap-overflow.patch 1075
+AUX evolution-data-server-1.11.3-as-needed.patch 1942 RMD160 1db5815026e06a47c91295f4b502b94692dbe115 SHA1 0f94fb16e14ed685154cd0ad1211095431e179ca SHA256 95b1d4a23e801a36c7027080347e8fcb1ad90bc1d4040e9bdab8d00eb1f27986
+MD5 155b41ae38364779c8e27f78d4c5ef96 files/evolution-data-server-1.11.3-as-needed.patch 1942
+RMD160 1db5815026e06a47c91295f4b502b94692dbe115 files/evolution-data-server-1.11.3-as-needed.patch 1942
+SHA256 95b1d4a23e801a36c7027080347e8fcb1ad90bc1d4040e9bdab8d00eb1f27986 files/evolution-data-server-1.11.3-as-needed.patch 1942
+AUX evolution-data-server-1.11.3-no-libdb.patch 570 RMD160 404dfda7aac4e9ff6504ecd9ee5b7af6efafc969 SHA1 411f311317439bf20643491d2b7d1cbee99c561e SHA256 992602fd04cfa8afba084238f62f765b1d5caf29cc10ad739c7e63ea78291905
+MD5 5a49b18302183354a1285506d0e0b45c files/evolution-data-server-1.11.3-no-libdb.patch 570
+RMD160 404dfda7aac4e9ff6504ecd9ee5b7af6efafc969 files/evolution-data-server-1.11.3-no-libdb.patch 570
+SHA256 992602fd04cfa8afba084238f62f765b1d5caf29cc10ad739c7e63ea78291905 files/evolution-data-server-1.11.3-no-libdb.patch 570
 AUX evolution-data-server-1.2.0-gentoo_etc_services.patch 815 RMD160 d48ad5a34bfdf9f814b9ae22ba188f2f0c7f0304 SHA1 9248c74b334534f74e027fc119509673bff4542f SHA256 a64e0e4d74ac91f69c4b7a011b6325e27af6fa28a58e20f48ff09ec2a1538c5a
 MD5 ab9f8a22a7b870a6e1e2edc463949c82 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
 RMD160 d48ad5a34bfdf9f814b9ae22ba188f2f0c7f0304 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
@@ -56,6 +67,7 @@ RMD160 d86bf9a9ed25615bcb3dab23977ac01c341a799c files/evolution-data-server-no_l
 SHA256 772bdd99f3936d377cd0ce59c4f03789d227b79c4a2ca2d5e7e3165c378c6403 files/evolution-data-server-no_lazy_bindings.patch 551
 DIST evolution-data-server-1.10.2.tar.bz2 7122238 RMD160 1fc5915338427a306e46a1c37bfc913fa05936a3 SHA1 0364dbf18306f9f36cdae37703f47571cb2a93fe SHA256 dc9772f92818c1846127df32524caaa4c266460af5bbd0e2254d0dba4fa36432
 DIST evolution-data-server-1.10.3.1.tar.bz2 7119022 RMD160 20aecc3e9917a07df0ebd31879ac283866a4d5a1 SHA1 d6406d617a8d72b20a1c26083f0d2c090092d6e0 SHA256 60daa18544d5b4c675401acc36c4eb9b2ce137ff39e42a7ab603427f473b041f
+DIST evolution-data-server-1.12.0.tar.bz2 7463329 RMD160 f58e5cff47cb1d1937a6fba5b7c6408e3da725ed SHA1 afc33c0612697bc46bc8b882e1079a480e991570 SHA256 854435b58756b365b978f1433bee026d4f5f2973e0c1c2ea279cd2c7c0e8f5f3
 DIST evolution-data-server-1.6.2.tar.bz2 7179353 RMD160 59af916ab4a9fabc14c65c16189188f829459985 SHA1 b9bcea4fbcdd0a39cb23e7cd1bc53a59c474a74d SHA256 3b02b940aaa90034609b9401d3da586e5439363ade9bf8d7fc562acacd28bfde
 DIST evolution-data-server-1.8.3.tar.bz2 7024111 RMD160 8051f35a0db514f919bf730cd35c37ea75029061 SHA1 f822fe520d778d0cd8efe8d6a767a5c0b483e798 SHA256 cbc067d87722afef84e8c4914787d990015e0c69b3bf3576fc15c8193ffd2fcc
 EBUILD evolution-data-server-1.10.2.ebuild 4404 RMD160 e2d97cd57d55617a0f2dd8c92cef0eb894524c80 SHA1 ec161ba5d40355bc0581c1f81c71356ee364de1c SHA256 f48c53f46929e2a92c89b088631633b576fe0cb576a9926ca0f68dfdaef5be56
@@ -66,6 +78,10 @@ EBUILD evolution-data-server-1.10.3.1.ebuild 4660 RMD160 6bbc966f1ce5b6f0b3f4f6b
 MD5 196b6286870a2351e966bebc507a74ea evolution-data-server-1.10.3.1.ebuild 4660
 RMD160 6bbc966f1ce5b6f0b3f4f6b4d9a6bf0983931961 evolution-data-server-1.10.3.1.ebuild 4660
 SHA256 0803edde9109272e8d81f869110238d3f1a756c721ee094134e141fadea65feb evolution-data-server-1.10.3.1.ebuild 4660
+EBUILD evolution-data-server-1.12.0.ebuild 4719 RMD160 a3d7c7a83421885ad99cae9afcd4509b7ce65ee6 SHA1 3ec614288197070a63ba1492ba01db64f721e1d8 SHA256 0c70d8918a1753eadb940464e3c36d5343efa1a868190cddb6a88b37ae7623d9
+MD5 2fa625a73aea0972434bf4518866fb73 evolution-data-server-1.12.0.ebuild 4719
+RMD160 a3d7c7a83421885ad99cae9afcd4509b7ce65ee6 evolution-data-server-1.12.0.ebuild 4719
+SHA256 0c70d8918a1753eadb940464e3c36d5343efa1a868190cddb6a88b37ae7623d9 evolution-data-server-1.12.0.ebuild 4719
 EBUILD evolution-data-server-1.6.2-r1.ebuild 2785 RMD160 20f22647dbaeef701d4b9c5780224792fdce5a23 SHA1 a3d4ffa8322822efa21c399ec5fc9043bf1d1867 SHA256 b307865799993811ac0c5a025257efec2805ede7577c2c59edaef1ca90c59ef9
 MD5 f808bfc1dc5d5c5efa7e3196bf40cb32 evolution-data-server-1.6.2-r1.ebuild 2785
 RMD160 20f22647dbaeef701d4b9c5780224792fdce5a23 evolution-data-server-1.6.2-r1.ebuild 2785
@@ -74,10 +90,10 @@ EBUILD evolution-data-server-1.8.3-r5.ebuild 5129 RMD160 1f01c1bddbdb4e9f02be60c
 MD5 7f25fef1eb7c6a25b8b0531d7a7c8529 evolution-data-server-1.8.3-r5.ebuild 5129
 RMD160 1f01c1bddbdb4e9f02be60cb423c924b4e30df39 evolution-data-server-1.8.3-r5.ebuild 5129
 SHA256 a9d65ada66829503a40c356275ca7180af817323dfeaf4edc21fe92062ac2b91 evolution-data-server-1.8.3-r5.ebuild 5129
-MISC ChangeLog 24171 RMD160 545e3ef51f637e2c57b6cb624ec1187b4e473b90 SHA1 0b06349c0b4eb1f4b5ed76cd484d775d7504e35f SHA256 1c662f16c16c6076fc049097cdb09cb259bbfd34c3d633bf397b261295294699
-MD5 0ae41660df6e7ceaf9596fa3ed2d6c97 ChangeLog 24171
-RMD160 545e3ef51f637e2c57b6cb624ec1187b4e473b90 ChangeLog 24171
-SHA256 1c662f16c16c6076fc049097cdb09cb259bbfd34c3d633bf397b261295294699 ChangeLog 24171
+MISC ChangeLog 24444 RMD160 f1d316e49b17d328450ed8c28920f32cb9ff79b4 SHA1 1ebcbdb56bca541ddd61a76c074d515ebc9ece49 SHA256 627d7087fa9238f26ffce5d7986507b88fee291b049b773972b7c3b53af62c3c
+MD5 05c00958ed360e97092e887182947081 ChangeLog 24444
+RMD160 f1d316e49b17d328450ed8c28920f32cb9ff79b4 ChangeLog 24444
+SHA256 627d7087fa9238f26ffce5d7986507b88fee291b049b773972b7c3b53af62c3c ChangeLog 24444
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -88,9 +104,19 @@ SHA256 db08d3da5e01a2208cda82e2b8b13f91ab2d1319f96c9dca852b7be284611514 files/di
 MD5 614d7eb4776456d47dd4746a3fbf8bac files/digest-evolution-data-server-1.10.3.1 298
 RMD160 723884adf8e1328a6693ff3be16fa53d3643072d files/digest-evolution-data-server-1.10.3.1 298
 SHA256 82f70d909432d553a1669c0485e1b463f3fbe8f13fead86616788cb5e69f2897 files/digest-evolution-data-server-1.10.3.1 298
+MD5 e75a5b2442206b74784205ed9d29ac18 files/digest-evolution-data-server-1.12.0 292
+RMD160 a59e1199d9e598b2bb6715f031c14ad621af0313 files/digest-evolution-data-server-1.12.0 292
+SHA256 7573c10542ecac9ceb9a65be1b0b78aa0da7f03334648f36ecec55a78c4cb262 files/digest-evolution-data-server-1.12.0 292
 MD5 7fd74c11700c9860da2318b520a983f8 files/digest-evolution-data-server-1.6.2-r1 289
 RMD160 4d8c1fc955f215beddbbc5b95ac3a0c81f8912fa files/digest-evolution-data-server-1.6.2-r1 289
 SHA256 c474de3fb11f9641e62deea95bc409b7d208389cf6deca8c15c08a39a0c70d14 files/digest-evolution-data-server-1.6.2-r1 289
 MD5 159e4efbb6f5fe2e3973464851a6015b files/digest-evolution-data-server-1.8.3-r5 289
 RMD160 9311383fcc0546bb79ba3632bf984e3bb2783652 files/digest-evolution-data-server-1.8.3-r5 289
 SHA256 00dcc94a5030febdfc278394de4449c744c57e0fa812818a260fa807276ecca8 files/digest-evolution-data-server-1.8.3-r5 289
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFG/73VomPajV0RnrERAkcYAJ9NQ/mBWAoF/k6/b2bDQhraV2fxAQCfbPUh
+efrbKvstMo1xBumwyytcByY=
+=JXgd
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.12.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.12.0.ebuild
new file mode 100644
index 000000000000..a2be25fbe250
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.12.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2007 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-1.12.0.ebuild,v 1.1 2007/09/30 15:16:23 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 keyring krb4 ldap ssl"
+
+RDEPEND=">=x11-libs/gtk+-2.10
+	>=gnome-base/orbit-2.9.8
+	>=gnome-base/gnome-vfs-2.4
+	>=gnome-base/libbonobo-2.4.2
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2
+	>=dev-libs/libxml2-2
+	keyring? ( gnome-base/gnome-keyring )
+	ssl? (
+		>=dev-libs/nspr-4.4
+		>=dev-libs/nss-3.9 )
+	>=gnome-base/libgnomeui-2
+	>=net-libs/libsoup-2.2.91
+	>=gnome-base/gnome-common-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
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+
+DOCS="ChangeLog MAINTAINERS NEWS TODO"
+
+RESTRICT="confcache"
+
+pkg_setup() {
+	G2CONF="$(use_with ldap openldap)       \
+		$(use_with kerberos krb5 /usr)      \
+		$(use_enable ssl nss)               \
+		$(use_enable ssl smime)             \
+		$(use_enable ipv6)                  \
+		$(use_enable keyring 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
+
+	# Fix what ?
+	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
+
+#-------------Upstream GNOME look here -----------------#
+
+	# --as-needed fixes
+	epatch "${FILESDIR}"/${PN}-1.11.3-as-needed.patch
+
+	# fix for dep ordering so we can add libedataserverui to libexchange-storage
+	# we need to do this or: undefined reference to `e_passwords_get_password'
+	# are the kinds of errors you will get.
+
+	# move the groupwise backend and provider for addressbook, camel, and
+	# calendar to its own folder called server.deps.
+	mkdir server.deps || die "mkdir server.deps failed"
+	mv addressbook/backends/groupwise server.deps/addressbook || die "mv address/groupwise failed"
+	mv camel/providers/groupwise server.deps/camel || die "mv camel/groupwise failed"
+	mv calendar/backends/groupwise server.deps/calendar || die "mv calendar/groupwise failed"
+
+	# now fix the autotools foo for the new directory and the removed ones
+	echo "SUBDIRS = addressbook camel calendar" > server.deps/Makefile.am || die "echo failed"
+
+	# remove groupwise folder from Makefile's since they are in a diff location
+	sed -i -e 's: groupwise::' addressbook/backends/Makefile.am camel/providers/Makefile.am calendar/backends/Makefile.am || die "sed 1 failed"
+
+	# fix configure.in location of the Makefile's
+	sed -i -e 's:addressbook/backends/groupwise:server.deps/addressbook:' configure.in || die "sed 2 failed"
+	sed -i -e 's:camel/providers/groupwise:server.deps/camel:' configure.in || die "sed 3 failed"
+	# tack on the server.deps Makefile on our last edit
+	sed -i -e 's:calendar/backends/groupwise:server.deps/calendar/Makefile\nserver.deps:' configure.in || die "sed 4 failed"
+
+	# fix file includes 
+	sed -i -e 's:<backends/groupwise/e-book-backend-groupwise.h>:"server.deps/addressbook/e-book-backend-groupwise.h":' addressbook/libedata-book/e-data-book-factory.c || die "sed 5 failed"
+
+	# Fix db version for FreeBSD users where -ldb is always db-1
+	sed -i -e "s:-ldb:-l$(db_libname):" configure.in || die "sed 6 failed"
+
+#---------------Upstream GNOME stop here---------------
+	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
+}
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.0 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.0
new file mode 100644
index 000000000000..98f49a78cb40
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.0
@@ -0,0 +1,3 @@
+MD5 787cfe9d652f46395a9adce056bdb286 evolution-data-server-1.12.0.tar.bz2 7463329
+RMD160 f58e5cff47cb1d1937a6fba5b7c6408e3da725ed evolution-data-server-1.12.0.tar.bz2 7463329
+SHA256 854435b58756b365b978f1433bee026d4f5f2973e0c1c2ea279cd2c7c0e8f5f3 evolution-data-server-1.12.0.tar.bz2 7463329
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-as-needed.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-as-needed.patch
new file mode 100644
index 000000000000..fe287ea2377a
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-as-needed.patch
@@ -0,0 +1,35 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-1.11.3.orig/Makefile.am evolution-data-server-1.11.3/Makefile.am
+--- evolution-data-server-1.11.3.orig/Makefile.am	2007-06-04 01:41:14.000000000 -0400
++++ evolution-data-server-1.11.3/Makefile.am	2007-06-07 11:03:46.000000000 -0400
+@@ -9,8 +9,8 @@ if ENABLE_CALENDAR
+ CALENDAR_DIR = calendar
+ endif
+ 
+-SUBDIRS = $(LIBDB) win32 libedataserver servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po
+-DIST_SUBDIRS= win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
++SUBDIRS = $(LIBDB) win32 libedataserver camel addressbook $(CALENDAR_DIR) libedataserverui servers server.deps src docs art po
++DIST_SUBDIRS= win32 libedataserver camel addressbook calendar libedataserverui servers server.deps src docs art po
+ 
+ changelogs =			\
+ 	ChangeLog
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-1.11.3.orig/servers/exchange/storage/Makefile.am evolution-data-server-1.11.3/servers/exchange/storage/Makefile.am
+--- evolution-data-server-1.11.3.orig/servers/exchange/storage/Makefile.am	2007-06-01 03:06:39.000000000 -0400
++++ evolution-data-server-1.11.3/servers/exchange/storage/Makefile.am	2007-06-07 11:02:23.000000000 -0400
+@@ -63,14 +63,15 @@ libexchange_storage_1_2_la_LIBADD =				\
+ 	$(top_builddir)/servers/exchange/lib/libexchange.la	\
+ 	$(top_builddir)/servers/exchange/xntlm/libxntlm.la	\
+ 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
++	$(top_builddir)/libedataserverui/libedataserverui-1.2.la\
+ 	$(E_DATA_SERVER_LIBS)					\
+ 	$(E_DATA_SERVER_UI_LIBS)				\
+ 	$(LDAP_LIBS)						\
+ 	$(SOUP_LIBS)						\
+-	$(SOCKET_LIBS)
++	$(SOCKET_LIBS)						\
++	$(KRB5_LDFLAGS)
+ 
+ libexchange_storage_1_2_la_LDFLAGS =				\
+-	$(KRB5_LDFLAGS)						\
+ 	$(NO_UNDEFINED)						\
+ 	-version-info $(LIBEXCHANGE_STORAGE_CURRENT):$(LIBEXCHANGE_STORAGE_REVISION):$(LIBEXCHANGE_STORAGE_AGE)
+ 
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-no-libdb.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-no-libdb.patch
new file mode 100644
index 000000000000..b2b7769289e8
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-no-libdb.patch
@@ -0,0 +1,13 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-1.11.3.orig/configure.in evolution-data-server-1.11.3/configure.in
+--- evolution-data-server-1.11.3.orig/configure.in	2007-06-04 06:50:47.000000000 -0400
++++ evolution-data-server-1.11.3/configure.in	2007-06-07 10:58:22.000000000 -0400
+@@ -1431,9 +1431,6 @@ export privdatadir
+ if test $enable_calendar = yes; then
+         AC_CONFIG_SUBDIRS(calendar/libical)
+ fi
+-if test $dynamic_libdb = no; then
+-        AC_CONFIG_SUBDIRS(libdb/dist)
+-fi
+ AC_OUTPUT([
+ Makefile
+ evolution-data-server-zip