[gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/

[Alexandre Restovtsev]

commit:     177123cffdbca7914cdf75f4b80ed69abd7340c2
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 06:59:17 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Oct 31 07:24:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=177123cf

mail-client/evolution: qa + fix clutter build

Switch to EAPI4, clean up src_prepare to match gx86, gnome2.eclass will
take care of maintainer mode. Update CPPFLAGS sed for configure.ac
changes (the second " made it fail). Finally add a REQUIRED_USE.

Also, add a patch to fix building with USE=clutter on a system that has
both clutter-gtk:0.10 and clutter-gtk:1.0 installed; submitted upstream
at https://bugzilla.gnome.org/show_bug.cgi?id=663077

---
 mail-client/evolution/evolution-3.2.1.ebuild       |   54 ++++++--------------
 mail-client/evolution/evolution-9999.ebuild        |   54 ++++++--------------
 .../evolution-3.2.1-reorder-mx-clutter-gtk.patch   |   34 ++++++++++++
 3 files changed, 66 insertions(+), 76 deletions(-)

diff --git a/mail-client/evolution/evolution-3.2.1.ebuild b/mail-client/evolution/evolution-3.2.1.ebuild
index 49c720f..d90c2d8 100644
--- a/mail-client/evolution/evolution-3.2.1.ebuild
+++ b/mail-client/evolution/evolution-3.2.1.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.1-r1.ebuild,v 1.3 2011/01/15 19:56:39 nirbheek Exp $
 
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.4"
@@ -57,7 +56,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28:2
 	clutter? (
 		>=media-libs/clutter-1.0.0:1.0
 		>=media-libs/clutter-gtk-0.90:1.0
-		x11-libs/mx )
+		x11-libs/mx:1.0 )
 	connman? ( net-misc/connman )
 	crypt? ( || (
 		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
@@ -92,15 +91,17 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/evolution-exchange-2.32"
 
-# Need EAPI=4 support in python eclass
-#REQUIRED_USE="map? ( clutter )"
+# contact maps require clutter
+# NM and connman support cannot coexist
+REQUIRED_USE="map? ( clutter )
+	connman? ( !networkmanager )
+	networkmanager? ( !connman )"
 
 pkg_setup() {
 	ELTCONF="--reverse-deps"
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
 	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
 	G2CONF="${G2CONF}
-		--disable-maintainer-mode
 		--without-glade-catalog
 		--without-kde-applnk-path
 		--enable-plugins=experimental
@@ -115,22 +116,12 @@ pkg_setup() {
 		$(use_enable connman)
 		$(use_enable gnome-online-accounts goa)
 		$(use_enable gstreamer audio-inline)
+		$(use_enable map contact-maps)
 		$(use_enable python)
 		$(use_with clutter)
 		$(use_with ldap openldap)
 		$(use_with kerberos krb5 ${EPREFIX}/usr)"
 
-	# workaround for lack of EAPI 4 support in python.eclass
-	local myconf="--disable-contact-maps"
-	if use map; then
-		if use clutter; then
-			myconf="--enable-contact-maps"
-		else
-			ewarn "map plugin auto-disabled due to USE=-clutter"
-		fi
-	fi
-	G2CONF="${G2CONF} ${myconf}"
-
 	# dang - I've changed this to do --enable-plugins=experimental.  This will
 	# autodetect new-mail-notify and exchange, but that cannot be helped for the
 	# moment.  They should be changed to depend on a --enable-<foo> like mono
@@ -147,33 +138,20 @@ pkg_setup() {
 			--without-nss-includes"
 	fi
 
-	# NM and connman support cannot coexist
-	if use networkmanager && use connman ; then
-		ewarn "It is not possible to enable both ConnMan and NetworkManager, disabling connman..."
-		G2CONF="${G2CONF} --disable-connman"
-	fi
-
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -e 's|mozilla-nss|nss|' \
-			-e 's|mozilla-nspr|nspr|' \
-			-i configure.ac || die "sed 2 failed"
-	fi
-
-	# Fix compilation flags crazyness
-	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS"/\1/' \
-		-i configure.ac || die "sed 1 failed"
-
-	if [[ ${PV} != 9999 ]]; then
-		intltoolize --force --copy --automake || die "intltoolize failed"
-		eautoreconf
-	fi
+	# https://bugzilla.gnome.org/show_bug.cgi?id=663077, requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.2.1-reorder-mx-clutter-gtk.patch"
+	[[ ${PV} != 9999 ]] && eautoreconf
 
 	gnome2_src_prepare
+
+	# Fix compilation flags crazyness
+	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure || die "CPPFLAGS sed failed"
 }
 
 pkg_postinst() {

diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index 49c720f..d90c2d8 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.1-r1.ebuild,v 1.3 2011/01/15 19:56:39 nirbheek Exp $
 
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.4"
@@ -57,7 +56,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28:2
 	clutter? (
 		>=media-libs/clutter-1.0.0:1.0
 		>=media-libs/clutter-gtk-0.90:1.0
-		x11-libs/mx )
+		x11-libs/mx:1.0 )
 	connman? ( net-misc/connman )
 	crypt? ( || (
 		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
@@ -92,15 +91,17 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/evolution-exchange-2.32"
 
-# Need EAPI=4 support in python eclass
-#REQUIRED_USE="map? ( clutter )"
+# contact maps require clutter
+# NM and connman support cannot coexist
+REQUIRED_USE="map? ( clutter )
+	connman? ( !networkmanager )
+	networkmanager? ( !connman )"
 
 pkg_setup() {
 	ELTCONF="--reverse-deps"
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
 	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
 	G2CONF="${G2CONF}
-		--disable-maintainer-mode
 		--without-glade-catalog
 		--without-kde-applnk-path
 		--enable-plugins=experimental
@@ -115,22 +116,12 @@ pkg_setup() {
 		$(use_enable connman)
 		$(use_enable gnome-online-accounts goa)
 		$(use_enable gstreamer audio-inline)
+		$(use_enable map contact-maps)
 		$(use_enable python)
 		$(use_with clutter)
 		$(use_with ldap openldap)
 		$(use_with kerberos krb5 ${EPREFIX}/usr)"
 
-	# workaround for lack of EAPI 4 support in python.eclass
-	local myconf="--disable-contact-maps"
-	if use map; then
-		if use clutter; then
-			myconf="--enable-contact-maps"
-		else
-			ewarn "map plugin auto-disabled due to USE=-clutter"
-		fi
-	fi
-	G2CONF="${G2CONF} ${myconf}"
-
 	# dang - I've changed this to do --enable-plugins=experimental.  This will
 	# autodetect new-mail-notify and exchange, but that cannot be helped for the
 	# moment.  They should be changed to depend on a --enable-<foo> like mono
@@ -147,33 +138,20 @@ pkg_setup() {
 			--without-nss-includes"
 	fi
 
-	# NM and connman support cannot coexist
-	if use networkmanager && use connman ; then
-		ewarn "It is not possible to enable both ConnMan and NetworkManager, disabling connman..."
-		G2CONF="${G2CONF} --disable-connman"
-	fi
-
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -e 's|mozilla-nss|nss|' \
-			-e 's|mozilla-nspr|nspr|' \
-			-i configure.ac || die "sed 2 failed"
-	fi
-
-	# Fix compilation flags crazyness
-	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS"/\1/' \
-		-i configure.ac || die "sed 1 failed"
-
-	if [[ ${PV} != 9999 ]]; then
-		intltoolize --force --copy --automake || die "intltoolize failed"
-		eautoreconf
-	fi
+	# https://bugzilla.gnome.org/show_bug.cgi?id=663077, requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.2.1-reorder-mx-clutter-gtk.patch"
+	[[ ${PV} != 9999 ]] && eautoreconf
 
 	gnome2_src_prepare
+
+	# Fix compilation flags crazyness
+	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure || die "CPPFLAGS sed failed"
 }
 
 pkg_postinst() {

diff --git a/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch b/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch
new file mode 100644
index 0000000..6df8f2b
--- /dev/null
+++ b/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch
@@ -0,0 +1,34 @@
+From 1c036f9a0a922f68fbbf09540a14173465e51a1e Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@g.o>
+Date: Mon, 31 Oct 2011 02:15:54 -0400
+Subject: [PATCH] reorder mx-1.0 and clutter-gtk-1.0 in PKG_CHECK_MODULES:q
+
+clutter-gtk-1.0 installs headers in /usr/include/clutter-gtk-1.0/clutter-gtk;
+clutter-gtk-0.10 installs headers in /usr/include/clutter-1.0/clutter-gtk
+
+To ensure that clutter-gtk-1.0's headers (and not 0.10's) are used,
+-I/usr/include/clutter-gtk-1.0 must come before -I/usr/include/clutter-1.0
+in CLUTTER_CFLAGS. And that means clutter-gtk-1.0 must come before mx-1.0
+in PKG_CHECK_MODULES.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=663077
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5c2c5ed..b5c74ee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -596,7 +596,7 @@ AC_ARG_WITH([clutter],
+ AC_MSG_RESULT($with_clutter)
+ 
+ if test "x$with_clutter" = "xyes"; then
+-   PKG_CHECK_MODULES(CLUTTER, [mx-1.0 clutter-gtk-1.0 >= clutter_gtk_minimum_version clutter-1.0 >= 1.0.0])
++   PKG_CHECK_MODULES(CLUTTER, [clutter-gtk-1.0 >= clutter_gtk_minimum_version mx-1.0 clutter-1.0 >= 1.0.0])
+ 
+    AC_DEFINE(HAVE_CLUTTER, 1, [Clutter available])
+    AM_CONDITIONAL(ENABLE_CLUTTER, true)
+-- 
+1.7.7.1
+