Version bump for gnome-3.6. Drop old.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 123 insertions, 49 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/Manifest b/gnome-extra/evolution-ews/Manifest
index 9475d988de95..5dd4ac9fb52c 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST evolution-ews-3.4.3.tar.xz 429728 SHA256 3239fcd0f66ab416ceff66b829e3e287599320fcd747f4e2d68a9b094469615d SHA512 405073e680f9962ad7029a0cab738c615c811e9dec4b88aba37ccc675d55fafcdf709c7866ab0e5d84577480e409dcf53e1ebba962a5c58c1d8ffeb30fca9b1e WHIRLPOOL 3d52bad57b1f84a51cb18daea0a2ce8722ed602813b0c8829894e5f0024de47b5e90e3b4fab7b49d0d7db47785f8102481b0800b4b2e27e78af60d2759aaa1b7
+AUX evolution-ews-3.6.1-libm.patch 1431 SHA256 10fc2158597fbf111060315a4daa87741ebd8772bd93b1271e2fc0aee2895e5d SHA512 a7fcc0420c11d153ccdf85bac669e80a79f0e0cdb7906caf1b33a792837ae8db788208d6f9b48a463eb454a6c70472d58679b22f4559ad577927e238e4ae304a WHIRLPOOL 5065ee45ab45341b66b9b8720210e5bab00e49b76ab6f9950281cc6be7f18b27d504f9fa024910f17e0124dc3e489108e97e858ec94a5448e2400fd0053f53a5
 DIST evolution-ews-3.4.4.tar.xz 432440 SHA256 b5e2e0e0575dfb92e5e9db95d8e2316cb509ae931b8e7e5945b6d5bef4e6790d SHA512 a3e6537abc26d76e4dfd9c4e9eb73a599dc0c0f470282e0eb9089a2cae0bc3214613b1871f984082e7bb0b7ea2a3ff36e3618d4774ecf4288d45bf4520c53f6d WHIRLPOOL 1b792c6380ca6250938f6d15f973f2fbb40a1ef87ae5769ded7b2440b7a13eecacc69ae5916cf6f73ed150bd009414de5e09bb897037de482bee09dd70dae160
-EBUILD evolution-ews-3.4.3.ebuild 1032 SHA256 e458b502513d7f897efd9051dec6ab7b1267d92d989bcba99026199abc3d3aaf SHA512 545e93e61ffe3b89e4a415b6cf2d722f000565994f27cf98972b2ff44752557d4dd1abc2e66b57e0d6fee7eeab1a8768afb5d648e09ae26c9b7def52faaa0e9a WHIRLPOOL 1f080ec64516ee6684a9fc6d01f696eacdac8584344fdc835488ea6504d5b7ab604b8d128285d3c3ff020fa2b7ef443df6c4e7b6fc035c1c652c14200fd5a35d
+DIST evolution-ews-3.6.1.tar.xz 498324 SHA256 77931879da57a0721fb3bdc383eab961bf1f20040f309b7be329f19488e5f836 SHA512 cd948b04bf040b40485edc6557d8c6a9114ebb0c82de05ad5ed1ea7ed52c2f35eedf262cb5812b5e16d9971ef0f27db8e74de2fb10f3f16cbc7c1acb081e570a WHIRLPOOL a8f55a3edb69cb915297bed71c57b9dede35376a1438dbb658cf20ff191f8cbf60b947f074a9313ca8d144efdb8228af8f7f38c1bf5fc5151b031481784d7364
 EBUILD evolution-ews-3.4.4.ebuild 1033 SHA256 4b500f638d9cf1cb8ec82aa64e9dd960fe155b958310b09d09e947673163a0b0 SHA512 dbaeb7f8d961b79f8146263854f4cdf1b575e3a7b30be2871e6ce47b20f5e6cf7877d92899dbf452d4ea4ec4681f2a18693c5cb0c14d9e32412396a64e3d0f65 WHIRLPOOL c5381414703253185d8d75c5da58548c2c24e51997d468d0e0cdb913e5649bb6bff361751869e91831942eac8e2721b4f14ffe43db1d02d4413f13b7a6ab2d7d
