bump to 2.22.3.1. A bunch of bug fixes as usual and translation updates.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

6 files changed, 18 insertions, 487 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 525420b93c6c..3e9bd0840171 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.238 2008/06/07 12:22:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.239 2008/07/03 21:31:37 eva Exp $
+
+*evolution-2.22.3.1 (03 Jul 2008)
+
+  03 Jul 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -evolution-2.12.3-r1.ebuild, -evolution-2.22.0.ebuild,
+  -evolution-2.22.1.1.ebuild, -evolution-2.22.2.ebuild,
+  +evolution-2.22.3.1.ebuild:
+  bump to 2.22.3.1. A bunch of bug fixes as usual and translation updates.
 
 *evolution-2.22.2-r2 (07 Jun 2008)
 
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index ba193ee26bc5..1896d14bcd34 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -14,22 +14,18 @@ AUX evolution-2.22.2-CVE-2008-1109.patch 1441 RMD160 01973241d615cb013dc03a053f0
 AUX evolution-2.22.2-deleted-mails.patch 3081 RMD160 8682338af8cd34a58160b0f2f46197d615bb219f SHA1 7ef7e767f45d47505676a7368874e63a40aad6ec SHA256 9101120bdce2830dfc6401264647fc41245444a8f08e60237f49b74ab6c6027d
 AUX evolution-CVE-2008-0072.patch 2890 RMD160 8911d13efd9c86d1b95cd844ebeab695e2e80ab6 SHA1 f040da832c681efe7ac85c281ec54f3b991ff6bf SHA256 28a7cda8c1a3aab284d69a7142e74fc345f7130627e180b6de0ae8389e8adbc1
 DIST evolution-2.12.3.tar.bz2 25938535 RMD160 afe803833e213387fde3c180afc91bfc1e792262 SHA1 14861dd497e935074424269f2d1e6c11be56abfe SHA256 1703f6888c1549a1b9b89112bed73504f4ae2db5b2fb8f926adb5cf3a490d6bf
-DIST evolution-2.22.0.tar.bz2 29556434 RMD160 59b1ff729846e61b81e6957635d115485c3817ce SHA1 887cb6d261633508ba2d31ff9f90d4163f69c533 SHA256 03a6842c195d950b1273f7d492b274b40e03311161d5f68ef87f9c45bf2d1e63
-DIST evolution-2.22.1.1.tar.bz2 30907929 RMD160 6331696fcb67dcf0ba9ded5da4dda2fa038f3732 SHA1 ea058e3b0885246bdf6628c47d807b49f14b4abd SHA256 5c5d387a9bdd8f89f46a49bbf2b7bf63b2a117e15e2c7472fe4dc365cbb2c1f9
 DIST evolution-2.22.2.tar.bz2 30989731 RMD160 47c1813d564e97a7eca679a9e6c607bd6ac951ee SHA1 ec52b816c95daaa694a0116d32d03832dc95d707 SHA256 5aca34588601ba46f8ec4d81760ca950466eb8a05fc5bf760596a8c7243b1247
-EBUILD evolution-2.12.3-r1.ebuild 5969 RMD160 8cf10d034ef92e4b986e9b9a15ad766d33584ed0 SHA1 d3e88be18390a08ba1e894bdaa1a3617524557a5 SHA256 189b8bdbeb7b0403f2bb29122ae89ed90b66e434f64cf26427814295cf910c21
+DIST evolution-2.22.3.1.tar.bz2 30988398 RMD160 ab361fc18d9a91211572845de7e4671368649a68 SHA1 806058728c497bbb2ac6c4ddb5182eebdf97d078 SHA256 d7e455fb1e54e21b05b419814e8b7a38bd76cec93e8531a99d27045493a5a756
 EBUILD evolution-2.12.3-r2.ebuild 6110 RMD160 521fb22abbadca1cf34339827fc47381f96d6bfe SHA1 ba379b2844be7192495cfe04caf0f647ecf33851 SHA256 f6bcb227286252fc01be707d32e5cfb064ca2466f67695f696f143f18caf05fd
-EBUILD evolution-2.22.0.ebuild 4608 RMD160 a76079d938ee0587d5e020e9a5be904616808913 SHA1 b3d6e99624d27fc0eb0befa1114f40081996374c SHA256 ae9560b145c31a5c584ebfb8323e2ca8657bc1382f84e68a8f8f41d00d60f672
-EBUILD evolution-2.22.1.1.ebuild 4512 RMD160 3a10e014946c3dc9688aa51e7e983ccfa11137d2 SHA1 694543a37711603d6cd3a653385103f6b2d6b59f SHA256 dd30e7165d0bc74e2030c571f013af9edadebb9fa671c30bbf8a675673fcc90c
 EBUILD evolution-2.22.2-r1.ebuild 4719 RMD160 b1b66e529b766a9eccdafb1e87d62c1a1b65fbfc SHA1 8cb974c771126a16e226c72079a398ffa5bc4b2d SHA256 a1a6a6c05f4ede00084a378d39f779665174297a4cf44dd664fe8940fdf9fd04
 EBUILD evolution-2.22.2-r2.ebuild 4822 RMD160 8fdf4c1940107a31d840e3806f4a7dede52ff0b5 SHA1 869a1a34218df7e34dc21aa6390f78af5a703514 SHA256 120a8fbfe46a35e9e54bd0fb2897e846c68ed28acca8b1fee4ab42b01fe3d3b4
