From b174f78b500b69b1c3ff2a28e1e4997d16431e87 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Tue, 12 Apr 2011 11:14:26 +0000 Subject: Apply upstream patches committed to their 2.32 branch. Package-Manager: portage-2.1.9.45/cvs/Linux x86_64 --- mail-client/evolution/ChangeLog | 7 +- mail-client/evolution/Manifest | 10 +- mail-client/evolution/evolution-2.32.2-r3.ebuild | 186 +++++++++++++++++++++++ 3 files changed, 198 insertions(+), 5 deletions(-) create mode 100644 mail-client/evolution/evolution-2.32.2-r3.ebuild (limited to 'mail-client/evolution') diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog index 54ca9be2a611..c4bfaaf5e61a 100644 --- a/mail-client/evolution/ChangeLog +++ b/mail-client/evolution/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-client/evolution # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.334 2011/03/27 20:36:45 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.335 2011/04/12 11:14:26 pacho Exp $ + +*evolution-2.32.2-r3 (12 Apr 2011) + + 12 Apr 2011; Pacho Ramos +evolution-2.32.2-r3.ebuild: + Apply upstream patches committed to their 2.32 branch. *evolution-2.32.2-r2 (27 Mar 2011) diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest index b6d36ae309f0..8fe04a76a45b 100644 --- a/mail-client/evolution/Manifest +++ b/mail-client/evolution/Manifest @@ -9,18 +9,20 @@ AUX evolution-2.32.2-mime-handler.patch 4169 RMD160 8ec9bd24fcaa9cff0b2e865a85a4 AUX evolution-2.32.2-smime-fix.patch 2444 RMD160 e3f5c36d800bd7d0578f1696efe2582eb55db123 SHA1 e4ad555a982a5cd334df95d3420404dddb334d4d SHA256 3e5fae0d34cec92f01c1e66d5fdac858f39619bfcb00f8f74231c04571892362 DIST evolution-2.30.2-patches.tar.bz2 12728 RMD160 d8058da75675a1990aad84348a40cd3f7be21aa3 SHA1 4bbb89f10ba893ef992af5fc32aad84b2ad46d2f SHA256 f3d6dcfba9ee7c21b415d04a545902cb5a28d1bcc00e579c6cc78aeac7650a45 DIST evolution-2.30.2.tar.bz2 32570501 RMD160 c1b5703bc241a2dee20f94e60e7c9995c8cce841 SHA1 14ddccbf33eb86c976899eccea6ae1fb565ea9ca SHA256 470d12c0de9cae2dc0275152a356150c7a57339e6feca77f43508bd7d1f04d83 +DIST evolution-2.32.2-patches-r1.tar.bz2 15387 RMD160 1b5279f83c5d6048294a4b320b3bbc03bcb91485 SHA1 d6a6c18eaf2cb94256971e8b4444fe7c7ba20851 SHA256 466783eadc50e06c7c34c6e5a93ddc87b3af15456f28b40e52c2e785fb324b8e DIST evolution-2.32.2-patches.tar.bz2 11380 RMD160 af368025fe76823282e12de5c555052be33f2573 SHA1 3d7f0b153c0f9f3931ad8120b2a067ea0a72dd58 SHA256 8df00b351fe3abcebffc86efa3ebcb9ad90afaeef27d01c5e89cf5b645d620fb DIST evolution-2.32.2.tar.bz2 31929154 RMD160 1d68825111309600093c8d4718e1cc001635e61d SHA1 48f25fffda1ac9c209fd02162ca298df5c03b05f SHA256 1831c7f5f00b4755869cf84ef3e3f79c4705a33e0659e72b6c1ffa4a59d4a4bb EBUILD evolution-2.30.2-r1.ebuild 4699 RMD160 f754b3d1252458873eccaa8378dd03ba1b511d12 SHA1 722cf33b3b3248cc26d7f2556fc3ed5cf529ed47 SHA256 0698a02d00e0fe1f17443fe707e88f30cfb024a5df388bf715c2c138c409803b EBUILD evolution-2.32.2-r1.ebuild 5473 RMD160 9bd2bf3dad02b47f18621f7d856ad3e2e0dd7090 SHA1 17a194d2a02529a36be076a938805dfe2b2f02ba SHA256 e9f77b46d6c4b704b2934662242f8e5d2aa21ce3c5e90f95db728305e4cafb00 EBUILD evolution-2.32.2-r2.ebuild 5858 RMD160 91aeed687900d6e8152180ec10db4b3d2edc8c5d SHA1 0cd614426409df0956a32bd5aec3ad8d408107e1 SHA256 0804b4ca30227e1a37413e5023b0a622a7dfe20d1e1e3da0e1c81b34122ebb92 +EBUILD evolution-2.32.2-r3.ebuild 5864 RMD160 2ef495cd1293189a081927b86465634aad8ff9be SHA1 6ecfd9e917e445a194050d0f7c781ad4461d294a SHA256 f2cabfc63c33f24c80b067d976e2c42cf9aef17535a728f3b88342bbb86c6500 EBUILD evolution-2.32.2.ebuild 5514 RMD160 aa1f7b1ef07fe38a5cbd8b712f05abf14da2fd0c SHA1 3cca56e1cc421157cca43b0d6e2589c76dfaae33 SHA256 9ca4d7dccfb6a5033e134fa302e51b20dc398d12e9786686e5cfc26373f121c3 -MISC ChangeLog 76981 RMD160 0b81558fad81f9985cee8022b1d0489645d694e4 SHA1 6278d2d39570f895a3126541ce896c4b3f3f4fd8 SHA256 95a1460c82419afc4dc2c482767cd0c3573c4587d5ab640327b224d0fb3826af +MISC ChangeLog 77150 RMD160 3acb45be6c5e8aa6a593d87836211b602acb3cf6 SHA1 5e04e2e77f9a64ca6cfb7b8032cd9f398bc8b6f0 SHA256 d3bf5d3a757baa11f2c96c1f71fe24a61d47d80450d911c6c8df5f9fb9a904d3 MISC metadata.xml 1123 RMD160 abcc4bc1f7bbc92df0e35db1b59056fe5a4d05d2 SHA1 ecc4a4f56aeb9b5d0d9ec612308d9cb1ef9f9f3d SHA256 b188965e8c8ce0823c081f8b86653e3848665eb4b0d59fee4176589b549c6911 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2Pn+MACgkQCaWpQKGI+9SuAQCdF+WZCPdBR3P/+tuDk6yB/nwm -OfUAnAxzXIxdrIjn4SU9ChdkGqsjJj/U -=nNPy +iEYEARECAAYFAk2kNBcACgkQCaWpQKGI+9TehACfcWg/p2XYcwayWQvqPsvZLHoZ +MGcAnA3qSelZC8vOXvI7xsZd5rYOu/HF +=nI7D -----END PGP SIGNATURE----- diff --git a/mail-client/evolution/evolution-2.32.2-r3.ebuild b/mail-client/evolution/evolution-2.32.2-r3.ebuild new file mode 100644 index 000000000000..12003ba5a692 --- /dev/null +++ b/mail-client/evolution/evolution-2.32.2-r3.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.2-r3.ebuild,v 1.1 2011/04/12 11:14:26 pacho Exp $ + +EAPI="3" +GCONF_DEBUG="no" +PYTHON_DEPEND="python? 2:2.4" + +inherit autotools flag-o-matic gnome2 python versionator + +MY_MAJORV=$(get_version_component_range 1-2) + +DESCRIPTION="Integrated mail, addressbook and calendaring functionality" +HOMEPAGE="http://www.gnome.org/projects/evolution/" + +SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches-r1.tar.bz2" + +LICENSE="GPL-2 LGPL-2 OPENLDAP" +SLOT="2.0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="clutter connman crypt doc gstreamer kerberos ldap 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] )" + +# contacts-map plugin requires libchaimplain and geoclue +# 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 +RDEPEND=">=dev-libs/glib-2.25.12:2 + >=x11-libs/gtk+-2.20.0:2 + >=dev-libs/libunique-1.1.2:1 + >=gnome-base/gnome-desktop-2.26:2 + >=dev-libs/libgweather-2.25.3:2 + media-libs/libcanberra[gtk] + >=x11-libs/libnotify-0.3 + >=gnome-extra/evolution-data-server-${PV}[weather] + >=gnome-extra/gtkhtml-3.31.90:3.14 + >=gnome-base/gconf-2:2 + dev-libs/atk + >=dev-libs/libxml2-2.7.3:2 + >=net-libs/libsoup-2.4:2.4 + >=media-gfx/gtkimageview-1.6 + >=x11-misc/shared-mime-info-0.22 + >=x11-themes/gnome-icon-theme-2.30.2.1 + >=dev-libs/libgdata-0.4 + + clutter? ( media-libs/clutter:1.0[gtk] ) + connman? ( net-misc/connman ) + crypt? ( || ( + ( >=app-crypt/gnupg-2.0.1-r2 + ${PINENTRY_DEPEND} ) + =app-crypt/gnupg-1.4* ) ) + 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 ) + networkmanager? ( >=net-misc/networkmanager-0.7 ) + ssl? ( + >=dev-libs/nspr-4.6.1 + >=dev-libs/nss-3.11 ) + + !=gnome-base/gnome-common-2.12 +# >=dev-util/gtk-doc-am-1.9 + +pkg_setup() { + ELTCONF="--reverse-deps" + DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README" + G2CONF="${G2CONF} + --without-kde-applnk-path + --enable-plugins=experimental + --enable-image-inline + --enable-canberra + --enable-weather + $(use_enable ssl nss) + $(use_enable ssl smime) + $(use_enable networkmanager nm) + $(use_enable connman) + $(use_enable gstreamer audio-inline) + --disable-profiling + --disable-pst-import + $(use_enable python) + $(use_with clutter) + $(use_with ldap openldap) + $(use_with kerberos krb5 /usr) + --disable-contacts-map + --without-glade-catalog + --disable-mono + --disable-gtk3" + + # 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- 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 + + # NM and connman support cannot coexist + if use networkmanager && use connman ; then + ewarn "It is not possible to enable both ConnMan and NetworkManager, disabling connman..." + G2CONF="${G2CONF} --disable-connman" + fi + + python_set_active_version 2 +} + +src_prepare() { + gnome2_src_prepare + + epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-0.7.patch + + # Fix invalid use of la file in contact-editor, upstream bug #635002 + epatch "${FILESDIR}/${PN}-2.32.0-wrong-lafile-usage.patch" + + # Fix compilation with --disable-smime, bug #356471 + epatch "${FILESDIR}/${PN}-2.32.2-smime-fix.patch" + + # Fix desktop file to work with latest glib + epatch "${FILESDIR}/${PN}-2.32.2-mime-handler.patch" + + # Apply multiple backports from master fixing important bugs + epatch "${WORKDIR}/${P}-patches-r1"/*.patch + + # Use NSS/NSPR only if 'ssl' is enabled. + if use ssl ; then + sed -e 's|mozilla-nss|nss|' \ + -e 's|mozilla-nspr|nspr|' \ + -i configure.ac configure || die "sed 2 failed" + fi + + # Fix compilation flags crazyness + sed -e 's/-D.*_DISABLE_DEPRECATED//' \ + -i configure.ac configure || die "sed 1 failed" + + intltoolize --force --copy --automake || die "intltoolize failed" + eautoreconf +} + +src_install() { + gnome2_src_install + + find "${ED}"/usr/$(get_libdir)/evolution/${MY_MAJORV}/plugins \ + -name "*.la" -delete || die "la files removal failed 1" + find "${ED}"/usr/$(get_libdir)/evolution/${MY_MAJORV}/modules \ + -name "*.la" -delete || die "la files removal failed 2" +} + +pkg_postinst() { + gnome2_pkg_postinst + + elog "To change the default browser if you are not using GNOME, do:" + elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'firefox %s'" + elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'firefox %s'" + elog "" + elog "Replace 'firefox %s' with which ever browser you use." + 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" +} -- cgit v1.2.3-65-gdbad