Version bump with some bugfixes.

Package-Manager: portage-2.1.9.36/cvs/Linux x86_64

3 files changed, 154 insertions, 5 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 18adb3d55344..476fdb99b078 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.289 2011/02/05 15:15:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.290 2011/02/07 10:07:00 pacho Exp $
+
+*evolution-data-server-2.32.2 (07 Feb 2011)
+
+  07 Feb 2011; Pacho Ramos <pacho@gentoo.org>
+  +evolution-data-server-2.32.2.ebuild:
+  Version bump with some bugfixes.
 
   05 Feb 2011; Pacho Ramos <pacho@gentoo.org>
   -evolution-data-server-2.32.1.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 951f76780bca..6cd7ef0a3aa9 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -13,15 +13,17 @@ DIST evolution-data-server-2.30.2.tar.bz2 4643434 RMD160 a4748e462b7b293bf35ddf9
 DIST evolution-data-server-2.30.3.tar.bz2 4652416 RMD160 2d4dc2fd6b8dfdc013042400b382f4684e642425 SHA1 449d3e7a9b19768d5a792434ca5d55c9d2496993 SHA256 3773e677ab3b9ff5564a26409ec6b00bc1bd68baf58a8781109866a7e29df890
 DIST evolution-data-server-2.32.1-patches.tar.bz2 12351 RMD160 d5fb943514b7d76c0f43d382005a5a8a47b4b46f SHA1 6692934e9227790707848f0e9710e2914a298742 SHA256 86bf9b09f65fbc6b84f4c76e3889020797ebf6e10caae809b0ad55e13d42b437
 DIST evolution-data-server-2.32.1.tar.bz2 4290087 RMD160 1555b03669c60e70c01e57b35739f2953e7896d9 SHA1 aaf96d976dd0c5d8615adf6c7300c5098eb14046 SHA256 de6a724504a9d72ca550a5a157df1e27dbb951a673f281106171c2345912fc79
+DIST evolution-data-server-2.32.2.tar.bz2 4290879 RMD160 a024d3032d12c3cfe31e2471218c7c6817e2168f SHA1 a8d1820d7b89fabed8dc44ad51eb90fc5a61e9da SHA256 d22fcd9e6f1cee7b4b11a25ae3c3d19e6a454e4f09b983a954ff2d7640bf1c36
 EBUILD evolution-data-server-2.30.2.ebuild 3530 RMD160 d1a8c815617b6bde51a21420f371549276335b26 SHA1 cd477a71f258de6e9bfd1dc9aed039debac7758e SHA256 39e312d31bf97bfc7bea51438fc7787b8854fc37fbc19c83633074f3ee08482c
 EBUILD evolution-data-server-2.30.3.ebuild 3054 RMD160 4c1073beeac99d86c39c3d1ab36805fbe2e825ed SHA1 9df5774916d14b2bc3498c42c91e62de45c8e9d7 SHA256 21b82d4dc261c1c8272304947973b6c55945fd8df35cf5412a51fb543f0360b8
 EBUILD evolution-data-server-2.32.1-r1.ebuild 4181 RMD160 f2729eaef04d89432262697a1007e6d8302270bb SHA1 2625503f044050f2230db1ced50be00de9d7faf5 SHA256 4de29a80f58e3ea61d7ced77d520c36975d3c0b096a354303f4db2bbfca13a0b
-MISC ChangeLog 55993 RMD160 a41a58bc08d0fa80e38ff6dc85bee0adac62c501 SHA1 ba19fd962e3454d362c2bd2d24ff4d40872c007d SHA256 f8daa99f93029a440fbdc05efea7ba0a3b52098133310fbeaa51a74f3cd56f27
+EBUILD evolution-data-server-2.32.2.ebuild 3916 RMD160 2511ef37b07195b1e8b92c1fd7e78c522b9adbaf SHA1 ebbb7ca8946608415ea20edbcd63c1dcd4c3b045 SHA256 5cd1d57efb681926091cdc8aabb9155cb4f07a901802886f27293ba0ef11f628
+MISC ChangeLog 56160 RMD160 83a798632f1876bce208c525bfdff82fae729750 SHA1 15a85d87128d80e49b2c963e438287e7e2f25306 SHA256 39a5bd4d370d5241b861138680457f0b2116cfadc1827150ebc10c9372af06b6
 MISC metadata.xml 242 RMD160 930a0247c2ceed0dfad103c8e18493d54fa77382 SHA1 d332c62f5dff3da42709228dfcd0131d81a7048c SHA256 cea2d969f6f71bb465d787a64966e9bafd3706b2d2f8fe3b81cb85c409b74104
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEUEARECAAYFAk1NaX4ACgkQCaWpQKGI+9RVFQCVGKEQEPYrGu0QCGcXQRksHV4r
-aACePb8xIlotOwd3pnHkHX26rRs4LtY=
-=tyrX
+iEYEARECAAYFAk1PxEoACgkQCaWpQKGI+9SN2gCeLuVJrel21Q1K1Cbvm5V/n5WY
+A4sAnA+0u804dYtg5PjxqEtd5e24EM7G
+=LWqG
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild
new file mode 100644
index 000000000000..d4bbbf9db64a
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2011 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.2.ebuild,v 1.1 2011/02/07 10:07:00 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+
+LICENSE="LGPL-2 BSD DB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+
+IUSE="doc ipv6 kerberos gnome-keyring ldap ssl +weather"
+
+RDEPEND=">=dev-libs/glib-2.25.12:2
+	>=x11-libs/gtk+-2.20: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
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2 )
+	ssl? (
+		>=dev-libs/nspr-4.4
+		>=dev-libs/nss-3.9 )
+	weather? ( >=dev-libs/libgweather-2.25.4:2 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35.5
+	sys-devel/bison
+	>=gnome-base/gnome-common-2
+	>=dev-util/gtk-doc-am-1.9
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2
+#	>=dev-util/gtk-doc-am-1.9
+
+pkg_setup() {
+	DOCS="ChangeLog MAINTAINERS NEWS TODO"
+	G2CONF="${G2CONF}
+		$(use_enable gnome-keyring)
+		$(use_enable ipv6)
+		$(use_with kerberos krb5 /usr)
+		$(use_with ldap openldap)
+		$(use_enable ssl ssl)
+		$(use_enable ssl smime)
+		$(use_with weather)
+		--disable-gtk3
+		--enable-largefile
+		--with-libdb=/usr"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# 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"
+
+	# Fix build with >=libgdata-0.7
+	epatch "${FILESDIR}/${PN}-2.32.1-libgdata07.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"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	find "${ED}" -name "*.la" -delete || die "la files removal failed"
+
+	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
+}