Version bump for gnome-3.6. Drop old.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

6 files changed, 63 insertions, 237 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index d0d83a4c552f..589909619a1f 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.376 2012/11/26 16:19:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.377 2012/12/19 05:52:12 tetromino Exp $
+
+*evolution-3.6.2-r1 (19 Dec 2012)
+
+  19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/evolution-3.2.1-reorder-mx-clutter-gtk.patch,
+  -evolution-3.2.3-r1.ebuild, -files/evolution-3.2.3-g_thread_init.patch,
+  -files/evolution-3.2.3-gmodule-explicit.patch,
+  -files/evolution-3.2.3-gtkhtml-4.4.patch, +evolution-3.6.2-r1.ebuild:
+  Version bump for gnome-3.6. Drop old.
 
   26 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   evolution-3.2.3-r1.ebuild, evolution-3.4.4.ebuild:
diff --git a/mail-client/evolution/evolution-3.2.3-r1.ebuild b/mail-client/evolution/evolution-3.6.2-r1.ebuild
index a3311e64b0a4..166e03eb9f46 100644
--- a/mail-client/evolution/evolution-3.2.3-r1.ebuild
+++ b/mail-client/evolution/evolution-3.6.2-r1.ebuild
@@ -1,130 +1,108 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.2.3-r1.ebuild,v 1.6 2012/11/26 16:19:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.6.2-r1.ebuild,v 1.1 2012/12/19 05:52:12 tetromino Exp $
 
-EAPI=4
-GCONF_DEBUG=no
-GNOME2_LA_PUNT=yes
-PYTHON_DEPEND="python? 2:2.5"
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils flag-o-matic gnome2 python
+inherit autotools eutils flag-o-matic gnome2
 
 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
 HOMEPAGE="http://projects.gnome.org/evolution/"
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-gentoo-patches.tar.xz"
 
 # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
 LICENSE="|| ( LGPL-2 LGPL-3 ) CCPL-Attribution-ShareAlike-3.0 FDL-1.3+ OPENLDAP"
 SLOT="2.0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="clutter connman crypt +gnome-online-accounts gstreamer kerberos ldap map networkmanager python ssl"
+IUSE="crypt +gnome-online-accounts gstreamer kerberos ldap map ssl"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
 # We need a graphical pinentry frontend to be able to ask for the GPG
 # password from inside evolution, bug 160302
 PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
 
-# contacts-map plugin requires libchaimplain and geoclue
 # glade-3 support is for maintainers only per configure.ac
-# mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571)
 # pst is not mature enough and changes API/ABI frequently
-COMMON_DEPEND=">=dev-libs/glib-2.28:2
-	>=x11-libs/cairo-1.9.15[glib]
-	>=x11-libs/gtk+-3.0.2:3
-	>=gnome-base/gnome-desktop-2.91.3:3
+# also supports gstreamer 1.0
+COMMON_DEPEND=">=dev-libs/glib-2.32:2
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gtk+-3.4.0:3
+	>=gnome-base/gnome-desktop-2.91.3:3=
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=dev-libs/libgweather-2.90.0:2
+	>=dev-libs/libgweather-3.5.0:2=
 	>=media-libs/libcanberra-0.25[gtk3]
-	>=x11-libs/libnotify-0.7
-	>=gnome-extra/evolution-data-server-${PV}[gnome-online-accounts?,weather]
-	>=gnome-extra/gtkhtml-4.1.2:4.0
-	>=gnome-base/gconf-2:2
+	>=x11-libs/libnotify-0.7:=
+	>=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather]
+	>=gnome-extra/gtkhtml-4.5.2:4.0
 	dev-libs/atk
+	>=dev-libs/dbus-glib-0.6
 	>=dev-libs/libxml2-2.7.3:2
-	>=net-libs/libsoup-gnome-2.31.2:2.4
+	>=net-libs/libsoup-gnome-2.38.1:2.4
 	>=x11-misc/shared-mime-info-0.22
 	>=x11-themes/gnome-icon-theme-2.30.2.1
