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, 89 insertions, 36 deletions

diff --git a/gnome-extra/evolution-kolab/ChangeLog b/gnome-extra/evolution-kolab/ChangeLog
index 4567bb20a41c..5a6eba1c3112 100644
--- a/gnome-extra/evolution-kolab/ChangeLog
+++ b/gnome-extra/evolution-kolab/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/evolution-kolab
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-kolab/ChangeLog,v 1.2 2012/08/14 01:25:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-kolab/ChangeLog,v 1.3 2012/12/19 07:01:35 tetromino Exp $
+
+*evolution-kolab-3.6.2 (19 Dec 2012)
+
+  19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -evolution-kolab-3.4.3.ebuild, evolution-kolab-3.4.4.ebuild,
+  +files/evolution-kolab-3.5.5-no-tests.patch, +evolution-kolab-3.6.2.ebuild:
+  Version bump for gnome-3.6. Drop old.
 
 *evolution-kolab-3.4.4 (14 Aug 2012)
 
diff --git a/gnome-extra/evolution-kolab/Manifest b/gnome-extra/evolution-kolab/Manifest
index fefa0c06edda..7958bc510b56 100644
--- a/gnome-extra/evolution-kolab/Manifest
+++ b/gnome-extra/evolution-kolab/Manifest
@@ -4,20 +4,21 @@ Hash: SHA256
 AUX evolution-kolab-3.4.3-no-hello-world.patch 627 SHA256 a2f7140e0d24d051f56d7d251d9be98f2828c2b48ba32d098d0031de067e2307 SHA512 cee1a46864f666ec909b54711619bee579740667829edcd55ad3d2fc93be2d7a79f05e99a2fc6b29b6a67c98837d1fd4d803cdf978c8dca0207e2e0138fcb368 WHIRLPOOL f65a60c5271cabb0b0a041adef420482a50f5a9e177b4b1662ff7ad8b76e6985f8ad391ad3125330c2ba0cade4adb6274c666fbb3e6288a17b96214a53f80a7e
 AUX evolution-kolab-3.4.3-no-tests.patch 1382 SHA256 31c8cc55d1da86554250f4489da30f0f304da07341cabd42010504f1b46f4410 SHA512 529ecc1978a9851901bcaecd12e95b8f16aa1e916d6bd5ae177fb17469e43937738deb37b822b39302c08d492d7603b0a8e8e7e60d1652967947f8c40efd86c1 WHIRLPOOL b271e65a6d8f84172c2b5f0a80535154fa91533cb629b1bc70019cc4dd8a703549a75650fa63d912875b7370d7903c8e7686d6ac3171157973df6a442a881315
 AUX evolution-kolab-3.4.4-no-tests.patch 1446 SHA256 ab56c2d03f76c6744fb02483ec7b9cac37a2569b1ef135bf0c68a5217402a13e SHA512 5fb2e7fcfe7afe567c3cad7b0a8c91ab36fe18caf864a7b446fe30c5c37d0223145254b2e6574e77a659cf26fa1825b974652a7433f78472247f5124afb7cc54 WHIRLPOOL 1bd385947357bbdb3b7c56a2e82922ef54ae2d7900d48c6642cf1aedd5cb7e61c3f7d9d5207f73a8b00d260247864455836cd8ec385a4165e03e0e62d661311b
-DIST evolution-kolab-3.4.3.tar.xz 733172 SHA256 dcbc5099be755fe32e6754f30a01efa5144337ccea1b71c3f3ab9b393fed0698 SHA512 06369178e9422c6b84f36abd8ad69ebef02d3900caafd21abe5d389f5b319847236fd92a7f58532b922e6ce7e2bcc95ef02e9b660259988d00be6646829a7de6 WHIRLPOOL 72e26af25085af8e352af1d999b91eb3044fc973a592f47cfb12942dee9ac70b9b4e2465cc3cbcbb04a7541510d0c3a0f493389feb3b56afe3d218ed4ad4fef0
+AUX evolution-kolab-3.5.5-no-tests.patch 1447 SHA256 5154882bf1ad09398d4f9f3f75393d4b6bf000e57389bc783f32d1510bc1e8e9 SHA512 0c2dbc75e89c3f33bc4671b8c68d8eca3a4da1d6c531865c684f8c638de4659cb47ff97527fc9a052696240d1359db656fb1f8c8aab0f3a465d47cfff8d339ed WHIRLPOOL 1d8a451f27bbbea90c50466015b4f1b55eef1517b22140fa31cadfb5a80370a5201e0a8750a8b1c9aeb881c4115fa782b6bbe15c15dfbb121546043997299742
 DIST evolution-kolab-3.4.4.tar.xz 716436 SHA256 96ee29d99725dc03e0766ac5cfee6466f9067ca5d6ebb5284ce5c5eeca594c9a SHA512 79578b993dedbb28da767e43846715dddf7f8c10667901fb2e9c409b0961b1beff6dab3b14c285bc328b1fe67aa2dbbdc6cd231870502ee36e6a83ad572b800c WHIRLPOOL 542816776bbc0058fb72da6180f6c98d2b03f1b5b6de4b74374ceafd1b638e53a3ef59d93480e506eec5b69580eac7cf5bf298f15411532edbb241d335d0d07a
