Version bump. Loads of fixes and translation updates.

Package-Manager: portage-2.2_rc74/cvs/Linux x86_64

5 files changed, 213 insertions, 9 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 67f42d226b65..745eccd10c46 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.304 2010/08/24 08:19:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.305 2010/09/08 18:57:54 eva Exp $
+
+*evolution-2.30.3 (08 Sep 2010)
+
+  08 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  evolution-2.30.2-r1.ebuild, +evolution-2.30.3.ebuild,
+  +files/evolution-2.30.3-fix-linking-issues-in-libeshell.patch:
+  Version bump. Loads of fixes and translation updates.
 
   24 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
   evolution-2.30.2-r1.ebuild, metadata.xml:
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 0b19c80af86c..5077db1a4f16 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -12,20 +12,23 @@ AUX evolution-2.28.3.1-allow-setting-alarms_3.patch 1890 RMD160 e42285e4817e98eb
 AUX evolution-2.28.3.1-attachment-bar-RTL.patch 1360 RMD160 e2f512542837dd47c820f2a23b936f5a065665b7 SHA1 f2df4a491ccea878232dd55747526b4f80a40ff8 SHA256 1afb9010a997be10e168dcd050d4d8cb3bb85544f5f9f37c9bd17eb698579f49
 AUX evolution-2.28.3.1-unknown-attachment-size.patch 1182 RMD160 4df9108c74c3b1b1d6d828502d26feab93db7dca SHA1 d248e9d07f6279539b1fa03a59e4005fa6a3aebe SHA256 ae8314004b7e0cfd4f285459a9bfabd864fbb3d3954417e0f5eed8b7e1944a4b
 AUX evolution-2.30.1.2-configure.patch 1243 RMD160 f7cefb76592fff6e2fba441993b546b8c9a30ca6 SHA1 6ca2073ce735bf40c4ca403d695a16976a6c3360 SHA256 c757dd941f9b4798ed6c0b5c6d23517700c9c232c60aca3b6f09f2c4278885a2
+AUX evolution-2.30.3-fix-linking-issues-in-libeshell.patch 870 RMD160 12d6fe68f2c91f5be97057a2324946eb4ce90a08 SHA1 f0e4310ca1124481373fb5760b15ccbada67cc41 SHA256 4ee4ca24cd3ff8bb27b03d262b0bb4ff8953a3973f04044984beaf2804c3d07c
 DIST evolution-2.26.3.tar.bz2 36427464 RMD160 f2b3aa2275095feb2af406022c0a6bc8a381e8d5 SHA1 d0e247ccb903a57a5e6fe23cfb04535ea141e9fb SHA256 e37f8d21a8aa201e9a3d91a110ec9d4dc3feae978be45b0c16cf93adacd5605b
 DIST evolution-2.28.3.1.tar.bz2 29765375 RMD160 442c7b472caf94ba0aa1abbe253b810d15911a4f SHA1 412c8be73e483444ad69a4ad8c15b0db9520fe0a SHA256 9fda41b0994b1bb8d119f594597f77bb4af1a883588a39f7a81ec7a2eb18f5fd
 DIST evolution-2.30.2-patches.tar.bz2 12728 RMD160 d8058da75675a1990aad84348a40cd3f7be21aa3 SHA1 4bbb89f10ba893ef992af5fc32aad84b2ad46d2f SHA256 f3d6dcfba9ee7c21b415d04a545902cb5a28d1bcc00e579c6cc78aeac7650a45
 DIST evolution-2.30.2.tar.bz2 32570501 RMD160 c1b5703bc241a2dee20f94e60e7c9995c8cce841 SHA1 14ddccbf33eb86c976899eccea6ae1fb565ea9ca SHA256 470d12c0de9cae2dc0275152a356150c7a57339e6feca77f43508bd7d1f04d83
+DIST evolution-2.30.3.tar.bz2 32555386 RMD160 b79e3f6ba181033a9add979de8b6d518d451322c SHA1 f62e1dea59243242f626cc73ffdd68df28cedd57 SHA256 8c47e93ff5aedfad39d4224ae0751a938ccb7d2a2bcd407513cf1331c51b9cab
 EBUILD evolution-2.26.3.ebuild 4474 RMD160 969fc82fb9207a1b30710d0ceac59d44e58ff3a6 SHA1 2a34a86256377aece30bd133699aa4a0d112b549 SHA256 de6801a09682a57f663fa28610493df9d4dad22a2a2cc34f06c40f7e8f050bad
 EBUILD evolution-2.28.3.1-r1.ebuild 5273 RMD160 2dd659e7fdea2694ab7e35023fca8ae33d3bb775 SHA1 5c574cd7016c4112edaab7c706afde8e138a6495 SHA256 d3f897b3877d01f1f2257df8291956e742e2a6ba0e87a7c472c6fe7625a812b2
 EBUILD evolution-2.28.3.1.ebuild 4776 RMD160 635a26b79e548eae0307f92ab414733043a271eb SHA1 38dc812719d7e59986ecb7d2c72c3a8daefe343d SHA256 dba152baf57204968e92ca6690967001a715104d0a20d1ef11a09231da6b3822
