From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-567124-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 A61AA198002
for <garchives@archives.gentoo.org>; Tue, 5 Mar 2013 13:47:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 76AF2E0417;
Tue, 5 Mar 2013 13:47:21 +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 EC2B3E0417
for <gentoo-commits@lists.gentoo.org>; Tue, 5 Mar 2013 13:47:20 +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 017D733DC4F
for <gentoo-commits@lists.gentoo.org>; Tue, 5 Mar 2013 13:47:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 877F3E4073
for <gentoo-commits@lists.gentoo.org>; Tue, 5 Mar 2013 13:47:18 +0000 (UTC)
From: "Priit Laes" <plaes@plaes.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, "Priit Laes" <plaes@plaes.org>
Message-ID: <1362491207.19d23249c91cbcf4b4738c3dfb1e69272ecd0b9f.plaes@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/
X-VCS-Repository: proj/gnome
X-VCS-Files: mail-client/evolution/evolution-3.7.91.ebuild mail-client/evolution/evolution-9999.ebuild
X-VCS-Directories: mail-client/evolution/
X-VCS-Committer: plaes
X-VCS-Committer-Name: Priit Laes
X-VCS-Revision: 19d23249c91cbcf4b4738c3dfb1e69272ecd0b9f
X-VCS-Branch: master
Date: Tue, 5 Mar 2013 13:47:18 +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: 9877162d-db93-4557-9a11-a40a009c0d85
X-Archives-Hash: 05fcdd9ee41118575df43e13e39bcc55
commit: 19d23249c91cbcf4b4738c3dfb1e69272ecd0b9f
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Mar 5 13:46:47 2013 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Mar 5 13:46:47 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=19d23249
mail-client/evolution: Adapt to new GNOME Team policies
---
mail-client/evolution/evolution-3.7.91.ebuild | 10 ++++------
mail-client/evolution/evolution-9999.ebuild | 10 ++++------
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/mail-client/evolution/evolution-3.7.91.ebuild b/mail-client/evolution/evolution-3.7.91.ebuild
index b1f7635..c341de0 100644
--- a/mail-client/evolution/evolution-3.7.91.ebuild
+++ b/mail-client/evolution/evolution-3.7.91.ebuild
@@ -101,10 +101,6 @@ src_prepare() {
ELTCONF="--reverse-deps"
DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i data/org.gnome.evolution.spamassassin.gschema.xml.in \
- -i modules/spamassassin/evolution-spamassassin.c || die "sed failed"
-
gnome2_src_prepare
# Fix compilation flags crazyness
@@ -115,7 +111,8 @@ src_prepare() {
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)"
+ local myconf
+ [[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)"
gnome2_src_configure \
--disable-schemas-compile \
--without-glade-catalog \
@@ -137,7 +134,8 @@ src_configure() {
--without-nspr-includes
--without-nss-libs
--without-nss-includes") \
- $(use_enable weather)
+ $(use_enable weather) \
+ ${myconf}
}
pkg_postinst() {
diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index b1f7635..c341de0 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -101,10 +101,6 @@ src_prepare() {
ELTCONF="--reverse-deps"
DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i data/org.gnome.evolution.spamassassin.gschema.xml.in \
- -i modules/spamassassin/evolution-spamassassin.c || die "sed failed"
-
gnome2_src_prepare
# Fix compilation flags crazyness
@@ -115,7 +111,8 @@ src_prepare() {
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)"
+ local myconf
+ [[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)"
gnome2_src_configure \
--disable-schemas-compile \
--without-glade-catalog \
@@ -137,7 +134,8 @@ src_configure() {
--without-nspr-includes
--without-nss-libs
--without-nss-includes") \
- $(use_enable weather)
+ $(use_enable weather) \
+ ${myconf}
}
pkg_postinst() {