-EBUILD evolution-kolab-3.4.3.ebuild 1691 SHA256 9d80135910241bbd3bec2ff925643af55044a77c70750812af390c1ccd3d2239 SHA512 4f39cfed58d516cfd2443a9515ef013714aee54f9ace441ed5c7ec17a6121212ad04f87b35d078aba3ae3e14a160e07c0e8150e7dac7712f95d9a276c6edf555 WHIRLPOOL ca52832c63720c990ca9a5b57ddab61aa8ed22febcefd3a2b2e6b84ec6d927f65f145c6ffc1f77273c0ca087ac111a39f0cff0989720662642f08b3419bc414a
-EBUILD evolution-kolab-3.4.4.ebuild 1698 SHA256 14917be10d426874688390f56db003327a5462bf2dd9a4e47b8d8b78d565dfeb SHA512 3f6b8d5986f639366ae9159a9cdec7cc69c4b7fc6baf1f098ea05cd8d53651c48f54b5403a4e13b96e81901e73822bc110e487c6354e53ace4e00ef50a72d738 WHIRLPOOL 6e97aa1508a7a6c2671d7fdc28de39ac59aeab0e7d6fca99a1bc0846476b598c9ba3c4e75311954ee1a908c2caa7f6d6336e2b1bb364bf95c6ecb551f5dc24a1
-MISC ChangeLog 760 SHA256 1ae63b3b03b1b12cef107bfddebab6041a8525cab684b3e2760631d97be22373 SHA512 6f9c3ee9cbe81a45cda290f7e0d55d604b7d09f91325130f8a7229b4050506c0332d51040e44ea9a4172da88a78255564489e1ef362ff6f6537876e79c9b995f WHIRLPOOL c5e2c00bcbbdb83adf205585fdd7f8e86326309d2d44b1484f954049a17e0992a322c51a2a04941f4ea2f6c5101cdae5f64809d5b01fe9279f8734cd4e110058
+DIST evolution-kolab-3.6.2.tar.xz 659832 SHA256 704df45dd5f30bf32e47b5b5a0bc09b2e1b6c7601ed83a3a7e1b1937ae62f0b7 SHA512 2d70a5eb3ad8815a8833306a308f5cf969c802ea837bfa5242da41944cdea09ddf4240357c5bceb514741a643937183c16f98c78c12e5579323004b1f47c7bef WHIRLPOOL bf94c3918ef42b4ec4914d1aafab34be815d6b74b53a60d227402a4f0775116dd7a2c98db28beace10404862a727854f77f460c71f25c72b0ec7c906d77d4c69
+EBUILD evolution-kolab-3.4.4.ebuild 1604 SHA256 2cf8ed0c30fe57d06635476827adcaf508cba4a66aaeec3108efc517294d37f7 SHA512 66ef3553ecf536327048b01637ecff734dac435832ba22c8752cd4f7d23bf39be90e4016167edceb560fb53a12edbb43ad2d1ad0d0e5abfb4f1631fa3fd7b426 WHIRLPOOL 8fd37eea78e33c5cd622092474baba978e8660159a8537aa9f38eb19b5da680bd6f63c22b782220f8a24926489c88ae8adcfea86457a887286f2c9d8699e581d
+EBUILD evolution-kolab-3.6.2.ebuild 1595 SHA256 5c10d74d57d31d5e22a3415766b2ca62e28898490a14eaaac2ce9d8600c249f0 SHA512 38d74f1cd29e50cdb64cb8c8339641c33ce3799de51c406291ced546f4d7463e1e7fb3ea1569433eb8aa3f80157dcfb7721952c7e5662841a4091cf7b3a6780f WHIRLPOOL 136925674cd9b8231ac1dbd4a5c1fe32685a7551ac607673004a49e88fb734acf358ce5babadec3af7ef05b6cf1ed19c212c5a3ff0d06994e157c8b70642f7f0
+MISC ChangeLog 1039 SHA256 ad4b971cb0bcb5da11cd80fa175638a59b846e103142083805aaf8a747ac4e8a SHA512 e55d011055085a6227b008c8c057996392515848ec7f228ea362247af696f5731aee0b0081794f1f03ca5ad9ff7e7057705ffd642616b17efd5ded7a79383022 WHIRLPOOL 6fd178c6725818ffef6e886d9580237b1da6f1a9357fec47827c1f037ad0102ca3edf402274a56fa32ba40e886d092d5fa00d3b4999985db4a89870f1ccc6a47
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQKakgAAoJEJ0WA1zPCt1hfi8IAKktg+f4c/6vWOYx2xJ2Nrx5
-fbPVegYkPsLheT3NXgP/1Amo9S2jjzVp2bVuA2+B+LGqiISgf1H+8SHLlxS42jdB
-6RzDgTvXk9E25Kk5H9wbuWHV+uafUc+qVyLzEp0Lb4vpxpys8D7trRMBKXy2TNOo
-o7NUysuxRcDhXpNpq+tE1gjd+wLeZGelMKBMkKpB7Ukr9lSbzu1/Idnl1wzp8DOM
-0iUsifmU+xBbODKVgWWlLBlCwqy2d9wzz3w+sEKSYAjEU2vO0VOHfweFj5foXxuN
-S0qm8Lir2nPzXi3/QlM55UEU9Z7o1qii4cxCtf9ns80DUhHXKxCoj2qFXueApa0=
-=70pT
+iQEcBAEBCAAGBQJQ0WZQAAoJEJ0WA1zPCt1hMwEH/1RfDcMGiTQYwoG4jrL9Huvg
+rLNnekuXCC2qMSS/4Xy4e7N0UruUc9UxSJJbfQetJi2KcOzLvKQWhqxTMHUfbY9/
+X7I2XeeVGSLH3BDRJ2tu8Qz7DwXP+0Zg+znBnP1RrTVZYGBvvWou8WC0nbZ0WIte
+r9ZeX8ZPv0rJNdnY69NeLyWwJZrvL9hvR1AVkPClnWJOE1CbFCKL+iz9wp+r+vQR
+FPbZAtBNP7hJBTLMsd1YYqoRcAZXUMwJ4da1ns+iqaqA1DB8wzv8MXaCkIdX1qBX
+9Me+nQ4bR1CmxRqdjRkPbP4xAgj2suXEnxHXVPslqHi0x+T/G92QInsl+nShg7Y=
+=O95j
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-kolab/evolution-kolab-3.4.4.ebuild b/gnome-extra/evolution-kolab/evolution-kolab-3.4.4.ebuild
index fb243d48e1ab..c01aa89a99d9 100644
--- a/gnome-extra/evolution-kolab/evolution-kolab-3.4.4.ebuild
+++ b/gnome-extra/evolution-kolab/evolution-kolab-3.4.4.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-kolab/evolution-kolab-3.4.4.ebuild,v 1.1 2012/08/14 01:25:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-kolab/evolution-kolab-3.4.4.ebuild,v 1.2 2012/12/19 07:01:35 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="https://live.gnome.org/Evolution/Kolab"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="" # doc (gtk-doc fails); kerberos (does nothing useful for now)
+IUSE="" # kerberos (does nothing useful for now)
 
 RDEPEND=">=mail-client/evolution-${PV}:2.0
 	>=gnome-extra/evolution-data-server-${PV}
