diff --git a/srcpkgs/evolution-data-server/depends b/srcpkgs/evolution-data-server/depends
index 6a11fcf61de..6e8d7e9a547 100644
--- a/srcpkgs/evolution-data-server/depends
+++ b/srcpkgs/evolution-data-server/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.32.0"
+abi_depends=">=2.91.90"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/evolution-data-server/evolution-data-server-devel.template b/srcpkgs/evolution-data-server/evolution-data-server-devel.template
index 49110d4b70b..46511067ac7 100644
--- a/srcpkgs/evolution-data-server/evolution-data-server-devel.template
+++ b/srcpkgs/evolution-data-server/evolution-data-server-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-data-server-devel'.
 #
-short_desc="${sourcepkg} (development files)"
+short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
@@ -10,26 +10,29 @@ Add_dependency run intltool
 Add_dependency run gperf
 Add_dependency run glib-devel
 Add_dependency run zlib-devel
-Add_dependency run libsoup-devel
+Add_dependency run dbus-devel
+Add_dependency run dbus-glib-devel
 Add_dependency run libxml2-devel
 Add_dependency run sqlite-devel
 Add_dependency run mit-krb5-devel
 Add_dependency run e2fsprogs-devel
 Add_dependency run nss-devel
 Add_dependency run nspr-devel
-Add_dependency run dbus-glib-devel
-Add_dependency run dbus-devel
-Add_dependency run GConf-devel
-Add_dependency run gtk+-devel
 Add_dependency run atk-devel
 Add_dependency run pango-devel
 Add_dependency run cairo-devel
 Add_dependency run freetype-devel
 Add_dependency run fontconfig-devel
+Add_dependency run gdk-pixbuf-devel
+Add_dependency run gtk+3-devel
+Add_dependency run GConf-devel
+Add_dependency run libsoup-devel
 Add_dependency run libgnome-keyring-devel
 Add_dependency run db-devel
 Add_dependency run libical-devel
 Add_dependency run libgweather-devel
+Add_dependency run libldap-devel
+Add_dependency run libgdata-devel
 Add_dependency run evolution-data-server
 
 do_install()
@@ -37,5 +40,5 @@ do_install()
 	mkdir -p ${DESTDIR}/usr/{lib,share}
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share
 }
