Bump for 2.14.2; fix bug# 136500

Package-Manager: portage-2.1.1_pre1-r2

4 files changed, 226 insertions, 6 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 759d5ce34014..51af15b0cfca 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.125 2006/06/07 21:05:30 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.126 2006/06/27 18:00:08 dang Exp $
+
+*evolution-2.6.2 (27 Jun 2006)
+
+  27 Jun 2006; Daniel Gryniewicz <dang@gentoo.org> +evolution-2.6.2.ebuild:
+  Bump for 2.14.2; fix bug# 136500
 
   07 Jun 2006; John N. Laliberte <allanonjl@gentoo.org>
   evolution-2.6.0-r1.ebuild, evolution-2.6.1.ebuild:
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index f6b6bb271f05..92731c1751f6 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX evolution-2-CAN-2005-0102.patch 467 RMD160 7fc04d14339759a720c5007f9b75a9d575aa36a1 SHA1 d2567b1f9f90b3e320ae2793ffc110c90204f4c3 SHA256 96984df6e198faf47af75e61c7dea696f6716710583d8fbd8d22437ca5a8aca7
 MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467
 RMD160 7fc04d14339759a720c5007f9b75a9d575aa36a1 files/evolution-2-CAN-2005-0102.patch 467
@@ -33,9 +36,10 @@ SHA256 54bbdf9df28ac28af4aa457c432197bdcc428e97b69b052718a41400450b32cc files/ev
 DIST evolution-2.0.3.tar.bz2 15381448 RMD160 411899a8c59a06142a39ff6cbfd0cf59a6b3dde7 SHA256 dfce4790d6724789f35d7e2e4536a1d67051025e06631f95893d47c10a29d1e8
 DIST evolution-2.0.4.tar.bz2 15395184 RMD160 980400d7de33dee702c0624ee3312b3c4556baed SHA256 5d37ee2796ade1ebfc3b3e0dc4919594a3b3119079c055e0c3e935e5954c90c2
 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 SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045
+DIST evolution-2.5.5.1-bf-junk.tar.bz2 10771 RMD160 7ae764761607d50024fbec32680bc57e04ac7879 SHA1 465205cf50770b72641995ec59617010dadaf204 SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045
 DIST evolution-2.6.0.tar.bz2 12072895 RMD160 7f01966a6ff8b02ab5f5bf74a120e452cbc32f4d SHA256 9565772416a42ed779d33b55f56183c51baabbf5db6109f1e0d63611d76e7d7d
 DIST evolution-2.6.1.tar.bz2 12291684 RMD160 05a6cdc9e1af70fb8009978ae1c4f1eda5adf38c SHA1 7faad424c0b5b04d5225f3804abe0564276f01d8 SHA256 9b78e132a52a9f7192ff396a6b957f9836794e34f45b96823f971756b8261ef8
+DIST evolution-2.6.2.tar.bz2 12394719 RMD160 72133312fb9cceae74d9f0e570dd898d5119a10b SHA1 08a6a9bf3754fff71cbdf82857337b1edc13ef46 SHA256 a69c45e9deae3a2eea06af08eacb9266e6cdcd452dd600ad96c2de23effa56f5
 EBUILD evolution-2.0.3-r2.ebuild 4203 RMD160 f6949275136453c3f437192ca54c2961137f4b0c SHA1 1253032a6f8df7d5832837b8d253417b0263a69d SHA256 807bfb77ae001822844a95fa69c0dcff076b0d04addfdb8739a6608b47c2ad25
 MD5 b79c5ccc56e7e370472f66aa4ba28d68 evolution-2.0.3-r2.ebuild 4203
 RMD160 f6949275136453c3f437192ca54c2961137f4b0c evolution-2.0.3-r2.ebuild 4203
@@ -56,10 +60,14 @@ EBUILD evolution-2.6.1.ebuild 6049 RMD160 f7e3c386c809c393e23b519866ea1787d032dc
 MD5 6fc51d77491ffe602536bc665f7b644f evolution-2.6.1.ebuild 6049
 RMD160 f7e3c386c809c393e23b519866ea1787d032dce0 evolution-2.6.1.ebuild 6049
 SHA256 9c8919e1ac164502155b361c6e1e887a5142009bc1a2df4ef7f38b1821246d83 evolution-2.6.1.ebuild 6049
