Version bump.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 160 insertions, 5 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index a37e145fb7ea..16e5f935f26d 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.390 2013/03/29 22:59:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.391 2013/03/31 14:31:17 eva Exp $
+
+*evolution-3.6.4 (31 Mar 2013)
+
+  31 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> +evolution-3.6.4.ebuild:
+  Version bump.
 
   29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -evolution-3.4.4.ebuild,
   -evolution-3.6.2-r1.ebuild:
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 26af2a942fae..cd1d3744311f 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -12,16 +12,18 @@ AUX evolution-3.3.91-spamassassin-paths.patch 2223 SHA256 9f2ea27193ff299dd130f5
 DIST evolution-2.32.3-patches.tar.xz 11784 SHA256 eadfcd9d1663206f1d15457358afa7901f095894d782d4043ffd762b242eded6 SHA512 f8514ffc5079ba91448277365fadcec3f4ec949fdef8a5eebd1d529aaa73736721c405088eea363bbf5fc9cac6f8799ed329b53c5369e6acf93ac16eb8d2e7ac WHIRLPOOL 1a9fb503c921705d58ab89aa24495cb85cbd00df8ff6f2fd1f79750213759ee4d4856efe5bf7bd927eff3e250b2c06c0aec448d69fc974bc17a47fb67a49f8bc
 DIST evolution-2.32.3.tar.bz2 31966138 SHA256 33ab38780e9abb71506230e331e9c3534444b5ed3f17046f0b6371a00df686fb SHA512 7241954f4e6ab87151e2c4af0bd33d5f428ab5e01f935aafbfaf50714a495fe01fe54c3f3c6498d514880bf1c5271d491a523d79b2928827490204b9eee4c0d3 WHIRLPOOL 982ca39ff6c02adbd168a8c82a164636eaf908e0e4905195d321187199339a8e9725fa91b7d8d95b3ff5d32a9b7faf0a4a9da8d651915b4d1581788f722fb8c9
 DIST evolution-3.6.3.tar.xz 12396872 SHA256 2c564f3e59cb26663d3e3992c881842815fb8fbc037074475f906030c8c5fd25 SHA512 cc2c47d844b5745f6b3632450b91a56b5aad652ce14c796f3f56a99dd52c80b2ccae1ab8fe2d5832022c0e8b1e5529f9bf38fe5efd2d2c5c24ef82d7acae1a27 WHIRLPOOL 43465c0805b019b5f174ad2f5605d5662c2657541452bd271dbf12c4fa95338308e3d968b28ee29d155a202ed9e3d6b085edfd6f43f92576173b117492828506
+DIST evolution-3.6.4.tar.xz 12401324 SHA256 7bf7054d85b7d1bd0e62d69f15ef80dbe781f57359bf91e7c427cd93378ba4a1 SHA512 a7e162289ac7b29f748c3f3bb65b17b1362831131b5b5aed32f763259b6b54ba7d38d7a59f4df778384fbf2c90e2d4807299c0dc05f576df19ae6a9abf72e4e2 WHIRLPOOL bd86b79c45b8d01557999729b1dc12ab49e5791651c2ae885b30a0ef50a3e78670ca055eb0e242f8aa40f78c1edf8beab3f33a49d57532f0912c48cc58349123
 DIST evolution-3.8.0.tar.xz 12318896 SHA256 6f78bcce1d4da7640dad8d083cc90de3500d51f190a089c723b0dcced690f642 SHA512 ba4f51583476956d76ac1de8f7ee780e6c71d947d133dff3b516f4bfdf7e5732c513173435cdc81e1602c2b6cd42ff223449161a72cd95b50c99337e13f69fde WHIRLPOOL 9363e77c46fe40345af900d1513023321d1f2f9827e034c23e0eda30578e5ef6c27e5e69ce7756f161c6796f941d3b54bfa77b4eaf25ef580b0040244fe424eb
 EBUILD evolution-2.32.3-r1.ebuild 6164 SHA256 eccfbb24f84fdee7528af0973e475f92e7049b85e59bfbbcc4e58b67747e8e49 SHA512 4f84b8ab0e6188a4162199d7ed1e319702f2831cb1907452d7d02b82e5eaf19f439d99e39f05852ff81ffcdd75b6da5036c04e3d177afd45bdb475ad4ec5de33 WHIRLPOOL 95416087ca1f2677f145d2bbabfb2c6d4d7a0497d03d0fa76aa7a1d5abadb0136d796a7c6c5048745c4fb33448dea5fd744b8eda22a0a7e2b99c5076a0c5401c
 EBUILD evolution-3.6.3.ebuild 4810 SHA256 89df750c3f42d329a8d78d8d870ceaa27ff82b4bde1f36419697741ac9f7f1b5 SHA512 5ff0f555073348ddd623f5cbef742f67bc3c608e5fbd44fe5946d1b9e2229722be86c426266e48138043635d2724df7d2980e777590f17393e8322d2d55abc1d WHIRLPOOL 18ca17ff10b9c3ead02c2da0c8fd6a948a61efd0092b24a27e64ee7f6c5167e5eb214c5a90100d4fe89115d0209f51c7eb702a01a8abb29cbe593ff399f50983
