Bump to 2.24.3 - lots of bug fixes. Dropping icaltz-util.patch since this has been committed.

Package-Manager: portage-2.2_rc21/cvs/Linux 2.6.27.5 i686

3 files changed, 117 insertions, 3 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index a88dc58a518a..e0ee5140fa33 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,13 @@
 # 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.199 2008/12/20 17:31:47 nixnut Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.200 2009/01/18 06:48:42 ford_prefect Exp $
+
+*evolution-data-server-2.24.3 (18 Jan 2009)
+
+  18 Jan 2009; Arun Raghavan <ford_prefect@gentoo.org>
+  +evolution-data-server-2.24.3.ebuild:
+  Bump to 2.24.3 - lots of bug fixes. Dropping icaltz-util.patch since this
+  has been committed.
 
   20 Dec 2008; nixnut <nixnut@gentoo.org>
   evolution-data-server-2.22.3-r1.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 48284f2ca6d5..974d7265fb42 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -16,10 +16,12 @@ DIST evolution-data-server-1.12.3.tar.bz2 7447166 RMD160 c7102c38af4888f3f8933c9
 DIST evolution-data-server-2.22.2.tar.bz2 7613774 RMD160 92677046697b0f48b273ad3fb3fbf656dac02e5b SHA1 d3fc33802fec51a16b017abb7516f4ed79311dfa SHA256 dc86b3f61cc4f9db08012deee692774562cfc93a3313298517fca8639a6eb3de
 DIST evolution-data-server-2.22.3.tar.bz2 7621470 RMD160 eed9c26fba0b69f0cbe44b01d698388c4ae44a0b SHA1 5d01b1248fcacef9c478787892f223338dff731b SHA256 6e9fa1258c8b4d1fd75a1da78ee637ad5b8a82bc58c93324d73afecf8d73fe87
 DIST evolution-data-server-2.24.2.tar.bz2 7886652 RMD160 703b064095b960954ebb0621e15887731c429010 SHA1 8c4988446c6a8552972974800766eb536fcf267c SHA256 ac66e2f5341c488fa9e5e02c7e4eb7a7a1c01c093ad4a7a9b9e0e028f43f617a
+DIST evolution-data-server-2.24.3.tar.bz2 7882341 RMD160 f0a83cf0d77c7798f6d0dbaa0dd9c77198629740 SHA1 079a2a0a139d4073e7a4122c81271695dfc56de8 SHA256 4bb4c8f8bafdcca558299d317817efbb3c35fe06b163b41e543ed2a15c2aefb4
 EBUILD evolution-data-server-1.12.3.ebuild 5047 RMD160 47e7a7a27fc51270a57644179594e302ffe11a73 SHA1 8e819d7c74c140aed79e5f265082a96541dbdb74 SHA256 482df2b372d83beaf408af1b0d6e7162d52481eef0513a25b6f9fc1805e7a229
 EBUILD evolution-data-server-2.22.2.ebuild 3121 RMD160 b25a0c60d2724073c6fa7a12ef05d37ff64c5c51 SHA1 7792a7a2f0902fd55cfad7dc7a5099ae3b31e3df SHA256 6e2bb7b8b57d839a35bfac3ed3b970da6a3088ca23985170a2941aaf78eb1ece
 EBUILD evolution-data-server-2.22.3-r1.ebuild 3233 RMD160 54447c637693f00b42eb87f5392f8674290c3657 SHA1 d39ef796968ad6aec398318b388956518711b22a SHA256 adaaffe22b38cd3e59801b82664348ec715d8d0671141e126b2b5cc17f7c6728
 EBUILD evolution-data-server-2.22.3.ebuild 3118 RMD160 11a9c2f85fc84d848c47fc478a55a1ca77361efa SHA1 4b4ecd802fc9c7a1e997f8b35a9e95bcbda0da80 SHA256 2194dfb3d1cdf85e448e6fd6aa3e5a62f0759c7054b3c50fa3cd0ee3af9c4700
 EBUILD evolution-data-server-2.24.2.ebuild 3015 RMD160 bee5734c69aadc03670b796b2c9aae3e3711e79b SHA1 21c3d1040da61eaf0cd89d959543abaa8933710d SHA256 3f7019bba2a6e621746a0aae94e22e2fd0456c89ee1e02f812cbd34bfb198cc8
-MISC ChangeLog 37812 RMD160 125807e87c79f542df695aa5ef8c8f1de32a3b9d SHA1 e84c139b944a136795fe52a2ad5f7430397f9e29 SHA256 ff2eab779920dc3a3206565c21a611551b37da545b4f5845d06cf875f87870aa
+EBUILD evolution-data-server-2.24.3.ebuild 2874 RMD160 7c22a18a82f9d2e86750a2dfa1ce15ac380257fe SHA1 7eda7eaa6337f50c8a8206e46a437838d9f9ad4e SHA256 a8ce2e39e717c97be2b49b275b1adf19e431dfbd721ef66276412ac4c00dffc5
+MISC ChangeLog 38057 RMD160 09dd398d6e7d792972f1cefce842cc3fb2f67cfa SHA1 bb708b0b97b038a9573c83bbb231394268ae0d53 SHA256 ecf629940cc83042476e9c97a2bf18aca933e0d3ea4f733e381ece67a38ee250
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.24.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.24.3.ebuild
new file mode 100644
index 000000000000..2fe70806e5ae
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.24.3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2009 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.24.3.ebuild,v 1.1 2009/01/18 06:48:42 ford_prefect 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.16.1
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/orbit-2.9.8
+	>=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.1 )
+	>=dev-db/sqlite-3.5
+	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
+
+	# Rewind in camel-disco-diary to fix a crash
+	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
+
+	# Fix building evo-exchange with --as-needed, upstream bug #342830
+	epatch "${FILESDIR}"/${PN}-2.23.6-as-needed.patch
+
+	# gtk-doc-am and gnome-common needed for this
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	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
+}