-	>=dev-libs/libgdata-0.9.1
+	>=dev-libs/libgdata-0.10:=
+	>=net-libs/webkit-gtk-1.8.0
+	!=net-libs/webkit-gtk-1.9.90
 
 	x11-libs/libSM
 	x11-libs/libICE
 
-	clutter? (
+	map? (
 		>=media-libs/clutter-1.0.0:1.0
 		>=media-libs/clutter-gtk-0.90:1.0
 		x11-libs/mx:1.0 )
-	connman? ( net-misc/connman )
 	crypt? ( || (
 		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
 		=app-crypt/gnupg-1.4* ) )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10:0.10
 		>=media-libs/gst-plugins-base-0.10:0.10 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2 )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
 	map? (
-		>=app-misc/geoclue-0.11.1
-		media-libs/libchamplain:0.10 )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
+		>=app-misc/geoclue-0.12.0
+		>=media-libs/libchamplain-0.12:0.12 )
 	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11 )"
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )"
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	sys-devel/bison
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.9.1
 	app-text/docbook-xml-dtd:4.1.2
-	>=gnome-base/gnome-common-2.12
-	>=dev-util/gtk-doc-am-1.9"
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+
+	app-text/yelp-tools
+	>=gnome-base/gnome-common-2.12"
 # eautoreconf needs:
+#	app-text/yelp-tools
 #	>=gnome-base/gnome-common-2.12
 RDEPEND="${COMMON_DEPEND}
+	app-text/highlight
 	!<gnome-extra/evolution-exchange-2.32"
 
-# contact maps require clutter
-# NM and connman support cannot coexist
-REQUIRED_USE="map? ( clutter )
-	connman? ( !networkmanager )
-	networkmanager? ( !connman )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
 	ELTCONF="--reverse-deps"
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
 	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
 	G2CONF="${G2CONF}
+		--disable-schemas-compile
 		--without-glade-catalog
 		--without-kde-applnk-path
-		--enable-plugins=experimental
 		--disable-image-inline
-		--disable-mono
 		--disable-pst-import
 		--enable-canberra
 		--enable-weather
 		$(use_enable ssl nss)
 		$(use_enable ssl smime)
-		$(use_enable networkmanager nm)
-		$(use_enable connman)
 		$(use_enable gnome-online-accounts goa)
 		$(use_enable gstreamer audio-inline)
 		$(use_enable map contact-maps)
-		$(use_enable python)
-		pythonpath=$(PYTHON -2 -a)
-		$(use_with clutter)
 		$(use_with ldap openldap)
 		$(use_with kerberos krb5 ${EPREFIX}/usr)"
 
-	# dang - I've changed this to do --enable-plugins=experimental.  This will
-	# autodetect new-mail-notify and exchange, but that cannot be helped for the
-	# moment.  They should be changed to depend on a --enable-<foo> like mono
-	# is.  This cleans up a ton of crap from this ebuild.
-
 	# Use NSS/NSPR only if 'ssl' is enabled.
 	if use ssl ; then
 		G2CONF="${G2CONF} --enable-nss=yes"
