Version bump with various bugfixes. Modernize ebuild.

Package-Manager: portage-2.2.0_alpha158/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

3 files changed, 172 insertions, 2 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 41286d714c07..2a795de89c8c 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # 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.382 2013/01/06 09:44:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.383 2013/01/22 03:48:11 tetromino Exp $
+
+*evolution-3.6.3 (22 Jan 2013)
+
+  22 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +evolution-3.6.3.ebuild:
+  Version bump with various bugfixes. Modernize ebuild.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> evolution-3.6.2-r1.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 2ff2206ef613..1ac955bb0bc9 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX evolution-2.32.0-wrong-lafile-usage.patch 634 SHA256 79e169a86b658bbd339fe79585f908f0eee4cfeef972be0731faa742a769deb8 SHA512 090833ec9422a30ae8306e748115a4d21e47e48583d231226c4b9571ff36e39aa62e190eb5e392a5790f59067bdef3d5181c414f0b52d5679171a64924cf7a4f WHIRLPOOL 712cea5305f6d7b745e156db64f9c48b83e854415e7b08ce72c3ff19e6a94635235808833ca5df7f6a9eca1a0f45c22765c12a80c50ec8c596dcd3abf40e4fd3
 AUX evolution-2.32.1-libnotify-0.7.patch 2239 SHA256 73746e65a3ba190ace8bd1e5fc9d52f6a67556fac0ba8727d7705ffe74e3ce0d SHA512 c8ee71f63bf5f15d4f759614c587cdfd2721e4a3df878b7f89b1cd614d8bbd11485fb61af8e1f528236e8086c5529394488502488b9d5186af167007320bb0f6 WHIRLPOOL 9f7a158a15acbf13aeffe1c39afc635592148ce9fd624a53cd293c507bda7cd51c0fddd369fbbeb8717e4557d5fde75786b43a6e9cd4c23f4156c9a1216e89cd
 AUX evolution-2.32.2-mime-handler.patch 4169 SHA256 ba6db000b4c38b53462c0281146e504b7212b84a6d7f5f482b375674042ff846 SHA512 cb42e680b580eb792643aef30a7228e4e1346be4f1b607401e17a13b4f1c0b19748b344c0cba2e7979cebb6b7de391f93ba3d03d42e13a73aa7f0bb08c4006bc WHIRLPOOL c77b72cf65847f481affdc744b32c768d4e235a776fd1206144cba98c84b4fdea818baf31118b0130c0a929925c2c145586e2eaf7136c994fc4ec098c0938628
@@ -10,8 +13,21 @@ DIST evolution-2.32.3.tar.bz2 31966138 SHA256 33ab38780e9abb71506230e331e9c35344
 DIST evolution-3.4.4.tar.xz 11899620 SHA256 7e541d0894c1d48b89820b6466edafe40215f8cdb45b1c0e9635cc15f49ecb9a SHA512 b72100c39016c2e9436b2e2318918e57e8945dc850b9b47a6738c17b6b25048bcb29269b5e3a481939b493147b537a0158adf0f32aec98268489ccfa1fa7be6b WHIRLPOOL 0c621797311158cbd0e9322fb2af615bc123ff84c5c31470afd00c6ed9c12402b54ef0cec02cb87880843ca778e0cc451d9e72fc9b4a3b259ee5f185c6686f22
 DIST evolution-3.6.2-gentoo-patches.tar.xz 20740 SHA256 0f69f5355d07d0e80f0279559a08f7f4bdc0ec815cf5cc26dfd4de23f8293c39 SHA512 ddb841ed5308565e9e150d03cd0477dd90ad5ba0892cf0f23209e3d1adafa17417471386c8b16cd118810d3f96ec31c3dbf3a608ce890c7b0510ee6d52bb0600 WHIRLPOOL ac08e25a46aac56e42a2ab27595f2052ae1360b8ebd161aa5c4e674c605af37a4becb08cb7545a110a85d4a6edd247704814fc2992c97541b8375f5fdbb02498
 DIST evolution-3.6.2.tar.xz 12006684 SHA256 40b326c63abc33ccc1393c9e3b60c747234ab14a46fc4690255b523942ea8983 SHA512 31299782e7e8dcdd7002fc81425fc19fd4af221a734d8fdcee652b38d41745e7817bf48e53707157fe7e88f46aa02c79b7024c8e30ecdbd7755587abc03191a9 WHIRLPOOL 794091d521615060ab05b8191b4154a39f501d244b39c6e2a46d0de68631b582839c93b85ab99484b8247de3749ceb02eb471290fb5b266aa67ed0d645d630ed
