Bump to 3.2.1 from the gnome overlay. The venerable gentoo_etc_services patch is not needed for any version of baselayout in portage. Drop alpha, arm, ia64, ppc, ppc64, sparc keywords due to new liboauth, libgdata, and gnome-online-accounts dependencies. Keywording bug will be filed later for all of gnome-3.2.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 164 insertions, 8 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 121f17254f0c..93ee716a3ed2 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,15 @@
 # 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.315 2011/10/30 16:18:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.316 2011/10/31 04:57:54 tetromino Exp $
+
+*evolution-data-server-3.2.1 (31 Oct 2011)
+
+  31 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +evolution-data-server-3.2.1.ebuild, metadata.xml:
+  Bump to 3.2.1 from the gnome overlay. The venerable gentoo_etc_services patch
+  is not needed for any version of baselayout in portage. Drop alpha, arm,
+  ia64, ppc, ppc64, sparc keywords due to new liboauth, libgdata, and
+  gnome-online-accounts dependencies.
 
   30 Oct 2011; Raúl Porcel <armin76@gentoo.org>
   evolution-data-server-2.32.3-r1.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 4cb658f2ff44..bebe7257fa9f 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX calentry.schema 3661 RMD160 68dfc3a8bbf08a1cf2713727c6617b2de613cb7c SHA1 06ddcc64c3b2b3230fbbef21a7e2a682bd95788c SHA256 107d60463833d5ceb5f752335dd07fef303093c58a51fb03405fed5837999431
 AUX e-d-s-camel-skip-failing-test.patch 660 RMD160 0907bb916a124d689f1880016eb8013971944016 SHA1 7ef6fd67bddbba16b3c6dd24a9b50ea9f8f5aa86 SHA256 f89f7635e9a5ddc2aa2f713a6d7eb9322f3416f8f9ad1cba1a113f65a1eaacb5
@@ -11,16 +11,18 @@ DIST evolution-data-server-2.32.2.tar.bz2 4290879 RMD160 a024d3032d12c3cfe31e247
 DIST evolution-data-server-2.32.3-patches.tar.xz 24072 RMD160 2508b5b101f59bb383020728a8abb9ee2eb7836d SHA1 76b86f747415c117c660ec70561a786ff772d2b2 SHA256 7b1f29fad87a7e868736380c69880a29ddf5d4bd365734df53042e4bc9e8b0fa
 DIST evolution-data-server-2.32.3.tar.bz2 4322281 RMD160 adc8b07aef41a89d16fc426541c12190a3688b8f SHA1 cbf32c3438c4f1650b35b87007a337ebc1c56cec SHA256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c
 DIST evolution-data-server-3.0.3.tar.xz 3583040 RMD160 0a8ec29328a832d80dd82a9bd1507b9a7c9ba8dd SHA1 c48bd62dec8843637b5e96cefa6b1c00b9a20d6e SHA256 c23cfb53cc6224fd61339b1d4bf8bde869149c808cf31c29529c0f2dd364c033
+DIST evolution-data-server-3.2.1.tar.xz 3724708 RMD160 3b767a101dc33b525b2b13c43d0297c74a2aaf4d SHA1 d735653b64febadbbd447925a06f4714aa2c8678 SHA256 0091e41e87d589a984c6d089919fece2d28101df5b37e4b2d8615efdf60a09c3
 EBUILD evolution-data-server-2.32.2-r1.ebuild 4152 RMD160 e54b7f66c57669c5a3f561bc8dea1f27456e6629 SHA1 a7a514e11127dbd10d922ef981ebb30270f508f5 SHA256 5ef16e6793c0717318bedcaf0f5a455c5eb4237860dcd8bcdeeb9d04c1482e12
 EBUILD evolution-data-server-2.32.2.ebuild 3925 RMD160 40696eead31cd6967cee24757284322a03ad54dc SHA1 7982a446e8b556abf0d549a4de9a9faa1966c74b SHA256 1bbf97c42b44a2a47e7bf2d2271694ef1c9f8fe86375da418d73dafd02ec193c
 EBUILD evolution-data-server-2.32.3-r1.ebuild 4645 RMD160 b2886f04ad7cde68a875e086ba60886f84084cbb SHA1 f1c8ea4ca624f41232e6296e73aa1d33cd95da46 SHA256 d1dcff8dac6ec70b125fc6fefcbb107b154308da0e649e466415d48f49caf0ab
 EBUILD evolution-data-server-3.0.3.ebuild 3871 RMD160 f587689dffdf9858b257952d11078a16842ae086 SHA1 6036468edb2b89c8513ee41d8d3f10679ba90f57 SHA256 3b79c526e73c04710b20876a64b00ec2472a29e28456115b4d48b9158ffe48a3
