From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-557589-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 2432C13897B
for <garchives@archives.gentoo.org>; Sun, 10 Feb 2013 20:47:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9FFC021C047;
Sun, 10 Feb 2013 20:47:54 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 2BFCD21C047
for <gentoo-commits@lists.gentoo.org>; Sun, 10 Feb 2013 20:47:54 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 13C9533DEEB
for <gentoo-commits@lists.gentoo.org>; Sun, 10 Feb 2013 20:47:53 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 9FD12E4073
for <gentoo-commits@lists.gentoo.org>; Sun, 10 Feb 2013 20:47:51 +0000 (UTC)
From: "Alexandre Rostovtsev" <tetromino@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" <tetromino@gentoo.org>
Message-ID: <1360529240.fe097773f0b514d342359e74802dd84a0f7942ee.tetromino@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/
X-VCS-Repository: proj/gnome
X-VCS-Files: mail-client/evolution/evolution-9999.ebuild mail-client/evolution/metadata.xml
X-VCS-Directories: mail-client/evolution/
X-VCS-Committer: tetromino
X-VCS-Committer-Name: Alexandre Rostovtsev
X-VCS-Revision: fe097773f0b514d342359e74802dd84a0f7942ee
X-VCS-Branch: master
Date: Sun, 10 Feb 2013 20:47:51 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: fb58375e-7344-4d27-887c-47445db202b6
X-Archives-Hash: e9ba54652c0d9a7c2c25a94de3d0f124
commit: fe097773f0b514d342359e74802dd84a0f7942ee
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 10 20:47:20 2013 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sun Feb 10 20:47:20 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fe097773
mail-client/evolution: sync with gx86
---
mail-client/evolution/evolution-9999.ebuild | 68 +++++++++++++--------------
mail-client/evolution/metadata.xml | 1 +
2 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index 55b478e..60fe55b 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -15,14 +15,14 @@ DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
HOMEPAGE="http://projects.gnome.org/evolution/"
# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CCPL-Attribution-ShareAlike-3.0 FDL-1.3+ OPENLDAP"
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
SLOT="2.0"
-IUSE="crypt +gnome-online-accounts gstreamer kerberos ldap map ssl"
+IUSE="crypt +gnome-online-accounts gstreamer kerberos ldap map ssl +weather"
if [[ ${PV} = 9999 ]]; then
IUSE="${IUSE} doc"
KEYWORDS=""
else
- KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
# We need a graphical pinentry frontend to be able to ask for the GPG
@@ -37,10 +37,10 @@ COMMON_DEPEND=">=dev-libs/glib-2.32:2
>=x11-libs/gtk+-3.4.0:3
>=gnome-base/gnome-desktop-2.91.3:3=
>=gnome-base/gsettings-desktop-schemas-2.91.92
- >=dev-libs/libgweather-3.5.0:2=
>=media-libs/libcanberra-0.25[gtk3]
>=x11-libs/libnotify-0.7:=
- >=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather]
+ >=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather?]
+ =gnome-extra/evolution-data-server-${MY_MAJORV}*
>=gnome-extra/gtkhtml-4.5.2:4.0
dev-libs/atk
>=dev-libs/dbus-glib-0.6
@@ -73,7 +73,8 @@ COMMON_DEPEND=">=dev-libs/glib-2.32:2
>=media-libs/libchamplain-0.12:0.12 )
ssl? (
>=dev-libs/nspr-4.6.1:=
- >=dev-libs/nss-3.11:= )"
+ >=dev-libs/nss-3.11:= )
+ weather? ( >=dev-libs/libgweather-3.5.0:2= )"
DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.1.2
dev-util/gtk-doc-am
@@ -95,34 +96,6 @@ fi
src_prepare() {
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-schemas-compile
- --without-glade-catalog
- --without-kde-applnk-path
- --disable-image-inline
- --disable-pst-import
- --enable-canberra
- --enable-weather
- $(use_enable ssl nss)
- $(use_enable ssl smime)
- $(use_enable gnome-online-accounts goa)
- $(use_enable gstreamer audio-inline)
- $(use_enable map contact-maps)
- $(use_with ldap openldap)
- $(use_with kerberos krb5 ${EPREFIX}/usr)"
-
- # Use NSS/NSPR only if 'ssl' is enabled.
- if use ssl ; then
- G2CONF="${G2CONF} --enable-nss=yes"
- else
- G2CONF="${G2CONF}
- --without-nspr-libs
- --without-nspr-includes
- --without-nss-libs
- --without-nss-includes"
- fi
- [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
# Fix paths for Gentoo spamassassin executables
epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch"
@@ -138,6 +111,31 @@ src_prepare() {
-i configure || die "CPPFLAGS sed failed"
}
+src_configure() {
+ # Use NSS/NSPR only if 'ssl' is enabled.
+ # image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
+ [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+ gnome2_src_configure \
+ --disable-schemas-compile \
+ --without-glade-catalog \
+ --without-kde-applnk-path \
+ --disable-image-inline \
+ --disable-pst-import \
+ --enable-canberra \
+ $(use_enable ssl nss) \
+ $(use_enable ssl smime) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable gstreamer audio-inline) \
+ $(use_enable map contact-maps) \
+ $(use_with ldap openldap) \
+ $(use_with kerberos krb5 "${EPREFIX}"/usr) \
+ $(usex ssl --enable-nss=yes "--without-nspr-libs
+ --without-nspr-includes
+ --without-nss-libs
+ --without-nss-includes") \
+ $(use_enable weather)
+}
+
pkg_postinst() {
gnome2_pkg_postinst
diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml
index 303024b..a050b85 100644
--- a/mail-client/evolution/metadata.xml
+++ b/mail-client/evolution/metadata.xml
@@ -17,5 +17,6 @@
<flag name="networkmanager">Allows Evolution to automagically toggle
online/offline mode by talking to <pkg>net-misc/networkmanager</pkg>
and getting the current network state</flag>
+ <flag name="weather">Enable optional weather calendar support</flag>
</use>
</pkgmetadata>