[gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-ews/

[Gilles Dartiguelongue]

commit:     f165faeacb5b3aca8a9ac01957a9722feaa38cb8
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 21:30:12 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 21:30:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f165faea

gnome-extra/evolution-ews: 3.4.4 → 3.6.0

---
 ...-ews-9999.ebuild => evolution-ews-3.6.0.ebuild} |   19 ++++++++++++-------
 .../evolution-ews/evolution-ews-9999.ebuild        |   19 ++++++++++++-------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/gnome-extra/evolution-ews/evolution-ews-9999.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.6.0.ebuild
similarity index 71%
copy from gnome-extra/evolution-ews/evolution-ews-9999.ebuild
copy to gnome-extra/evolution-ews/evolution-ews-3.6.0.ebuild
index 9b3d0d7..7a2b643 100644
--- a/gnome-extra/evolution-ews/evolution-ews-9999.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.6.0.ebuild
@@ -21,15 +21,18 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE="" # doc
+IUSE="kerberos" # doc
 
-RDEPEND=">=mail-client/evolution-${PV}:2.0
-	>=gnome-extra/evolution-data-server-${PV}
-	>=dev-libs/glib-2.26:2
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/libical
+	>=mail-client/evolution-${PV}:2.0[kerberos?]
+	>=gnome-extra/evolution-data-server-${PV}[kerberos?]
+	>=dev-libs/glib-2.28:2
 	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2:2
 	>=net-libs/libsoup-2.30:2.4
-	>=x11-libs/gtk+-2.90.4:3
+	>=x11-libs/gtk+-3:3
+	kerberos? ( virtual/krb5 )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35.5
@@ -40,6 +43,8 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test" # tests require connecting to an Exchange server
 
-pkg_setup() {
+src_configure() {
 	DOCS="ChangeLog NEWS README" # AUTHORS is empty
+	G2CONF="${G2CONF} $(use_with kerberos krb5)"
+	gnome2_src_configure
 }

diff --git a/gnome-extra/evolution-ews/evolution-ews-9999.ebuild b/gnome-extra/evolution-ews/evolution-ews-9999.ebuild
index 9b3d0d7..7a2b643 100644
--- a/gnome-extra/evolution-ews/evolution-ews-9999.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-9999.ebuild
@@ -21,15 +21,18 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE="" # doc
+IUSE="kerberos" # doc
 
-RDEPEND=">=mail-client/evolution-${PV}:2.0
-	>=gnome-extra/evolution-data-server-${PV}
-	>=dev-libs/glib-2.26:2
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/libical
+	>=mail-client/evolution-${PV}:2.0[kerberos?]
+	>=gnome-extra/evolution-data-server-${PV}[kerberos?]
+	>=dev-libs/glib-2.28:2
 	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2:2
 	>=net-libs/libsoup-2.30:2.4
-	>=x11-libs/gtk+-2.90.4:3
+	>=x11-libs/gtk+-3:3
+	kerberos? ( virtual/krb5 )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35.5
@@ -40,6 +43,8 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test" # tests require connecting to an Exchange server
 
-pkg_setup() {
+src_configure() {
 	DOCS="ChangeLog NEWS README" # AUTHORS is empty
+	G2CONF="${G2CONF} $(use_with kerberos krb5)"
+	gnome2_src_configure
 }