New release: 2.4.2

Package-Manager: portage-2.0.53_rc7

4 files changed, 38 insertions, 22 deletions

diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 98e4e406245a..9f411c6a36c9 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -3,14 +3,14 @@ MD5 3318548ad5a620ebd3b5405ef77100fd evolution-1.2.4.ebuild 6254
 MD5 b2bf22eca079cbb39f39c374cb306715 evolution-2.0.3-r2.ebuild 4206
 MD5 249e276509b42a3954b5935626218dab evolution-2.0.4.ebuild 4093
 MD5 3c3a045e22357b7bbb98e000ebf161c1 evolution-2.2.3-r3.ebuild 6063
-MD5 755ba3764519e16940938c27a7e132a3 evolution-2.4.0.ebuild 6417
 MD5 b8b6e85957f1c53b8c75270fd6c9987b evolution-2.4.1.ebuild 6384
+MD5 14c1891bf6f2ebb5fdf4cb7ec4cc9c87 evolution-2.4.2.ebuild 6573
 MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131
 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 ff6f734b2038ba0c6577ca271d3e7718 files/digest-evolution-2.4.0 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
diff --git a/mail-client/evolution/evolution-2.4.0.ebuild b/mail-client/evolution/evolution-2.4.2.ebuild
index 9bf97d0673e1..a43dce40aaed 100644
--- a/mail-client/evolution/evolution-2.4.0.ebuild
+++ b/mail-client/evolution/evolution-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.2 2005/09/14 01:44:59 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.4.2.ebuild,v 1.1 2005/12/04 09:09:52 leonardop Exp $
 
 inherit eutils flag-o-matic alternatives gnome2
 
@@ -10,7 +10,7 @@ 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"
+IUSE="crypt dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono mozilla nntp pda profile spell ssl"
 
 # Pango dependency required to avoid font rendering problems
 RDEPEND=">=x11-themes/gnome-icon-theme-1.2
@@ -19,7 +19,7 @@ RDEPEND=">=x11-themes/gnome-icon-theme-1.2
 	>=dev-libs/glib-2
 	>=gnome-base/orbit-2.9.8
 	>=gnome-base/libbonobo-2
-	>=gnome-extra/evolution-data-server-1.3.1
+	>=gnome-extra/evolution-data-server-1.4.1
 	>=gnome-base/libbonoboui-2.4.2
 	>=gnome-base/gnome-vfs-2.4
 	>=gnome-base/libgnomeui-2
@@ -52,10 +52,8 @@ RDEPEND=">=x11-themes/gnome-icon-theme-1.2
 		=media-libs/gst-plugins-0.8* )
 	dbus? ( sys-apps/dbus )
 	mono? ( >=dev-lang/mono-1 )"
-
-	# For firefox, once it's fixed
 #		mozilla? ( !firefox? ( >=www-client/mozilla-1.7.3 ) )
-#		firefox? ( >=www-client/mozilla-firefox-1.0.6-r6 )
+#		firefox? ( >=www-client/mozilla-firefox-1.0.7-r3 )
 #		!mozilla? ( !firefox? (
 
 DEPEND="${RDEPEND}
@@ -74,7 +72,6 @@ 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)               \
@@ -85,8 +82,6 @@ pkg_setup() {
 		$(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"
@@ -102,13 +97,29 @@ pkg_setup() {
 	# 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"
+	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"
@@ -135,12 +146,17 @@ src_unpack() {
 	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
+	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
+	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
+	epatch "${FILESDIR}"/${PN}-2.3.8-gentoo.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"
 }
diff --git a/mail-client/evolution/files/digest-evolution-2.4.0 b/mail-client/evolution/files/digest-evolution-2.4.0
deleted file mode 100644
index 38e66ef651f8..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c6b38b9a6ba920be5a859e9ed368508d evolution-2.4.0.tar.bz2 11478244
diff --git a/mail-client/evolution/files/digest-evolution-2.4.2 b/mail-client/evolution/files/digest-evolution-2.4.2
new file mode 100644
index 000000000000..44f0141c1245
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-2.4.2
@@ -0,0 +1 @@
+MD5 5c5258ec39afa8bf27c9700477807a2c evolution-2.4.2.tar.bz2 11501052