Version bump for gnome-3.6. Drop old.

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

4 files changed, 112 insertions, 39 deletions

diff --git a/gnome-extra/evolution-ews/ChangeLog b/gnome-extra/evolution-ews/ChangeLog
index f34c78c378cd..38402cf9bc49 100644
--- a/gnome-extra/evolution-ews/ChangeLog
+++ b/gnome-extra/evolution-ews/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-extra/evolution-ews
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-ews/ChangeLog,v 1.3 2012/08/13 04:59:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-ews/ChangeLog,v 1.4 2012/12/19 06:30:27 tetromino Exp $
+
+  19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -evolution-ews-3.4.3.ebuild, +evolution-ews-3.6.1.ebuild,
+  +files/evolution-ews-3.6.1-libm.patch:
+  Version bump for gnome-3.6. Drop old.
+
+*evolution-ews-3.6.1 (19 Dec 2012)
+
+  19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -evolution-ews-3.4.3.ebuild, +evolution-ews-3.6.1.ebuild:
+  Version bump for gnome-3.6. Drop old.
 
 *evolution-ews-3.4.4 (13 Aug 2012)
 
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.4.3.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.4.3.ebuild
deleted file mode 100644
index 7aa9e2717f7a..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.4.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-ews/evolution-ews-3.4.3.ebuild,v 1.1 2012/06/24 08:44:48 nirbheek Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit db-use eutils flag-o-matic gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="" # doc
-
-RDEPEND=">=mail-client/evolution-${PV}:2.0
-	>=gnome-extra/evolution-data-server-${PV}
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2:2
-	>=net-libs/libsoup-2.30:2.4
-	>=x11-libs/gtk+-2.90.4:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-"
-# For now, this package has no gtk-doc documentation to build
-#	doc? ( >=dev-util/gtk-doc-1.9 )
-
-RESTRICT="test" # tests require connecting to an Exchange server
-
-pkg_setup() {
-	DOCS="ChangeLog NEWS README" # AUTHORS is empty
-}
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.6.1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.6.1.ebuild
new file mode 100644
index 000000000000..cd672e310631
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.6.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-ews/evolution-ews-3.6.1.ebuild,v 1.1 2012/12/19 06:30:27 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools db-use eutils flag-o-matic gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="kerberos"
+
+RDEPEND="
+	dev-db/sqlite:3=
+	dev-libs/libical:=
+	>=mail-client/evolution-${PV}:2.0[kerberos?]
+	>=gnome-extra/evolution-data-server-${PV}:=[kerberos?]
+	>=dev-libs/glib-2.28:2
+	>=dev-libs/libxml2-2
+	>=net-libs/libsoup-2.30:2.4
+	>=x11-libs/gtk+-3:3
+	kerberos? ( virtual/krb5:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+"
+
+# Requires connection to an Exchange server
+RESTRICT="test"
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=690474
+	epatch "${FILESDIR}/${PN}-3.6.1-libm.patch"
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	G2CONF="${G2CONF} $(use_with kerberos krb5)"
+	gnome2_src_configure
+}
diff --git a/gnome-extra/evolution-ews/files/evolution-ews-3.6.1-libm.patch b/gnome-extra/evolution-ews/files/evolution-ews-3.6.1-libm.patch
new file mode 100644
index 000000000000..29b4977cd5e9
--- /dev/null
+++ b/gnome-extra/evolution-ews/files/evolution-ews-3.6.1-libm.patch
@@ -0,0 +1,52 @@
+From 616cc1e349f0cdb386b6e18e3eebf507d12d8b23 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 19 Dec 2012 01:19:25 -0500
+Subject: [PATCH] Bug #690474 - Explicitly link to libm
+
+---
+ configure.ac                    | 3 +++
+ src/addressbook/Makefile.am     | 1 +
+ src/addressbook/lzx/Makefile.am | 1 +
+ 3 files changed, 5 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index f5e9cd5..f821438 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -71,6 +71,9 @@ AM_CONDITIONAL(OS_WIN32, [test "x$os_win32" = "xyes"])
+ AC_SUBST(NO_UNDEFINED)
+ AC_SUBST(SOCKET_LIBS)
+ 
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
+ dnl ***********************
+ dnl Compiler Warning Flags
+ dnl ***********************
+diff --git a/src/addressbook/Makefile.am b/src/addressbook/Makefile.am
+index 261fb5e..6ba6d83 100644
+--- a/src/addressbook/Makefile.am
++++ b/src/addressbook/Makefile.am
+@@ -42,6 +42,7 @@ libebookbackendews_la_LIBADD = \
+ 	$(EVOLUTION_ADDRESSBOOK_LIBS) \
+ 	$(SQLITE3_LIBS) \
+ 	$(SOUP_LIBS) \
++	$(LIBM) \
+ 	$(NULL)
+ 
+ libebookbackendews_la_LDFLAGS = \
+diff --git a/src/addressbook/lzx/Makefile.am b/src/addressbook/lzx/Makefile.am
+index d157e94..8b0871a 100644
+--- a/src/addressbook/lzx/Makefile.am
++++ b/src/addressbook/lzx/Makefile.am
+@@ -20,6 +20,7 @@ liblzx_la_LDFLAGS = $(NO_UNDEFINED)
+ 
+ liblzx_la_LIBADD = \
+ 	$(GNOME_PLATFORM_LIBS) \
++	$(LIBM) \
+ 	$(NULL)
+ 
+ -include $(top_srcdir)/git.mk
+-- 
+1.8.0.2
+