diff options
Diffstat (limited to 'mail-client/evolution')
| -rw-r--r-- | mail-client/evolution/ChangeLog | 12 | ||||
| -rw-r--r-- | mail-client/evolution/evolution-2.24.5.ebuild | 6 | ||||
| -rw-r--r-- | mail-client/evolution/evolution-2.26.2.ebuild | 12 | ||||
| -rw-r--r-- | mail-client/evolution/evolution-2.26.3.ebuild | 156 | ||||
| -rw-r--r-- | mail-client/evolution/files/evolution-2.26.3-automagic-plugins.patch | 176 |
5 files changed, 353 insertions, 9 deletions
diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog index 820b1911bd7d..d0906e02aa46 100644 --- a/mail-client/evolution/ChangeLog +++ b/mail-client/evolution/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for mail-client/evolution # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.268 2009/06/15 03:55:22 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.269 2009/07/23 21:02:16 eva Exp $ + +*evolution-2.26.3 (23 Jul 2009) + + 23 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org> + evolution-2.24.5.ebuild, evolution-2.26.2.ebuild, + +evolution-2.26.3.ebuild, +files/evolution-2.26.3-automagic-plugins.patch: + Version bump. A few bug/crash fixes and translation updates. Use + app-misc/krb5 where virtual/krb5 is inappropriate, bug #277218. Disable + pst plugin due unstable API, bug #271451. Make gstreamer not automagic for + real this time, bug #204300. 15 Jun 2009; Jeroen Roovers <jer@gentoo.org> evolution-2.26.2.ebuild: Marked ~hppa (bug #271002). diff --git a/mail-client/evolution/evolution-2.24.5.ebuild b/mail-client/evolution/evolution-2.24.5.ebuild index 9d9969fe86c4..dd6304354a33 100644 --- a/mail-client/evolution/evolution-2.24.5.ebuild +++ b/mail-client/evolution/evolution-2.24.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.24.5.ebuild,v 1.8 2009/04/27 14:40:57 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.24.5.ebuild,v 1.9 2009/07/23 21:02:16 eva Exp $ inherit gnome2 flag-o-matic libtool @@ -39,7 +39,7 @@ RDEPEND=">=dev-libs/glib-2.16 networkmanager? ( net-misc/networkmanager ) >=net-libs/libsoup-2.4 kerberos? ( virtual/krb5 ) - krb4? ( virtual/krb5 ) + krb4? ( app-crypt/mit-krb5 ) >=gnome-base/orbit-2.9.8 crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) ) ldap? ( >=net-nds/openldap-2 ) @@ -81,7 +81,7 @@ pkg_setup() { fi fi - if use krb4 && ! built_with_use virtual/krb5 krb4; then + if use krb4 && ! built_with_use app-crypt/mit-krb5 krb4; then ewarn ewarn "In order to add kerberos 4 support, you have to emerge" ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well." diff --git a/mail-client/evolution/evolution-2.26.2.ebuild b/mail-client/evolution/evolution-2.26.2.ebuild index 1dbfede8440f..5a696cdd4046 100644 --- a/mail-client/evolution/evolution-2.26.2.ebuild +++ b/mail-client/evolution/evolution-2.26.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.26.2.ebuild,v 1.4 2009/06/15 03:55:22 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.26.2.ebuild,v 1.5 2009/07/23 21:02:16 eva Exp $ EAPI="2" @@ -12,7 +12,8 @@ HOMEPAGE="http://www.gnome.org/projects/evolution/" LICENSE="GPL-2 FDL-1.1" SLOT="2.0" KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~x86 ~x86-fbsd" -IUSE="crypt dbus hal kerberos krb4 ldap mono networkmanager nntp pda profile python ssl gstreamer exchange pst" +IUSE="crypt dbus hal kerberos krb4 ldap mono networkmanager nntp pda profile python ssl gstreamer exchange" +# pst # Pango dependency required to avoid font rendering problems RDEPEND=">=dev-libs/glib-2.18 @@ -31,7 +32,6 @@ RDEPEND=">=dev-libs/glib-2.18 >=x11-misc/shared-mime-info-0.22 dbus? ( dev-libs/dbus-glib ) hal? ( >=sys-apps/hal-0.5.4 ) - pst? ( net-mail/libpst ) x11-libs/libnotify pda? ( >=app-pda/gnome-pilot-2.0.15 @@ -43,7 +43,7 @@ RDEPEND=">=dev-libs/glib-2.18 networkmanager? ( net-misc/networkmanager ) >=net-libs/libsoup-2.4 kerberos? ( virtual/krb5 ) - krb4? ( virtual/krb5[krb4] ) + krb4? ( app-crypt/mit-krb5[krb4] ) >=gnome-base/orbit-2.9.8 crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) ) ldap? ( >=net-nds/openldap-2 ) @@ -52,6 +52,8 @@ RDEPEND=">=dev-libs/glib-2.18 gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 )" +# Disabled until API stabilizes +# pst? ( >=net-mail/libpst-0.6 ) DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.16 @@ -80,7 +82,7 @@ pkg_setup() { $(use_enable dbus) $(use_enable gstreamer audio-inline) $(use_enable exchange) - $(use_enable pst pst-import) + --disable-pst-import $(use_enable pda pilot-conduits) $(use_enable profile profiling) $(use_enable python) diff --git a/mail-client/evolution/evolution-2.26.3.ebuild b/mail-client/evolution/evolution-2.26.3.ebuild new file mode 100644 index 000000000000..f9e42a286322 --- /dev/null +++ b/mail-client/evolution/evolution-2.26.3.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.26.3.ebuild,v 1.1 2009/07/23 21:02:16 eva Exp $ + +EAPI="2" + +inherit autotools gnome2 flag-o-matic python + +DESCRIPTION="Integrated mail, addressbook and calendaring functionality" +HOMEPAGE="http://www.gnome.org/projects/evolution/" + +LICENSE="GPL-2 FDL-1.1" +SLOT="2.0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~x86 ~x86-fbsd" +IUSE="crypt dbus hal kerberos krb4 ldap mono networkmanager nntp pda profile python ssl gstreamer exchange" +# pst + +# Pango dependency required to avoid font rendering problems +RDEPEND=">=dev-libs/glib-2.18 + >=x11-libs/gtk+-2.14 + >=gnome-extra/evolution-data-server-2.26.1 + >=x11-themes/gnome-icon-theme-2.20 + >=gnome-base/libbonobo-2.20.3 + >=gnome-base/libbonoboui-2.4.2 + >=gnome-extra/gtkhtml-3.25.4 + >=gnome-base/gconf-2 + >=gnome-base/libglade-2 + >=gnome-base/libgnomecanvas-2 + >=gnome-base/libgnomeui-2 + >=dev-libs/libxml2-2 + >=dev-libs/libgweather-2.25.3 + >=x11-misc/shared-mime-info-0.22 + dbus? ( dev-libs/dbus-glib ) + hal? ( >=sys-apps/hal-0.5.4 ) + x11-libs/libnotify + pda? ( + >=app-pda/gnome-pilot-2.0.15 + >=app-pda/gnome-pilot-conduits-2 ) + dev-libs/atk + ssl? ( + >=dev-libs/nspr-4.6.1 + >=dev-libs/nss-3.11 ) + networkmanager? ( net-misc/networkmanager ) + >=net-libs/libsoup-2.4 + kerberos? ( virtual/krb5 ) + krb4? ( app-crypt/mit-krb5[krb4] ) + >=gnome-base/orbit-2.9.8 + crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) ) + ldap? ( >=net-nds/openldap-2 ) + mono? ( >=dev-lang/mono-1 ) + python? ( >=dev-lang/python-2.4 ) + gstreamer? ( + >=media-libs/gstreamer-0.10 + >=media-libs/gst-plugins-base-0.10 )" +# Disabled until API stabilizes +# pst? ( >=net-mail/libpst-0.6 ) + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.16 + >=dev-util/intltool-0.35.5 + sys-devel/gettext + sys-devel/bison + app-text/scrollkeeper + >=gnome-base/gnome-common-2.12.0 + >=app-text/gnome-doc-utils-0.9.1" + +PDEPEND="exchange? ( >=gnome-extra/evolution-exchange-2.26.1 )" + +DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README" +ELTCONF="--reverse-deps" +GCONF_DEBUG="no" + +pkg_setup() { + G2CONF="${G2CONF} + --without-kde-applnk-path + --enable-plugins=experimental + --with-weather + $(use_enable ssl nss) + $(use_enable ssl smime) + $(use_enable mono) + $(use_enable nntp) + $(use_enable dbus) + $(use_enable gstreamer audio-inline) + $(use_enable exchange) + --disable-pst-import + $(use_enable pda pilot-conduits) + $(use_enable profile profiling) + $(use_enable python) + $(use_with ldap openldap) + $(use_with kerberos krb5 /usr) + $(use_with krb4 krb4 /usr)" + + # We need a graphical pinentry frontend to be able to ask for the GPG + # password from inside evolution, bug 160302 + if use crypt && has_version '>=app-crypt/gnupg-2.0.1-r2'; then + if ! built_with_use -o app-crypt/pinentry gtk qt3; then + die "You must build app-crypt/pinentry with GTK or QT3 support" + fi + fi + + # 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. +} + +src_prepare() { + gnome2_src_prepare + + # Fix timezone offsets on fbsd. bug #183708 + epatch "${FILESDIR}/${PN}-2.21.3-fbsd.patch" + + # Fix delete keyboard shortcut + epatch "${FILESDIR}/${PN}-2.23.3.1-delete-key.patch" + + # Fix multiple automagic plugins, bug #204300 & bug #271451 + epatch "${FILESDIR}/${PN}-2.26.3-automagic-plugins.patch" + + intltoolize --force --copy --automake || die "intltoolize failed" + eautoreconf + + # Use NSS/NSPR only if 'ssl' is enabled. + if use ssl ; then + sed -i -e "s|mozilla-nss|nss| + s|mozilla-nspr|nspr|" "${S}"/configure || die "sed 1 failed" + G2CONF="${G2CONF} --enable-nss=yes" + else + G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \ + --without-nss-libs --without-nss-includes" + fi + + # problems with -O3 on gcc-3.3.1 + replace-flags -O3 -O2 + + # Bug #? + if [ "${ARCH}" = "hppa" ]; then + append-flags "-fPIC -ffunction-sections" + # bad bad bad, what about user settings !!! + export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000" + fi +} + +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 'mozilla %s'" + elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'" + elog "" + elog "Replace 'mozilla %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" +} diff --git a/mail-client/evolution/files/evolution-2.26.3-automagic-plugins.patch b/mail-client/evolution/files/evolution-2.26.3-automagic-plugins.patch new file mode 100644 index 000000000000..30634b1441f9 --- /dev/null +++ b/mail-client/evolution/files/evolution-2.26.3-automagic-plugins.patch @@ -0,0 +1,176 @@ +Fix automagic dependencies for PST [1] and gtreamer [2] + +[1] https://bugs.gentoo.org/show_bug.cgi?id=271451 +[2] https://bugs.gentoo.org/show_bug.cgi?id=204300 + +--- + + configure.in | 127 +++++++++++++++++++++++++++++++++------------------------- + 1 files changed, 73 insertions(+), 54 deletions(-) + + +diff --git a/configure.in b/configure.in +index 4e36e01..fe03ff8 100644 +--- a/configure.in ++++ b/configure.in +@@ -1773,9 +1773,9 @@ dnl Add any new plugins here + plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup webdav-account-setup" + + plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " +-all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono" ++all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin mono" + +-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates pst-import" ++plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates" + + plugins_standard="$plugins_standard_always" + all_plugins_standard="$plugins_standard" +@@ -1830,53 +1830,89 @@ if test "x${enable_python}" = "xyes"; then + msg_plugins="$msg_plugins (and python)" + fi + +-AC_SUBST(plugins_enabled) +-AC_SUBST(all_plugins_base) +-AC_SUBST(all_plugins_standard) +-AC_SUBST(all_plugins_experimental) ++dnl ********************* ++dnl gstreamer ++dnl ********************* ++AC_ARG_ENABLE([audio-inline], ++ AC_HELP_STRING([--disable-audio-inline], ++ [Disable audio-inline plugin @<:@default=yes@:>@]), ++ [enable_audio_inline="$enableval"], [enable_audio_inline=yes]) + +-if echo ${plugins_enabled} | grep "audio-inline" > /dev/null ++if test "x$enable_audio_inline" = "xyes" + then +- if ${PKG_CONFIG} --exists gstreamer-0.10 +- then +- dnl ********************* +- dnl gstreamer +- dnl ********************* +- PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10) +- AC_SUBST(GSTREAMER_CFLAGS) +- AC_SUBST(GSTREAMER_LIBS) ++ PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10, have_gst=yes, have_gst=no) ++ AC_SUBST(GSTREAMER_CFLAGS) ++ AC_SUBST(GSTREAMER_LIBS) ++ ++ if test "$have_gst" = "yes"; then ++ plugins_enabled="$plugins_enabled audio-inline" ++ msg_plugins="$msg_plugins (audio-inline)" + else +- plugins_enabled=`echo $plugins_enabled | sed -e "s/audio-inline//g"` +- echo "warning: gstreamer was not found, audio-inline plugin will not be built." +- echo "you are probably missing gstreamer-devel package." ++ AC_MSG_WARN([gstreamer was not found, audio-inline plugin will not be built. ++You are probably missing gstreamer-devel package.]) + fi + fi + +-if ${PKG_CONFIG} --exists dbus-glib-1 ; then ++dnl ********************* ++dnl libpst ++dnl ********************* ++ ++AC_ARG_ENABLE([pst-import], ++ AC_HELP_STRING([--disable-pst-import], ++ [Disable pst import plugin @<:@default=yes@:>@]), ++ [enable_pst="$enableval"], [enable_pst=yes]) ++ ++if test "x$enable_pst" = "xyes" ++then ++ PKG_CHECK_MODULES(LIBPST, libpst, have_pst=yes, have_pst=no) ++ AC_SUBST(LIBPST_CFLAGS) ++ AC_SUBST(LIBPST_LIBS) ++ ++ if test "$have_pst" = "yes"; then ++ plugins_enabled="$plugins_enabled pst-import" ++ msg_plugins="$msg_plugins (pst-import)" ++ else ++ AC_MSG_WARN([libpst was not found, pst-import plugin will not be built. ++You are probably missing libpst-devel package.]) ++ fi ++fi ++ ++AC_SUBST(plugins_enabled) ++AC_SUBST(all_plugins_base) ++AC_SUBST(all_plugins_standard) ++AC_SUBST(all_plugins_experimental) ++ ++AC_ARG_ENABLE([dbus], ++ AC_HELP_STRING([--disable-dbus], [Disable mail notification DBus messages plugin @<:@default=yes@:>@]), ++ [enable_dbus="$enableval"], [enable_dbus=yes]) ++ ++if test "x$enable_dbus" = "xyes"; then + dnl ************************************************** + dnl * Mail Notification plugin's DBus messages + dnl ************************************************** +- PKG_CHECK_MODULES(NMN, dbus-glib-1) +- AC_SUBST(NMN_CFLAGS) +- AC_SUBST(NMN_LIBS) +- +- # Get the version of the DBus API, so we can hack around API changes until the API stabilises: +- # multiply by 1000 to convert decimal to integer; so e.g. 0.31 become 310 +- # since preprocessor values must be integral +- FOUND_DBUS_VERSION="`$PKG_CONFIG --modversion dbus-1 | $AWK '{print 1000 * $1}'`" +- AC_SUBST(FOUND_DBUS_VERSION) +- AC_DEFINE(HAVE_DBUS,1,[Define if you have DBUS support]) +- AC_SUBST(HAVE_DBUS) +- AM_CONDITIONAL(ENABLE_DBUS, true) +- +-else +- echo "warning: dbus-glib-1 was not found, Mail notification plugins's dbus message support not built" +- AM_CONDITIONAL(ENABLE_DBUS, false) ++ if $PKG_CONFIG --exists dbus-glib-1; then ++ PKG_CHECK_MODULES(NMN, dbus-glib-1) ++ AC_SUBST(NMN_CFLAGS) ++ AC_SUBST(NMN_LIBS) ++ ++ # Get the version of the DBus API, so we can hack around API changes until the API stabilises: ++ # multiply by 1000 to convert decimal to integer; so e.g. 0.31 become 310 ++ # since preprocessor values must be integral ++ FOUND_DBUS_VERSION="`$PKG_CONFIG --modversion dbus-1 | $AWK '{print 1000 * $1}'`" ++ AC_SUBST(FOUND_DBUS_VERSION) ++ AC_DEFINE(HAVE_DBUS,1,[Define if you have DBUS support]) ++ AC_SUBST(HAVE_DBUS) ++ else ++ echo "warning: dbus-glib-1 was not found, Mail notification plugins's dbus message support not built" ++ fi + + fi + +-if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then +- PKG_CHECK_MODULES(LIBEXCHANGESTORAGE, libexchange-storage-$EDS_PACKAGE >= eds_minimum_version, have_libexchange="yes", have_libexchange="no") ++AM_CONDITIONAL(ENABLE_DBUS, test x$enable_dbus = xyes) ++ ++if test "x$enable_exchange" = "xyes"; then ++ PKG_CHECK_MODULES(LIBEXCHANGESTORAGE, libexchange-storage-$EDS_PACKAGE >= eds_minimum_version, ++ have_libexchange="yes", have_libexchange="no") + if test "x$have_libexchange" = "xyes"; then + dnl ************************************************** + dnl * Exchange Operations plugin +@@ -1890,23 +1926,6 @@ if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then + fi + fi + +-if echo ${plugins_enabled} | grep "pst-import" > /dev/null +-then +- if ${PKG_CONFIG} --exists libpst +- then +- dnl ********************* +- dnl libpst +- dnl ********************* +- PKG_CHECK_MODULES(LIBPST, libpst) +- AC_SUBST(LIBPST_CFLAGS) +- AC_SUBST(LIBPST_LIBS) +- else +- plugins_enabled=`echo $plugins_enabled | sed -e "s/pst-import//g"` +- echo "warning: libpst was not found, pst-import plugin will not be built." +- echo "you are probably missing libpst-devel package." +- fi +-fi +- + dnl *********** + dnl GConf stuff + dnl *********** |