Add new version for Gnome 2.30

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 191 insertions, 3 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/Manifest b/mail-client/evolution/Manifest
index 69fe2838bffb..55c16f1cb232 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX evolution-2.21.3-fbsd.patch 1107 RMD160 7dbbf08ed68124a398b9db64bac6a4b0cecfa9ef SHA1 05f581d030bb81aad2e0f734f432dd23add4b3c2 SHA256 942b81689f9e4b5a1896ec7c810c323bfaeb74d40c6c6683d8dfd8b670236e77
 AUX evolution-2.23.3.1-delete-key.patch 2382 RMD160 41e30f2f9e52c8a1a45db11d12fa5da8eb137c04 SHA1 2df3f06c427072d2de7bf379f6d0b6fedaf2a4e1 SHA256 37809a6b12cb93a6da0cf11a50e33d040380ac31b1377eba867e3a12f92d1cbc
 AUX evolution-2.26.3-automagic-plugins.patch 7022 RMD160 2e7279257e90c66abbfc4703ba0fbba015b6f484 SHA1 23602b5b73caf2b06235422042ae3e32c6b520c3 SHA256 acae2843c8068b298b0e54eb263b3b7582ddf272aae5c0ceffa3d4d095f40e91
@@ -8,10 +11,21 @@ AUX evolution-2.28.3.1-allow-setting-alarms_2.patch 2149 RMD160 a44c12bcdd3316a4
 AUX evolution-2.28.3.1-allow-setting-alarms_3.patch 1890 RMD160 e42285e4817e98eb63c4cee7c02821636fc1c382 SHA1 e90cbd558c59bed177a69bc80d42357712f87564 SHA256 3a2dfb68917f9ca9d3a17a67eff3bc465d4527385c3e35d6aeefdbb4121a4ddf
 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 687 RMD160 905805b7ff0377f70b64a30e27d3c8f439703dfb SHA1 d603d9eccd85059877f924666c731263759097d7 SHA256 1ae9ca4d22f258339c364906ef026c323b3f1f7fff0cb79d66b789965eb1e269
 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.1.2-patches.tar.bz2 26702 RMD160 f3468f2f6bb8ac9ee6add0b97fd6dbeeb36a5d76 SHA1 9054e255b4658384bf56968770ecd43ff3e6fc11 SHA256 f4d3581b323c88a42cacc93ffeddcd413c8cabc0f227e8b36b80fed6438ede12
+DIST evolution-2.30.1.2.tar.bz2 30681129 RMD160 33f71e2c8b8afdc300202924afe398f4a40c3796 SHA1 f1e100ff68f9454d5adafd6420577c655971b69e SHA256 8b946914e53135edf89f9ddb8667d0ca3d76d37d8c622888befd65b2c4d3ce24
 EBUILD evolution-2.26.3.ebuild 4543 RMD160 be4487a89d3a2195a78f0ba2376227c01f556b2b SHA1 fc3e87a9f6f21d245855d928275d90869a11a1ba SHA256 91dff725e7f78199f94250dc5d3d3078d373c73ecc9c2874589d9799e52f1c88
 EBUILD evolution-2.28.3.1-r1.ebuild 5343 RMD160 b41f223e648639fc0505b0f1e0372a3c9ada180e SHA1 2f017ae516204faf0fcfef390698b0a78773f61c SHA256 657d8568fc3d54dd7886ab4c3eefb6b3ad82a5c871a5407c20c7f68e1eb2fcbc
 EBUILD evolution-2.28.3.1.ebuild 4851 RMD160 587cae4ba2745b2623156c61e1db0dc686c2fc55 SHA1 7f3c8b53af55cbbdba0b592253dd16ce87c3c1dd SHA256 85045aa14899dcbdaf8861a5d0868ebbe6f33dc1c298f52f90072856e5e6dcfc
-MISC ChangeLog 68505 RMD160 7d6e48adb7ba1c30e02c8859db27b1d866972536 SHA1 ab99bc6a5245a721785fe2169d39d1e45e50e78e SHA256 3de7834c42e66720f09463aebca3d48bfcc698c407531cf6f914d2c393a2b87f
-MISC metadata.xml 1461 RMD160 a54b702777b629e801eb07e83c3151d020b2db2c SHA1 1db2d57540fd6732e6ad356e746f8c14f7411750 SHA256 1768837d6848092351ece0bff37f4db820dcb9cf9efcd21e596a71ad97892035
+EBUILD evolution-2.30.1.2-r1.ebuild 4521 RMD160 ba079fbae92f3cadd56fef158c013d03a557220d SHA1 a0be81080474df725563887187de8180ddef2426 SHA256 d4da7f4ac985d7830215f63efc13eb22ceeac9d9ef7188ae5efb0be17c989f7c
+MISC ChangeLog 68702 RMD160 e9a45b838a47fddd638efed53ac174a4e551a7a1 SHA1 08286add28ca39aa7f28f3ba7b36abe457637e1b SHA256 8f4824d6ee9810f713f91e21126eef77e2aeb26334c40f1d5be54c4ee519867e
+MISC metadata.xml 1532 RMD160 44749261021a81bb77167cd8ea800eb18a99dfee SHA1 3a52cba14a151672c86eceb118e7757a12ec91a3 SHA256 d642c82216a4ce3c5f45ea007f4d5055beab1261baea130becc2d37d1bfb3797
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwVO9MACgkQCaWpQKGI+9TAwQCfRB6x/4QZHiLxF0aPUe+cG1Ky
+pzoAnA8l0wvORxuSGoaZYLzgmUZQUxcM
+=8VLd
+-----END PGP SIGNATURE-----
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>