New version

Package-Manager: portage-2.0.52-r1

4 files changed, 212 insertions, 5 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index ffc6fef4cc99..6faf4ad1a935 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,11 @@
 # 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.100 2005/09/14 01:44:59 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.101 2005/10/04 12:54:33 dang Exp $
+
+*evolution-2.4.1 (04 Oct 2005)
+
+  04 Oct 2005; <dang@gentoo.org> +evolution-2.4.1.ebuild:
+  New version
 
   14 Sep 2005; <dang@gentoo.org> evolution-2.4.0.ebuild:
   Remove firefox flag for now, as evo can't be built against it yet and have
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index f26abfbf2e14..8a6af24a0742 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -6,8 +6,9 @@ MD5 755ba3764519e16940938c27a7e132a3 evolution-2.4.0.ebuild 6417
 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 6065f149e1c27517cf43d3b98f876e62 ChangeLog 30670
+MD5 fea4d6fae865658b389bf603c475e742 ChangeLog 30775
 MD5 6ec9b6a7896b799d17a21c4edffd33c9 metadata.xml 272
+MD5 5c4d7df6e3f38dbbbcf3ed981ac2b62b evolution-2.4.1.ebuild 6384
 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
@@ -21,6 +22,7 @@ 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 ff6f734b2038ba0c6577ca271d3e7718 files/digest-evolution-2.4.0 70
+MD5 df16d9e1a97c7c51943e481671bbe509 files/digest-evolution-2.4.1 70
 MD5 aa077f2d45a8f2def9094b367f1eb60e files/evolution-2.2.3-mail_notify.patch 570
 MD5 a71bb4ab71d2e4cc5e02649d87f36e12 files/evolution-2.2.3-configure_plugins.patch 2733
 MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
@@ -29,7 +31,7 @@ MD5 56a0d793e598c8e0c91ec5ab0e2a4e4b files/evolution.formatstring.patch 2146
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDJ4GVomPajV0RnrERAsP/AJ9bM9bIJLYQoql8KnabwRrKVVgEfQCePvpc
-azrw8EywHZjinFUxI1pZbdA=
-=/0g3
+iD8DBQFDQnukomPajV0RnrERArEWAJ4sPMy4K2QmZ9EvY9Dsv666MEF5fwCeIgjf
+1Ab4HkLK32sXut/c3IjooTo=
+=cK1Y
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.4.1.ebuild b/mail-client/evolution/evolution-2.4.1.ebuild
new file mode 100644
index 000000000000..25871b519ddc
--- /dev/null
+++ b/mail-client/evolution/evolution-2.4.1.ebuild
@@ -0,0 +1,199 @@
+# 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.1.ebuild,v 1.1 2005/10/04 12:54:33 dang 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 mozilla nntp pda profile spell ssl static"
+
+# 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.3.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? (
+		mozilla? ( >=www-client/mozilla-1.7.3 )
+		!mozilla? (
+			>=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 )"
+#		mozilla? ( !firefox? ( >=www-client/mozilla-1.7.3 ) )
+#		firefox? ( >=www-client/mozilla-firefox-1.0.7-r3 )
+#		!mozilla? ( !firefox? (
+
+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 static)             \
+		$(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)"
+
+	use ldap && G2CONF="${G2CONF} $(use_with static static-ldap)"
+
+	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 sa-junk-plugin   \
+		bbdb subject-thread save-calendar select-one-source copy-tool \
+		mail-to-task mark-calendar-offline mailing-list-actions       \
+		default-mailer"
+
+	# 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
+
+	autoconf || die "autoconf failed"
+	automake || die "automake failed"
+}
+
+src_compile() {
+	# Use NSS/NSPR only if 'ssl' is enabled. They can be used from
+	# mozilla/firefox if the relevant USE flags are enabled. 'firefox' take
+	# precedence over 'mozilla'.
+	if use ssl ; then
+#		if use firefox; then
+#			NSS_LIB=$(pkg-config --variable=libdir firefox-nss)
+#			NSS_INC=$(pkg-config --variable=includedir firefox-nss)/nss
+#			NSPR_LIB=$(pkg-config --variable=libdir firefox-nspr)
+#			NSPR_INC=$(pkg-config --variable=includedir firefox-nspr)/nspr
+#		elif use mozilla; then
+		if use mozilla; then
+			NSS_LIB=$(pkg-config --variable=libdir mozilla-nss)
+			NSS_INC=$(pkg-config --variable=includedir mozilla-nss)/nss
+			NSPR_LIB=$(pkg-config --variable=libdir mozilla-nspr)
+			NSPR_INC=$(pkg-config --variable=includedir mozilla-nspr)/nspr
+		else
+			NSS_LIB=/usr/$(get_libdir)/nss
+			NSS_INC=/usr/include/nss
+			NSPR_LIB=/usr/$(get_libdir)/nspr
+			NSPR_INC=/usr/include/nspr
+		fi
+
+		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.1 b/mail-client/evolution/files/digest-evolution-2.4.1
new file mode 100644
index 000000000000..8afc125a01df
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-2.4.1
@@ -0,0 +1 @@
+MD5 13235405e08d14a54129e3a65548f58e evolution-2.4.1.tar.bz2 11543481