+EBUILD evolution-3.6.4.ebuild 4764 SHA256 8cd9cfd7b8fb48761947fdfa9caf1ad2eba60bb1c5421a2db59f52ce6575a5d5 SHA512 77e7e231f5c3be4d1bcfd04eaad57c6a11c09922bcfc9227471640f74fbe09e10a7417c548f213c90fb30372a687064839c8bca959df2789bf9d1f02ec4a732a WHIRLPOOL c1d26df27287f23946ca71c0aa9c0c502c205393863f9bab8111d4016b851d734aa36dee8df96419ece1fde0610a054f53e791bb8b67e7e4e8727f448db548a3
 EBUILD evolution-3.8.0.ebuild 4581 SHA256 6d23db47cb03dfb9fba4e79b89e17d5c4239d2c6074348ab1f0598519786fb69 SHA512 f1f022caf3b9e659d538683baaab935450776f4d15b5e85fdf2d2c3c85cc6892846b90e3834a0411eafb0a8f2cb4085fd39c0645785c67a33a5ca851248a908f WHIRLPOOL 43c34228c6cf135dc7c9e9cea8fb6e099d34e04d51467290bcc391408bb39dd962e2b9685c97877979c97f718db76d4734770ccfd95eb3b6572a725d442929a2
-MISC ChangeLog 87320 SHA256 4aa8701575519d54b6b149e92269b07e9a796e1a2bbbb5b8305a5fc39e090fc2 SHA512 7886c448e523a026bb2dae897c3732b4567002c2ddb6ae484a8da78e581b4f8d02a185a8d393b6db4e4931ec7da35ad760624472968d55550fa183196bd25385 WHIRLPOOL 2e5d62c82ba01bbe1084ec32a51594eef9463aba0d12f100eb003f127854fa9de8d18f08339fdb2bf4d1f0ddd334908cbdaf59dc1d9f2a88ccf6027128fe29d7
+MISC ChangeLog 87448 SHA256 d203df73067741b58879e0f4ef3ceb03461ec29318526b867150842a0a65ea5d SHA512 9713cac0ab0a551e7dde11a02194b10984ba6b6c9507be0a4a05a2ab023bbb58b3b3c1408a4098b18189cb922ec0ad328e08d9350a24ab32a7a9352fc4722680 WHIRLPOOL 42b12dbdc51eeb315b99866e4a494f90b61d101f87287db0588a445d28394e07d2e79b25d47eecc4f29c24360d89d3fc47e177274acaafe381e610f6bd3ac305
 MISC metadata.xml 1402 SHA256 97c7c33d12acb93e8a196aabc4aeb583853566ccff20edc29c6f518e57455ffc SHA512 f84ab366cd1415ab2eeefb121ec6d90a98306a7445321f0850f96d95c750ff8e8c4a3f47fe0a83b5cb7f6d14e570040cc95bbac39e7432608b0d9547c5c23f93 WHIRLPOOL 9fee0a2143eb8b315e34959e3137eeae1398955c969133724c42833c62e41ac9ef4f5e9e6f7c0e130ea0d45e91cb00538c7849d8be6f54096c4be0e6144f7dd4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFWHNMACgkQ1fmVwcYIWAbIxACgrj7GgyujqtwKGluEIiJwE4e3