-EBUILD evolution-2.30.2-r1.ebuild 4654 RMD160 457b86c1244dcff2b8e64a630e5dd70baba8f5aa SHA1 4348bc6bea33c9b7ba6987c1836f57729aeab01f SHA256 535da98aabb963bb03788b2506db403a2ed89f96bee61d6c47ab8eea18b9846e
-MISC ChangeLog 71201 RMD160 b73df5a3d69e526547ac2ec93161919062375dc1 SHA1 93cdf125303229cb2aae0bf6ad6048f12f0dc293 SHA256 f2a610288d55953df1e58afbd6b40719b296795e7fe90f87ecfae65bca0f775f
+EBUILD evolution-2.30.2-r1.ebuild 4662 RMD160 7c3b67038ff39d120e4c1b0709801b5a2453a344 SHA1 5523ec8f9f7ba66c6c38c29cc98c53e1022b609e SHA256 d31b3c2970513265939abdc5001073e5df01da194d77d638a0660ddb17a453bd
+EBUILD evolution-2.30.3.ebuild 4761 RMD160 e6a1f4c7cd7172fc6a0098b0b3bd1e5a998e1534 SHA1 8e8a0002278145f8ca40218f30c71562ac2cfa2b SHA256 dbdd04a0ca39d67c6d6468e9396a7939a8bec7e5804b2a0599165ff099af0b66
+MISC ChangeLog 71466 RMD160 75232fa54098d8ae18b83d345f7d6da2555c5e49 SHA1 657e8c62cd3d31d77519fd7afc82c3f3a3c4316d SHA256 e8961bb0b75ad078f1f67d37bf3138d5d07fec504e1d98d611f45a01bf4a9b6f
 MISC metadata.xml 1461 RMD160 a54b702777b629e801eb07e83c3151d020b2db2c SHA1 1db2d57540fd6732e6ad356e746f8c14f7411750 SHA256 1768837d6848092351ece0bff37f4db820dcb9cf9efcd21e596a71ad97892035
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxzgL0ACgkQ1fmVwcYIWAb3CQCgh0jMsEKAEIbnpv+bvYvVGNgl
-rHsAoO5xw9DRwqjTIkOs1gLp9tLS/gaP
-=wgJ/
+iEYEARECAAYFAkyH3MAACgkQ1fmVwcYIWAazXwCgoEsTrgZ9nP2O1t+E0PL7AHDG
+6l4An3Ta3UalUD9WuftZPu130hZH+Jyv
+=xQ2p
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.30.2-r1.ebuild b/mail-client/evolution/evolution-2.30.2-r1.ebuild
index f6b9895563b5..80a0c2f73387 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-2010 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.6 2010/08/24 08:19:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.30.2-r1.ebuild,v 1.7 2010/09/08 18:57:54 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -10,7 +10,7 @@ inherit autotools gnome2 flag-o-matic python versionator
 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
 HOMEPAGE="http://www.gnome.org/projects/evolution/"
 SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-patches.tar.bz2"
+	mirror://gentoo/${PN}-2.30.2-patches.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2 OPENLDAP"
 SLOT="2.0"
diff --git a/mail-client/evolution/evolution-2.30.3.ebuild b/mail-client/evolution/evolution-2.30.3.ebuild
new file mode 100644
index 000000000000..add60518080e
--- /dev/null
+++ b/mail-client/evolution/evolution-2.30.3.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2010 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.1 2010/09/08 18:57:54 eva 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 profile 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
+# password from inside evolution, bug 160302
+RDEPEND=">=dev-libs/glib-2.22
+	>=x11-libs/gtk+-2.18
+	>=gnome-extra/evolution-data-server-$(get_version_component_range 1-2)
+	>=gnome-base/gnome-desktop-2.26
+	>=gnome-extra/gtkhtml-3.29.6
+	>=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
+	>=net-libs/libsoup-2.4
+	>=media-gfx/gtkimageview-1.6
+	media-libs/libcanberra[gtk]
+	x11-libs/libnotify
+	>=x11-misc/shared-mime-info-0.22
+	>=x11-themes/gnome-icon-theme-2.20
+
+	crypt? ( || (
+				  ( >=app-crypt/gnupg-2.0.1-r2
+					|| ( 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 )
+	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)
+		--disable-pst-import
+		$(use_enable pda pilot-conduits)
+		$(use_enable profile profiling)
+		$(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/files/evolution-2.30.3-fix-linking-issues-in-libeshell.patch b/mail-client/evolution/files/evolution-2.30.3-fix-linking-issues-in-libeshell.patch
new file mode 100644
index 000000000000..47bd44536325
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.30.3-fix-linking-issues-in-libeshell.patch
@@ -0,0 +1,39 @@
+From 7ae36c45c81c8f1f4e837b564ea73c035c34a395 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 8 Sep 2010 18:39:35 +0200
+Subject: [PATCH] Fix linking issues in libeshell
+
+---
+ shell/Makefile.am |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index 7b742de..64ced47 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -2,6 +2,12 @@ if ENABLE_TEST_COMPONENT
+ SUBDIRS = . test
+ endif
+ 
++if OS_WIN32
++eggsm_libs =
++else
++eggsm_libs = -lSM -lICE
++endif
++
+ # Executable
+ bin_PROGRAMS = evolution
+ 
+@@ -82,7 +88,8 @@ libeshell_la_LIBADD =					\
+ 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
+ 	$(top_builddir)/widgets/menus/libmenus.la	\
+ 	$(GNOME_PLATFORM_LIBS)				\
+-	$(SHELL_LIBS)
++	$(SHELL_LIBS)					\
++	$(eggsm_libs)
+ 
+ # Evolution executable
+ 
+-- 
+1.7.2.2
+