gnome-extra/evolution-data-server: Bump version to 3.20.0

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

4 files changed, 80 insertions, 51 deletions

diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 07e5eba0..2924718c 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1 +1,15 @@
-DIST evolution-data-server-3.19.90.tar.xz 5559104 SHA256 02454b3e1d8e896b9670a42ff6effa1c2cfc552f2ad9d04cfba9fd0d59306f96 SHA512 79e9846ad20a5a6e69c64bb1467883c9ecaea12eda7892f77f0814ed74213e13c45e6a367e88d7efb638cb39c5eddd1c4609443758b676bf50f62af4c4ff7107 WHIRLPOOL 2982b51107ecb26fd8dab15ecd3bc748bcbe15a64552b6ab59b3828665e8ad9a2e278964dd6dbcd83b484ae5c61c50e2547922026e80f0a2f864bc0016c728e9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST evolution-data-server-3.20.0.tar.xz 5559612 SHA256 05f2e84fd5b02f9a526ffd549753af564f54c56047b5126aeecb28a8a0fa4f4b SHA512 3fe3967d82faa240b41bd264ed443d260b8449eb6b4ba0379fc257214c320550ff9b7bdcaf036d3897c69c7d3fdb60e206d6ca31d88fdc7ebb0543e9a6104247 WHIRLPOOL c98d0fcd158836cee28797337c22b9335b6ad7c4d9098f96c0ef0f3216578a4b73c13bb409ff5bc06c7cd46461465036f8603b97275892fd9c8ea45514e74348
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJW/6iNAAoJEOnlaGd+i01C50YH/1C37p22O53Yli0jZZA6K0cm
+iGqM2GYptrwf8Otm5TrS22AjkCiAby9x5VmK2rfFP+TMa2g9qgiXBXqtPyIjr1Ps
+QA91a3ywgyaKpa8NYMhKrZE3wFokvS5gMiUKP8xio/F3fF9je9CZKHpO20Z+tSzP
+/ifOCzAhriKuVSSmt0FkrKWNeO4Ctl0YXa5DpxV0csHayoOyTXfyH6X2h2pg5l8y
+sBfFmRMJgzzzxvTD1Qto9/O9tXD/mPnr5GBHurccoUWrTDoKs+Qi4JUoXTf0SPL0
+znVE0nq7ZbE92BCvPeqActba3JRK4pqRDISkJdI3xqa2betTnbUddvxRDEjlrC8=
+=Uqo1
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.19.90.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.20.0.ebuild
index d3400cf6..cc9b480b 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.19.90.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.20.0.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_4 pypy pypy2_0 )
-VALA_MIN_API_VERSION="0.22"
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
 VALA_USE_DEPEND="vapigen"
 
 inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx
@@ -16,40 +15,44 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
 
 # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
 LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/57" # subslot = libcamel-1.2 soname + optional revision if needed
-IUSE="api-doc-extras +google-auth +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
+SLOT="0/57" # subslot = libcamel-1.2 soname version
+
+IUSE="api-doc-extras +berkdb +gnome-online-accounts +gtk +google +introspection ipv6 ldap kerberos vala +weather"
 REQUIRED_USE="vala? ( introspection )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
 
 # sys-libs/db is only required for migrating from <3.13 versions
 # gdata-0.15.1 is required for google tasks
-# google-auth allows adding own google_client_id and google_client_secret
+# berkdb needed only for migrating old calendar data, bug #519512
 RDEPEND="
 	>=app-crypt/gcr-3.4
 	>=app-crypt/libsecret-0.5[crypt]
 	>=dev-db/sqlite-3.7.17:=
 	>=dev-libs/glib-2.40:2
+	>=dev-libs/json-glib-1.0.4
 	>=dev-libs/libgdata-0.10:=
 	>=dev-libs/libical-0.43:=
-	>=net-libs/libsoup-2.42:2.4
 	>=dev-libs/libxml2-2
 	>=dev-libs/nspr-4.4:=
 	>=dev-libs/nss-3.9:=
