Version bump with various bugfixes.

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

2 files changed, 147 insertions, 1 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 6e360d9fa3c8..1dbab0c8b77d 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.334 2012/05/07 05:58:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.335 2012/05/20 10:44:45 tetromino Exp $
+
+*evolution-data-server-3.4.2 (20 May 2012)
+
+  20 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +evolution-data-server-3.4.2.ebuild:
+  Version bump with various bugfixes.
 
 *evolution-data-server-3.4.1 (07 May 2012)
 *evolution-data-server-3.2.3-r2 (07 May 2012)
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.4.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.4.2.ebuild
new file mode 100644
index 000000000000..22304defed4d
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.4.2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2012 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-3.4.2.ebuild,v 1.1 2012/05/20 10:44:45 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit 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="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
+
+RDEPEND=">=dev-libs/glib-2.30:2
+	>=x11-libs/gtk+-3.2:3
+	>=gnome-base/gconf-2
+	>=dev-db/sqlite-3.5
+	>=dev-libs/libgdata-0.10
+	>=gnome-base/gnome-keyring-2.20.1
+	>=dev-libs/dbus-glib-0.6
+	>=dev-libs/libical-0.43
+	>=net-libs/libsoup-2.31.2:2.4
+	>=dev-libs/libxml2-2
+	>=sys-libs/db-4
+	>=dev-libs/nspr-4.4
+	>=dev-libs/nss-3.9
+
+	sys-libs/zlib
+	virtual/libiconv
+
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.1.1
+		>=net-libs/liboauth-0.9.4 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2 )
+	weather? ( >=dev-libs/libgweather-2.90.0:2 )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/gperf
+	>=dev-util/intltool-0.35.5
+	sys-devel/bison
+	>=gnome-base/gnome-common-2
+	>=dev-util/gtk-doc-am-1.9
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.14 )
+	vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] )"
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2
+#	>=dev-util/gtk-doc-am-1.9
+
+REQUIRED_USE="vala? ( introspection )"
+
+# FIXME
+RESTRICT="test"
+
+pkg_setup() {
+	DOCS="ChangeLog MAINTAINERS NEWS TODO"
+	# Uh, what to do about dbus-call-timeout ?
+	G2CONF="${G2CONF}
+		--disable-schemas-compile
+		VALAC=$(type -P valac-0.14)
+		VAPIGEN=$(type -P vapigen-0.14)
+		$(use_enable gnome-online-accounts goa)
+		$(use_enable introspection)
+		$(use_enable ipv6)
+		$(use_with kerberos krb5 ${EPREFIX}/usr)
+		$(use_with ldap openldap)
+		$(use_enable vala vala-bindings)
+		$(use_enable weather)
+		--enable-nntp
+		--enable-largefile
+		--enable-smime
+		--with-libdb=${EPREFIX}/usr"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# GNOME bug 611353 (skips failing test atm)
+	# XXX: uncomment when there's a proper fix
+	#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"
+
+	# /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
+	# Touch configure.ac if doing eautoreconf
+	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure || die "sed failed"
+}
+
+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_postinst() {
+	gnome2_pkg_postinst
+
+	if use ldap; then
+		elog ""
+		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
+	fi
+}