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, 77 insertions, 25 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/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
+