diff --git a/srcpkgs/evolution-data-server/gir-evolution-data-server.template b/srcpkgs/evolution-data-server/gir-evolution-data-server.template
new file mode 100644
index 00000000000..bfbbeb19cb4
--- /dev/null
+++ b/srcpkgs/evolution-data-server/gir-evolution-data-server.template
@@ -0,0 +1,13 @@
+# Template file for 'gir-evolution-data-server'.
+#
+short_desc="Introspection data for EDS"
+long_desc="${long_desc}
+
+ This package contains small pieces of introspection data for the GNOME's
+ Evolution Data Server libraries."
+
+do_install()
+{
+	install -d ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index a1eb26830e6..6d56618b8e7 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,34 +1,34 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=2.32.1
-revision=1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=2.91.90
+distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--localstatedir=/var --enable-gnome-keyring
+configure_args="--localstatedir=/var --with-openldap
 --enable-ssl --enable-smime --enable-ipv6=yes --enable-calendar=yes
 --enable-largefile --disable-schemas-install --with-libdb=/usr
 --with-gconf-schema-file-dir=/usr/share/gconf/schemas
 --with-krb5=/usr --with-nspr-includes=/usr/include/nspr
---with-nss-includes=/usr/include/nss --with-openldap"
+--with-nss-includes=/usr/include/nss"
 short_desc="Evolution data server"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=de6a724504a9d72ca550a5a157df1e27dbb951a673f281106171c2345912fc79
+checksum=16fad4862120c67144d0c630be86cf2417901b2fa5d56b61c24f69412fbde1f1
 long_desc="
  Evolution Data Server is responsible for managing calendar and addressbook
  information within the GNOME desktop."
 
-subpackages="$pkgname-devel"
+subpackages="gir-$pkgname $pkgname-devel"
+
 Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency run glib
 Add_dependency run libxml2
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
 Add_dependency run sqlite
 Add_dependency run mit-krb5-libs
 Add_dependency run e2fsprogs-libs
 Add_dependency run nss
 Add_dependency run nspr
-Add_dependency run dbus-glib
-Add_dependency run dbus-libs
 Add_dependency run atk
 Add_dependency run pango
 Add_dependency run cairo
@@ -36,38 +36,38 @@ Add_dependency run freetype
 Add_dependency run fontconfig
 Add_dependency run libpng
 Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
+Add_dependency run gtk+3
 Add_dependency run libdb
 Add_dependency run libldap
 Add_dependency run libical
 Add_dependency run libsoup
 Add_dependency run libgnome-keyring
 Add_dependency run libgweather
-Add_dependency run GConf
 Add_dependency run libgdata
+Add_dependency run GConf
 
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gperf
 Add_dependency build glib-devel
 Add_dependency build zlib-devel
-Add_dependency build libsoup-devel
+Add_dependency build dbus-devel
+Add_dependency build dbus-glib-devel
 Add_dependency build libxml2-devel
 Add_dependency build sqlite-devel
 Add_dependency build mit-krb5-devel
 Add_dependency build e2fsprogs-devel
 Add_dependency build nss-devel
 Add_dependency build nspr-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build dbus-devel
-Add_dependency build GConf-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build gtk+-devel
 Add_dependency build atk-devel
 Add_dependency build pango-devel
 Add_dependency build cairo-devel
 Add_dependency build freetype-devel
 Add_dependency build fontconfig-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build gtk+3-devel
+Add_dependency build GConf-devel
+Add_dependency build libsoup-devel
 Add_dependency build libgnome-keyring-devel
 Add_dependency build db-devel
 Add_dependency build libical-devel
diff --git a/srcpkgs/gir-evolution-data-server b/srcpkgs/gir-evolution-data-server
new file mode 120000
index 00000000000..5d0d6efe0d2
--- /dev/null
+++ b/srcpkgs/gir-evolution-data-server
@@ -0,0 +1 @@
+evolution-data-server
\ No newline at end of file
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index de9c95e6f81..2b69226d2c6 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -566,17 +566,17 @@ libgweather-3.so		libgweather		libgweather-devel
 libical.so			libical			libical-devel
 libicalss.so			libical			libical-devel
 libicalvcal.so			libical			libical-devel
-libcamel-1.2.so.19		evolution-data-server	evolution-data-server-devel
-libcamel-provider-1.2.so.19	evolution-data-server	evolution-data-server-devel
+libcamel-1.2.so.23		evolution-data-server	evolution-data-server-devel
+libcamel-provider-1.2.so.23	evolution-data-server	evolution-data-server-devel
 libebackend-1.2.so		evolution-data-server	evolution-data-server-devel
 libebook-1.2.so.10		evolution-data-server	evolution-data-server-devel
 libecal-1.2.so			evolution-data-server	evolution-data-server-devel
 libedata-book-1.2.so		evolution-data-server	evolution-data-server-devel
-libedata-cal-1.2.so.10		evolution-data-server	evolution-data-server-devel
+libedata-cal-1.2.so.11		evolution-data-server	evolution-data-server-devel
 libedataserver-1.2.so.14	evolution-data-server	evolution-data-server-devel
 libedataserverui-1.2.so.11	evolution-data-server	evolution-data-server-devel
 libegroupwise-1.2.so.13		evolution-data-server	evolution-data-server-devel
-libgdata-1.2.so			evolution-data-server	evolution-data-server-devel
+libgdata.so.11			evolution-data-server	evolution-data-server-devel
 libgdata-google-1.2.so		evolution-data-server	evolution-data-server-devel
 libpcap.so			libpcap			libpcap-devel
 libiptc.so			iptables		iptables-devel