-	>=sys-libs/db-4:=
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.4.9:3
 
 	dev-libs/icu:=
 	sys-libs/zlib:=
 	virtual/libiconv
 
-	google-auth? (
-		>=net-libs/webkit-gtk-2.4.9
-		>=dev-libs/json-glib-1.0.4
-	)
+	berkdb? ( >=sys-libs/db-4:= )
 	gtk? (
 		>=app-crypt/gcr-3.4[gtk]
 		>=x11-libs/gtk+-3.10:3
 	)
+	google? (
+		>=dev-libs/json-glib-1.0.4
+		>=dev-libs/libgdata-0.15.1:=
+		>=net-libs/webkit-gtk-2.4.9:3
+	)
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
 	kerberos? ( virtual/krb5:= )
@@ -62,7 +65,6 @@ DEPEND="${RDEPEND}
 	dev-util/gperf
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-3.5.5
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
@@ -87,24 +89,22 @@ src_prepare() {
 	ELTCONF="--reverse-deps"
 
 	gnome2_src_prepare
-
-	# Fix compilation flags crazyness, upstream bug #653157
-	sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "sed failed"
 }
 
 src_configure() {
 	# /usr/include/db.h is always db-1 on FreeBSD
 	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
+	use berkdb && append-cppflags "-I$(db_includedir)"
 
 	# phonenumber does not exist in tree
 	gnome2_src_configure \
 		$(use_enable api-doc-extras gtk-doc) \
 		$(use_with api-doc-extras private-docs) \
+		$(usex berkdb --with-libdb="${EPREFIX}"/usr --with-libdb=no) \
 		$(use_enable gnome-online-accounts goa) \
-		$(use_enable google-auth) \
 		$(use_enable gtk) \
+		$(use_enable google google-auth) \
+		$(use_enable google) \
 		$(use_enable introspection) \
 		$(use_enable ipv6) \
 		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
@@ -112,15 +112,20 @@ src_configure() {
 		$(use_with ldap openldap) \
 		$(use_enable vala vala-bindings) \
 		$(use_enable weather) \
-		--enable-google \
 		--enable-largefile \
 		--enable-smime \
-		--with-libdb="${EPREFIX}"/usr \
 		--without-phonenumber \
 		--disable-examples \
 		--disable-uoa
 }
 
+src_test() {
+	unset ORBIT_SOCKETDIR
+	unset SESSION_MANAGER
+	unset DISPLAY
+	Xemake check
+}
+
 src_install() {
 	gnome2_src_install
 
@@ -131,10 +136,10 @@ src_install() {
 	fi
 }
 
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset ORBIT_SOCKETDIR
-	unset SESSION_MANAGER
-	unset DISPLAY
-	Xemake check
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if ! use berkdb; then
+		ewarn "You will need to enable berkdb USE for migrating old"
+		ewarn "(pre-3.12 evolution versions) addressbook data"
+	fi
 }
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
index 6948f3c1..19daf6c7 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_4 pypy pypy2_0 )
-VALA_MIN_API_VERSION="0.22"
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
 VALA_USE_DEPEND="vapigen"
 
 inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx
@@ -19,8 +18,9 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
 
 # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
 LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/54" # subslot = libcamel-1.2 soname + optional revision if needed
-IUSE="api-doc-extras +google-auth +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
+SLOT="0/57" # subslot = libcamel-1.2 soname + optional revision if needed
+
+IUSE="api-doc-extras +berkdb +gnome-online-accounts +gtk +google +introspection ipv6 ldap kerberos vala +weather"
 REQUIRED_USE="vala? ( introspection )"
 
 if [[ ${PV} = 9999 ]]; then
@@ -33,32 +33,35 @@ fi
 
 # sys-libs/db is only required for migrating from <3.13 versions
 # gdata-0.15.1 is required for google tasks
