Brown paper bag fix: a crasher was introduced in 2.8.1, this includes the upstream fix

Package-Manager: portage-2.1.2_pre2-r9

3 files changed, 18 insertions, 220 deletions

diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 381c8f6ff9c9..95028f67dac0 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -57,6 +57,10 @@ AUX evolution-2.8.1-64-bit.patch 6566 RMD160 64b831a30040b7e58dba6937f6482ea3341
 MD5 3ab1cc430efec3d44700a4abd0112300 files/evolution-2.8.1-64-bit.patch 6566
 RMD160 64b831a30040b7e58dba6937f6482ea33419984d files/evolution-2.8.1-64-bit.patch 6566
 SHA256 449ab7a55404f721e54c383ffec91267c54588f37f41a4f51c242f17d13305f5 files/evolution-2.8.1-64-bit.patch 6566
+AUX evolution-2.8.1-filter-bar-crash.patch 1518 RMD160 530fb81af0f3d48335c1f25da5aa62af2ab28dcb SHA1 7be2d8aae24bbd882a9883000891d32622301343 SHA256 62230d26a4b91a6a0cd141b3ff872e1a854e2b50965dcc957e16f3ffcafb86f3
+MD5 b25ab85d211c347ac4116182f19565f8 files/evolution-2.8.1-filter-bar-crash.patch 1518
+RMD160 530fb81af0f3d48335c1f25da5aa62af2ab28dcb files/evolution-2.8.1-filter-bar-crash.patch 1518
+SHA256 62230d26a4b91a6a0cd141b3ff872e1a854e2b50965dcc957e16f3ffcafb86f3 files/evolution-2.8.1-filter-bar-crash.patch 1518
 DIST evolution-2.4.2.1.tar.bz2 11503590 RMD160 cb72e939fbd651a43ae09e0341f47e6ebf490c56 SHA1 b3e61e8f013ea35aa137928d1d25a91b3043357d SHA256 eae8fed13de8eee9f60606ec0e645876e4b9a1e9bb30d21dace54e3995ca5f40
 DIST evolution-2.5.5.1-bf-junk.tar.bz2 10771 RMD160 7ae764761607d50024fbec32680bc57e04ac7879 SHA1 465205cf50770b72641995ec59617010dadaf204 SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045
 DIST evolution-2.6.2.tar.bz2 12394719 RMD160 72133312fb9cceae74d9f0e570dd898d5119a10b SHA1 08a6a9bf3754fff71cbdf82857337b1edc13ef46 SHA256 a69c45e9deae3a2eea06af08eacb9266e6cdcd452dd600ad96c2de23effa56f5
@@ -74,14 +78,14 @@ EBUILD evolution-2.8.0-r1.ebuild 6366 RMD160 a1a2485584b0ba7fb954c12c5b35efba359
 MD5 a234f120db7f1e56289d58ea5c21e191 evolution-2.8.0-r1.ebuild 6366
 RMD160 a1a2485584b0ba7fb954c12c5b35efba3594a607 evolution-2.8.0-r1.ebuild 6366
 SHA256 3381275f0f09b2a638bc784ec6af5768582fcefd340edf38b425fdb76cbdee4a evolution-2.8.0-r1.ebuild 6366
-EBUILD evolution-2.8.1.ebuild 6122 RMD160 02640917e335b01073c8c44c0c0d22e74ad9ef26 SHA1 2089fb7309f72330f4b07652f6fd9f13fb1fa5be SHA256 51b380566d1c0c85933b101f419b18a447ea1245ef6ffabec19897d4b939980c
-MD5 9cff1809dc81a800a554f4ddce218040 evolution-2.8.1.ebuild 6122
-RMD160 02640917e335b01073c8c44c0c0d22e74ad9ef26 evolution-2.8.1.ebuild 6122
-SHA256 51b380566d1c0c85933b101f419b18a447ea1245ef6ffabec19897d4b939980c evolution-2.8.1.ebuild 6122
-MISC ChangeLog 37813 RMD160 ad03729b52f71c16bdb22ebf40c6cb892c3bf073 SHA1 fca1f9f46b16007d6147e1455dc80813ff063cc2 SHA256 fcf12b7f65f8dd0edb089c4c1b467c8db93edbf5985485e3c39d394c968825f1
-MD5 19accfed813515a9b8bdfcb7586584b2 ChangeLog 37813
-RMD160 ad03729b52f71c16bdb22ebf40c6cb892c3bf073 ChangeLog 37813
-SHA256 fcf12b7f65f8dd0edb089c4c1b467c8db93edbf5985485e3c39d394c968825f1 ChangeLog 37813
+EBUILD evolution-2.8.1-r1.ebuild 6198 RMD160 4e7567edc516fce249a748d7feac99824a957d08 SHA1 9a61c05e0a622803264fe4665142ffa725185126 SHA256 0d65b3bca6611403f091c1ed5cb73e3ce064eac744c8cb891dc7e060caf1b658
+MD5 8428416782c9eb091e6158bf67ccb35e evolution-2.8.1-r1.ebuild 6198
+RMD160 4e7567edc516fce249a748d7feac99824a957d08 evolution-2.8.1-r1.ebuild 6198
+SHA256 0d65b3bca6611403f091c1ed5cb73e3ce064eac744c8cb891dc7e060caf1b658 evolution-2.8.1-r1.ebuild 6198
+MISC ChangeLog 38270 RMD160 cd7c9002b261edf5285f7e6c03fecf2209bbb0ca SHA1 967eff5f36677438346d6e9c6d3b0e540c15f310 SHA256 7058d83eb32f43064f51b9050d854b1f83385dbc2863815649f9dfc525a0efda
+MD5 324be56e12e25719b5e6462bfffc9dec ChangeLog 38270
+RMD160 cd7c9002b261edf5285f7e6c03fecf2209bbb0ca ChangeLog 38270
+SHA256 7058d83eb32f43064f51b9050d854b1f83385dbc2863815649f9dfc525a0efda ChangeLog 38270
 MISC metadata.xml 228 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf SHA1 a7000d8d92e63e8b0bcb2531adea06af0fb4ceac SHA256 2f477aca2b0940f4b8d5a5817f1def0daa79846e5d3cb9b6c832a02ee7be298a
 MD5 adc1e2cec38f3e23b706de11a2ac0d92 metadata.xml 228
 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf metadata.xml 228