-MISC ChangeLog 34647 RMD160 c0b5e65a0e664935aef25ab921850179834039cb SHA1 08fabbd9bc7221a5728697e7c448d53680c09a7f SHA256 8466699f8c907bac2b1c18215e44ee7d40d1ffcdc8b0eba3c3038fac542c278c
-MD5 f5ac3813c450abbc8c4033c5f138fc20 ChangeLog 34647
-RMD160 c0b5e65a0e664935aef25ab921850179834039cb ChangeLog 34647
-SHA256 8466699f8c907bac2b1c18215e44ee7d40d1ffcdc8b0eba3c3038fac542c278c ChangeLog 34647
+EBUILD evolution-2.6.2.ebuild 5861 RMD160 9f2221e666190fd3013f07344174eaabc4af67c5 SHA1 f67c413ae3470861f002963cdab9de507e0e3527 SHA256 75ccb24407d9237ad72cb460c5a4166986abe15ba98ddfc00cd862789d694955
+MD5 73e97f6695c87636d343b08992c6c686 evolution-2.6.2.ebuild 5861
+RMD160 9f2221e666190fd3013f07344174eaabc4af67c5 evolution-2.6.2.ebuild 5861
+SHA256 75ccb24407d9237ad72cb460c5a4166986abe15ba98ddfc00cd862789d694955 evolution-2.6.2.ebuild 5861
+MISC ChangeLog 34786 RMD160 51ae7a630ce92075dbdc55ea14ba3d64db343add SHA1 d778f7290cf280dd56e0e03117629c6d3d798613 SHA256 a28bb984ba1fe3bc029ee3e45d3ca9c1dd8e9f2d09e80d98427628e8cee9fbf3
+MD5 6fef3ed9a36cb0754f850277a0d5db85 ChangeLog 34786
+RMD160 51ae7a630ce92075dbdc55ea14ba3d64db343add ChangeLog 34786
+SHA256 a28bb984ba1fe3bc029ee3e45d3ca9c1dd8e9f2d09e80d98427628e8cee9fbf3 ChangeLog 34786
 MISC metadata.xml 285 RMD160 0c12c7c2e6dd66ea44e83541384d6b634c642bc0 SHA1 bbd215b7c718049707751c25e6bfc2318fa0f292 SHA256 0c662917bda7d3035eab7db55ade83dadca650d2ceddc44b7765ba5f898bd816
 MD5 f0750af493d9560f5faf50f39fd644c5 metadata.xml 285
 RMD160 0c12c7c2e6dd66ea44e83541384d6b634c642bc0 metadata.xml 285
@@ -79,3 +87,13 @@ SHA256 c9b2f3e30b0cd1b7dd81baddb73e424b997a4b7e32a1930bfcbd2d163fc0f768 files/di
 MD5 3bc57efa6cec9374097217e87d91e962 files/digest-evolution-2.6.1 533
 RMD160 09715c910f0b1a9d4f0e85fb7a02b9fdb9b6cd16 files/digest-evolution-2.6.1 533
 SHA256 d00bc781bcfb2fb66114729b1ec42fed88f999c0f7971304729e9ca61fbfc5cb files/digest-evolution-2.6.1 533
+MD5 f58ca96f6e0006d63acada5e98d62982 files/digest-evolution-2.6.2 533
+RMD160 94fb86de744f42bcae39b6f5a0d6276ed559014e files/digest-evolution-2.6.2 533
+SHA256 730a2ffe0655db234cb17adecb91357a37e42064f41dc64cccfb7ab2fda0614d files/digest-evolution-2.6.2 533
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFEoXIromPajV0RnrERAhFBAJ9qelCVTL+Wia533nDfnlnsBtlh0wCdES0g
+xM/IfSJz4pruemEUqSb8+wU=
+=b1EE
+-----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.6.2.ebuild b/mail-client/evolution/evolution-2.6.2.ebuild
new file mode 100644
index 000000000000..926a17b6131e
--- /dev/null
+++ b/mail-client/evolution/evolution-2.6.2.ebuild
@@ -0,0 +1,191 @@
+# 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.6.2.ebuild,v 1.1 2006/06/27 18:00:08 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bogofilter crypt dbus debug doc gstreamer hal ipv6 kerberos krb4 ldap mono nntp pda profile spell ssl widescreen"
+
+# 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.5.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.2
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=x11-libs/gtk+-2
+	>=gnome-base/libgnome-2
+	>=net-libs/libsoup-2.2
+	>=x11-libs/pango-1.8.1
+	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 )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10
+		>=media-libs/gst-plugins-base-0.10 )
+	dbus? ( sys-apps/dbus )
+	mono? ( >=dev-lang/mono-1 )
+	bogofilter? ( mail-filter/bogofilter )
+	!bogofilter? ( mail-filter/spamassassin )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.30
+	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 mail-account-disable \
+		bbdb subject-thread save-calendar select-one-source copy-tool \
+		mail-to-task mark-calendar-offline mailing-list-actions       \
+		default-mailer"
+
+	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
+	use bogofilter && unpack ${PN}-2.5.5.1-bf-junk.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
+
+	# Add bogofilter junk plugin source
+	use bogofilter && epatch ${WORKDIR}/${PN}-2.5.5.1-bf-junk.patch
+
+
+	# Add widescreen mode, if requested
+	use widescreen && epatch ${FILESDIR}/${PN}-2.5.5.1-sideview.patch
+
+	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.6.2 b/mail-client/evolution/files/digest-evolution-2.6.2
new file mode 100644
index 000000000000..8b55786da215
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-2.6.2
@@ -0,0 +1,6 @@
+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 24b97cf70a3c1e9e34f6e328e6910ab1 evolution-2.6.2.tar.bz2 12394719
+RMD160 72133312fb9cceae74d9f0e570dd898d5119a10b evolution-2.6.2.tar.bz2 12394719
+SHA256 a69c45e9deae3a2eea06af08eacb9266e6cdcd452dd600ad96c2de23effa56f5 evolution-2.6.2.tar.bz2 12394719