-# google-auth allows adding own google_client_id and google_client_secret
+# berkdb needed only for migrating old calendar data, bug #519512
 RDEPEND="
 	>=app-crypt/gcr-3.4
 	>=app-crypt/libsecret-0.5[crypt]
 	>=dev-db/sqlite-3.7.17:=
 	>=dev-libs/glib-2.40:2
+	>=dev-libs/json-glib-1.0.4
 	>=dev-libs/libgdata-0.10:=
 	>=dev-libs/libical-0.43:=
-	>=net-libs/libsoup-2.42:2.4
 	>=dev-libs/libxml2-2
 	>=dev-libs/nspr-4.4:=
 	>=dev-libs/nss-3.9:=
-	>=sys-libs/db-4:=
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.4.9:3
 
 	dev-libs/icu:=
 	sys-libs/zlib:=
 	virtual/libiconv
 
-	google-auth? (
-		>=net-libs/webkit-gtk-2.4.9
-		>=dev-libs/json-glib-1.0.4
-	)
+	berkdb? ( >=sys-libs/db-4:= )
 	gtk? (
 		>=app-crypt/gcr-3.4[gtk]
 		>=x11-libs/gtk+-3.10:3
 	)
+	google? (
+		>=dev-libs/json-glib-1.0.4
+		>=dev-libs/libgdata-0.15.1:=
+		>=net-libs/webkit-gtk-2.4.9:3
+	)
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
 	kerberos? ( virtual/krb5:= )
@@ -71,7 +74,6 @@ DEPEND="${RDEPEND}
 	dev-util/gperf
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-3.5.5
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
@@ -106,15 +108,17 @@ src_prepare() {
 src_configure() {
 	# /usr/include/db.h is always db-1 on FreeBSD
 	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
+	use berkdb && append-cppflags "-I$(db_includedir)"
 
 	# phonenumber does not exist in tree
 	gnome2_src_configure \
 		$(use_enable api-doc-extras gtk-doc) \
 		$(use_with api-doc-extras private-docs) \
+		$(usex berkdb --with-libdb="${EPREFIX}"/usr --with-libdb=no) \
 		$(use_enable gnome-online-accounts goa) \
-		$(use_enable google-auth) \
 		$(use_enable gtk) \
+		$(use_enable google google-auth) \
+		$(use_enable google) \
 		$(use_enable introspection) \
 		$(use_enable ipv6) \
 		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
@@ -122,15 +126,20 @@ src_configure() {
 		$(use_with ldap openldap) \
 		$(use_enable vala vala-bindings) \
 		$(use_enable weather) \
-		--enable-google \
 		--enable-largefile \
 		--enable-smime \
-		--with-libdb="${EPREFIX}"/usr \
 		--without-phonenumber \
 		--disable-examples \
 		--disable-uoa
 }
 
+src_test() {
+	unset ORBIT_SOCKETDIR
+	unset SESSION_MANAGER
+	unset DISPLAY
+	Xemake check
+}
+
 src_install() {
 	gnome2_src_install
 
@@ -141,10 +150,10 @@ src_install() {
 	fi
 }
 
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset ORBIT_SOCKETDIR
-	unset SESSION_MANAGER
-	unset DISPLAY
-	Xemake check
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if ! use berkdb; then
+		ewarn "You will need to enable berkdb USE for migrating old"
+		ewarn "(pre-3.12 evolution versions) addressbook data"
+	fi
 }
diff --git a/gnome-extra/evolution-data-server/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml
index fce64556..f9541c1a 100644
--- a/gnome-extra/evolution-data-server/metadata.xml
+++ b/gnome-extra/evolution-data-server/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="api-doc-extras">Build documentation for private APIs</flag>
 		<flag name="gnome-online-accounts">Enable using
 			<pkg>net-libs/gnome-online-accounts</pkg> for authorization</flag>
+		<flag name="google">Enable support for google authentication, contacts and tasks</flag>
 		<flag name="weather">Enable optional weather calendar support</flag>
 	</use>
 </pkgmetadata>