@@ -95,13 +99,13 @@ SHA256 730a2ffe0655db234cb17adecb91357a37e42064f41dc64cccfb7ab2fda0614d files/di
 MD5 26fe6f66858beb4a799a0d4a2ef4ed19 files/digest-evolution-2.8.0-r1 533
 RMD160 51f8fb00430feb4a94d4851754fc5fe6cc5c77d5 files/digest-evolution-2.8.0-r1 533
 SHA256 ad352c750121d30170619502ba3a3dcf059d205cb1832e31b2f20687e188dbc9 files/digest-evolution-2.8.0-r1 533
-MD5 7aa989b23e314d6e0194123857993c68 files/digest-evolution-2.8.1 533
-RMD160 7a6799ec23898007381f8ba8224817238ce821ee files/digest-evolution-2.8.1 533
-SHA256 a0410f5224e9ef931bb63c7d14940ff8f0ac93665aa70fb2c9b878cf327193a4 files/digest-evolution-2.8.1 533
+MD5 7aa989b23e314d6e0194123857993c68 files/digest-evolution-2.8.1-r1 533
+RMD160 7a6799ec23898007381f8ba8224817238ce821ee files/digest-evolution-2.8.1-r1 533
+SHA256 a0410f5224e9ef931bb63c7d14940ff8f0ac93665aa70fb2c9b878cf327193a4 files/digest-evolution-2.8.1-r1 533
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFL9OHomPajV0RnrERAkVBAJ93/7Pnili0GWPqRWqgCg45mEyVZACdHQRX
-Q3Hf2GeWNQCmnQk2D7swDfU=
-=GpOr
+iD8DBQFFL//vomPajV0RnrERAquWAJ0Q6EVjsUNiN6eeOGkQWYSCtckbYgCfYwpB
+nOD+w7BMnNYV9S6QZDf1cRU=
+=/rum
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.8.1.ebuild b/mail-client/evolution/evolution-2.8.1.ebuild
deleted file mode 100644
index b566df904e68..000000000000
--- a/mail-client/evolution/evolution-2.8.1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.1.ebuild,v 1.1 2006/10/13 17:57:14 dang Exp $
-
-inherit eutils flag-o-matic alternatives gnome2 autotools
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}
-	bogofilter? ( mirror://gentoo/${PN}-2.5.5.1-bf-junk.tar.bz2 )"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-# gstreamer for audio-inline, when it uses 0.10
-IUSE="bogofilter crypt dbus debug doc hal ipv6 kerberos krb4 ldap mono nntp pda profile spell ssl"
-
-# Pango dependency required to avoid font rendering problems
-# evolution-data-server dep is 1.5 because in the e-utils directories,
-# the includes reference locations only present in eds > 1.5
-RDEPEND=">=x11-themes/gnome-icon-theme-1.2
-	dev-libs/atk
-	>=gnome-extra/gtkhtml-3.9.90
-	>=dev-libs/glib-2
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/libbonobo-2
-	>=gnome-extra/evolution-data-server-1.7.90
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeprint-2.7
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=net-libs/libsoup-2.2.96
-	>=x11-libs/pango-1.8.1
-	x11-libs/libnotify
-	hal? ( >=sys-apps/hal-0.5.4 )
-	pda? (
-		>=app-pda/gnome-pilot-2
-		>=app-pda/gnome-pilot-conduits-2 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? ( >=dev-libs/nspr-4.6.1
-		   >=dev-libs/nss-3.11 )
-	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	dbus? ( sys-apps/dbus )
-	mono? ( >=dev-lang/mono-1 )
-	bogofilter? ( mail-filter/bogofilter )
-	!bogofilter? ( mail-filter/spamassassin )"
-#	gstreamer? (
-#		>=media-libs/gstreamer-0.10
-#		>=media-libs/gst-plugins-base-0.10 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	sys-devel/bison
-	app-text/scrollkeeper
-	>=gnome-base/gnome-common-2.12.0
-	doc? ( >=dev-util/gtk-doc-0.6 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-
-
-pkg_setup() {
-	G2CONF="--disable-default-binary \
-		--without-kde-applnk-path        \
-		$(use_enable ssl nss)            \
-		$(use_enable ssl smime)          \
-		$(use_enable ipv6)               \
-		$(use_enable mono)               \
-		$(use_enable nntp)               \
-		$(use_enable pda pilot-conduits) \
-		$(use_enable profile profiling)  \
-		$(use_with ldap openldap)        \
-		$(use_with kerberos krb5 /usr)"
-
-	if use krb4 && ! built_with_use virtual/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."
-		ewarn
-		ewarn "Skipping for now."
-		ewarn
-		G2CONF="${G2CONF} --without-krb4"
-	else
-		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
-	fi
-
-	# Plug-ins to install. Normally we would want something similar to
-	# --enable-plugins=all (plugins_base + plugins_standard), except for some
-	# special cases.
-	local plugins="calendar-file calendar-http calendar-weather \
-		itip-formatter plugin-manager default-source addressbook-file \
-		startup-wizard print-message mark-all-read groupwise-features \
-		groupwise-account-setup hula-account-setup mail-account-disable \
-		publish-calendar caldav \
-		bbdb subject-thread save-calendar select-one-source copy-tool \
-		mail-to-task mark-calendar-offline mailing-list-actions \
-		new-mail-notify default-mailer import-ics-attachments"
-
-	# For dev releases, add experimental plugins
-	plugins="${plugins} backup-restore folder-unsubscribe mail-to-meeting \
-		prefer-plain save-attachments"
-
-	if use bogofilter; then
-		plugins="${plugins} bf-junk-plugin"
-	else
-		plugins="${plugins} sa-junk-plugin"
-	fi
-
-	# The special cases
-
-	# remove this due to bug #128035 re-enable later if it doesn't dep on
-	# gstreamer-0.8
-	# use gstreamer && plugins="${plugins} audio-inline"
-	use dbus && plugins="${plugins} new-mail-notify"
-	use mono && plugins="${plugins} mono"
-
-	if built_with_use gnome-extra/evolution-data-server ldap; then
-		plugins="${plugins} exchange-operations"
-	fi
-
-	local pluginlist=""
-	for p in $plugins; do
-		[ "x$pluginlist" != "x" ] && pluginlist="${pluginlist},"
-		pluginlist="${pluginlist}${p}"
-	done
-
-	G2CONF="${G2CONF} --enable-plugins=${pluginlist}"
-}
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-
-	gnome2_omf_fix help/omf.make
-
-	# Accept the list of plugins separated by commas instead of spaces.
-	epatch ${FILESDIR}/${PN}-2.3.7-configure_plugins.patch
-
-	# Move evo to URI-based saving
-	epatch ${FILESDIR}/${PN}-2.8.0-uri.patch.gz
-
-	# Fix 64-bit warnings
-	epatch ${FILESDIR}/${P}-64-bit.patch
-
-	# Add bogofilter junk plugin source
-	use bogofilter && epatch ${FILESDIR}/${PN}-2.7.3-bf-junk.patch.gz
-
-
-	eaclocal || die
-	_elibtoolize --copy --force || die
-	eautoheader || die
-	eautomake || die
-	intltoolize --force || die
-	eautoconf || die
-}
-
-src_compile() {
-	# 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
-		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
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
-	einfo "To change the default browser if you are not using GNOME, do:"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	einfo ""
-	einfo "Replace 'mozilla %s' with which ever browser you use."
-}
diff --git a/mail-client/evolution/files/digest-evolution-2.8.1 b/mail-client/evolution/files/digest-evolution-2.8.1
deleted file mode 100644
index 94690e15dbe4..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.8.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 31456188591167083628df719adc8f22 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-RMD160 7ae764761607d50024fbec32680bc57e04ac7879 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-MD5 6a08d1121bc126c4ed7035ab94a09871 evolution-2.8.1.tar.bz2 12873039
-RMD160 8a06f9a3d1a402d3e92edf1de623b07b09322059 evolution-2.8.1.tar.bz2 12873039
-SHA256 91d3e7c7fd961959fc01abcd7bb18747bfd8fe8b90bd91f03b4392b11f0e3a7b evolution-2.8.1.tar.bz2 12873039