From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RKmPE-000821-AS for garchives@archives.gentoo.org; Mon, 31 Oct 2011 07:35:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8422E21C074; Mon, 31 Oct 2011 07:35:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 45DD221C074 for ; Mon, 31 Oct 2011 07:35:23 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 90B781B400C for ; Mon, 31 Oct 2011 07:35:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8E2D780052 for ; Mon, 31 Oct 2011 07:35:21 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <177123cffdbca7914cdf75f4b80ed69abd7340c2.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/ X-VCS-Repository: proj/gnome X-VCS-Files: mail-client/evolution/evolution-3.2.1.ebuild mail-client/evolution/evolution-9999.ebuild mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch X-VCS-Directories: mail-client/evolution/ mail-client/evolution/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 177123cffdbca7914cdf75f4b80ed69abd7340c2 Date: Mon, 31 Oct 2011 07:35:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 792208ac-4c3a-4dcc-9ddf-8e25daee6c3b X-Archives-Hash: 0961042e7db1b9aff100a6a7fc39cf66 commit: 177123cffdbca7914cdf75f4b80ed69abd7340c2 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Mon Oct 31 06:59:17 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Mon Oct 31 07:24:31 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D177123cf 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=3Dclutter 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=3D663077 --- 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/e= volution/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 $ =20 -EAPI=3D"3" -GNOME_TARBALL_SUFFIX=3D"xz" +EAPI=3D"4" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" PYTHON_DEPEND=3D"python? 2:2.4" @@ -57,7 +56,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.28:2 clutter? ( >=3Dmedia-libs/clutter-1.0.0:1.0 >=3Dmedia-libs/clutter-gtk-0.90:1.0 - x11-libs/mx ) + x11-libs/mx:1.0 ) connman? ( net-misc/connman ) crypt? ( || ( ( >=3Dapp-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} ) @@ -92,15 +91,17 @@ DEPEND=3D"${COMMON_DEPEND} RDEPEND=3D"${COMMON_DEPEND} ! like mo= no @@ -147,33 +138,20 @@ pkg_setup() { --without-nss-includes" fi =20 - # NM and connman support cannot coexist - if use networkmanager && use connman ; then - ewarn "It is not possible to enable both ConnMan and NetworkManager, d= isabling connman..." - G2CONF=3D"${G2CONF} --disable-connman" - fi - python_set_active_version 2 + python_pkg_setup } =20 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=3D"\)$WARNING_FLAGS"/\1/' \ - -i configure.ac || die "sed 1 failed" - - if [[ ${PV} !=3D 9999 ]]; then - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf - fi + # https://bugzilla.gnome.org/show_bug.cgi?id=3D663077, requires eautore= conf + epatch "${FILESDIR}/${PN}-3.2.1-reorder-mx-clutter-gtk.patch" + [[ ${PV} !=3D 9999 ]] && eautoreconf =20 gnome2_src_prepare + + # Fix compilation flags crazyness + sed -e 's/\(AM_CPPFLAGS=3D"\)$WARNING_FLAGS/\1/' \ + -i configure || die "CPPFLAGS sed failed" } =20 pkg_postinst() { diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/ev= olution/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 $ =20 -EAPI=3D"3" -GNOME_TARBALL_SUFFIX=3D"xz" +EAPI=3D"4" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" PYTHON_DEPEND=3D"python? 2:2.4" @@ -57,7 +56,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.28:2 clutter? ( >=3Dmedia-libs/clutter-1.0.0:1.0 >=3Dmedia-libs/clutter-gtk-0.90:1.0 - x11-libs/mx ) + x11-libs/mx:1.0 ) connman? ( net-misc/connman ) crypt? ( || ( ( >=3Dapp-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} ) @@ -92,15 +91,17 @@ DEPEND=3D"${COMMON_DEPEND} RDEPEND=3D"${COMMON_DEPEND} ! like mo= no @@ -147,33 +138,20 @@ pkg_setup() { --without-nss-includes" fi =20 - # NM and connman support cannot coexist - if use networkmanager && use connman ; then - ewarn "It is not possible to enable both ConnMan and NetworkManager, d= isabling connman..." - G2CONF=3D"${G2CONF} --disable-connman" - fi - python_set_active_version 2 + python_pkg_setup } =20 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=3D"\)$WARNING_FLAGS"/\1/' \ - -i configure.ac || die "sed 1 failed" - - if [[ ${PV} !=3D 9999 ]]; then - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf - fi + # https://bugzilla.gnome.org/show_bug.cgi?id=3D663077, requires eautore= conf + epatch "${FILESDIR}/${PN}-3.2.1-reorder-mx-clutter-gtk.patch" + [[ ${PV} !=3D 9999 ]] && eautoreconf =20 gnome2_src_prepare + + # Fix compilation flags crazyness + sed -e 's/\(AM_CPPFLAGS=3D"\)$WARNING_FLAGS/\1/' \ + -i configure || die "CPPFLAGS sed failed" } =20 pkg_postinst() { diff --git a/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutt= er-gtk.patch b/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clu= tter-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 +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-gt= k + +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=3D663077 +--- + 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) +=20 + if test "x$with_clutter" =3D "xyes"; then +- PKG_CHECK_MODULES(CLUTTER, [mx-1.0 clutter-gtk-1.0 >=3D clutter_gtk_= minimum_version clutter-1.0 >=3D 1.0.0]) ++ PKG_CHECK_MODULES(CLUTTER, [clutter-gtk-1.0 >=3D clutter_gtk_minimum= _version mx-1.0 clutter-1.0 >=3D 1.0.0]) +=20 + AC_DEFINE(HAVE_CLUTTER, 1, [Clutter available]) + AM_CONDITIONAL(ENABLE_CLUTTER, true) +--=20 +1.7.7.1 +