Add new version for Gnome 2.30

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 175 insertions, 1 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 3b5cec25cd01..089dff566e52 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # 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.292 2010/06/08 12:06:22 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.293 2010/06/13 20:13:01 pacho Exp $
+
+*evolution-2.30.1.2-r1 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> +evolution-2.30.1.2-r1.ebuild,
+  +files/evolution-2.30.1.2-configure.patch:
+  Add new version for Gnome 2.30.
 
   08 Jun 2010; Gilles Dartiguelongue <eva@gentoo.org>
   evolution-2.26.3.ebuild, -evolution-2.28.2.ebuild,
diff --git a/mail-client/evolution/evolution-2.30.1.2-r1.ebuild b/mail-client/evolution/evolution-2.30.1.2-r1.ebuild
new file mode 100644
index 000000000000..e929650cc0e8
--- /dev/null
+++ b/mail-client/evolution/evolution-2.30.1.2-r1.ebuild
@@ -0,0 +1,147 @@
+# 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.1.2-r1.ebuild,v 1.1 2010/06/13 20:13:01 pacho Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit autotools gnome2 flag-o-matic python
+
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${P}-patches.tar.bz2"
+
+IUSE="crypt kerberos ldap networkmanager pda profile python ssl
+gstreamer +sound"
+# 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-2.30.1
+	>=gnome-base/gnome-desktop-2.26.0
+	>=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
+	>=dev-libs/libxml2-2.7.3
+	>=dev-libs/libgweather-2.25.3
+	>=net-libs/libsoup-2.4
+	>=media-gfx/gtkimageview-1.6
+	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 )
+	pst? ( >=net-mail/libpst-0.6.41 )
+	python? ( >=dev-lang/python-2.4 )
+	sound? ( media-libs/libcanberra )
+	ssl? (
+		>=dev-libs/nspr-4.6.1
+		>=dev-libs/nss-3.11 )"
+# 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
+	>=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="${G2CONF}
+		--without-kde-applnk-path
+		--enable-plugins=experimental
+		--enable-image-inline
+		--enable-weather
+		$(use_enable ssl nss)
+		$(use_enable ssl smime)
+		$(use_enable networkmanager nm)
+		$(use_enable gstreamer audio-inline)
+		$(use_enable sound canberra)
+		--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.
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# FIXME: Fix compilation flags crazyness
+	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
+		-i configure.ac configure || die "sed 1 failed"
+
+	# Do not require unstable libunique
+	epatch "${FILESDIR}/${PN}-2.30.1.2-configure.patch"
+
+	# Apply upstream patches committed to gnome-2-30 branch
+	epatch "${WORKDIR}"/${P}-patches/*.patch
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+
+	# 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 || die "sed 1 failed"
+		G2CONF="${G2CONF} --enable-nss=yes"
+	else
+		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
+			--without-nss-libs --without-nss-includes"
+	fi
+}
+
+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.1.2-configure.patch b/mail-client/evolution/files/evolution-2.30.1.2-configure.patch
new file mode 100644
index 000000000000..8532f3e3a04c
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.30.1.2-configure.patch
@@ -0,0 +1,19 @@
+--- configure.ac~	2010-04-27 14:14:22.000000000 +0200
++++ configure.ac	2010-06-12 22:24:39.000000000 +0200
+@@ -47,7 +47,6 @@
+ m4_define([libxml_minimum_version], [2.7.3])
+ m4_define([shared_mime_info_minimum_version], [0.22])
+ m4_define([libpst_minimum_version], [0.6.41])
+-m4_define([unique_minimum_version], [1.1.2])
+ m4_define([dbus_glib_minimum_version], [0.74])
+ 
+ dnl Optional Packages
+@@ -224,7 +223,7 @@
+ 	 libxml-2.0 >= libxml_minimum_version
+ 	 shared-mime-info >= shared_mime_info_minimum_version
+ 	 gnome-desktop-2.0 >= gnome_desktop_minimum_version
+-	 unique-1.0 >= unique_minimum_version])
++	 unique-1.0 ])
+ AC_SUBST(GNOME_PLATFORM_CFLAGS)
+ AC_SUBST(GNOME_PLATFORM_LIBS)
+ 
diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml
index 0bf53d072891..873e2c26b016 100644
--- a/mail-client/evolution/metadata.xml
+++ b/mail-client/evolution/metadata.xml
@@ -24,5 +24,7 @@
 			<pkg>app-pda/gnome-pilot-conduit</pkg></flag>
 		<flag name="profile">Build support for profiling Evolution for
 			development purposes</flag>
+		<flag name="sound">Use Canberra and Canberra-GTK for
+			sound</flag>
 	</use>
 </pkgmetadata>