proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

7 files changed, 645 insertions, 0 deletions

diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
new file mode 100644
index 000000000000..6e05d4fa391a
--- /dev/null
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -0,0 +1,3 @@
+DIST evolution-data-server-3.12.11.tar.xz 5288904 SHA256 59023d2cf92e36b69c1f83b2e56a0ba037754982a23cb06f35f6cc5de7a12201 SHA512 851b5ba6384e918593043088ac093c02f31b0b3bcb6852f2ee24159cc0c99e28713db84d76339a40073da8cbe4857222031e7150f0f99dca61eaf910d76b139f WHIRLPOOL c90345f2273ff66156fd266521521fd381e1c8d9e05311067835e729c24d5544a1bf29f0d988c6585e9caf3b7f0107645c781a15fd7b4ca3d9367f45441ce4a4
+DIST evolution-data-server-3.16.4.tar.xz 5364536 SHA256 62af92dd5563d58a2f13eceeee99cbb7201c15a60eb9e6f4f2bf69688aa07a06 SHA512 7dfb5abc663c09f3bf43b8f34dc4eaab0d16107221ae862d6e4c7b2adc8fa16983a9c619020ce4c032866bd846491db693bcf231c8bdd7fdf6bdd75c3cc327cc WHIRLPOOL 41024ce5039189e5261df9f8ed74b860d712ff55ea0d4cc42d804ae052410fd502dc55d4cfffa70640c2a8747695687840905db145630cf7e1b858554d7761de
+DIST evolution-data-server-3.16.4_pre20150704.tar.xz 4139492 SHA256 2b52f062ab20edfbb99541e87ae1936ff80c5e4ca9a0d5d7ce8459e182aa8ae7 SHA512 9a0fba7588b2700810a2d7efbe6d50b1762ac4754d43d17bd55272ae3b51362c120462dbc6cd596fbb2691a75d14896d012963a3146483ccfbf0a712f34eb59e WHIRLPOOL 12beb7ddd0bc00452bc2070521c53ffc8cf07b9b08e73f5edf8df4fbd5dfb4b37c0f7b1d6da713b370b05b84a3fd901afe70b85e1dc21c153013ed8ce93ea3e1
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.12.11.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.12.11.ebuild
new file mode 100644
index 000000000000..dc7c25acddb3
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.12.11.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 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"
+VALA_USE_DEPEND="vapigen"
+
+inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+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/49" # subslot = libcamel-1.2 soname version
+IUSE="api-doc-extras +gnome-online-accounts +gtk +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"
+
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.5:=
+	>=dev-libs/glib-2.36:2
+	>=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:=
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.2:3
+	)
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.8:2= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	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) )
+"
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2
+
+# Some tests fail due to missings locales.
+# Also, dbus tests are flacky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+
+	# Fix relink issues in src_install
+	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)"
+
+	# phonenumber does not exist in tree
+	gnome2_src_configure \
+		$(use_enable api-doc-extras gtk-doc) \
+		$(use_with api-doc-extras private-docs) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable gtk) \
+		$(use_enable introspection) \
+		$(use_enable ipv6) \
+		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
+		$(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \
+		$(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_install() {
+	gnome2_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	unset ORBIT_SOCKETDIR
+	unset SESSION_MANAGER
+	unset DISPLAY
+	Xemake check
+}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild
new file mode 100644
index 000000000000..f9c7e626d795
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 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"
+VALA_USE_DEPEND="vapigen"
+
+inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+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/52" # subslot = libcamel-1.2 soname version
+IUSE="api-doc-extras +gnome-online-accounts +gtk +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
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.5:=
+	>=dev-libs/glib-2.40:2
+	>=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:=
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.6:3
+	)
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.8:2= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	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) )
+"
+
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2
+
+# Some tests fail due to missings locales.
+# Also, dbus tests are flacky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+
+	# Fix relink issues in src_install
+	ELTCONF="--reverse-deps"
+
+	# Honor Google settings as defined in gnome-online-accounts (from 3.16 branch)
+	epatch "${FILESDIR}"/${P}-goa-gmail.patch
+
+	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)"
+
+	# phonenumber does not exist in tree
+	gnome2_src_configure \
+		$(use_enable api-doc-extras gtk-doc) \
+		$(use_with api-doc-extras private-docs) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable gtk) \
+		$(use_enable introspection) \
+		$(use_enable ipv6) \
+		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
+		$(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \
+		$(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_install() {
+	gnome2_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	unset ORBIT_SOCKETDIR
+	unset SESSION_MANAGER
+	unset DISPLAY
+	Xemake check
+}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.16.4_pre20150704.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.16.4_pre20150704.ebuild
new file mode 100644
index 000000000000..97b374e5160a
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.16.4_pre20150704.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 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"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools db-use flag-o-matic gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+COMMIT="d3587d1e064ff46406a3bd137ebdd3625c339001"
+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
+IUSE="api-doc-extras +gnome-online-accounts +gtk +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
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.5:=
+	>=dev-libs/glib-2.40:2
+	>=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:=
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.6:3
+	)
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.8:2= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	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) )
+
+	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
+
+# Some tests fail due to missings locales.
+# Also, dbus tests are flacky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+
+	# Fix relink issues in src_install
+	ELTCONF="--reverse-deps"
+
+	eautoreconf
+
+	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)"
+
+	# phonenumber does not exist in tree
+	gnome2_src_configure \
+		$(use_enable api-doc-extras gtk-doc) \
+		$(use_with api-doc-extras private-docs) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable gtk) \
+		$(use_enable introspection) \
+		$(use_enable ipv6) \
+		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
+		$(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \
+		$(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_install() {
+	gnome2_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	unset ORBIT_SOCKETDIR
+	unset SESSION_MANAGER
+	unset DISPLAY
+	Xemake check
+}
diff --git a/gnome-extra/evolution-data-server/files/calentry.schema b/gnome-extra/evolution-data-server/files/calentry.schema
new file mode 100644
index 000000000000..bc79da273cc2
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/calentry.schema
@@ -0,0 +1,108 @@
+# RFC2739 calEntry schema for OpenLDAP 2.x 
+
+#
+# From https://bugs.gentoo.org/show_bug.cgi?id=83988
+# Please notify us of updated revisions by submitting a bug report at bugs.gentoo.org
+#
+
+# Version of RFC 2739 schema translated by Terrelle Shaw 
+# (xytek@xytek.org) # Nov. 7, 2002 # Modifications by Peter Marschall
+# <peter.marschall@adpm.de> # Nov. 9, 2002
+
+# Notes:
+# * RFC2739 seems to be a bit sloppy about attribute type and
+#   objectclass definitions syntax and also about attribute syntax
+#   and matching rules.
+#   (It even counts the attributes in the calEntry objectclass wrong ;-)
+# * The following changes have been applied to correct the schema
+#   - added description to each attributetype definition
+#   - changed SYNTAX from 'IA5String' to corresponding OID
+#     to make matching rules and syntax consistent
+#   - replaced illegal keyword SUBSTRING by SUBSTR
+#   - changed SUBSTR from caseIgnoreIA5Match to caseIgnoreIA5SubstringsMatch
+#   - removed illegal keyword MULTI-VALUE
+#   - added keyword SINGLE-VALUE where appropriate
+#   - removed USAGE since cwuserApplications is the default 
+#   - added description to the objectclass defintion
+#   - corrected typo in objectclass definition
+#   - added the attributetypes defined but not used to the objectclass
+
+
+# 2.4.4.1 calCalURI
+attributetype ( 1.2.840.113556.1.4.478 
+	NAME 'calCalURI' 
+	DESC 'URI to a snapshot of the users entire default calendar'
+	EQUALITY caseIgnoreIA5Match 
+	SUBSTR caseIgnoreIA5SubstringsMatch 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+# 2.4.4.2 calFBURL
+attributetype ( 1.2.840.113556.1.4.479
+	NAME 'calFBURL'
+	DESC 'URI to the users default free/busy time data'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+# 2.4.4.3 calCAPURI
+attributetype ( 1.2.840.113556.1.4.480
+	NAME 'calCAPURI'
+	DESC 'URI used to communicate with the users calendar'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+# 2.4.4.4 calCalAdrURI
+attributetype ( 1.2.840.113556.1.4.481
+	NAME 'calCalAdrURI'
+	DESC 'URI to which event requests should be sent for the user'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+# 2.4.4.5 calOtherCalURIs
+attributetype ( 1.2.840.113556.1.4.482
+	NAME 'calOtherCalURIs'
+	DESC 'URIs to snapshots of non-default calendars belonging to the user'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+# 2.4.4.6 calOtherFBURLs
+attributetype ( 1.2.840.113556.1.4.483
+	NAME 'calOtherFBURLs'
+	DESC 'URIs to non-default free/busy data belonging to the user'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+# 2.4.4.7 calOtherCAPURIs
+attributetype ( 1.2.840.113556.1.4.484
+	NAME 'calOtherCAPURIs'
+	DESC 'URIs to non-default calendars belonging to the user'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+# 2.4.4.8 calOtherCalAdrURIs
+attributetype ( 1.2.840.113556.1.4.485
+	NAME 'calOtherCalAdrURIs'
+	DESC 'URIs of destinations for event requests to non-default calendars'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+# 2.4.3.1 calEntry
+objectclass ( 1.2.840.113556.1.5.87
+	NAME 'calEntry'
+	DESC 'Calendering and free/busy information'
+	SUP top AUXILIARY
+	MAY ( calCalURI $ calFBURL $ calCAPURI $ calCalAdrURI $
+		calOtherCAPURIs $ calOtherCalURIs $ calOtherFBURLs $ 
+		calOtherCalAdrURIs ) )
+
+# EOF
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch
new file mode 100644
index 000000000000..c5fc44e1aa09
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch
@@ -0,0 +1,108 @@
+From c66b549c259d33e15947d89257c50d945e3020c7 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Tue, 14 Jul 2015 11:49:31 +0200
+Subject: Doesn't honor Google settings as defined in gnome-online-accounts
+
+Use mail-disabled, calendar-disabled and contacts-disabled properties,
+rather than rely on an interface addition/removal and a notification
+about the change.
+
+Reported at https://bugzilla.redhat.com/show_bug.cgi?id=1242541
+
+diff --git a/modules/gnome-online-accounts/module-gnome-online-accounts.c b/modules/gnome-online-accounts/module-gnome-online-accounts.c
+index e800c23..2f9be5e 100644
+--- a/modules/gnome-online-accounts/module-gnome-online-accounts.c
++++ b/modules/gnome-online-accounts/module-gnome-online-accounts.c
+@@ -162,50 +162,6 @@ gnome_online_accounts_provider_type_to_backend_name (GBinding *binding,
+ 	return TRUE;
+ }
+ 
+-static gboolean
+-gnome_online_accounts_object_is_non_null (GBinding *binding,
+-                                          const GValue *source_value,
+-                                          GValue *target_value,
+-                                          gpointer unused)
+-{
+-	GoaObject *goa_object = GOA_OBJECT (g_binding_get_source (binding));
+-	ESourceExtension *source_extension = E_SOURCE_EXTENSION (g_binding_get_target (binding));
+-	ESource *source;
+-	ESourceGoa *goa_extension;
+-	gpointer v_object;
+-
+-	v_object = g_value_get_object (source_value);
+-	g_value_set_boolean (target_value, v_object != NULL);
+-
+-	g_return_val_if_fail (goa_object != NULL, TRUE);
+-	g_return_val_if_fail (source_extension != NULL, TRUE);
+-
+-	source = e_source_extension_get_source (source_extension);
+-	goa_extension = e_source_get_extension (source, E_SOURCE_EXTENSION_GOA);
+-
+-	if (g_strcmp0 (g_binding_get_source_property (binding), "calendar") == 0) {
+-		gchar *uri = NULL;
+-
+-		if (v_object && GOA_IS_CALENDAR (v_object))
+-			uri = goa_calendar_dup_uri (v_object);
+-
+-		e_source_goa_set_calendar_url (goa_extension, uri);
+-
+-		g_free (uri);
+-	} else if (g_strcmp0 (g_binding_get_source_property (binding), "contacts") == 0) {
+-		gchar *uri = NULL;
+-
+-		if (v_object && GOA_IS_CONTACTS (v_object))
+-			uri = goa_contacts_dup_uri (v_object);
+-
+-		e_source_goa_set_contacts_url (goa_extension, uri);
+-
+-		g_free (uri);
+-	}
+-
+-	return TRUE;
+-}
+-
+ static GoaObject *
+ gnome_online_accounts_ref_account (EGnomeOnlineAccounts *extension,
+                                    ESource *source)
+@@ -629,29 +585,20 @@ gnome_online_accounts_config_collection (EGnomeOnlineAccounts *extension,
+ 		source_extension, "identity",
+ 		G_BINDING_SYNC_CREATE);
+ 
+-	e_binding_bind_property_full (
+-		goa_object, "calendar",
++	e_binding_bind_property (
++		goa_account, "calendar-disabled",
+ 		source_extension, "calendar-enabled",
+-		G_BINDING_SYNC_CREATE,
+-		gnome_online_accounts_object_is_non_null,
+-		NULL,
+-		NULL, (GDestroyNotify) NULL);
++		G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
+ 
+-	e_binding_bind_property_full (
+-		goa_object, "contacts",
++	e_binding_bind_property (
++		goa_account, "contacts-disabled",
+ 		source_extension, "contacts-enabled",
+-		G_BINDING_SYNC_CREATE,
+-		gnome_online_accounts_object_is_non_null,
+-		NULL,
+-		NULL, (GDestroyNotify) NULL);
++		G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
+ 
+-	e_binding_bind_property_full (
+-		goa_object, "mail",
++	e_binding_bind_property (
++		goa_account, "mail-disabled",
+ 		source_extension, "mail-enabled",
+-		G_BINDING_SYNC_CREATE,
+-		gnome_online_accounts_object_is_non_null,
+-		NULL,
+-		NULL, (GDestroyNotify) NULL);
++		G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
+ 
+ 	g_clear_object (&goa_account);
+ 	g_clear_object (&goa_calendar);
+-- 
+cgit v0.10.2
+
diff --git a/gnome-extra/evolution-data-server/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml
new file mode 100644
index 000000000000..89e564fd9647
--- /dev/null
+++ b/gnome-extra/evolution-data-server/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnome</herd>
+	<use>
+		<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="weather">Enable optional weather calendar support</flag>
+	</use>
+</pkgmetadata>