@@ -31,15 +31,12 @@ RDEPEND=">=mail-client/evolution-${PV}:2.0
 "
 DEPEND="${RDEPEND}
 	dev-util/gperf
+	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.35.5
 	sys-devel/gettext
 	virtual/pkgconfig
 	dev-util/gtk-doc-am
 "
-#	doc? (
-#		app-text/docbook-xml-dtd:4.3
-#		>=dev-util/gtk-doc-1.14 )
-# eautoreconf needs gtk-doc-am
 
 RESTRICT="test" # test suite is non-functional
 
diff --git a/gnome-extra/evolution-kolab/evolution-kolab-3.4.3.ebuild b/gnome-extra/evolution-kolab/evolution-kolab-3.6.2.ebuild
index 585443c29c35..205ce6ff2bbc 100644
--- a/gnome-extra/evolution-kolab/evolution-kolab-3.4.3.ebuild
+++ b/gnome-extra/evolution-kolab/evolution-kolab-3.6.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-kolab/evolution-kolab-3.4.3.ebuild,v 1.1 2012/08/13 06:14:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-kolab/evolution-kolab-3.6.2.ebuild,v 1.1 2012/12/19 07:01:35 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -14,46 +14,43 @@ HOMEPAGE="https://live.gnome.org/Evolution/Kolab"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="" # doc (gtk-doc fails); kerberos (does nothing useful for now)
+IUSE="" # kerberos (does nothing useful for now)
 
 RDEPEND=">=mail-client/evolution-${PV}:2.0
 	>=gnome-extra/evolution-data-server-${PV}
 	>=dev-db/sqlite-3.7:3