-MISC ChangeLog 797 SHA256 aaf88d926f6040f887096eb2e943ce3e3cefd703ed018b8e4c944328ab6a7b9b SHA512 fd0e37f7d9eb67df44e6f4a7641d12b084256313793326406905c9ddbab49d75cd521787fa61f2cbf23d4dc44e6ac27f2287fe7a08abdbc4bda63704e18ebe47 WHIRLPOOL 227a995c70f833d9be69bc6913664c99ac4623e821086af1485bbecceba4dfcc4f157c961778b7478037743ef0474f7f0ace48f2dc8c9665eb91724ae1033791
+EBUILD evolution-ews-3.6.1.ebuild 1201 SHA256 fa5522007b44b27937dec462760ca60dac1ae0a88c67b5cb440445da4b7daeb3 SHA512 98b328ccae71f6ac372b4dda5cf6ece799321876b50ae8b10ba614375e84fc1d3a7c3601629c04035deeaea8741180b61ed766283378846decdc43fd05edcfac WHIRLPOOL 4d150bae7e6acf45caf6f03c7497b453cb24d2a36197008c20f85749ac6ea60f0a665bd1f8f4fec16342b3d705e5972e07026d55e522f874fbe5f2046d102196
+MISC ChangeLog 1194 SHA256 279d2df1e2eb4ecc1c846266aaa53da200bf4999a9840d7ba48fc25bc5076d18 SHA512 60c3c96eb54d69bff5aec927d41924af81fef049c78e47599854522d2432c654539b126f03160558135b2d02c8f5dec5fbf285a7c4724daf0c8bf8756ea353e3 WHIRLPOOL ddd10932b272ca0f05cb7866212ae88e5ecdf3618a18dea8759cff517e4d585b8bee09ec0c87667be3c76c9f6177b1ce51fc7d960028dbe8e9536bdff01b1f03
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQKInOAAoJEJ0WA1zPCt1hlpgH/RcSkNv2GRPMFfHsDDuhyYOq
-0nhQ7A3aqVOuQpoqV8jengjlU49Xy74RrbByaDZHaCX+Llz+dMUu2sD7ItJ8k98t
-ftz0NYkaHWEyacwOkrdr518/XWf/qT+lq8EexJVI0Kb0hDRD2UH7+sVuZMUo2BmB
-8sf1MqhF6CoLkhm9Nm1oPfhCLjphvvIgfA9c99z2N6vsNFCwOL1dp229IABpieiZ
-qB9EHXQjrYYtXcFBarOjq6oHqRKidC3bI7lRxL3JpXXgUXypvxQ+rXwA2kf3hPkd
-n5vj2wql7LWlSOQQXfhaEJ2iBFVNGeX3HK+8HZbCblI7kAM5O7heRDq+EaNzZR4=
-=pWdA
+iQEcBAEBCAAGBQJQ0V8FAAoJEJ0WA1zPCt1hE4YIAKVhC3XEI93k4+ZE3whhnvz/
+4jQPqUUYWrZ/GsPo36X8Tg1k12hIkXnlxgZrkEJtf634hHCrIsVLyBKJWFQSWfec
+lXhcL/MgyZW8W9vyyjJ8QKemDvfFf9rpCiLbBYvUvYwhn51+0tXOBlQ7at15VxDp
+w/vQ3W/pd5qQubr+sygpiZTkj+2+A19IrtkNxf1efI5vbZCbaKDMa6ipH0zTQ71k
+OWSdDSKW7r/GIfpkomaSnmNsafqyfWNZTptRB7mmzl6wDoeI1uOMR+l0PhaXmr95
+ztryPLvZ6aUoeK8G/HhhBzxg/Y0I0fuf0q7igpOh9Y01IDjwJhV49nI0q92flSU=
+=tNll
 -----END PGP SIGNATURE-----
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
+