new version, fixes gentoo #114868, sent patch upstream gnome #323580

(Portage version: 2.0.51.22-r3)

5 files changed, 299 insertions, 17 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 19d44841e921..dd794d265139 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.103 2005/12/05 06:24:09 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.104 2005/12/08 20:07:12 allanonjl Exp $
+
+*evolution-2.4.2.1 (08 Dec 2005)
+
+  08 Dec 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/evolution-2.4.2.1-link.patch, +evolution-2.4.2.1.ebuild:
+  new version, fixes gentoo #114868, sent patch upstream gnome #323580
 
   05 Dec 2005; <dang@gentoo.org> evolution-2.4.2.ebuild:
   -m Start removing deps on mozilla/firefox for nss/nspr per mozilla herd
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 49a38e6fbf52..28dfa5967c7d 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,27 +1,30 @@
-MD5 fc25c65d272975f79b4cab6a3a1447a8 ChangeLog 31042
 MD5 3318548ad5a620ebd3b5405ef77100fd evolution-1.2.4.ebuild 6254
-MD5 b2bf22eca079cbb39f39c374cb306715 evolution-2.0.3-r2.ebuild 4206
+MD5 4aca40839221d8c4378a5dffb5e1a984 evolution-2.4.2.1.ebuild 5764
+MD5 4bdbcc2757f5a3eddb5a03bc170e3a4e evolution-2.4.2.ebuild 5662
 MD5 249e276509b42a3954b5935626218dab evolution-2.0.4.ebuild 4093
+MD5 b2bf22eca079cbb39f39c374cb306715 evolution-2.0.3-r2.ebuild 4206
 MD5 3c3a045e22357b7bbb98e000ebf161c1 evolution-2.2.3-r3.ebuild 6063
+MD5 597643c05f972ed5b96c4ac1bd98b6b9 ChangeLog 31270
+MD5 f0750af493d9560f5faf50f39fd644c5 metadata.xml 285
 MD5 b8b6e85957f1c53b8c75270fd6c9987b evolution-2.4.1.ebuild 6384
-MD5 4bdbcc2757f5a3eddb5a03bc170e3a4e evolution-2.4.2.ebuild 5662
-MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131
+MD5 7b8c1cc2fd2428815184d471af4bb3bf files/evolution-2.0.3-gentoo_etc_services.patch 1662
+MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467
+MD5 35dfdb3422f49ada8891285f5104d29c files/evolution-2.3.8-gentoo.patch 660
+MD5 37b21b99689c8ad1b67df7ed2425e6cc files/evolution-2.2.3-credits.patch 1838
+MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
+MD5 b5eaa2e30f75b8ec2df29cfd90a1e1f0 files/evolution-2.3.7-configure_plugins.patch 3010
+MD5 5b251dccca668c00b3b15692399253a9 files/digest-evolution-2.4.2.1 72
+MD5 2381d584d4a3104a6c491b21ecc0bc47 files/evolution_mail-account-gui_authtype.diff 737
+MD5 c6f7cb2777a5622bc3ea45b046713895 files/evolution-2.4.2.1-link.patch 2625
+MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
 MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r2 70
-MD5 75a9be02c12e91b5ddedbdfd11c07e03 files/digest-evolution-2.0.4 70
 MD5 5a8c8a5e4d082901feeb677b0e68cb2c files/digest-evolution-2.2.3-r3 70
+MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131
+MD5 75a9be02c12e91b5ddedbdfd11c07e03 files/digest-evolution-2.0.4 70
 MD5 df16d9e1a97c7c51943e481671bbe509 files/digest-evolution-2.4.1 70
 MD5 5ed7243a0f9ac1f4533f95f2ac2cd159 files/digest-evolution-2.4.2 70
-MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
-MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
-MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
-MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467
-MD5 7b8c1cc2fd2428815184d471af4bb3bf files/evolution-2.0.3-gentoo_etc_services.patch 1662
+MD5 aa077f2d45a8f2def9094b367f1eb60e files/evolution-2.2.3-mail_notify.patch 570
 MD5 a71bb4ab71d2e4cc5e02649d87f36e12 files/evolution-2.2.3-configure_plugins.patch 2733
-MD5 37b21b99689c8ad1b67df7ed2425e6cc files/evolution-2.2.3-credits.patch 1838
+MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
 MD5 388d698898d1346cb7007da471abed11 files/evolution-2.2.3-linking-fix.patch 1491