-	>=dev-libs/glib-2.30:2
+	>=dev-libs/glib-2.32:2
 	>=dev-libs/libical-0.44
 	dev-libs/libxml2
 	dev-libs/nss
 	>=gnome-base/gconf-2:2
-	>=net-libs/libsoup-2.36:2.4
-	>=net-libs/libsoup-gnome-2.36:2.4
 	>=net-misc/curl-7.19[ssl]
 	>=x11-libs/gtk+-3.2:3
 "
 DEPEND="${RDEPEND}
 	dev-util/gperf
+	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.35.5
 	sys-devel/gettext
 	virtual/pkgconfig
-	dev-util/gtk-doc-am
 "
-#	doc? (
-#		app-text/docbook-xml-dtd:4.3
-#		>=dev-util/gtk-doc-1.14 )
-# eautoreconf needs gtk-doc-am
 
 RESTRICT="test" # test suite is non-functional
 
-pkg_setup() {
-	DOCS="AUTHORS NEWS"
+src_prepare() {
 	G2CONF="${G2CONF} --without-krb5" # --with-krb5 does nothing useful
-}
 
-src_prepare() {
 	# We do not want to install a "hello world" program.
-	epatch "${FILESDIR}/${P}-no-hello-world.patch"
-	# Disable test suite: parts fail, other parsts require connection to a live
+	epatch "${FILESDIR}/${PN}-3.4.3-no-hello-world.patch"
+
+	# Disable test suite: parts fail, other parts require connection to a live
 	# kolab server, plus it installs test executables to /usr/bin
-	epatch "${FILESDIR}/${P}-no-tests.patch"
+	epatch "${FILESDIR}/${PN}-3.5.5-no-tests.patch"
+
+	# Strip stupid cflags
+	sed -e 's/\(ADD_CFLAGS=.*\) -pedantic/\1/' \
+		-i configure.ac configure || die
+
 	eautoreconf
 	gnome2_src_prepare
 }
diff --git a/gnome-extra/evolution-kolab/files/evolution-kolab-3.5.5-no-tests.patch b/gnome-extra/evolution-kolab/files/evolution-kolab-3.5.5-no-tests.patch
new file mode 100644
index 000000000000..bbefccd401d3
--- /dev/null
+++ b/gnome-extra/evolution-kolab/files/evolution-kolab-3.5.5-no-tests.patch
@@ -0,0 +1,51 @@
+From f0e43e8a098da3291d5870f55688faf7865ab775 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 13 Aug 2012 01:40:01 -0400
+Subject: [PATCH] Disable test suite
+
+---
+ configure.ac                  |    1 -
+ src/Makefile.am               |    3 +--
+ src/libekolabconv/Makefile.am |    2 +-
+ 3 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2f8f72b..bdb4a2e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -76,7 +76,6 @@ PKG_CHECK_MODULES(GTK, gtk+-3.0)
+ PKG_CHECK_MODULES(SOUP, libsoup-2.4 libsoup-gnome-2.4)
+ PKG_CHECK_MODULES(CURL, libcurl)
+ PKG_CHECK_MODULES(ICAL, libical)
+-PKG_CHECK_MODULES(GMIME, gmime-2.4,,[PKG_CHECK_MODULES(GMIME, gmime-2.6)]) dnl TODO make tests optional
+ PKG_CHECK_MODULES(EVOLUTION, evolution-mail-3.0 libebook-1.2 libecal-1.2)
+ 
+ dnl ***********
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2bf873e..5c7e7c4 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -9,8 +9,7 @@ SUBDIRS =		\
+ 	calendar	\
+ 	collection	\
+ 	configuration	\
+-	eplugin		\
+-	tests
++	eplugin
+ 
+ 
+ AM_CPPFLAGS = 					\
+diff --git a/src/libekolabconv/Makefile.am b/src/libekolabconv/Makefile.am
+index 2de4832..dbb6411 100644
+--- a/src/libekolabconv/Makefile.am
++++ b/src/libekolabconv/Makefile.am
+@@ -1,5 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS = main test
++SUBDIRS = main
+ 
+ -include $(top_srcdir)/git.mk
+-- 
+1.7.8.6
+