-MISC ChangeLog 60361 RMD160 e5de36abf03744100cfb02c0f5da785c9b355f96 SHA1 013f5a6aef9fd09e2180f595c7904798464009bc SHA256 21e40693c3b863c3ca072f0993c92fb83ccc4cacfb5ab241632fcd18f472b5a2
-MISC metadata.xml 348 RMD160 f60cb046b2bc01d7ec62b57f3ba49ac296a58ef0 SHA1 cfc2ce6cc4abcf993a19ac5c2f6aea7b949d872d SHA256 c45eeae495b3321df26f82242845d9635e51d4958b1f4d5fcb52d22e133f8ec7
+EBUILD evolution-data-server-3.2.1.ebuild 4168 RMD160 76639d332f3bb99658afd4f221265a33a91b2e02 SHA1 6493b4610987151fb3fb161f99e1d6643f147bac SHA256 d839d522fc4a64e58f7e70f65ae5e2b456017f2c18fde7095579b109bc97c4f4
+MISC ChangeLog 60783 RMD160 590791c91e614bd80a4b79840f38c03d6377b4d5 SHA1 8fbd2d8f7c1330049ebe2bcdafd8d2e8aadbf1de SHA256 32b360c234f2b651fed914425f002b45366692d2aea2209297be6124df534396
+MISC metadata.xml 535 RMD160 206f4b4067eab119530224247177d5f8ca6c97e2 SHA1 21a9ce92639d7c5aed6b189eca4f40b00b97778b SHA256 f458f1517ae769596f0dab7860b2789867e773eb32ad7cc00279dc7e2e82d64c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6tePIACgkQuQc30/atMkCbxACgr7NIrKH9CvH0SYBjdX0USzOx
-XZEAoLgDxjiC9TFBFW0LKK+oQjgDdaou
-=g6u5
+iF4EAREIAAYFAk6uKtgACgkQdjK8w9WeBnAIPwD8DR7uYxkQIGZf6hFrAUJlAyuY
+gV1lwGgHDutg5HdOUcEA/jr+zNrWV+F7drK6Z8B3c/MzshlwUti/Q35eeMyEC9//
+=RudJ
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild
new file mode 100644
index 000000000000..4cdf06565d1f
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild
@@ -0,0 +1,142 @@
+# 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-3.2.1.ebuild,v 1.1 2011/10/31 04:57:54 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+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="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos ssl vala +weather"
+
+# GNOME3: How do we slot libedataserverui-3.0.so?
+# Also, libedata-cal-1.2.so and libecal-1.2.so use gtk-3, but aren't slotted
+RDEPEND=">=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3.0:3
+	>=gnome-base/gconf-2
+	>=dev-db/sqlite-3.5
+	>=dev-libs/libgdata-0.9.1
+	>=gnome-base/gnome-keyring-2.20.1
+	>=dev-libs/libical-0.43
+	>=net-libs/libsoup-2.31.2:2.4
+	>=dev-libs/libxml2-2
+	>=sys-libs/db-4
+	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 )
+	ssl? (
+		>=dev-libs/nspr-4.4
+		>=dev-libs/nss-3.9 )
+	weather? ( >=dev-libs/libgweather-2.90.0:2 )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	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
+	>=sys-devel/gettext-0.17
+	doc? ( >=dev-util/gtk-doc-1.9 )
+	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}
+		$(use_enable gnome-online-accounts goa)
+		$(use_enable ipv6)
+		$(use_with kerberos krb5 ${EPREFIX}/usr)
+		$(use_with ldap openldap)
+		$(use_enable ssl ssl)
+		$(use_enable ssl smime)
+		$(use_enable vala vala-bindings)
+		$(use_enable weather)
+		--enable-calendar
+		--enable-nntp
+		--enable-largefile
+		--with-libdb=${EPREFIX}/usr"
+	if use vala; then
+		G2CONF="${G2CONF}
+			VALAC=$(type -P valac-0.14) VAPIGEN=$(type -P vapigen-0.14)"
+	fi
+}
+
+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
+}
diff --git a/gnome-extra/evolution-data-server/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml
index 9647eabe2a6f..31ddbb5a86e3 100644
--- a/gnome-extra/evolution-data-server/metadata.xml
+++ b/gnome-extra/evolution-data-server/metadata.xml
@@ -3,8 +3,11 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 	<use>
+		<flag name="gnome-online-accounts">Enable using
+			<pkg>net-libs/gnome-online-accounts</pkg> for authorization</flag>
 		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
 			for introspection</flag>
+		<flag name="vala">Build <pkg>dev-lang/vala</pkg> bindings</flag>
 		<flag name="weather">Enable optional weather calendar support</flag>
 	</use>
 </pkgmetadata>