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 1S8QMW-0003BI-Sq for garchives@archives.gentoo.org; Fri, 16 Mar 2012 06:10:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D0CAE06F9; Fri, 16 Mar 2012 06:09:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F3455E06F9 for ; Fri, 16 Mar 2012 06:09:55 +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 E8B771B4001 for ; Fri, 16 Mar 2012 06:09:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 85DB9E5402 for ; Fri, 16 Mar 2012 06:09:52 +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: <1331877563.d11193f8b7e399157f8520161ac86da71bb6c1dd.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.3.91-r1.ebuild mail-client/evolution/evolution-3.3.91.ebuild mail-client/evolution/evolution-9999.ebuild mail-client/evolution/files/evolution-3.3.91-spamassassin-paths.patch X-VCS-Directories: mail-client/evolution/ mail-client/evolution/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: d11193f8b7e399157f8520161ac86da71bb6c1dd X-VCS-Branch: master Date: Fri, 16 Mar 2012 06:09:52 +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: d7620414-353b-48f3-b977-d7d110fdb2c1 X-Archives-Hash: 9371d6ffa1e34df1a47641f2f01f734f commit: d11193f8b7e399157f8520161ac86da71bb6c1dd Author: Alexandre Rostovtsev gentoo org> AuthorDate: Fri Mar 16 05:59:23 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Fri Mar 16 05:59:23 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dd11193f8 mail-client/evolution: fix Gentoo spamassassin executable paths Otherwise, evolution assumes spamd is in /usr/bin. --- ...on-3.3.91.ebuild =3D> evolution-3.3.91-r1.ebuild} | 6 ++ mail-client/evolution/evolution-9999.ebuild | 6 ++ .../evolution-3.3.91-spamassassin-paths.patch | 60 ++++++++++++++= ++++++ 3 files changed, 72 insertions(+), 0 deletions(-) diff --git a/mail-client/evolution/evolution-3.3.91.ebuild b/mail-client/= evolution/evolution-3.3.91-r1.ebuild similarity index 95% rename from mail-client/evolution/evolution-3.3.91.ebuild rename to mail-client/evolution/evolution-3.3.91-r1.ebuild index 96ea520..f6ea5b4 100644 --- a/mail-client/evolution/evolution-3.3.91.ebuild +++ b/mail-client/evolution/evolution-3.3.91-r1.ebuild @@ -146,6 +146,12 @@ src_prepare() { # Fix build with USE=3Dmap; in next version epatch "${FILESDIR}/${P}-map.patch" =20 + # Fix paths for Gentoo spamassassin executables + epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch" + 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 =20 # Fix compilation flags crazyness diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/ev= olution/evolution-9999.ebuild index 95c29ce..4c7dac5 100644 --- a/mail-client/evolution/evolution-9999.ebuild +++ b/mail-client/evolution/evolution-9999.ebuild @@ -143,6 +143,12 @@ pkg_setup() { } =20 src_prepare() { + # Fix paths for Gentoo spamassassin executables + epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch" + 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 =20 # Fix compilation flags crazyness diff --git a/mail-client/evolution/files/evolution-3.3.91-spamassassin-pa= ths.patch b/mail-client/evolution/files/evolution-3.3.91-spamassassin-pat= hs.patch new file mode 100644 index 0000000..3078fb9 --- /dev/null +++ b/mail-client/evolution/files/evolution-3.3.91-spamassassin-paths.pat= ch @@ -0,0 +1,60 @@ +From 2f4ddb9f4d4262afbf8f60dd601a639ae33e05c6 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Fri, 16 Mar 2012 01:56:14 -0400 +Subject: [PATCH] Use correct Gentoo paths for spamassassin executables + +--- + ...org.gnome.evolution.spamassassin.gschema.xml.in | 4 ++-- + modules/spamassassin/evolution-spamassassin.c | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/data/org.gnome.evolution.spamassassin.gschema.xml.in b/data= /org.gnome.evolution.spamassassin.gschema.xml.in +index 85d43d4..07fabd3 100644 +--- a/data/org.gnome.evolution.spamassassin.gschema.xml.in ++++ b/data/org.gnome.evolution.spamassassin.gschema.xml.in +@@ -16,12 +16,12 @@ + <_description>Use SpamAssassin daemon and client (spamc/spamd). + + +- '/usr/bin/spamc' ++ '@EPREFIX@/usr/bin/spamc' + <_summary>SpamAssassin client binary + <_description>SpamAssassin client binary + + +- '/usr/bin/spamd' ++ '@EPREFIX@/usr/sbin/spamd' + <_summary>SpamAssassin daemon binary + <_description>SpamAssassin daemon binary + +diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spa= massassin/evolution-spamassassin.c +index 7f595ca..a92e02d 100644 +--- a/modules/spamassassin/evolution-spamassassin.c ++++ b/modules/spamassassin/evolution-spamassassin.c +@@ -35,19 +35,19 @@ + ((obj), E_TYPE_SPAM_ASSASSIN, ESpamAssassin)) +=20 + #ifndef SPAMASSASSIN_BINARY +-#define SPAMASSASSIN_BINARY "/usr/bin/spamassassin" ++#define SPAMASSASSIN_BINARY "@EPREFIX@/usr/bin/spamassassin" + #endif +=20 + #ifndef SA_LEARN_BINARY +-#define SA_LEARN_BINARY "/usr/bin/sa-learn" ++#define SA_LEARN_BINARY "@EPREFIX@/usr/bin/sa-learn" + #endif +=20 + #ifndef SPAMC_BINARY +-#define SPAMC_BINARY "/usr/bin/spamc" ++#define SPAMC_BINARY "@EPREFIX@/usr/bin/spamc" + #endif +=20 + #ifndef SPAMD_BINARY +-#define SPAMD_BINARY "/usr/bin/spamd" ++#define SPAMD_BINARY "@EPREFIX@/usr/sbin/spamd" + #endif +=20 + /* For starting our own daemon. */ +--=20 +1.7.8.5 +