Fix incompatibility with libical-0.48 (#453546 by lor)

Package-Manager: portage-2.1.11.47/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 218 insertions, 9 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 7fce91f3d003..91c7013a87b4 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.351 2013/01/22 03:47:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.352 2013/01/22 19:59:23 pacho Exp $
+
+*evolution-data-server-2.32.3-r3 (22 Jan 2013)
+
+  22 Jan 2013; Pacho Ramos <pacho@gentoo.org>
+  +evolution-data-server-2.32.3-r3.ebuild,
+  +files/evolution-data-server-2.32.3-libical-0.48.patch:
+  Fix incompatibility with libical-0.48 (#453546 by lor)
 
 *evolution-data-server-3.6.3 (22 Jan 2013)
 
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 617d6be116f9..eb2b6c5351f3 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -7,6 +7,7 @@ AUX evolution-data-server-2.31-gentoo_etc_services.patch 1350 SHA256 1dae07ed5cb
 AUX evolution-data-server-2.32.3-g_thread_init.patch 5091 SHA256 23d3bd95ab952dd572547b64e1c430443586094cd8049b5034c12811fb7be162 SHA512 79e7606a9d2e2f1b3358dd47dd2b66152c008f57cbbdd411e5373da16441fbcb6776ea03a9a7badeb04370e026b0cc1944769fa3466b6593d003c234296c3573 WHIRLPOOL 61c19d778226795699d6748dd3fb7c471e74577f6341d7d611f691abc96ba1c15821e891077cd7a8ca3cea4be28bf8019c1c2eee1f8dfe4e3cad4deb23be0f8e
 AUX evolution-data-server-2.32.3-gmodule-explicit.patch 2137 SHA256 cb936b70909a9a6588de0c8ba8b1c2fe2f9a5b288620c40d992774a9302f05df SHA512 cb6b4cc2bc8c825de2d7073f3e874d98860bba8b0aad1f042f5069516733995faa713a6ea85907770f42df0204a55b1745da2a142b6f272f6b482d55533189fc WHIRLPOOL d8e727759ace5e110fcf146bfe1df54f1abaab797465485d012bad537a9550404885a107beab02f8e78aa9e317a47ac1178e03fcab03a83be72e889414db1ce4
 AUX evolution-data-server-2.32.3-imap-move.patch 2647 SHA256 8effa465fc2913f22f030d66f9726a6e9dcf327f7abbf1774b1bfb9f4cc1c40f SHA512 f3def00fcf4b392b1e4f9c5d222897ea5f0f767557d7a790f72bab76c994332c273d27af509d5037519b872dffacd85a8cf204a4c2b2b38b3fc68719a3346c3c WHIRLPOOL c9428f28c92c24522fa46f572e030435ef807aea049186c3e20b300c1948521b08f2f88b6b22fa7567d14929eed7332ba3e8d923cda0a64b9655921d2372f716
+AUX evolution-data-server-2.32.3-libical-0.48.patch 920 SHA256 7d38183419b479502623382252be86fabd707a8dbb1f1ff20c6e5e07207dad11 SHA512 112f1722e5ca8e763ed8a16bb73c7dd86d90e40baa50df2fe6fbc094c0db8305b4f7f057d60301626cd4c784279dfaf45aa6ede0a5ea6cdc6b236464568f0bb3 WHIRLPOOL 5192f3bceed1d17806f057849518b9e0e1ed5f482a9e111bfc6fc90aad6af96325951ced570753d4b7025f7b568cafbf85632b09184a50a58c1c5fc2b5611748
 AUX fix_relink_command.pl 4074 SHA256 f6da0e687f7e64eab82671def4b7445602d1bf64e9b56c3c188d43fadc7dabc2 SHA512 bb6d512f00e976c708395d9552aaa30afab17ad09c04e57488a11505565542396f450d9121c6ff0d8becca84778ade24873a39fcc785aa62e523fc038f1fe054 WHIRLPOOL e94d4b6c51936b9184401cf36f7cf108cbec2f806bf0a4660289cdd7ebe8a370bb396f77d9cb9d463c741eeaacb655c7771f113b0a79f7b429b4569d1e28e43a
 DIST evolution-data-server-2.32.3-patches.tar.xz 24072 SHA256 7b1f29fad87a7e868736380c69880a29ddf5d4bd365734df53042e4bc9e8b0fa SHA512 20e12257e7153d074f20c158fc16a5a8feed8e9ed34035c6d752e31ca5b21436e08d767433aa16b885ad0aa8a95b18b41f79c80f2b30db42a5af402082882d55 WHIRLPOOL 660000ccaa0160325b92cf26ea031c96190645ce4bd2a6fc83b03411c6a2bb7f7aadc0ca0a493e1ff386fd4ac4471035af2da0decb436db7f8cf74b792ac4bd2
 DIST evolution-data-server-2.32.3.tar.bz2 4322281 SHA256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c SHA512 863ccea7717a7fe743155513e74fc8ea35f558702bd4ff1075e15d1a36c1ecd9d5e285bd2a81245d680c05cf0521029583134b4e1d12668244042df3f5e62dfb WHIRLPOOL 3c56210f477901c3ea2d4712e631d219969cb113ff1c4cba3fcefccb67fed363a6207025b46922b9c1f6ba3427b962b5e0565c6b1441249c74b29afa314e3580
@@ -15,19 +16,16 @@ DIST evolution-data-server-3.6.2-gentoo-patches.tar.xz 12836 SHA256 38ac40ca3fb1
 DIST evolution-data-server-3.6.2.tar.xz 3953424 SHA256 bc94d8b9f1a6fb81a630cf38abec303b87a87ce2fd880f9519c23e5de2ce88f0 SHA512 9cce9ec36327e24e011f2c4f627c7a9df86cf2b3ddfee5fd2e9c4b45224d81e18ff4991afcdfe6e609232b189b7464c5135f3e94bbade25cabaf1127e7f15a87 WHIRLPOOL a1ccd75c4f23b589ea38c1e90776d3485571899733250a03c78ca7cf5ca66da25f56af95f5c7cd3372631e32e56ca4c875fd8be09567e1c9e0f86c5c6d7e68b3
 DIST evolution-data-server-3.6.3.tar.xz 4073908 SHA256 37a0d0d4f6c8515e70e34f1e7e1f457f4c7736f35ba0f18c4b4bca0a17db7de0 SHA512 c22fc555857c60bdac671cdd53bfec4f7d63398c2f690ef540ca1dda5c3d06d49fde5a9310a1d12c1ad93de48dc507ead1342c3e0d9958b81d65b8f8714ce25b WHIRLPOOL 54dd5a904bb4e94baeeff68fb29ac0329ec80e3d845fe4b7f5795c9cabb67d061e194abced022cfee5f150fb06b36814fff744d9720d75e5cb938184e877147e
 EBUILD evolution-data-server-2.32.3-r2.ebuild 4951 SHA256 3ebf16a907aad5c9ce1cbe68f43050165e25230f1fedf2976e2a1cda4e991dbe SHA512 0f191c89d2ea6e463cfa3a12ca5b922b2d842d0ec5651ad933cd7e08d42de23358e46a8374390897265296efd028bedac2bd9cd619673d33c7c38eca04d4d01c WHIRLPOOL 89fb49855e1663268927bda04eaed7e79977a426ea89302c218b145ec5f30f314ca470d980159aa26b231d0f31c06295b9dd058964d459bb36b3a447088b69df
+EBUILD evolution-data-server-2.32.3-r3.ebuild 5060 SHA256 a915529d17bb2bbcdd9883421339305e7d4494d83400d54d7bd6f73150a042d0 SHA512 1380d8cf96390fbe5921a3b5aef5e44d41eaa265928dabe90b0dbb7fba0e3d551f9ef5f2349331cd836ab349eee7ccb21b366523938b14ba9c728198b6e452d8 WHIRLPOOL d6037b68928cd6e540e7ce8c83c63aaca36c3517a1f33ffd6e7e01c5d438df28a744448f6823dc1602c9256882af14df498354e619dc5fd892d2a4a4d961414d
 EBUILD evolution-data-server-3.4.4.ebuild 4012 SHA256 75dcfdca52053e7c936d13d563cc493fd73401767206ffb43ac9f6f2f8325a92 SHA512 52f0f9e3fbeb02da98c7e7ed03ac0c8f49e15e933a78022bd716c7ee6b93ac62ed4e5e7f8b22c758c1dd00d032389e3fb5fe9434ef8bf456f7d9979434aa6379 WHIRLPOOL 30d08e070075b5ef35b3d41eeeada12b05fb2a20c67bdb87e7abc7935cf352fc496deb5e411a0652cebd9211439c1f80cb7a176f5845d178fa90728db969879a
 EBUILD evolution-data-server-3.6.2-r1.ebuild 4114 SHA256 252c88d4314a80ae810fda852c00ed17afb0dfeb3bcc66525bd1f3353da5d661 SHA512 8e8d5afe628ab36a80cf0d80e9885a14b0a0ecd53cf356623c341179c2d8a54001a9d1f0405d109cedc165104f4f1090b2c5a291b9d38fc6a0f88ccf952f055a WHIRLPOOL 6baedc6ec6bd979f4354eaf3ac4bd5841036ee4691499fcdad9eb1fb2f974700bb457b06d0908df8b9354a313efed27dcaa6bb73e26dd3071a0bb63d652a40ef
 EBUILD evolution-data-server-3.6.3.ebuild 3996 SHA256 42bfb676eeca11f0eb369ae2efa0787e900fdedfa31d729e9c77527b206f14cb SHA512 09c1b4189d272bb52f0d3b310b7f73e98c8a0e3e64caa7b37dc15e11cb765ce1c9eba3f0726ff918757ed568f5b20b761549512cb333873a5a4a79e1bb478836 WHIRLPOOL dea1736fd1d6eb30413517770aee4517e402dce02c45a8e69d85fd85cc8b1c957117381d0e8129a6562c06155161c9b94388f3d5945b515379a7bf4eb6d44f57
-MISC ChangeLog 69541 SHA256 f3ffa45c85e948afacfc4afc5d9055fe9156006cc9f98f1f80afd6c7d9deb264 SHA512 ab5cda753ff3e802f07faf09ac27a48ce198fcbb325c2d3547414a6a95a94ab2869cbe831a1ba1305c58c07f4e33f0815bae05593a197ea928ca0f745ba9b3f5 WHIRLPOOL 94a49096828889cfa472346d1abe97e3ebe655b9c72b2b45d3a4f84fcf24a086098e6536a567667cd065a8b453639141119c67c7942ecdbd22c353f47ffd53c8
+MISC ChangeLog 69790 SHA256 61a90831f23f11ae94995fd03b55cda7b9fd3a5730abc344de29cb9827d7de7e SHA512 70c2af9275487ea43117f98c1b05be87b9e0ffbf7aeb51c14e87cfa07adb0488989a3ddb9fb4a095e9176392a733dfc9c400858f315c6100b9951dcf0ce58a7e WHIRLPOOL e4eba178df831a4545fbbd9d151b9b818e3ce64bdf4185ca4b9d8a535f9322719a256de75dadc1451e6c1e9728b36eecc77cc9e2e44b26b3c071f1dc1febd44a
 MISC metadata.xml 506 SHA256 3b17f5d3335559ed8198c33f0866c39d854a452218344082d4453dddf555710b SHA512 4916d65f5fc5ccf4ddb5bd12717e3d839e01240df064c0b485f106713aa28573dd9a79944d2f4db0371fd766f8ff2938580b91fc90d2a72e44b9829f4e026b89 WHIRLPOOL 6b863b456d3e3c87a88cfcdfaaa105b4620524d840af99cafb9a70ea6ae619113e3c5e9575f3f7d4e487a695aa26aa3246e79c36059fa555f158d5fc3923a86a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ/gvDAAoJEJ0WA1zPCt1hitAIALvEfduXcCZoQ8/eSTfliqj/
-I7twYZ5PI+mdlIu22LcNATkmaJfC6mZVbic1/satVVbBWfZfI2O8i9ZEjswDwQL4
-VLdnMaqprlQn38haQsRsV0pXxITwAC4ETnwR15Pl9mJaJIWN2c9ljMUGTTlcs3Nc
-MPxwv84zOqP83p+Jb/gutmJUeWCRmawLI76qrfLBLAAKO5qRAVdLP/e400rJzpxF
-APW2/OxZg8a5muDF3QdNFYLzwNsbV3ObWvmJZcYb0Mjx/l8kOH9nkmJyj+noYuQH
-pekevqJa2KUjfPKo/Ja4mXAVvV0Hwbv7J7lMYVzNvIHj5tQK8N58c7pmCy+u/gQ=
-=I9t2
+iEYEAREIAAYFAlD+75wACgkQCaWpQKGI+9SkcQCfW0pNycxmPYmJaqmp/GjHRRZE
+B/cAnimT8nP14FUQgnQMDBpaxyXEsJ7v
+=OZHN
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild
new file mode 100644
index 000000000000..fe254129e297
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2013 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.32.3-r3.ebuild,v 1.1 2013/01/22 19:59:23 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+WANT_AUTOMAKE="1.11"
+
+inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="http://projects.gnome.org/evolution/"
+
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+
+IUSE="ipv6 kerberos gnome-keyring ldap +weather"
+
+RDEPEND=">=dev-libs/glib-2.25.12:2
+	>=x11-libs/gtk+-2.24:2
+	>=gnome-base/gconf-2
+	>=dev-db/sqlite-3.5:=
+	>=dev-libs/libgdata-0.6.3:=
+	>=dev-libs/libical-0.43:=
+	>=net-libs/libsoup-2.4:2.4
+	>=dev-libs/libxml2-2:=
+	>=sys-libs/db-4:=
+	sys-libs/zlib:=
+	virtual/libiconv
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
+	gnome-keyring? ( gnome-base/libgnome-keyring )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? (
+		>=dev-libs/libgweather-2.25.4:2
+		<dev-libs/libgweather-2.91:2 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gperf
+	virtual/pkgconfig
+	>=dev-util/intltool-0.35.5
+	sys-devel/bison
+	>=gnome-base/gnome-common-2
+	>=dev-util/gtk-doc-am-1.9"
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2
+
+src_prepare() {
+	DOCS="ChangeLog MAINTAINERS NEWS TODO"
+
+	# ssl stuff always enabled as recommended in upstream bug #642984
+	G2CONF="${G2CONF}
+		$(use_enable gnome-keyring)
+		$(use_enable ipv6)
+		$(use_with kerberos krb5 /usr)
+		$(use_with ldap openldap)
+		$(use_with weather)
+		--disable-gtk3
+		--enable-largefile
+		--with-libdb=/usr
+		--enable-ssl
+		--enable-smime"
+
+	# Adjust to gentoo's /etc/service
+	epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch"
+
+	# GNOME bug 611353 (skips failing test atm)
+	epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
+
+	# GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo)
+	sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \
+		-i addressbook/tests/Makefile.{am,in} \
+		|| die "failing test sed 1 failed"
+
+	# Apply multiple backports and fixed from master and 2.32 branches
+	#
+	# 009 and 010 patches are broken, bug #372651
+	rm "${WORKDIR}/${P}-patches"/009*.patch || die
+	rm "${WORKDIR}/${P}-patches"/010*.patch || die
+	epatch "${WORKDIR}/${P}-patches"/*.patch
+
+	# Upstream bug #655167 - Messages moved from IMAP Inbox reappear
+	epatch "${FILESDIR}/${P}-imap-move.patch"
+
+	# Fix building with glib-2.32, bug #412109
+	epatch "${FILESDIR}/${P}-gmodule-explicit.patch"
+	epatch "${FILESDIR}/${P}-g_thread_init.patch"
+
+	# Upstream bug #669003 - CalDAV: Cannot modify calendar object (libical 0.48)
+	epatch "${FILESDIR}/${P}-libical-0.48.patch"
+
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	append-cppflags "-I$(db_includedir)"
+
+	# FIXME: Fix compilation flags crazyness
+	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure.ac configure || die "sed 3 failed"
+
+	sed -e "/AM_INIT_AUTOMAKE/s/-Werror//" -i configure.ac || die
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_install() {
+	# Prevent this evolution-data-server from linking to libs in the installed
+	# evolution-data-server libraries by adding -L arguments for build dirs to
+	# every .la file's relink_command field, forcing libtool to look there
+	# first during relinking. This will mangle the .la files installed by
+	# make install, but we don't care because we will be punting them anyway.
+	perl "${FILESDIR}/fix_relink_command.pl" . \
+		|| die "fix_relink_command.pl failed"
+
+	gnome2_src_install
+
+	if use ldap; then
+		MY_MAJORV=$(get_version_component_range 1-2)
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema || die "doins failed"
+		dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	unset ORBIT_SOCKETDIR
+	unset SESSION_MANAGER
+	export XDG_DATA_HOME="${T}"
+	unset DISPLAY
+	Xemake check || die "Tests failed."
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \
+		libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \
+		libedata-book-1.2.so.2 libebook-1.2.so.9 \
+		libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8
+	do
+		preserve_old_lib /usr/$(get_libdir)/$lib
+	done
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \
+		libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \
+		libedata-book-1.2.so.2 libebook-1.2.so.9 \
+		libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8
+	do
+		preserve_old_lib_notify /usr/$(get_libdir)/$lib
+	done
+
+	if use ldap; then
+		elog ""
+		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
+	fi
+}
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libical-0.48.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libical-0.48.patch
new file mode 100644
index 000000000000..dd4e20b06a78
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libical-0.48.patch
@@ -0,0 +1,37 @@
+From 830fa86226aa2c4fd0687aef605c93920888e3c4 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 30 Jan 2012 18:25:41 +0000
+Subject: Bug #669003 - CalDAV: Cannot modify calendar object (libical 0.48)
+
+---
+diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
+index 694e64a..50cece5 100644
+--- a/calendar/backends/caldav/e-cal-backend-caldav.c
++++ b/calendar/backends/caldav/e-cal-backend-caldav.c
+@@ -422,6 +422,24 @@ ecalcomp_get_etag (ECalComponent *comp)
+ 
+ 	str =  icomp_x_prop_get (icomp, X_E_CALDAV "ETAG");
+ 
++	/* libical 0.48 escapes quotes, thus unescape them */
++	if (str && strchr (str, '\\')) {
++		gint ii, jj;
++
++		for (ii = 0, jj = 0; str[ii]; ii++) {
++			if (str[ii] == '\\') {
++				ii++;
++				if (!str[ii])
++					break;
++			}
++
++			str[jj] = str[ii];
++			jj++;
++		}
++
++		str[jj] = 0;
++	}
++
+ 	return str;
+ }
+ 
+--
+cgit v0.9.0.2