Version bump for gnome-3.4. Drop old.

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

3 files changed, 10 insertions, 72 deletions

diff --git a/gnome-extra/evolution-groupwise/ChangeLog b/gnome-extra/evolution-groupwise/ChangeLog
index 11ceca719d1b..805216f60d94 100644
--- a/gnome-extra/evolution-groupwise/ChangeLog
+++ b/gnome-extra/evolution-groupwise/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/evolution-groupwise
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-groupwise/ChangeLog,v 1.3 2012/05/05 06:25:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-groupwise/ChangeLog,v 1.4 2012/05/07 05:58:40 tetromino Exp $
+
+*evolution-groupwise-3.4.0 (07 May 2012)
+
+  07 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -evolution-groupwise-3.2.1.ebuild,
+  -files/evolution-groupwise-3.2.1-timezone.patch,
+  +evolution-groupwise-3.4.0.ebuild:
+  Version bump for gnome-3.4. Drop old.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org>
   evolution-groupwise-3.2.1.ebuild, evolution-groupwise-3.2.3.ebuild:
diff --git a/gnome-extra/evolution-groupwise/evolution-groupwise-3.2.1.ebuild b/gnome-extra/evolution-groupwise/evolution-groupwise-3.4.0.ebuild
index b0d58626b32a..1fce003ca860 100644
--- a/gnome-extra/evolution-groupwise/evolution-groupwise-3.2.1.ebuild
+++ b/gnome-extra/evolution-groupwise/evolution-groupwise-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-groupwise/evolution-groupwise-3.2.1.ebuild,v 1.2 2012/05/05 06:25:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-groupwise/evolution-groupwise-3.4.0.ebuild,v 1.1 2012/05/07 05:58:40 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -39,17 +39,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Upstream patch to use correct timezone for new events; in next release
-	epatch "${FILESDIR}/${P}-timezone.patch"
-
 	# /usr/include/db.h is always db-1 on FreeBSD
 	# so include the right dir in CPPFLAGS
 	append-cppflags "-I$(db_includedir)"
 
 	gnome2_src_prepare
-
-	# FIXME: Fix compilation flags crazyness
-	# Touch configure.ac if eautoreconf
-	sed -e 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "sed 1 failed"
 }
diff --git a/gnome-extra/evolution-groupwise/files/evolution-groupwise-3.2.1-timezone.patch b/gnome-extra/evolution-groupwise/files/evolution-groupwise-3.2.1-timezone.patch
deleted file mode 100644
index 83e55da6d795..000000000000
--- a/gnome-extra/evolution-groupwise/files/evolution-groupwise-3.2.1-timezone.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From efd0f9f151bf8ef1ff0108100c63750ea0d1e6d5 Mon Sep 17 00:00:00 2001
-From: Vibha Yadav <yvibha@suse.com>
-Date: Mon, 21 Nov 2011 16:57:23 +0530
-Subject: [PATCH] Bug #651465 - event gets shifted by 5:30 hrs
-
-Don't set the zone of event to utc by default.
----
- src/calendar/e-cal-backend-groupwise-utils.c |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/calendar/e-cal-backend-groupwise-utils.c b/src/calendar/e-cal-backend-groupwise-utils.c
-index d671db5..5640ec4 100644
---- a/src/calendar/e-cal-backend-groupwise-utils.c
-+++ b/src/calendar/e-cal-backend-groupwise-utils.c
-@@ -590,7 +590,7 @@ set_rrule_from_comp (ECalComponent *comp,
- 				ECalComponentDateTime *dt = (ECalComponentDateTime *) l->data;
- 				if (dt->value) {
- 					if (!icaltime_get_timezone (*(dt->value)))
--						icaltime_set_timezone (dt->value, default_zone ? default_zone : utc);
-+						icaltime_set_timezone (dt->value, icaltimezone_get_builtin_timezone_from_tzid(dt->tzid));
- 					itt_utc = icaltime_convert_to_zone (*dt->value, utc);
- 					item_exdate_list = g_slist_append (item_exdate_list, icaltime_as_ical_string_r (itt_utc));
- 				}
-@@ -661,7 +661,7 @@ set_properties_from_cal_component (EGwItem *item,
- 		e_cal_component_get_dtend (comp, &dt);
- 		if (dt.value) {
- 			if (!icaltime_get_timezone (*dt.value))
--				icaltime_set_timezone (dt.value, default_zone ? default_zone : utc);
-+				icaltime_set_timezone (dt.value, icaltimezone_get_builtin_timezone_from_tzid(dt.tzid));
- 			itt_utc = icaltime_convert_to_zone (*dt.value, utc);
- 			value = icaltime_as_ical_string_r (itt_utc);
- 			e_gw_item_set_end_date (item, value);
-@@ -678,7 +678,7 @@ set_properties_from_cal_component (EGwItem *item,
- 		e_cal_component_get_due (comp, &dt);
- 		if (dt.value) {
- 			if (!icaltime_get_timezone (*dt.value))
--				icaltime_set_timezone (dt.value, default_zone);
-+				icaltime_set_timezone (dt.value, icaltimezone_get_builtin_timezone_from_tzid(dt.tzid));
- 			itt_utc = icaltime_convert_to_zone (*dt.value, utc);
- 			value = icaltime_as_ical_string_r (itt_utc);
- 			e_gw_item_set_due_date (item,  value);
-@@ -754,7 +754,7 @@ set_properties_from_cal_component (EGwItem *item,
- 	e_cal_component_get_dtstart (comp, &dt);
- 	if (dt.value) {
- 		if (!icaltime_get_timezone (*dt.value))
--			icaltime_set_timezone (dt.value, default_zone);
-+			icaltime_set_timezone (dt.value, icaltimezone_get_builtin_timezone_from_tzid(dt.tzid));
- 		itt_utc = icaltime_convert_to_zone (*dt.value, utc);
- 		value = icaltime_as_ical_string_r (itt_utc);
- 		e_gw_item_set_start_date (item, value);
-@@ -777,7 +777,7 @@ set_properties_from_cal_component (EGwItem *item,
- 	e_cal_component_get_created (comp, &dt.value);
- 	if (dt.value) {
- 		if (!icaltime_get_timezone (*dt.value))
--			icaltime_set_timezone (dt.value, default_zone);
-+			icaltime_set_timezone (dt.value, icaltimezone_get_builtin_timezone_from_tzid(dt.tzid));
- 		itt_utc = icaltime_convert_to_zone (*dt.value, utc);
- 		value = icaltime_as_ical_string_r (itt_utc);
- 		e_gw_item_set_creation_date (item, value);
--- 
-1.7.8
-