-EBUILD evolution-2.22.2.ebuild 4584 RMD160 ddc03bf632c93338871a114c4cbee4ae241ea6e6 SHA1 13db59bb92424d6fe13dda8b3f075ccd8f65bc03 SHA256 34115e767e83890ecc6bb36eb9ba0370bcc102df9839f463287e8fd2f35b795e
-MISC ChangeLog 58504 RMD160 63d66a4d8ed6e837cf5786125485d4ed614071c0 SHA1 d77ab7354dff27a7ebc1e89fdfc4dc5801856e26 SHA256 b63fe21e15799b945e4f248cff7b43adfd17fda30c1a8c6e36aa0b1defa7ea94
+EBUILD evolution-2.22.3.1.ebuild 4629 RMD160 5ed8a124bf06462bba6c150c027413761ca53178 SHA1 cdb085113e9e9537c8ecbcdae979b5bf9b6d4d0d SHA256 3ee77f4eb6b5cf7f2b1f8af96274c39169bd8525bb4c99e5e0b27587ba119f93
+MISC ChangeLog 58812 RMD160 a698feab5ba311ec2f44882cc032373f1c170b4b SHA1 24ce07d794fa01abf264f4f66338363cb96bed5a SHA256 74f5105c107b5637ec740699ef451ecfd0e557a095880f29e19eed61aa639939
 MISC metadata.xml 1403 RMD160 46bbe02ca00c865d3f90dd778d2b55cd7583cd42 SHA1 3d67fab1a280a4bf0fe6aad1a5784aeeebf8f1c3 SHA256 98257898dba7e207b5b929feccd3701a932adfe3fc48a9c2ed1abf9d0717dd5e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhKfbsACgkQ1fmVwcYIWAYkHQCghbhhlQFyIPvEROe00Cb+7w7J
