diff options
| -rw-r--r-- | mail-client/evolution/ChangeLog | 8 | ||||
| -rw-r--r-- | mail-client/evolution/Manifest | 19 | ||||
| -rw-r--r-- | mail-client/evolution/evolution-3.4.1.ebuild | 169 | ||||
| -rw-r--r-- | mail-client/evolution/files/evolution-3.3.91-spamassassin-paths.patch | 60 |
4 files changed, 254 insertions, 2 deletions
diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog index c7a895ea71ed..adb885b18c59 100644 --- a/mail-client/evolution/ChangeLog +++ b/mail-client/evolution/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for mail-client/evolution # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.362 2012/05/04 08:42:21 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.363 2012/05/07 05:58:19 tetromino Exp $ + +*evolution-3.4.1 (07 May 2012) + + 07 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + +files/evolution-3.3.91-spamassassin-paths.patch, +evolution-3.4.1.ebuild: + Version bump for gnome-3.4. 04 May 2012; Jeff Horelick <jdhore@gentoo.org> evolution-2.32.2-r3.ebuild, evolution-2.32.3.ebuild, evolution-2.32.3-r1.ebuild, evolution-3.2.3.ebuild, diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest index 663edd0bbaf9..3943244fd70c 100644 --- a/mail-client/evolution/Manifest +++ b/mail-client/evolution/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX evolution-2.32.0-wrong-lafile-usage.patch 634 RMD160 e14b9b17faacc3590419f7f1de78cd0f76323d58 SHA1 221fbd2112d206e52e741018c7ff2a3434819d18 SHA256 79e169a86b658bbd339fe79585f908f0eee4cfeef972be0731faa742a769deb8 AUX evolution-2.32.1-libnotify-0.7.patch 2239 RMD160 b0d8f2e830e32d9bc227978074f7e9975ae1307a SHA1 64c1f4ed1311cead4071e7543704ee8eeca4e418 SHA256 73746e65a3ba190ace8bd1e5fc9d52f6a67556fac0ba8727d7705ffe74e3ce0d AUX evolution-2.32.2-mime-handler.patch 4169 RMD160 8ec9bd24fcaa9cff0b2e865a85a430a3ea0856ca SHA1 e974601ec51a8e79db14520d18282af893cf89c9 SHA256 ba6db000b4c38b53462c0281146e504b7212b84a6d7f5f482b375674042ff846 @@ -8,15 +11,29 @@ AUX evolution-3.2.1-reorder-mx-clutter-gtk.patch 1308 RMD160 9d6db86c94ea6f5ed9a AUX evolution-3.2.3-g_thread_init.patch 2335 RMD160 6f5a4cd0053e50b0adf887755726722857523043 SHA1 1b302d79e86925154a2b8bf2f5029f625f11f032 SHA256 20b87e3fea68863fcda9dc57d6ccf74ce7e2c9f5b8e7d6f30032c034f0975116 AUX evolution-3.2.3-gmodule-explicit.patch 727 RMD160 80cc5b748f1d25aba0a1fca96fc4835cc9c1d6ae SHA1 37121a02f5164fd978190e3901f9e3b9634d28d7 SHA256 0fadbfec6a35ac569432007464ad165b51d65b16fcf95cd09c6a25a542880f54 AUX evolution-3.2.3-gtkhtml-4.4.patch 900 RMD160 7009155e3ce50e58e4dad01da2f99ba024ef81f2 SHA1 8084c904409eee75e12170b22988eaed78a5d83d SHA256 ee98a29f0dac28ad67fee72c4372f4edaa4dbe4b6a8627606784f20c1cdf440c +AUX evolution-3.3.91-spamassassin-paths.patch 2223 RMD160 b4437aef43ded2cb3b9dff87ac126b3ba919b23f SHA1 f5a54347ed684734d711b77b70f4451f1c9fc714 SHA256 9f2ea27193ff299dd130f562c5b9eb44ddf7825c357db11c72e49bf792f97680 DIST evolution-2.32.2-patches-r1.tar.bz2 15387 RMD160 1b5279f83c5d6048294a4b320b3bbc03bcb91485 SHA1 d6a6c18eaf2cb94256971e8b4444fe7c7ba20851 SHA256 466783eadc50e06c7c34c6e5a93ddc87b3af15456f28b40e52c2e785fb324b8e DIST evolution-2.32.2.tar.bz2 31929154 RMD160 1d68825111309600093c8d4718e1cc001635e61d SHA1 48f25fffda1ac9c209fd02162ca298df5c03b05f SHA256 1831c7f5f00b4755869cf84ef3e3f79c4705a33e0659e72b6c1ffa4a59d4a4bb DIST evolution-2.32.3-patches.tar.xz 11784 RMD160 34e536268814b2c41fd081321f3435ea10af620c SHA1 2f9af7d7f9489099daefceb7ea7f2948fa1314a5 SHA256 eadfcd9d1663206f1d15457358afa7901f095894d782d4043ffd762b242eded6 DIST evolution-2.32.3.tar.bz2 31966138 RMD160 1b64d00a38cf8ad5c273cc4f4aee73124fe818af SHA1 cc2a2126ef4192193dce50c43c5bb6fc0a57fcde SHA256 33ab38780e9abb71506230e331e9c3534444b5ed3f17046f0b6371a00df686fb DIST evolution-3.2.3.tar.xz 12419112 RMD160 9e7f770e3fa778c0742a6d9f3d35169772355ebe SHA1 847f4657250008f1963b94718e2377687961bb3b SHA256 a25d523e775c022ec9e68d7b989316e7252b687d70b9db2f60b72bb833099e9d +DIST evolution-3.4.1.tar.xz 12713576 RMD160 6e047fc3ed3cecc303c6530e68e1492d363040ec SHA1 56f1f57e0d9d6e95bb05317f268494234a7b4d4c SHA256 43311bc38302fc26efff98852d72981b791941622d32a2e6e346377341c1814d EBUILD evolution-2.32.2-r3.ebuild 5682 RMD160 dca2da7a550df02080dcf5146577c21f4e41effc SHA1 1f45bf80365b921a655ef507fe26bdbb0d664ebd SHA256 0fdb745201ad6b59b9710a4a7a3c37344cddc667365296adbf8ce84ffeb5fb63 EBUILD evolution-2.32.3-r1.ebuild 5955 RMD160 5c8d728eba98a35625c35df268bfa5e01ea18934 SHA1 d02229627bb0fe71dff3d94bc0038cf3d0bc4223 SHA256 6b9c43f69ed8b5ab325ddd5ac4617b17ed1fd905d830fc1fd22f2885d88eaa39 EBUILD evolution-2.32.3.ebuild 5535 RMD160 c15204a957fca4043755fca578753013eeb61c05 SHA1 4c3cbf7faf9a397166fcc3ad7dde8cbde7894e88 SHA256 19dc7b2c337af9773695ed1b2dc177e0cc7a0e5e95bca0f16429f901f7bb1461 EBUILD evolution-3.2.3-r1.ebuild 5460 RMD160 99d1f9a69b691d76887af95443d5bbabc9d0ce19 SHA1 2381bbaa5575058e1ba97f03b7fd923e7be5244e SHA256 8583690c88b134c2f41ddfd75988cca566f50f6bf2305702ef266d64f0bef57a EBUILD evolution-3.2.3.ebuild 5360 RMD160 cf0f4e8efc674a31a7e00a5094396c9d4feaa887 SHA1 a8d12cb33ad422e19ac427026c8c6032c9c331cd SHA256 741c161acd050e60af778181939b222cf04dafb7b45665fffa2d625f518ebe26 -MISC ChangeLog 82404 RMD160 10997e6709cee21ca76e77d603469f38edcf551b SHA1 ce54fb2817b854b53aeb4e98bad534d99381906e SHA256 28010369b4136e9d26cd52b118e86347a36085649a357440f213feaef908ed51 +EBUILD evolution-3.4.1.ebuild 5423 RMD160 b797ff067431d1e0da2a91a00d51d4cb4b0013f0 SHA1 cba138b87864ddba32cc644140d88ed831a637a9 SHA256 bd8ecf30602e026eafe68482678440b1bcbc564bfa3b21123076bce1ef392a3d +MISC ChangeLog 82606 RMD160 41f6598766fb58aaf3f0e5171c060343864524e8 SHA1 127e4da0044cc076bc5e15dd491ed5d96014914f SHA256 d261bd24e6d5c0c6b6bbc8e0e1ea6d6e5e47f1e8c1ac88ab957002e7aeb1f956 MISC metadata.xml 1097 RMD160 b1d9ba9ac1576e4e70d144b4db37c221ca6290dd SHA1 5f659a37f0021e82eb8fe9572d87d2af2ffe212c SHA256 fd96c4817ed5c032a35790835aa072abbee8188b443e43f591badb35f8b38147 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBAgAGBQJPp2SBAAoJEJ0WA1zPCt1huUkIAIQ5JzNHXWr8wdVNxRF/kJBh +au1FAgxa3ybXv+BxdAF/J5eE/r6dx5EInaqGJIKvILczbJXbx+XrhBm3ZHQD3/W5 +izKKIdfG0ueWrU10rVotNe0SMwYC4nv+kQVYvOYnAvBP0VQcR4VSo/IACs6n6VM6 +1h+tfRkWlyUgwhJ7HBjMMEHqCdqCEFN9/EWbL0qHriR5vpzVF7gjKB5Mm/Fh0kWu +J02ncIip7AFIs5sjDAaEc5DgqOIMzlIcPAP4CLfkg7a7loy1sRi4IbBDLP0oOR+Z +5YChFfxjAxSWYU/ZhMGeUW8mOpf1bRV21L0G1Ui5cQzmC7ciAXBVuFQvHuAOoCY= +=eHEx +-----END PGP SIGNATURE----- diff --git a/mail-client/evolution/evolution-3.4.1.ebuild b/mail-client/evolution/evolution-3.4.1.ebuild new file mode 100644 index 000000000000..8916e5a2ec48 --- /dev/null +++ b/mail-client/evolution/evolution-3.4.1.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.4.1.ebuild,v 1.1 2012/05/07 05:58:19 tetromino Exp $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +PYTHON_DEPEND="python? 2:2.5" + +inherit eutils flag-o-matic gnome2 python + +DESCRIPTION="Integrated mail, addressbook and calendaring functionality" +HOMEPAGE="http://www.gnome.org/projects/evolution/" + +LICENSE="GPL-2 LGPL-2 OPENLDAP" +SLOT="2.0" +KEYWORDS="~amd64 ~x86 ~x86-fbsd" +IUSE="clutter connman crypt doc +gnome-online-accounts gstreamer kerberos ldap map networkmanager python ssl" + +# 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 +# mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571) +# pst is not mature enough and changes API/ABI frequently +COMMON_DEPEND=">=dev-libs/glib-2.30:2 + >=x11-libs/cairo-1.9.15[glib] + >=x11-libs/gtk+-3.2.0:3 + >=gnome-base/gnome-desktop-2.91.3:3 + >=gnome-base/gsettings-desktop-schemas-2.91.92 + >=dev-libs/libgweather-2.90.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/gtkhtml-4.1.2:4.0 + >=gnome-base/gconf-2:2 + dev-libs/atk + >=dev-libs/dbus-glib-0.6 + >=dev-libs/libxml2-2.7.3:2 + >=net-libs/libsoup-gnome-2.31.2:2.4 + >=x11-misc/shared-mime-info-0.22 + >=x11-themes/gnome-icon-theme-2.30.2.1 + >=dev-libs/libgdata-0.10 + + x11-libs/libSM + x11-libs/libICE + + clutter? ( + >=media-libs/clutter-1.0.0:1.0 + >=media-libs/clutter-gtk-0.90:1.0 + x11-libs/mx:1.0 ) + connman? ( net-misc/connman ) + crypt? ( || ( + ( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} ) + =app-crypt/gnupg-1.4* ) ) + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 ) + gstreamer? ( + >=media-libs/gstreamer-0.10:0.10 + >=media-libs/gst-plugins-base-0.10:0.10 ) + kerberos? ( virtual/krb5 ) + ldap? ( >=net-nds/openldap-2 ) + map? ( + >=app-misc/geoclue-0.12.0 + >=media-libs/libchamplain-0.12:0.12 ) + networkmanager? ( >=net-misc/networkmanager-0.7 ) + ssl? ( + >=dev-libs/nspr-4.6.1 + >=dev-libs/nss-3.11 )" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + >=app-text/gnome-doc-utils-0.20.10 + app-text/scrollkeeper + >=dev-util/intltool-0.40.0 + sys-devel/bison + >=sys-devel/gettext-0.17 + virtual/pkgconfig + doc? ( >=dev-util/gtk-doc-1.14 )" +# eautoreconf needs: +# >=gnome-base/gnome-common-2.12 +# >=dev-util/gtk-doc-am-1.9 +RDEPEND="${COMMON_DEPEND} + !<gnome-extra/evolution-exchange-2.32" + +# contact maps require clutter +# NM and connman support cannot coexist +REQUIRED_USE="map? ( clutter ) + connman? ( !networkmanager ) + networkmanager? ( !connman )" + +pkg_setup() { + 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 + --enable-plugins=experimental + --disable-image-inline + --disable-mono + --disable-pst-import + --enable-canberra + --enable-weather + $(use_enable ssl nss) + $(use_enable ssl smime) + $(use_enable networkmanager nm) + $(use_enable connman) + $(use_enable gnome-online-accounts goa) + $(use_enable gstreamer audio-inline) + $(use_enable map contact-maps) + $(use_enable python) + $(use_with clutter) + $(use_with ldap openldap) + $(use_with kerberos krb5 ${EPREFIX}/usr)" + + # dang - I've changed this to do --enable-plugins=experimental. This will + # autodetect new-mail-notify and exchange, but that cannot be helped for the + # moment. They should be changed to depend on a --enable-<foo> like mono + # is. This cleans up a ton of crap from this ebuild. + + # 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 + + python_set_active_version 2 + python_pkg_setup +} + +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 + + # Fix compilation flags crazyness + sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \ + -i configure || die "CPPFLAGS sed failed" +} + +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)." + elog "" + elog "Junk filters are now a run-time choice. You will get a choice of" + elog "bogofilter or spamassassin based on which you have installed" + elog "" + elog "You have to install one of these for the spam filtering to actually work" +} 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 new file mode 100644 index 000000000000..3078fb9eebd7 --- /dev/null +++ b/mail-client/evolution/files/evolution-3.3.91-spamassassin-paths.patch @@ -0,0 +1,60 @@ +From 2f4ddb9f4d4262afbf8f60dd601a639ae33e05c6 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +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 + |