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

[Priit Laes]

commit:     12544bba84e79a37f7d6769085bcaceffad4430b
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sun Mar  3 12:49:55 2013 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sun Mar  3 12:49:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=12544bba

mail-client/evolution: Add 3.7.90 to overlay

---
 mail-client/evolution/evolution-3.7.90.ebuild      |  156 ++++++++++++++++++++
 .../evolution-3.3.91-spamassassin-paths.patch      |   60 --------
 2 files changed, 156 insertions(+), 60 deletions(-)

diff --git a/mail-client/evolution/evolution-3.7.90.ebuild b/mail-client/evolution/evolution-3.7.90.ebuild
new file mode 100644
index 0000000..b1f7635
--- /dev/null
+++ b/mail-client/evolution/evolution-3.7.90.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils flag-o-matic gnome2 versionator
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
+MY_MAJORV=$(get_version_component_range 1-2)
+
+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 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+IUSE="bogofilter crypt +gnome-online-accounts gstreamer highlight kerberos ldap map spamassassin ssl +weather"
+if [[ ${PV} = 9999 ]]; then
+	IUSE="${IUSE} doc"
+	KEYWORDS=""
+else
+	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
+# password from inside evolution, bug 160302
+PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+COMMON_DEPEND=">=dev-libs/glib-2.34:2
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gtk+-3.4.0:3
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=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-${MY_MAJORV}*
+	>=gnome-extra/gtkhtml-4.5.2:4.0
+	dev-libs/atk
+	>=dev-libs/dbus-glib-0.6
+	>=dev-libs/libxml2-2.7.3:2
+	>=net-libs/libsoup-gnome-2.40.3:2.4
+	>=x11-misc/shared-mime-info-0.22
+	>=x11-themes/gnome-icon-theme-2.30.2.1
+	>=dev-libs/libgdata-0.10:=
+	>=net-libs/webkit-gtk-1.10.0
+
+	x11-libs/libSM
+	x11-libs/libICE
+
+	crypt? ( || (
+		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
+		=app-crypt/gnupg-1.4* ) )
+	map? (
+		>=app-misc/geoclue-0.12.0
+		>=media-libs/libchamplain-0.12:0.12
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-0.99.0
+		x11-libs/mx:1.0 )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
+	gstreamer? ( || (
+		 ( media-libs/gstreamer:1.0
+		   media-libs/gst-plugins-base:1.0 )
+		 ( media-libs/gstreamer:0.10
+		   media-libs/gst-plugins-base:0.10 )
+	) )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=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
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig"
+# eautoreconf needs:
+#	app-text/yelp-tools
+#	>=gnome-base/gnome-common-2.12
+RDEPEND="${COMMON_DEPEND}
+	bogofilter? ( mail-filter/bogofilter )
+	highlight? ( app-text/highlight )
+	spamassassin? ( mail-filter/spamassassin )
+	!<gnome-extra/evolution-exchange-2.32"
+
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/yelp-tools
+		doc? ( >=dev-util/gtk-doc-1.14 )"
+fi
+
+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
+	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-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 bogofilter) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable gstreamer audio-inline) \
+		$(use_enable highlight) \
+		$(use_enable map contact-maps) \
+		$(use_enable spamassassin) \
+		$(use_enable ssl nss) \
+		$(use_enable ssl smime) \
+		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
+		$(use_with ldap openldap) \
+		$(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
+
+	elog "To change the default browser if you are not using GNOME, edit"
+	elog "~/.local/share/applications/mimeapps.list so it includes the"
+	elog "following content:"
+	elog ""
+	elog "[Default Applications]"
+	elog "x-scheme-handler/http=firefox.desktop"
+	elog "x-scheme-handler/https=firefox.desktop"
+	elog ""
+	elog "(replace firefox.desktop with the name of the appropriate .desktop"
+	elog "file from /usr/share/applications if you use a different browser)."
+}

diff --git a/mail-client/evolution/files/evolution-3.3.91-spamassassin-paths.patch b/mail-client/evolution/files/evolution-3.3.91-spamassassin-paths.patch
deleted file mode 100644
index 3078fb9..0000000
--- a/mail-client/evolution/files/evolution-3.3.91-spamassassin-paths.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2f4ddb9f4d4262afbf8f60dd601a639ae33e05c6 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@g.o>
-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).</_description>
-     </key>
-     <key name="spamc-binary" type="s">
--      <default>'/usr/bin/spamc'</default>
-+      <default>'@EPREFIX@/usr/bin/spamc'</default>
-       <_summary>SpamAssassin client binary</_summary>
-       <_description>SpamAssassin client binary</_description>
-     </key>
-     <key name="spamd-binary" type="s">
--      <default>'/usr/bin/spamd'</default>
-+      <default>'@EPREFIX@/usr/sbin/spamd'</default>
-       <_summary>SpamAssassin daemon binary</_summary>
-       <_description>SpamAssassin daemon binary</_description>
-     </key>
-diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/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))
- 
- #ifndef SPAMASSASSIN_BINARY
--#define SPAMASSASSIN_BINARY "/usr/bin/spamassassin"
-+#define SPAMASSASSIN_BINARY "@EPREFIX@/usr/bin/spamassassin"
- #endif
- 
- #ifndef SA_LEARN_BINARY
--#define SA_LEARN_BINARY "/usr/bin/sa-learn"
-+#define SA_LEARN_BINARY "@EPREFIX@/usr/bin/sa-learn"
- #endif
- 
- #ifndef SPAMC_BINARY
--#define SPAMC_BINARY "/usr/bin/spamc"
-+#define SPAMC_BINARY "@EPREFIX@/usr/bin/spamc"
- #endif
- 
- #ifndef SPAMD_BINARY
--#define SPAMD_BINARY "/usr/bin/spamd"
-+#define SPAMD_BINARY "@EPREFIX@/usr/sbin/spamd"
- #endif
- 
- /* For starting our own daemon. */
--- 
-1.7.8.5
-