@@ -135,25 +113,24 @@ src_prepare() {
 			--without-nss-libs
 			--without-nss-includes"
 	fi
+	G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+
+	# Fix paths for Gentoo spamassassin executables
+	epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch"
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=663077, requires eautoreconf
-	epatch "${FILESDIR}"/${PN}-3.2.1-reorder-mx-clutter-gtk.patch
-	# Fix build failure with glib-2.32
-	epatch "${FILESDIR}"/${P}-gmodule-explicit.patch
-	epatch "${FILESDIR}"/${P}-g_thread_init.patch
-	# Fix crashes and linking failure with gtkhtml-4.4
-	epatch "${FILESDIR}"/${P}-gtkhtml-4.4.patch
-
-	# Fix >=sys-devel/automake-1.12 compability wrt #421307
-	sed -i \
-		-e '/PROG_MKDIR_P/s:AM:AC:' \
-		-e 's:mkdir_p:MKDIR_P:' \
-		-e '/AM_INIT_AUTOMAKE/s:-Werror ::' \
-		m4/po.m4 po/Makefile.in.in configure.ac || die
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i data/org.gnome.evolution.spamassassin.gschema.xml.in \
+		-i modules/spamassassin/evolution-spamassassin.c || die "sed failed"
 
+	# Lots of crash and UI fixes, will be in 3.6.3
+	epatch ../patches/*.patch
 	eautoreconf
 
 	gnome2_src_prepare
+
+	# Fix compilation flags crazyness
+	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure || die "CPPFLAGS sed failed"
 }
 
 pkg_postinst() {
diff --git a/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch b/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch
deleted file mode 100644
index 6df8f2bf21b2..000000000000
--- a/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1c036f9a0a922f68fbbf09540a14173465e51a1e Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 31 Oct 2011 02:15:54 -0400
-Subject: [PATCH] reorder mx-1.0 and clutter-gtk-1.0 in PKG_CHECK_MODULES:q
-
-clutter-gtk-1.0 installs headers in /usr/include/clutter-gtk-1.0/clutter-gtk;
-clutter-gtk-0.10 installs headers in /usr/include/clutter-1.0/clutter-gtk
-
-To ensure that clutter-gtk-1.0's headers (and not 0.10's) are used,
--I/usr/include/clutter-gtk-1.0 must come before -I/usr/include/clutter-1.0
-in CLUTTER_CFLAGS. And that means clutter-gtk-1.0 must come before mx-1.0
-in PKG_CHECK_MODULES.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=663077
----
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5c2c5ed..b5c74ee 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -596,7 +596,7 @@ AC_ARG_WITH([clutter],
- AC_MSG_RESULT($with_clutter)
- 
- if test "x$with_clutter" = "xyes"; then
--   PKG_CHECK_MODULES(CLUTTER, [mx-1.0 clutter-gtk-1.0 >= clutter_gtk_minimum_version clutter-1.0 >= 1.0.0])
-+   PKG_CHECK_MODULES(CLUTTER, [clutter-gtk-1.0 >= clutter_gtk_minimum_version mx-1.0 clutter-1.0 >= 1.0.0])
- 
-    AC_DEFINE(HAVE_CLUTTER, 1, [Clutter available])
-    AM_CONDITIONAL(ENABLE_CLUTTER, true)
--- 
-1.7.7.1
-
diff --git a/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch b/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch
deleted file mode 100644
index 915de364caf6..000000000000
--- a/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From ed7f672fa38aa1528e9eca5419176e0f8a9583f6 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 24 Oct 2011 09:42:48 +0200
-Subject: [PATCH] Call g_thread_init() conditionally
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 3.2.3]
----
- capplet/anjal-settings-main.c         |    2 ++
- capplet/settings/mail-guess-servers.c |    2 ++
- plugins/backup-restore/backup.c       |    2 ++
- shell/main.c                          |    2 ++
- 4 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
-index 2bc3268..c810db3 100644
---- a/capplet/anjal-settings-main.c
-+++ b/capplet/anjal-settings-main.c
-@@ -168,8 +168,10 @@ main (gint argc,
- 	if (!gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error))
- 		g_error ("%s", error->message);
- 
-+	#if !GLIB_CHECK_VERSION(2,31,0)
- 	if (!g_thread_get_initialized ())
- 		g_thread_init (NULL);
-+	#endif
- 
- 	e_passwords_init ();
- 	categories_icon_theme_hack ();
-diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c
-index 0b14494..0b15271 100644
---- a/capplet/settings/mail-guess-servers.c
-+++ b/capplet/settings/mail-guess-servers.c
-@@ -343,7 +343,9 @@ main (gint argc,
-       gchar **argv)
- {
- 	EmailProvider *provider;
-+	#if !GLIB_CHECK_VERSION(2,31,0)
- 	g_thread_init (NULL);
-+	#endif
- 	g_type_init ();
- 
- 	provider = g_new0 (EmailProvider, 1);
-diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
-index 370608a..1e0ecb5 100644
---- a/plugins/backup-restore/backup.c
-+++ b/plugins/backup-restore/backup.c
-@@ -691,7 +691,9 @@ main (gint argc,
- 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- 	textdomain (GETTEXT_PACKAGE);
- 
-+	#if !GLIB_CHECK_VERSION(2,31,0)
- 	g_thread_init (NULL);
-+	#endif
- 
- 	gtk_init_with_args (
- 		&argc, &argv, NULL, options, (gchar *) GETTEXT_PACKAGE, &error);
-diff --git a/shell/main.c b/shell/main.c
-index 36e67d1..f0afc5a 100644
---- a/shell/main.c
-+++ b/shell/main.c
-@@ -509,8 +509,10 @@ main (gint argc,
- 	textdomain (GETTEXT_PACKAGE);
- 
- 	g_type_init ();
-+	#if !GLIB_CHECK_VERSION(2,31,0)
- 	if (!g_thread_get_initialized ())
- 		g_thread_init (NULL);
-+	#endif
- 
- 	/* do not require Gtk+ for --force-shutdown */
- 	if (argc == 2 && argv[1] && g_str_equal (argv[1], "--force-shutdown")) {
--- 
-1.7.8.5
-
diff --git a/mail-client/evolution/files/evolution-3.2.3-gmodule-explicit.patch b/mail-client/evolution/files/evolution-3.2.3-gmodule-explicit.patch
deleted file mode 100644
index 74cb319030f3..000000000000
--- a/mail-client/evolution/files/evolution-3.2.3-gmodule-explicit.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d459b0885f427588ff5d45c84065a1534034d966 Mon Sep 17 00:00:00 2001
-From: Christophe Fergeau <teuf@gnome.org>
-Date: Tue, 13 Dec 2011 09:09:05 -0500
-Subject: [PATCH] Bug 665782 - configure.ac: Add gmodule-2.0 to GNOME_PLATFORM
-
----
- configure.ac |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 128bd1f..047ffee 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -242,6 +242,7 @@ dnl Check for base dependencies early.
- dnl **********************************
- PKG_CHECK_MODULES([GNOME_PLATFORM],
- 	[gio-2.0 >= glib_minimum_version
-+	 gmodule-2.0 >= glib_minimum_version
- 	 cairo-gobject
- 	 gtk+-3.0 >= gtk_minimum_version
- 	 gail-3.0 >= gtk_minimum_version
--- 
-1.7.8.5
-
diff --git a/mail-client/evolution/files/evolution-3.2.3-gtkhtml-4.4.patch b/mail-client/evolution/files/evolution-3.2.3-gtkhtml-4.4.patch
deleted file mode 100644
index 24b6cf98ba88..000000000000
--- a/mail-client/evolution/files/evolution-3.2.3-gtkhtml-4.4.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 739cec4c2bfb1a89fd512315f573ef2313040c31 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 20 Apr 2012 01:39:35 -0400
-Subject: [PATCH] gtkhtml_editor_file_chooser_dialog_run() was removed in
- gtkhtml-4.4
-
-It is no longer needed with gtk+-3.2.
----
- composer/e-composer-actions.c |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
-index 163270f..cd50f7a 100644
---- a/composer/e-composer-actions.c
-+++ b/composer/e-composer-actions.c
-@@ -218,8 +218,7 @@ action_save_as_cb (GtkAction *action,
- 	gtk_window_set_icon_name (
- 		GTK_WINDOW (dialog), "mail-message-new");
- 
--	response = gtkhtml_editor_file_chooser_dialog_run (
--		GTKHTML_EDITOR (composer), dialog);
-+	response = gtk_dialog_run (GTK_DIALOG (dialog));
- 
- 	if (response != GTK_RESPONSE_OK)
- 		goto exit;
--- 
-1.7.8.5
-