-ysMAnRA7GPRpwI3Tj8GyOxdYn5nsCQK5
-=/sFS
+iEYEAREIAAYFAlFYSLYACgkQ1fmVwcYIWAbbFACeNib+jnygbOKDUurbD+Pi0atd
+ItYAnR2OKknljAYuo7P03UOkrFyvsEWR
+=K5al
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-3.6.4.ebuild b/mail-client/evolution/evolution-3.6.4.ebuild
new file mode 100644
index 000000000000..a170e79371a7
--- /dev/null
+++ b/mail-client/evolution/evolution-3.6.4.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.6.4.ebuild,v 1.1 2013/03/31 14:31:17 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils flag-o-matic gnome2 versionator
+
+MY_MAJORV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="http://projects.gnome.org/evolution/"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+IUSE="crypt +gnome-online-accounts gstreamer kerberos ldap map ssl +weather"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+# We need a graphical pinentry frontend to be able to ask for the GPG
+# password from inside evolution, bug 160302
+PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gtk+-3.4.0:3
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=x11-libs/libnotify-0.7:=
+	>=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather?]
+	=gnome-extra/evolution-data-server-${MY_MAJORV}*
+	>=gnome-extra/gtkhtml-4.5.2:4.0
+	dev-libs/atk
+	>=dev-libs/dbus-glib-0.6
+	>=dev-libs/libxml2-2.7.3:2
+	>=net-libs/libsoup-gnome-2.38.1:2.4
+	>=x11-misc/shared-mime-info-0.22
+	>=x11-themes/gnome-icon-theme-2.30.2.1
+	>=dev-libs/libgdata-0.10:=
+	>=net-libs/webkit-gtk-1.8.0:3
+	!=net-libs/webkit-gtk-1.9.90:3
+
+	x11-libs/libSM
+	x11-libs/libICE
+
+	map? (
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		x11-libs/mx:1.0 )
+	crypt? ( || (
+		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
+		=app-crypt/gnupg-1.4* ) )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	map? (
+		>=app-misc/geoclue-0.12.0
+		>=media-libs/libchamplain-0.12:0.12 )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.5.0:2= )"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+
+	app-text/yelp-tools
+	>=gnome-base/gnome-common-2.12"
+# eautoreconf needs:
+#	app-text/yelp-tools
+#	>=gnome-base/gnome-common-2.12
+RDEPEND="${COMMON_DEPEND}
+	app-text/highlight
+	!<gnome-extra/evolution-exchange-2.32"
+
+src_prepare() {
+	ELTCONF="--reverse-deps"
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+
+	# Fix paths for Gentoo spamassassin executables
+	epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch"
+
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i data/org.gnome.evolution.spamassassin.gschema.xml.in \
+		-i modules/spamassassin/evolution-spamassassin.c || die "sed failed"
+
+	gnome2_src_prepare
+
+	# Fix compilation flags crazyness
+	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure || die "CPPFLAGS sed failed"
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
+	gnome2_src_configure \
+		--disable-schemas-compile \
+		--without-glade-catalog \
+		--without-kde-applnk-path \
+		--disable-image-inline \
+		--disable-pst-import \
+		--enable-canberra \
+		$(use_enable ssl nss) \
+		$(use_enable ssl smime) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable gstreamer audio-inline) \
+		$(use_enable map contact-maps) \
+		$(use_with ldap openldap) \
+		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
+		$(usex ssl --enable-nss=yes "--without-nspr-libs
+			--without-nspr-includes
+			--without-nss-libs
+			--without-nss-includes") \
+		$(use_enable weather) \
+		ITSTOOL=$(type -P true)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "To change the default browser if you are not using GNOME, edit"
+	elog "~/.local/share/applications/mimeapps.list so it includes the"
+	elog "following content:"
+	elog ""
+	elog "[Default Applications]"
+	elog "x-scheme-handler/http=firefox.desktop"
+	elog "x-scheme-handler/https=firefox.desktop"
+	elog ""
+	elog "(replace firefox.desktop with the name of the appropriate .desktop"
+	elog "file from /usr/share/applications if you use a different browser)."
+	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"
+}