Remove patches causing evolution to close when creating an appointment (bug #372651), that patches look to be no longer needed as told by original author in upstream report (https://bugzilla.gnome.org/show_bug.cgi?id=649787#c5).

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

3 files changed, 173 insertions, 5 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 5a1e93cbb5bc..fc8c3172cc98 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.305 2011/07/17 21:00:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.306 2011/07/31 18:28:55 pacho Exp $
+
+*evolution-data-server-2.32.3-r1 (31 Jul 2011)
+
+  31 Jul 2011; Pacho Ramos <pacho@gentoo.org>
+  +evolution-data-server-2.32.3-r1.ebuild:
+  Remove patches causing evolution to close when creating an appointment (bug
+  #372651), that patches look to be no longer needed as told by original author
+  in upstream report (https://bugzilla.gnome.org/show_bug.cgi?id=649787#c5).
 
   17 Jul 2011; Markus Meier <maekke@gentoo.org>
   evolution-data-server-2.32.2-r1.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 71b17866687b..b5f4bccd160e 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -12,13 +12,14 @@ DIST evolution-data-server-2.32.3-patches.tar.xz 24072 RMD160 2508b5b101f59bb383
 DIST evolution-data-server-2.32.3.tar.bz2 4322281 RMD160 adc8b07aef41a89d16fc426541c12190a3688b8f SHA1 cbf32c3438c4f1650b35b87007a337ebc1c56cec SHA256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c
 EBUILD evolution-data-server-2.32.2-r1.ebuild 4153 RMD160 91391fc340a55d2a823cfa96c2ffb9f3cd44a473 SHA1 6ab186b08ee02a906a9e3baefd477373989d38c7 SHA256 945750e9a692785fceb07dc37af92f06516afc6c0c3215279223e174c6ae3f49
 EBUILD evolution-data-server-2.32.2.ebuild 3925 RMD160 40696eead31cd6967cee24757284322a03ad54dc SHA1 7982a446e8b556abf0d549a4de9a9faa1966c74b SHA256 1bbf97c42b44a2a47e7bf2d2271694ef1c9f8fe86375da418d73dafd02ec193c
+EBUILD evolution-data-server-2.32.3-r1.ebuild 4651 RMD160 0c879e58e9056d2350d2513efcaf1993a09a2d0f SHA1 0c70319aecdd0469c419456f6a9522f0ffad667f SHA256 783bb1cf852caee24ade1f148cb2df77eee38966f9cf465f2883e8b14f846515
 EBUILD evolution-data-server-2.32.3.ebuild 4502 RMD160 262f6faa999dbc937a81677673dc725db3896476 SHA1 a80d1d5b9340326f156de4c6f1019c5576ab1e4d SHA256 099b631abe1855705568d19b2ec4931427066e5a8ae73ce966eecf5a7cc3e891
-MISC ChangeLog 58639 RMD160 0088f4e34a14c433a596d83a2c02d66315018644 SHA1 a0b733e3beaf0656eac5706b57e1f88e9ef7388e SHA256 1bc15c69761730d58a53ab7907aca837805823757b2b415f987b055ecc0f7bb9
+MISC ChangeLog 59011 RMD160 9f9168c60df5e2a4501dc3d8f1ac329587ab687b SHA1 858cc0f1309f7d2154f9dc77748441e61c6ef7c6 SHA256 15f9a3f9983405b06cb269c5e4fc1cdc1cd188c41cde1bc536cea06692d7244a
 MISC metadata.xml 242 RMD160 930a0247c2ceed0dfad103c8e18493d54fa77382 SHA1 d332c62f5dff3da42709228dfcd0131d81a7048c SHA256 cea2d969f6f71bb465d787a64966e9bafd3706b2d2f8fe3b81cb85c409b74104
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4jTZ4ACgkQkKaRLQcq0GKkfQCbBKJ964h4G/aConDOMjT0leOn
-3B4AnRfv8jULLwi47gx9x6H1rWLoHkFo
-=ixQx
+iEYEARECAAYFAk41nu0ACgkQCaWpQKGI+9QLfwCghziWJIhJ3sFmWeSwlLnt1VSr
+s+AAn2pRVPSn4pPhs7YEtTHQCeS8Yurm
+=hWN3
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild
new file mode 100644
index 000000000000..ee3a5a73c9c4
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild
@@ -0,0 +1,159 @@
+# 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.3-r1.ebuild,v 1.1 2011/07/31 18:28:55 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+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"
+
+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 +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/gnome-keyring-2.20.1 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2 )
+	weather? ( >=dev-libs/libgweather-2.25.4:2 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gperf
+	>=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"
+
+	# 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"
+
+}
+
+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"
+
+	# 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
+
+	# /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() {
+	# 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
+}