Make calendar checks work, enable weather USE flag by default to prevent people using evolution (common on Gnome systems) to have to change package.use.

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

3 files changed, 25 insertions, 12 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index b35404f3764f..0d3372219bbb 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.278 2010/11/14 22:39:04 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.279 2010/11/15 10:09:06 pacho Exp $
+
+  15 Nov 2010; Pacho Ramos <pacho@gentoo.org>
+  evolution-data-server-2.32.0.ebuild:
+  Make calendar checks work, enable weather USE flag by default to prevent
+  people using evolution (common on Gnome systems) to have to change
+  package.use.
 
 *evolution-data-server-2.32.0 (14 Nov 2010)
 
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 7b1edd0eca63..69ace1dbc732 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
 AUX evolution-data-server-1.8.0-camel-rewind.patch 499 RMD160 90b94f0b20a52a4fdf476bcfa5fe0ad2a064d488 SHA1 db7d42df20ab50d81835b9c1b9ebed84d1e0d8cb SHA256 1323e9dc957e3cc02fd1628fa21d448c8c985028e5b57d03596b6bde9ad66e0e
@@ -11,6 +14,13 @@ DIST evolution-data-server-2.30.3.tar.bz2 4652416 RMD160 2d4dc2fd6b8dfdc01304240
 DIST evolution-data-server-2.32.0.tar.bz2 4269713 RMD160 69460540e387c408f883786d3f65255a8ebfa4b1 SHA1 e1d68efeed439824029021a621d0afe780897c95 SHA256 31ea1097a7bb1190b4aa51d16ec27b24207cf6421314c9c1320196752f02c0de
 EBUILD evolution-data-server-2.30.2.ebuild 3527 RMD160 f6d1c672c6c433cce4abac53b65b29a600074552 SHA1 9708a057f3d0d28a5472dd4222a240e96e45eab1 SHA256 928976c8a4a19138bb2badd3b1119158b726f27c246cc92c22adf3c8e783110b
 EBUILD evolution-data-server-2.30.3.ebuild 3053 RMD160 90105c3a13597be3006341e62966fcd03f330f89 SHA1 716fef69b9700ee0060b525fbc6a2a6e065739c3 SHA256 62914b7f11f8c599c1b75a68a36fdaa7c96d41040648e4375c1fd73d80d54248
-EBUILD evolution-data-server-2.32.0.ebuild 4122 RMD160 770451385b8697dad94606adb66713e2ab05668b SHA1 2608ae92b69f04ce7439f0d771758486cb687d9e SHA256 fd10b42defaf8e462c4f51af414fb42e80cfffbf230969fed61131866b9ebc58
-MISC ChangeLog 53785 RMD160 4de3995f3d7585f289baa5cbed3c9710290ced45 SHA1 edcb44acc84de6c217e9a12fb44cb3c9dbd11dff SHA256 b7ed9e3dd23fa24a05faaa6888d194b08e7fb81e6ecedba465a3c38fde1e2b5e
+EBUILD evolution-data-server-2.32.0.ebuild 4047 RMD160 4d9ddb87b2ff70fc1df9602231c5877bce7f96f7 SHA1 27fbcad0611746325248858b517dd63540957914 SHA256 8018e6b75fb50a232bb0c8794e1351baf8debf335f1c3e1574ddd2d0cbdf3e3c
+MISC ChangeLog 54032 RMD160 fbe7f7f98e17bb450fcb3fcdf59ea3f6d679d1d3 SHA1 e0abec9a7228995211d1fb3a8934f1d3e4ea4c86 SHA256 66dd9d6eae3c79da88e89f0ef259a9a223522ad9df549bf66d7b0f00b7c0a3b9
 MISC metadata.xml 242 RMD160 930a0247c2ceed0dfad103c8e18493d54fa77382 SHA1 d332c62f5dff3da42709228dfcd0131d81a7048c SHA256 cea2d969f6f71bb465d787a64966e9bafd3706b2d2f8fe3b81cb85c409b74104
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzhBsgACgkQCaWpQKGI+9SJzQCcDB9a4d4oMBap0FOwnWFVsN2U
+JxUAn0d6bO5G8JYxWR42RFgvTurS39ac
+=ZD4i
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.0.ebuild
index eae697140531..d12293bc8ea0 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.0.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.0.ebuild,v 1.1 2010/11/14 22:39:04 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.0.ebuild,v 1.2 2010/11/15 10:09:06 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ 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"
+IUSE="doc ipv6 kerberos gnome-keyring ldap ssl +weather"
 
 RDEPEND=">=dev-libs/glib-2.25.12:2
 	>=x11-libs/gtk+-2.20:2
@@ -38,9 +38,9 @@ RDEPEND=">=dev-libs/glib-2.25.12: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
-	sys-devel/bison
 	doc? ( >=dev-util/gtk-doc-1.9 )"
 # eautoreconf needs:
 #	>=gnome-base/gnome-common-2
@@ -67,7 +67,7 @@ src_prepare() {
 	# Adjust to gentoo's /etc/service
 	epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch"
 
-	# Rewind in camel-disco-diary to fix a crash
+	# Rewind in camel-disco-diary to fix a crash, upstream bug #632376
 	epatch "${FILESDIR}/${PN}-2.31-camel-rewind.patch"
 
 	# GNOME bug 611353 (skips failing test atm)
@@ -81,11 +81,6 @@ src_prepare() {
 		-i addressbook/tests/Makefile.{am,in} \
 		|| die "failing test sed 1 failed"
 
-	# Failing calendar checks ?
-	sed -e 's/\(SUBDIRS =.*\)ecal/\1/' \
-		-i calendar/tests/Makefile.{am,in} \
-		|| die "failing test sed 2 failed"
-
 	# /usr/include/db.h is always db-1 on FreeBSD
 	# so include the right dir in CPPFLAGS
 	append-cppflags "-I$(db_includedir)"
@@ -114,6 +109,8 @@ 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."
 }