-Fn8AoL3qUhRnubGQy7UcZsdGp1Yz4hpv
-=rpZC
+iEYEARECAAYFAkhtRUMACgkQ1fmVwcYIWAajZwCdH0xdyn5qqEmwgjnxjapEg/iP
+6zoAn1Otu7ktN8BPdwYtVsBY0qJAPvTh
+=8FVB
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.12.3-r1.ebuild b/mail-client/evolution/evolution-2.12.3-r1.ebuild
deleted file mode 100644
index a15291d60f9f..000000000000
--- a/mail-client/evolution/evolution-2.12.3-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.12.3-r1.ebuild,v 1.3 2008/04/01 20:16:50 leio Exp $
-EAPI="1"
-
-inherit gnome2 flag-o-matic
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-# gstreamer for audio-inline, when it uses 0.10
-IUSE="crypt dbus debug doc hal ipv6 kerberos krb4 ldap mono networkmanager nntp pda profile spell ssl"
-
-# Pango dependency required to avoid font rendering problems
-RDEPEND="
-	>=x11-libs/gtk+-2.10
-	>=gnome-extra/evolution-data-server-1.11.90
-	>=x11-themes/gnome-icon-theme-1.2
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/libbonobo-2.16
-	>=gnome-extra/gtkhtml-3.16
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libgnomeui-2
-	>=dev-libs/libxml2-2
-	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.2.96:2.2
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	>=dev-libs/glib-2.10
-	>=gnome-base/orbit-2.9.8
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) )
-	ldap? ( >=net-nds/openldap-2 )
-	mono? ( >=dev-lang/mono-1 )"
-#	gstreamer? (
-#		>=media-libs/gstreamer-0.10
-#		>=media-libs/gst-plugins-base-0.10 )
-
-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
-	doc? ( >=dev-util/gtk-doc-0.6 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-
-pkg_setup() {
-	G2CONF="--without-kde-applnk-path        \
-		--enable-plugins=experimental    \
-		$(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)"
-
-	# 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
-
-	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
-
-	# 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_unpack() {
-	gnome2_src_unpack
-
-	# Mail-remote doesn't build
-	epatch "${FILESDIR}"/${PN}-2.12.1-mail-remote-broken.patch
-
-	# Fix timezone offsets on fbsd.  bug #183708
-	epatch "${FILESDIR}"/${PN}-2.10.2-fbsd.patch
-
-	# Fix CVE-2008-0072
-	epatch "${FILESDIR}"/${PN}-CVE-2008-0072.patch
-
-	# Fix build with libsoup-2.4 present on system
-	epatch "${FILESDIR}"/${P}-no-libsoup24.patch
-
-	# Fix tests (again)
-	echo "evolution-addressbook.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-calendar.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-composer-entries.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-event-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-mail-global.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-mail-list.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-mail-message.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-mail-messagedisplay.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-memo-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-memos.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-message-composer.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-signature-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-subscribe.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-task-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-tasks.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution.xml" >> "${S}"/po/POTFILES.in
-}
-
-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
-
-	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.22.1.1.ebuild b/mail-client/evolution/evolution-2.22.1.1.ebuild
deleted file mode 100644
index 7c871a08d168..000000000000
--- a/mail-client/evolution/evolution-2.22.1.1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.22.1.1.ebuild,v 1.1 2008/05/02 19:32:15 dang Exp $
-
-inherit gnome2 flag-o-matic
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="crypt dbus debug hal ipv6 kerberos krb4 ldap mono networkmanager nntp pda profile spell ssl"
-
-# Pango dependency required to avoid font rendering problems
-RDEPEND=">=dev-libs/glib-2.15.3
-	>=x11-libs/gtk+-2.12
-	>=gnome-extra/evolution-data-server-2.21.92
-	>=x11-themes/gnome-icon-theme-2.20
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libbonobo-2.20.3
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-extra/gtkhtml-3.17.5
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libgnomeui-2
-	>=dev-libs/libxml2-2
-	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? ( virtual/krb5 )
-	>=gnome-base/orbit-2.9.8
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) )
-	ldap? ( >=net-nds/openldap-2 )
-	mono? ( >=dev-lang/mono-1 )"
-#	gstreamer? (
-#		>=media-libs/gstreamer-0.10
-#		>=media-libs/gst-plugins-base-0.10 )
-
-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"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-
-pkg_setup() {
-	G2CONF="--without-kde-applnk-path
-		--enable-plugins=experimental
-		$(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)"
-
-	# 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
-
-	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
-
-	# 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_unpack() {
-	gnome2_src_unpack
-
-	# Fix timezone offsets on fbsd.  bug #183708
-	epatch "${FILESDIR}"/${PN}-2.21.3-fbsd.patch
-}
-
-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
-
-	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.22.2.ebuild b/mail-client/evolution/evolution-2.22.2.ebuild
deleted file mode 100644
index c61c0adc0bed..000000000000
--- a/mail-client/evolution/evolution-2.22.2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.22.2.ebuild,v 1.2 2008/06/02 20:33:48 eva Exp $
-
-inherit gnome2 flag-o-matic
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="crypt dbus debug hal ipv6 kerberos krb4 ldap mono networkmanager nntp pda profile spell ssl"
-
-# Pango dependency required to avoid font rendering problems
-RDEPEND=">=dev-libs/glib-2.15.3
-	>=x11-libs/gtk+-2.12
-	>=gnome-extra/evolution-data-server-2.21.92
-	>=x11-themes/gnome-icon-theme-2.20
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libbonobo-2.20.3
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-extra/gtkhtml-3.17.5
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libgnomeui-2
-	>=dev-libs/libxml2-2
-	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? ( virtual/krb5 )
-	>=gnome-base/orbit-2.9.8
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) )
-	ldap? ( >=net-nds/openldap-2 )
-	mono? ( >=dev-lang/mono-1 )"
-#	gstreamer? (
-#		>=media-libs/gstreamer-0.10
-#		>=media-libs/gst-plugins-base-0.10 )
-
-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"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-
-pkg_setup() {
-	G2CONF="--without-kde-applnk-path
-		--enable-plugins=experimental
-		$(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)"
-
-	# 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
-
-	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
-
-	# 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_unpack() {
-	gnome2_src_unpack
-
-	# Fix timezone offsets on fbsd.  bug #183708
-	epatch "${FILESDIR}"/${PN}-2.21.3-fbsd.patch
-
-	# Fix tests, bug #216478
-	epatch "${FILESDIR}/${PN}-2.22.0-mk-doc.patch"
-}
-
-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
-
-	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.22.0.ebuild b/mail-client/evolution/evolution-2.22.3.1.ebuild
index c80c4ffe5c88..00a11de364eb 100644
--- a/mail-client/evolution/evolution-2.22.0.ebuild
+++ b/mail-client/evolution/evolution-2.22.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.22.0.ebuild,v 1.1 2008/03/24 23:15:52 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.22.3.1.ebuild,v 1.1 2008/07/03 21:31:37 eva Exp $
 
 inherit gnome2 flag-o-matic
 
@@ -107,8 +107,8 @@ src_unpack() {
 	# Fix timezone offsets on fbsd.  bug #183708
 	epatch "${FILESDIR}"/${PN}-2.21.3-fbsd.patch
 
-	# Fix build with USE=profile.  Bug #213516
-	epatch "${FILESDIR}"/${P}-e_profile_event_emit.patch
+	# Fix extra space in translation, bug #230628
+	sed -i "s/\(Correio \) \(e Agenda do Evolution\)/\1\2/g" po/pt_BR.po
 }
 
 src_compile() {