-MD5 aa077f2d45a8f2def9094b367f1eb60e files/evolution-2.2.3-mail_notify.patch 570
-MD5 b5eaa2e30f75b8ec2df29cfd90a1e1f0 files/evolution-2.3.7-configure_plugins.patch 3010
-MD5 35dfdb3422f49ada8891285f5104d29c files/evolution-2.3.8-gentoo.patch 660
 MD5 56a0d793e598c8e0c91ec5ab0e2a4e4b files/evolution.formatstring.patch 2146
-MD5 2381d584d4a3104a6c491b21ecc0bc47 files/evolution_mail-account-gui_authtype.diff 737
-MD5 f0750af493d9560f5faf50f39fd644c5 metadata.xml 285
diff --git a/mail-client/evolution/evolution-2.4.2.1.ebuild b/mail-client/evolution/evolution-2.4.2.1.ebuild
new file mode 100644
index 000000000000..af0b9112709d
--- /dev/null
+++ b/mail-client/evolution/evolution-2.4.2.1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.4.2.1.ebuild,v 1.1 2005/12/08 20:07:12 allanonjl Exp $
+
+inherit eutils flag-o-matic alternatives gnome2
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono nntp pda profile spell ssl"
+
+# Pango dependency required to avoid font rendering problems
+RDEPEND=">=x11-themes/gnome-icon-theme-1.2
+	dev-libs/atk
+	>=gnome-extra/libgtkhtml-3.7
+	>=dev-libs/glib-2
+	>=gnome-base/orbit-2.9.8
+	>=gnome-base/libbonobo-2
+	>=gnome-extra/evolution-data-server-1.4.1
+	>=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.2
+	>=x11-libs/pango-1.8.1
+	mail-filter/spamassassin
+	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.4.1
+		>=dev-libs/nss-3.9.2 )
+	ldap? ( >=net-nds/openldap-2 )
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )
+	gstreamer? (
+		=media-libs/gstreamer-0.8*
+		=media-libs/gst-plugins-0.8* )
+	dbus? ( sys-apps/dbus )
+	mono? ( >=dev-lang/mono-1 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.30
+	sys-devel/gettext
+	sys-devel/bison
+	app-text/scrollkeeper
+	doc? ( >=dev-util/gtk-doc-0.6 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+USE_DESTDIR="1"
+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="addressbook-file \
+		bbdb \
+		calendar-file \
+		calendar-http \
+		calendar-weather \
+		copy-tool \
+		default-mailer
+		default-source \
+		groupwise-account-setup \
+		groupwise-features \
+		itip-formatter \
+		mail-account-disable \
+		mark-calendar-offline \
+		mail-to-task \
+		mailing-list-actions \
+		mark-all-read \
+		plugin-manager \
+		print-message \
+		sa-junk-plugin \
+		save-calendar \
+		select-one-source \
+		startup-wizard \
+		subject-thread"
+
+	# The special cases
+	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 "${A}"
+	cd "${S}"
+
+	gnome2_omf_fix help/omf.make help/C/Makefile.in
+
+	# Accept the list of plugins separated by commas instead of spaces.
+	epatch "${FILESDIR}"/${PN}-2.3.7-configure_plugins.patch
+	# Fix for linking problems, #85013 and #92682
+	epatch "${FILESDIR}"/${PN}-2.2.3-linking-fix.patch
+	# Work-around for a start-up segfault (bug #104587).
+	epatch "${FILESDIR}"/${PN}-2.3.8-gentoo.patch
+
+	# fix linking problems, sent upstream, gnome #323580
+	epatch "${FILESDIR}"/${PN}-2.4.2.1-link.patch
+
+	export WANT_AUTOMAKE=1.9
+	intltoolize -c -f || die "intltoolize failed"
+	sed -n -e '/GNOME_COMPILE_WARNINGS/,/^])/p' aclocal.m4 > gnome.m4
+	aclocal -I . || die "aclocal failed"
+	libtoolize --copy --force || die "libtoolize failed"
+	autoconf || die "autoconf failed"
+	automake || die "automake failed"
+}
+
+src_compile() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	if use ssl ; then
+		NSS_LIB=/usr/$(get_libdir)/nss
+		NSS_INC=/usr/include/nss
+		NSPR_LIB=/usr/$(get_libdir)/nspr
+		NSPR_INC=/usr/include/nspr
+
+		G2CONF="${G2CONF} \
+			--with-nspr-includes=${NSPR_INC} \
+			--with-nspr-libs=${NSPR_LIB}     \
+			--with-nss-includes=${NSS_INC}   \
+			--with-nss-libs=${NSS_LIB}"
+	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.4.2.1 b/mail-client/evolution/files/digest-evolution-2.4.2.1
new file mode 100644
index 000000000000..0d8dbe478f9e
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-2.4.2.1
@@ -0,0 +1 @@
+MD5 cee3e0ac6ca43e5060468c3b938bea72 evolution-2.4.2.1.tar.bz2 11503590
diff --git a/mail-client/evolution/files/evolution-2.4.2.1-link.patch b/mail-client/evolution/files/evolution-2.4.2.1-link.patch
new file mode 100644
index 000000000000..6215f0f0534e
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.4.2.1-link.patch
@@ -0,0 +1,72 @@
+--- evolution-2.4.2.1/widgets/misc/Makefile.am	2005-07-11 04:44:02.000000000 -0400
++++ evolution-2.4.2.1.new/widgets/misc/Makefile.am	2005-12-08 12:56:16.000000000 -0500
+@@ -156,6 +156,7 @@
+ test_calendar_LDADD = 						\
+ 	./libemiscwidgets.la					\
+ 	$(top_builddir)/e-util/libeutil.la			\
++	$(top_builddir)/widgets/table/libetable.la              \
+ 	$(E_WIDGETS_LIBS)
+ 
+ # test-dateedit
+@@ -166,6 +167,7 @@
+ test_dateedit_LDADD = 			\
+ 	./libemiscwidgets.la		\
+ 	$(top_builddir)/e-util/libeutil.la	\
++	$(top_builddir)/widgets/table/libetable.la              \
+ 	$(E_WIDGETS_LIBS)
+ 
+ # test-dropdown-button
+@@ -176,6 +178,7 @@
+ test_dropdown_button_LDADD =	\
+ 	./libemiscwidgets.la	\
+ 	$(top_builddir)/e-util/libeutil.la  \
++	$(top_builddir)/widgets/table/libetable.la              \
+ 	$(E_WIDGETS_LIBS)
+ 
+ # test-multi-config-dialog
+@@ -186,6 +189,7 @@
+ test_multi_config_dialog_LDADD = 	\
+ 	./libemiscwidgets.la		\
+ 	$(top_builddir)/e-util/libeutil.la	\
++	$(top_builddir)/widgets/table/libetable.la              \
+ 	$(E_WIDGETS_LIBS)
+ 
+ # test-info-label
+@@ -196,6 +200,7 @@
+ test_info_label_LDADD = 		\
+ 	./libemiscwidgets.la	\
+ 	$(top_builddir)/e-util/libeutil.la	\
++	$(top_builddir)/widgets/table/libetable.la              \
+ 	$(E_WIDGETS_LIBS)
+ 
+ BUILT_SOURCES = $(MARSHAL_GENERATED)
+--- evolution-2.4.2.1/shell/Makefile.am	2005-08-18 00:35:30.000000000 -0400
++++ evolution-2.4.2.1.new/shell/Makefile.am	2005-12-08 13:08:53.000000000 -0500
+@@ -142,6 +142,7 @@
+ 	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la	\
+ 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
+ 	$(top_builddir)/e-util/libeutil.la				\
++	$(top_builddir)/widgets/table/libetable.la			\
+ 	$(TZDIALOG_LIBS)						\
+ 	$(SHELL_LIBS)
+ 
+--- evolution-2.4.2.1/calendar/gui/alarm-notify/Makefile.am	2005-08-25 06:26:28.000000000 -0400
++++ evolution-2.4.2.1.new/calendar/gui/alarm-notify/Makefile.am	2005-12-08 13:24:09.000000000 -0500
+@@ -50,6 +50,7 @@
+ 	$(top_builddir)/e-util/libeutil.la				\
+ 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
+ 	$(top_builddir)/calendar/common/libevolution-calendarprivate.la	\
++	$(top_builddir)/widgets/table/libetable.la			\
+ 	$(CAMEL_LIBS)							\
+ 	$(EVOLUTION_CALENDAR_LIBS)
+ 
+--- evolution-2.4.2.1/tools/Makefile.am	2005-08-10 06:38:36.000000000 -0400
++++ evolution-2.4.2.1.new/tools/Makefile.am	2005-12-08 13:49:46.000000000 -0500
+@@ -40,6 +40,7 @@
+ killev_LDADD =							\
+ 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
+ 	$(top_builddir)/e-util/libeutil.la			\
++	$(top_builddir)/widgets/table/libetable.la		\
+ 	$(E_UTIL_LIBS)
+ 
+ CLEANFILES = evolution-addressbook-clean $(BUILT_SOURCES)