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

["Priit Laes" <plaes@plaes.org>]

commit:     e96c6dd5584db84ae9a6bc4514d047124d9a4926
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Mar  5 13:33:45 2013 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Mar  5 13:33:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e96c6dd5

gnome-extra/evolution-data-server: Adapt to GNOME Team policies

---
 .../evolution-data-server-3.7.91.ebuild            |   39 +++++++++++---------
 .../evolution-data-server-9999.ebuild              |   39 +++++++++++---------
 2 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.7.91.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.7.91.ebuild
index bc3ebf4..ac3a4ca 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.7.91.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.7.91.ebuild
@@ -81,24 +81,6 @@ pkg_setup() {
 
 src_prepare() {
 	DOCS="ChangeLog MAINTAINERS NEWS TODO"
-	# TODO: ubuntu-online-accounts uoa
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		$(use_enable api-doc-extras gtk-doc)
-		$(use_with api-doc-extras private-docs)
-		$(use_enable gnome-online-accounts goa)
-		$(use_enable google)
-		$(use_enable introspection)
-		$(use_enable ipv6)
-		$(use_with kerberos krb5 ${EPREFIX}/usr)
-		$(use_with ldap openldap)
-		$(use_enable vala vala-bindings)
-		$(use_enable weather)
-		--disable-uoa
-		--enable-nntp
-		--enable-largefile
-		--enable-smime
-		--with-libdb=${EPREFIX}/usr"
 
 	gnome2_src_prepare
 	use vala && vala_src_prepare
@@ -113,6 +95,27 @@ src_prepare() {
 		-i configure || die "sed failed"
 }
 
+src_configure() {
+
+	gnome2_src_configure \
+		--disable-schemas-compile \
+		--disable-uoa \
+		$(use_enable api-doc-extras gtk-doc) \
+		$(use_with api-doc-extras private-docs) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable google) \
+		$(use_enable introspection) \
+		$(use_enable ipv6) \
+		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
+		$(use_with ldap openldap) \
+		$(use_enable vala vala-bindings) \
+		$(use_enable weather) \
+		--enable-nntp \
+		--enable-largefile \
+		--enable-smime \
+		--with-libdb="${EPREFIX}"/usr
+}
+
 src_install() {
 	# Prevent this evolution-data-server from linking to libs in the installed
 	# evolution-data-server libraries by adding -L arguments for build dirs to

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 bc3ebf4..ac3a4ca 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
@@ -81,24 +81,6 @@ pkg_setup() {
 
 src_prepare() {
 	DOCS="ChangeLog MAINTAINERS NEWS TODO"
-	# TODO: ubuntu-online-accounts uoa
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		$(use_enable api-doc-extras gtk-doc)
-		$(use_with api-doc-extras private-docs)
-		$(use_enable gnome-online-accounts goa)
-		$(use_enable google)
-		$(use_enable introspection)
-		$(use_enable ipv6)
-		$(use_with kerberos krb5 ${EPREFIX}/usr)
-		$(use_with ldap openldap)
-		$(use_enable vala vala-bindings)
-		$(use_enable weather)
-		--disable-uoa
-		--enable-nntp
-		--enable-largefile
-		--enable-smime
-		--with-libdb=${EPREFIX}/usr"
 
 	gnome2_src_prepare
 	use vala && vala_src_prepare
@@ -113,6 +95,27 @@ src_prepare() {
 		-i configure || die "sed failed"
 }
 
+src_configure() {
+
+	gnome2_src_configure \
+		--disable-schemas-compile \
+		--disable-uoa \
+		$(use_enable api-doc-extras gtk-doc) \
+		$(use_with api-doc-extras private-docs) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable google) \
+		$(use_enable introspection) \
+		$(use_enable ipv6) \
+		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
+		$(use_with ldap openldap) \
+		$(use_enable vala vala-bindings) \
+		$(use_enable weather) \
+		--enable-nntp \
+		--enable-largefile \
+		--enable-smime \
+		--with-libdb="${EPREFIX}"/usr
+}
+
 src_install() {
 	# Prevent this evolution-data-server from linking to libs in the installed
 	# evolution-data-server libraries by adding -L arguments for build dirs to