diff options
Diffstat (limited to 'mail-client')
-rw-r--r-- | mail-client/evolution/ChangeLog | 8 | ||||
-rw-r--r-- | mail-client/evolution/evolution-2.30.2-r1.ebuild | 24 | ||||
-rw-r--r-- | mail-client/evolution/evolution-2.30.3.ebuild | 158 | ||||
-rw-r--r-- | mail-client/evolution/evolution-2.32.1-r1.ebuild | 180 | ||||
-rw-r--r-- | mail-client/evolution/evolution-2.32.2-r1.ebuild | 10 | ||||
-rw-r--r-- | mail-client/evolution/evolution-2.32.2.ebuild | 10 |
6 files changed, 29 insertions, 361 deletions
diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog index 8791acaf925c..747aece3067c 100644 --- a/mail-client/evolution/ChangeLog +++ b/mail-client/evolution/ChangeLog @@ -1,6 +1,12 @@ # 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.330 2011/03/12 20:13:50 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.331 2011/03/21 00:38:47 nirbheek Exp $ + + 21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> + evolution-2.30.2-r1.ebuild, -evolution-2.30.3.ebuild, + -evolution-2.32.1-r1.ebuild, evolution-2.32.2.ebuild, + evolution-2.32.2-r1.ebuild: + Fix slot-deps on gtk+ and other libs, remove old 12 Mar 2011; Raúl Porcel <armin76@gentoo.org> evolution-2.32.2.ebuild: alpha/ia64/sparc stable wrt #353436 diff --git a/mail-client/evolution/evolution-2.30.2-r1.ebuild b/mail-client/evolution/evolution-2.30.2-r1.ebuild index f053b442ba66..461c56e184f0 100644 --- a/mail-client/evolution/evolution-2.30.2-r1.ebuild +++ b/mail-client/evolution/evolution-2.30.2-r1.ebuild @@ -1,6 +1,6 @@ # 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.30.2-r1.ebuild,v 1.12 2011/02/05 16:15:21 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.30.2-r1.ebuild,v 1.13 2011/03/21 00:38:47 nirbheek Exp $ EAPI="2" GCONF_DEBUG="no" @@ -22,19 +22,19 @@ IUSE="crypt doc gstreamer kerberos ldap networkmanager nntp pda profile python s # Pango dependency required to avoid font rendering problems # We need a graphical pinentry frontend to be able to ask for the GPG # password from inside evolution, bug 160302 -RDEPEND=">=dev-libs/glib-2.22 - >=x11-libs/gtk+-2.18 +RDEPEND=">=dev-libs/glib-2.22:2 + >=x11-libs/gtk+-2.18:2 >=gnome-extra/evolution-data-server-$(get_version_component_range 1-2) - >=gnome-base/gnome-desktop-2.26.0 - >=gnome-extra/gtkhtml-3.29.6 - >=gnome-base/gconf-2 + >=gnome-base/gnome-desktop-2.26.0:2 + >=gnome-extra/gtkhtml-3.29.6:3.14 + >=gnome-base/gconf-2:2 >=gnome-base/libgnomecanvas-2 dev-libs/atk >=dev-libs/dbus-glib-0.74 - >=dev-libs/libunique-1.1.2 - >=dev-libs/libxml2-2.7.3 + >=dev-libs/libunique-1.1.2:1 + >=dev-libs/libxml2-2.7.3:2 >=dev-libs/libgweather-2.25.3:2 - >=net-libs/libsoup-2.4 + >=net-libs/libsoup-2.4:2.4 >=media-gfx/gtkimageview-1.6 media-libs/libcanberra[gtk] <x11-libs/libnotify-0.7 @@ -46,15 +46,15 @@ RDEPEND=">=dev-libs/glib-2.22 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt3] ) ) =app-crypt/gnupg-1.4* ) ) gstreamer? ( - >=media-libs/gstreamer-0.10 - >=media-libs/gst-plugins-base-0.10 ) + >=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 ) pda? ( >=app-pda/gnome-pilot-2.0.16 >=app-pda/gnome-pilot-conduits-2 ) - python? ( >=dev-lang/python-2.4 ) + python? ( =dev-lang/python-2* ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) diff --git a/mail-client/evolution/evolution-2.30.3.ebuild b/mail-client/evolution/evolution-2.30.3.ebuild deleted file mode 100644 index 143e9488a9bd..000000000000 --- a/mail-client/evolution/evolution-2.30.3.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# 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.30.3.ebuild,v 1.10 2011/02/05 16:15:21 ssuominen Exp $ - -EAPI="2" -GCONF_DEBUG="no" - -inherit autotools eutils flag-o-matic gnome2 python versionator - -DESCRIPTION="Integrated mail, addressbook and calendaring functionality" -HOMEPAGE="http://www.gnome.org/projects/evolution/" - -LICENSE="GPL-2 LGPL-2 OPENLDAP" -SLOT="2.0" -KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd" -IUSE="crypt doc gstreamer kerberos ldap networkmanager nntp pda python ssl" -# pst -# mono - disabled because it just crashes on startup :S - -# Pango dependency required to avoid font rendering problems -# We need a graphical pinentry frontend to be able to ask for the GPG. -# Note that separate pinenetry-qt is actually newer than USE=qt4 in pinentry. -# password from inside evolution, bug 160302 -PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] app-crypt/pinentry[qt3] )" -RDEPEND=">=dev-libs/glib-2.22 - >=x11-libs/gtk+-2.18 - >=gnome-extra/evolution-data-server-$(get_version_component_range 1-2)[weather] - >=gnome-base/gnome-desktop-2.26 - >=gnome-extra/gtkhtml-3.29.6 - <gnome-extra/gtkhtml-3.31 - >=gnome-base/gconf-2 - >=gnome-base/libgnomecanvas-2 - dev-libs/atk - >=dev-libs/dbus-glib-0.74 - >=dev-libs/libunique-1.1.2 - >=dev-libs/libxml2-2.7.3 - >=dev-libs/libgweather-2.25.3:2 - >=net-libs/libsoup-2.4 - >=media-gfx/gtkimageview-1.6 - media-libs/libcanberra[gtk] - <x11-libs/libnotify-0.7 - >=x11-misc/shared-mime-info-0.22 - >=x11-themes/gnome-icon-theme-2.20 - - crypt? ( || ( - ( >=app-crypt/gnupg-2.0.1-r2 - ${PINENTRY_DEPEND} ) - =app-crypt/gnupg-1.4* ) ) - gstreamer? ( - >=media-libs/gstreamer-0.10 - >=media-libs/gst-plugins-base-0.10 ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-2 ) - networkmanager? ( >=net-misc/networkmanager-0.7 ) - pda? ( - >=app-pda/gnome-pilot-2.0.16 - >=app-pda/gnome-pilot-conduits-2 ) - python? ( >=dev-lang/python-2.4 ) - ssl? ( - >=dev-libs/nspr-4.6.1 - >=dev-libs/nss-3.11 ) - - !<gnome-extra/evolution-exchange-2.30" -# champlain, geoclue, clutter, gtkimageview -# mono? ( >=dev-lang/mono-1 ) - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.16 - >=dev-util/intltool-0.35.5 - sys-devel/gettext - sys-devel/bison - app-text/scrollkeeper - >=app-text/gnome-doc-utils-0.9.1 - app-text/docbook-xml-dtd:4.1.2 - >=gnome-base/gnome-common-2.12 - >=dev-util/gtk-doc-am-1.9 - doc? ( >=dev-util/gtk-doc-1.9 )" - -DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README" -ELTCONF="--reverse-deps" - -pkg_setup() { - 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 nntp) - $(use_enable gstreamer audio-inline) - $(use_enable pda pilot-conduits) - --disable-profiling - --disable-pst-import - $(use_enable python) - $(use_with ldap openldap) - $(use_with kerberos krb5 /usr) - --disable-contacts-map" - -# $(use_enable mono) - - # 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 -} - -src_prepare() { - gnome2_src_prepare - - # Fix linking issues with libeshell, upstream #629098 - epatch "${FILESDIR}/${PN}-2.30.3-fix-linking-issues-in-libeshell.patch" - - # FIXME: Fix compilation flags crazyness - sed -e 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \ - -i configure.ac configure || die "sed 1 failed" - sed -e 's/-DG.*_DISABLE_DEPRECATED//' \ - -e 's/-DPANGO_DISABLE_DEPRECATED//' \ - -i configure.ac configure || die "sed 2 failed" - - # 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 3 failed" - fi - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf -} - -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/evolution-2.32.1-r1.ebuild b/mail-client/evolution/evolution-2.32.1-r1.ebuild deleted file mode 100644 index 15135504bc20..000000000000 --- a/mail-client/evolution/evolution-2.32.1-r1.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# 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.1-r1.ebuild,v 1.4 2011/02/05 14:24:38 ssuominen 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} mirror://gentoo/${P}-patches.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 - >=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}-r1[weather] - >=gnome-extra/gtkhtml-3.31.90:3.14 - >=gnome-base/gconf-2 - dev-libs/atk - >=dev-libs/libxml2-2.7.3 - >=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 - >=media-libs/gst-plugins-base-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-extra/evolution-exchange-2.32" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.16 - >=dev-util/intltool-0.35.5 - sys-devel/gettext - sys-devel/bison - app-text/scrollkeeper - >=app-text/gnome-doc-utils-0.9.1 - app-text/docbook-xml-dtd:4.1.2 - >=gnome-base/gnome-common-2.12 - >=dev-util/gtk-doc-am-1.9 - doc? ( >=dev-util/gtk-doc-1.9 )" -# eautoreconf needs: -# >=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-<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 - - # 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}"/${P}-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" - - # Apply upstream patches committed to gnome-2.32 branch - epatch "${WORKDIR}"/${P}-patches/*.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/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \ - -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" -} diff --git a/mail-client/evolution/evolution-2.32.2-r1.ebuild b/mail-client/evolution/evolution-2.32.2-r1.ebuild index f0a18fb66618..fb41c3d09628 100644 --- a/mail-client/evolution/evolution-2.32.2-r1.ebuild +++ b/mail-client/evolution/evolution-2.32.2-r1.ebuild @@ -1,6 +1,6 @@ # 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-r1.ebuild,v 1.3 2011/02/27 15:12:39 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.2-r1.ebuild,v 1.4 2011/03/21 00:38:47 nirbheek Exp $ EAPI="3" GCONF_DEBUG="no" @@ -35,9 +35,9 @@ RDEPEND=">=dev-libs/glib-2.25.12:2 >=x11-libs/libnotify-0.3 >=gnome-extra/evolution-data-server-${PV}[weather] >=gnome-extra/gtkhtml-3.31.90:3.14 - >=gnome-base/gconf-2 + >=gnome-base/gconf-2:2 dev-libs/atk - >=dev-libs/libxml2-2.7.3 + >=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 @@ -51,8 +51,8 @@ RDEPEND=">=dev-libs/glib-2.25.12:2 ${PINENTRY_DEPEND} ) =app-crypt/gnupg-1.4* ) ) gstreamer? ( - >=media-libs/gstreamer-0.10 - >=media-libs/gst-plugins-base-0.10 ) + >=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 ) diff --git a/mail-client/evolution/evolution-2.32.2.ebuild b/mail-client/evolution/evolution-2.32.2.ebuild index 901798bd827d..1c8fe0a25300 100644 --- a/mail-client/evolution/evolution-2.32.2.ebuild +++ b/mail-client/evolution/evolution-2.32.2.ebuild @@ -1,6 +1,6 @@ # 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.ebuild,v 1.5 2011/03/12 20:13:50 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.2.ebuild,v 1.6 2011/03/21 00:38:47 nirbheek Exp $ EAPI="3" GCONF_DEBUG="no" @@ -30,14 +30,14 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi # 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 + >=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 + >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3 >=net-libs/libsoup-2.4:2.4 @@ -52,8 +52,8 @@ RDEPEND=">=dev-libs/glib-2.25.12:2 ${PINENTRY_DEPEND} ) =app-crypt/gnupg-1.4* ) ) gstreamer? ( - >=media-libs/gstreamer-0.10 - >=media-libs/gst-plugins-base-0.10 ) + >=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 ) |