pacho       14/03/16 14:41:07

  Modified:             ChangeLog
  Added:                evolution-3.10.4-r1.ebuild
  Removed:              evolution-3.10.3.ebuild
  Log:
  Apply some fixes from upstream 3.8 branch that also solves crash with IMAP 
folder creation (#504062 by Jaroslaw Strauchmann)
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
A188FBD4)

Revision  Changes    Path
1.417                mail-client/evolution/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/ChangeLog?rev=1.417&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/ChangeLog?rev=1.417&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/ChangeLog?r1=1.416&r2=1.417

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- ChangeLog   9 Mar 2014 12:01:21 -0000       1.416
+++ ChangeLog   16 Mar 2014 14:41:07 -0000      1.417
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.416 
2014/03/09 12:01:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.417 
2014/03/16 14:41:07 pacho Exp $
+
+*evolution-3.10.4-r1 (16 Mar 2014)
+
+  16 Mar 2014; Pacho Ramos <pa...@gentoo.org> +evolution-3.10.4-r1.ebuild,
+  +files/evolution-3.10.4-imap-crash.patch,
+  +files/evolution-3.10.4-main-ui.patch,
+  +files/evolution-3.10.4-nntp-outbox.patch, -evolution-3.10.3.ebuild:
+  Apply some fixes from upstream 3.8 branch that also solves crash with IMAP
+  folder creation (#504062 by Jaroslaw Strauchmann)
 
   09 Mar 2014; Pacho Ramos <pa...@gentoo.org> evolution-3.10.4.ebuild:
   x86 stable, bug 499954



1.1                  mail-client/evolution/evolution-3.10.4-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-3.10.4-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-3.10.4-r1.ebuild?rev=1.1&content-type=text/plain

Index: evolution-3.10.4-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.10.4-r1.ebuild,v 1.1 
2014/03/16 14:41:07 pacho Exp $

EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"

inherit eutils flag-o-matic readme.gentoo gnome2 #autotools

DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
HOMEPAGE="https://wiki.gnome.org/Apps/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 gstreamer highlight kerberos ldap map spamassassin ssl 
+weather"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"

# 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
        >=x11-libs/gdk-pixbuf-2.24:2
        >=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}:=[weather?]
        >=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-2.0.1:3

        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:0
                >=media-libs/libchamplain-0.12:0.12[gtk]
                >=media-libs/clutter-1.0.0:1.0
                >=media-libs/clutter-gtk-0.90:1.0
                >=sci-geosciences/geocode-glib-3.10.0
                x11-libs/mx:1.0 )
        gstreamer? (
                media-libs/gstreamer:1.0
                media-libs/gst-plugins-base:1.0 )
        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.8: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
"

DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
~/.local/share/applications/mimeapps.list so it includes the
following content:

[Default Applications]
x-scheme-handler/http=firefox.desktop
x-scheme-handler/https=firefox.desktop

(replace firefox.desktop with the name of the appropriate .desktop
file from /usr/share/applications if you use a different browser)."

src_prepare() {
        # Reason?
        ELTCONF="--reverse-deps"

        DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"

        # Run EMailFormatter in the main/UI thread (from 3.8 branch)
        epatch "${FILESDIR}/${P}-main-ui.patch"

        # NNTP Messages are silently dropped from Outbox (from 3.8 branch)
        epatch "${FILESDIR}/${P}-nntp-outbox.patch"

        # Crash creating a new folder (from 3.8 branch)
        epatch "${FILESDIR}/${P}-imap-crash.patch"

        #eautoreconf # See https://bugzilla.gnome.org/701904

        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
        gnome2_src_configure \
                --without-glade-catalog \
                --disable-image-inline \
                --disable-pst-import \
                --enable-canberra \
                $(use_enable bogofilter) \
                $(use_enable gstreamer audio-inline) \
                $(use_enable highlight text-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) \
                ITSTOOL=$(type -P true)
}

src_install() {
        gnome2_src_install
        readme.gentoo_create_doc
}

pkg_postinst() {
        gnome2_pkg_postinst
        readme.gentoo_print_elog
}




Reply via email to