+DIST evolution-3.6.3.tar.xz 12396872 SHA256 2c564f3e59cb26663d3e3992c881842815fb8fbc037074475f906030c8c5fd25 SHA512 cc2c47d844b5745f6b3632450b91a56b5aad652ce14c796f3f56a99dd52c80b2ccae1ab8fe2d5832022c0e8b1e5529f9bf38fe5efd2d2c5c24ef82d7acae1a27 WHIRLPOOL 43465c0805b019b5f174ad2f5605d5662c2657541452bd271dbf12c4fa95338308e3d968b28ee29d155a202ed9e3d6b085edfd6f43f92576173b117492828506
 EBUILD evolution-2.32.3-r1.ebuild 6064 SHA256 285087f4807086ca3fb07c3047575d3696aa9e3e31ea7ac81d2b6104f129b948 SHA512 89618829feb441a3da7b86a330cde83de1fb9442a2e388d31b73fcf42b7561c2794800dcf952387d68a668d75ec8ec73098e82b33711aacbb9dad5b6d5171c30 WHIRLPOOL 9705e94846e1239a2c660e114c97cb64f0c27a3fcf997f67ad48711a502236a2e3701ef89f941245ec946bbf6841c1d57178ef6193f45210704a9fead6c73fca
 EBUILD evolution-3.4.4.ebuild 5621 SHA256 176f62a8823bf1203d0f58d5b9a120a846d715bfec880f6f8c65b8de0486b109 SHA512 bf1c5bff35d0f74909cb34bae9651260f92f0a380484025ac2b744ee25bfe64327b301dea7e24b38b53c7746323d5e57efa49492761a09894ae99c5b879620dc WHIRLPOOL 1aa45b25e52940c1511ee788f90dc5557e07ff017b6e9ec67a7c7ca009bf65416cb07af45fc746627f01afeb75cb6f4043f90944efb37de32a8cfcc8b51e6fab
 EBUILD evolution-3.6.2-r1.ebuild 5015 SHA256 3a70e8503bd7b7ff00ebffcd0f98937ee8ca68a7924d4a1a463f4d76c288c679 SHA512 a554e73933c0ec56eefbfe1cd02ff9aa27f5fd358cbec28088fa57ac3afa8ad4f0868bc90416b8bef4175f37fd7e4b76d72476af1ef0e13b7ccb0233cf7fa5b6 WHIRLPOOL 1334ae76699c9ef865825bfc353d17d6fb6bdc07fdedbec2abbd75f3ce4bb8297b24084588a07fbbfed383f3c8c01e2e2c379b08819b714db55d450429f42e38
-MISC ChangeLog 86020 SHA256 5034d34c04d54574c4f1a2bc3f6a6fe1eefa660029b082543d466be63ffe89e5 SHA512 7a64ce32223a47ec0acbf9cd7d030e37c7718ddfa2791437a349d37e97f001ab5d5d5339334f6e9947c200d99123450ddccd88184b7e392c987ba72808836764 WHIRLPOOL a0b3076b896f809c0c2cbc20b9687e17b19d32c788ec69159d10a750c2c67e4c4094636c4c27380d4830ab68576cd99b300bc6f194483fe487d63f21460a5fa6
+EBUILD evolution-3.6.3.ebuild 4801 SHA256 56f031e4e9fc89bb975c1947f2f4416fb4c5e72538134ed2d66ffa7c6a7ee962 SHA512 da7cc47641bdb5ee179ea6cd5af3cd2aab9283352e7a00c20330bb425c401e84da372216f4fed7d5ca0f5c5e0b15e2d9b047279b20fe6d1846fe74fc017a415b WHIRLPOOL 34110b5a92b523ffd8a31873733d5ee58085cdd68233f7ed33d91c86d3080a73b71aa98d81807d7008c5d2c957e65ad390802d5df417fd62c8d70441127e8b26
+MISC ChangeLog 86201 SHA256 5b8cb0457221c224e403f41792f17b254cbc5e4f42373c5ba1472d4a076e7441 SHA512 fac5dcb9e1979c907715153b6726afbfc413719dda433122bbe4290c38851f674be4125b86bb38f165a49973753fbd2ba1e23f13aa4b9e8a89c767a214741328 WHIRLPOOL 65cd0275115ce42a33717cdb5801f14df546410adb4dcd14ca57e7ad73da600f4e8b01f906419ff517e74b2c4afc23d6ccf647fec2d517495c57d2435500304b
 MISC metadata.xml 1097 SHA256 fd96c4817ed5c032a35790835aa072abbee8188b443e43f591badb35f8b38147 SHA512 7214c362d0304fe50699b9b9489155e6d3c1b8a85e0d625e733ad036837938ed844e9ed0b25743252946ceb891a9db3db1580738f4312ba4056c88c2ba35a2a1 WHIRLPOOL a80537a65b1dbf887b49c02aa9d9182ed91bc87a7674f48d33c6178c14c206f7dfaa314970a62e4da83417c3d8271e4f47eeab222c4fa2b8f737f243811c1d6d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ/gv8AAoJEJ0WA1zPCt1hwwcH/2xUo0+52uWNPiQC+TZTxF46
+6R0j3jmVUjA8d/6qvJWZxcRdJuuGg3h6cfNXPbsmURJtW+lPg5nGMsKmFRFSYMiU
+ZFOXZ678iXIpuhHCDJrsRsfXgbH9yVeuC5HH8iYPKtnUFj6wE53JLCL4/DrLcCVr
+WrphNZigp7pV8odqHQZ3O181M4cqznp2UoBb0RIzg2phDm5xS2Pf+wE2suqToilN
+09G4bRWa6TAQmFgx8MKncNzo4KgMW/uyHg81hRdluB8JMpv6y6G/gYojlM/X5gwU
+lwyu9hyw4gLbD3bRZlkN589Ud1LWK/E7RpQdWpdJIYMJBuIyx7dCS1eEfEabzqM=
+=8w1h
+-----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-3.6.3.ebuild b/mail-client/evolution/evolution-3.6.3.ebuild
new file mode 100644
index 000000000000..e6cda1e425a5
--- /dev/null
+++ b/mail-client/evolution/evolution-3.6.3.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.3.ebuild,v 1.1 2013/01/22 03:48:11 tetromino 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 ) CCPL-Attribution-ShareAlike-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+IUSE="crypt +gnome-online-accounts gstreamer kerberos ldap map ssl"
+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
+# also supports gstreamer 1.0
+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
+	>=dev-libs/libgweather-3.5.0:2=
+	>=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
+	!=net-libs/webkit-gtk-1.9.90
+
+	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-0.10:0.10
+		>=media-libs/gst-plugins-base-0.10:0.10 )
+	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:= )"
+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 \
+		--enable-weather \
+		$(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") \
+		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"
+}