Version bump, drop old

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

2 files changed, 13 insertions, 16 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index a331f835f3e5..edebc34ec919 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.419 2015/07/04 12:53:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.420 2015/07/19 10:54:37 pacho Exp $
+
+*evolution-data-server-3.16.4 (19 Jul 2015)
+
+  19 Jul 2015; Pacho Ramos <pacho@gentoo.org>
+  +evolution-data-server-3.16.4.ebuild,
+  -evolution-data-server-3.16.4_pre20150619.ebuild:
+  Version bump, drop old
 
 *evolution-data-server-3.16.4_pre20150704 (04 Jul 2015)
 
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.16.4_pre20150619.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild
index dfeec8bcc968..f771abf4d51c 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.16.4_pre20150619.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.16.4_pre20150619.ebuild,v 1.2 2015/06/20 14:38:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild,v 1.1 2015/07/19 10:54:37 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -9,14 +9,11 @@ PYTHON_COMPAT=( python2_7 python3_4 pypy pypy2_0 )
 VALA_MIN_API_VERSION="0.22"
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools db-use flag-o-matic gnome2 python-any-r1 vala virtualx
+inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx
 
 DESCRIPTION="Evolution groupware backend"
 HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
 
-COMMIT="79dbb273a37623a1e667b82788e7f05e2746b444"
-SRC_URI="https://git.gnome.org/browse/${PN}/snapshot/${PN}-${COMMIT}.tar.xz -> ${P}.tar.xz"
-
 # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
 LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
 SLOT="0/52" # subslot = libcamel-1.2 soname version
@@ -49,7 +46,7 @@ RDEPEND="
 		>=x11-libs/gtk+-3.6:3
 	)
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
 	kerberos? ( virtual/krb5:= )
 	ldap? ( >=net-nds/openldap-2:= )
 	weather? ( >=dev-libs/libgweather-3.8:2= )
@@ -64,14 +61,8 @@ DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
-
-	dev-util/gtk-doc
 "
 
-# FIXME: This version needs dev-util/gtk-doc to provide gtk-doc.make
-# Next one should be a proper tarball created after distcheck run and, then
-# shouldn't require that DEPEND.
-
 # eautoreconf needs:
 #	>=gnome-base/gnome-common-2
 
@@ -80,8 +71,6 @@ DEPEND="${RDEPEND}
 # It looks like a nightmare to disable those for now.
 RESTRICT="test"
 
-S="${WORKDIR}/${PN}-${COMMIT}"
-
 pkg_setup() {
 	python-any-r1_pkg_setup
 }
@@ -92,7 +81,8 @@ src_prepare() {
 	# Fix relink issues in src_install
 	ELTCONF="--reverse-deps"
 
-	eautoreconf
+	# Honor Google settings as defined in gnome-online-accounts (from 3.16 branch)
+	epatch "${FILESDIR}"/${P}-goa-gmail.patch
 
 	gnome2_src_prepare