Add evolution-3, from gnome overlay for GNOME 3 (TODO: file bug for USE=map keywording)

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 196 insertions, 6 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index a7a8046d04d2..3b7185b3905a 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.342 2011/08/13 17:44:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.343 2011/09/30 18:45:22 nirbheek Exp $
+
+*evolution-3.0.3 (30 Sep 2011)
+
+  30 Sep 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +evolution-3.0.3.ebuild,
+  metadata.xml:
+  Add evolution-3, from gnome overlay for GNOME 3 (TODO: file bug for USE=map
+  keywording)
 
   13 Aug 2011; Raúl Porcel <armin76@gentoo.org> evolution-2.32.2-r3.ebuild:
   alpha/ia64/sparc stable wrt #369909
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index caf74f208d14..62ed315ee79b 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -9,15 +9,27 @@ DIST evolution-2.32.2-patches-r1.tar.bz2 15387 RMD160 1b5279f83c5d6048294a4b320b
 DIST evolution-2.32.2.tar.bz2 31929154 RMD160 1d68825111309600093c8d4718e1cc001635e61d SHA1 48f25fffda1ac9c209fd02162ca298df5c03b05f SHA256 1831c7f5f00b4755869cf84ef3e3f79c4705a33e0659e72b6c1ffa4a59d4a4bb
 DIST evolution-2.32.3-patches.tar.xz 11784 RMD160 34e536268814b2c41fd081321f3435ea10af620c SHA1 2f9af7d7f9489099daefceb7ea7f2948fa1314a5 SHA256 eadfcd9d1663206f1d15457358afa7901f095894d782d4043ffd762b242eded6
 DIST evolution-2.32.3.tar.bz2 31966138 RMD160 1b64d00a38cf8ad5c273cc4f4aee73124fe818af SHA1 cc2a2126ef4192193dce50c43c5bb6fc0a57fcde SHA256 33ab38780e9abb71506230e331e9c3534444b5ed3f17046f0b6371a00df686fb
+DIST evolution-3.0.3.tar.xz 25755880 RMD160 0cf0457ac4654e277cff0e174d29cc3dc96e0924 SHA1 c0ea8a8551e1937f5ede665d0a34ff8ea773d839 SHA256 37fadcd459b74960fccf805f627ff869e315367690af8809ce956ec7e23294f7
 EBUILD evolution-2.32.2-r3.ebuild 5595 RMD160 d3bfb6f5979cd13252f7814bb5b996057ddfb15a SHA1 fb897c4ab5227a0f4a22f4fff967de04654edc21 SHA256 4e5470ea94dc67191661f60caf52edb9bb5896a4fd971326aae355520429b187
 EBUILD evolution-2.32.2.ebuild 5639 RMD160 371ba5e6eff48a31c8f90ca70fb5d6813b478301 SHA1 d75ab8b0e83c19e81732dcd3321480eb38bf741d SHA256 4d67ce1d006858e20cf7bf91a7e24f9262633c16c2d9b08043dec281c440da00
 EBUILD evolution-2.32.3.ebuild 5991 RMD160 ab3b10d583397d98cea551dc932f121c8f46ab78 SHA1 348a407137f3b3d161e34c06c9cf9368325ab406 SHA256 47f177cc23b3dbdb4891ce8fdd36c51a4aea7ce1f207e544c21d06f3a700517f
-MISC ChangeLog 78196 RMD160 f269919b9a6b6feeacd0d00f4751ec70ae716277 SHA1 255436292bf1930b6358709cb244a21c16feeabe SHA256 e31c3674ac1c12d24e5c433a7ad605c20d11aa57aa41bc2a0712168bc9dcbd37
-MISC metadata.xml 842 RMD160 36762e0ef3acd839b3994516440ab9dd8435ab0c SHA1 1aae4d411bfbcf0be789ded2b8b5152ebfc97def SHA256 46d9a7140e80b42eca026e4f3e1cd91b663ac4a4d3179fcff6c9916b33840950
+EBUILD evolution-3.0.3.ebuild 5273 RMD160 df52e4b4df69de3822512d1606170e8cdcc86099 SHA1 e6795629d7df052e4b45bf59efe437a5871e91e7 SHA256 a11443c6385032fd8868ff838b95573856c4b01e120c2b5a44e4153cd3af10c4
+MISC ChangeLog 78417 RMD160 e00057765d6bf7dfee391c3723ba6edcf8346790 SHA1 e0cdb6e650ec5a56af2c43b16c9b68006efa5994 SHA256 31b1466feaa01390cadc6b5a3a6dbbc9ed4b87eb0de1a73111a5e19cf5d872fe
+MISC metadata.xml 977 RMD160 5c829eaa573329f537d7d1b042b11185481046d6 SHA1 919fd156ebe38465ad7cea6b35e1f43aa6e25786 SHA256 3a5374d12556f024da2da451eb7015accced023642d375ab715e072dc0c0837a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5GuAsACgkQuQc30/atMkAltwCaAw90YtuxoQ+XLFZJmv41rdB/
-7XoAn2GgjTuQdL7BkL9lBF8qP5z9omrb
-=w/NO
+iQIcBAEBAgAGBQJOhg5eAAoJEO/kOhxWD91kHiYP/1S52WtpGPBtSK/HK8F+B5k5
+u+AycT07LPfB4uVX2kgcSNCCRA8bLEk5cn+vi87eGHzBIngjqUdvKp9a7KFKELmD
+kn/6bl9lI5vX1UDiWRch+q98EW+aZMhMsT7hPYAX6Zr9Uw1eSfoetWHWY1Zejk8+
+R6mE8rD8YHbGqLEFrK38NkgopNbn7izfexcLknUS0v5dq0oLRFLcI9rWDs4Jc6NC
+4wvdCYxbZOYNpINs36JfuCm6tO5Gt6Ga/V9w/DRXkBeHCc5j9IIdfpbUkHJQ1aJR
+i12IbhWUKRNt5zS2xJzXDIbK6zpngRRneuvpxBCehX0N4QP12lM/jl8GCBS6v681
++NGghImGk2gKY1MTPyrP+m533Y8+FNIGUWcHu1oaQhUrnBKSmvZ6pPZdIUcZuS77
+eHIu722gIliaqC7E23ZMlGOaI3vwn7AKU3rXuvbxeGVpBB3vp2IntADQIqa69Nwg
+He/4JFhb4CwC0euJpdCh1sDBz7C2jCVOaLTsIqHZ1lM2hJ6IEar8kJq9i8SKfwXu
+732+V1xOgQV4aCisAjxEpNocbMF8f2M+tiJVwti6QUUferajKQ61kd8Ui80OYbHk
+eBmHFMbkV/rSWhrlPdYqTGpHsOpitI7xLX1wBAhB1X0HOOXmmL3DsAdF6D/wRzkF
+Z91//MZfVlwKwClJ/oXt
+=+J1L
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-3.0.3.ebuild b/mail-client/evolution/evolution-3.0.3.ebuild
new file mode 100644
index 000000000000..9314d17a4f03
--- /dev/null
+++ b/mail-client/evolution/evolution-3.0.3.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.0.3.ebuild,v 1.1 2011/09/30 18:45:22 nirbheek Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="xz"
+PYTHON_DEPEND="python? 2:2.4"
+
+inherit flag-o-matic gnome2 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="~amd64 ~x86 ~x86-fbsd"
+IUSE="clutter connman crypt doc gstreamer kerberos ldap map networkmanager python ssl"
+
+# 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] )"
+
+# contacts-map plugin requires libchaimplain and geoclue
+# glade-3 support is for maintainers only per configure.ac
+# mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571)
+# pst is not mature enough and changes API/ABI frequently
+COMMON_DEPEND=">=dev-libs/glib-2.28:2
+	>=x11-libs/cairo-1.9.15[glib]
+	>=x11-libs/gtk+-3.0.2:3
+	>=dev-libs/libunique-2.91.4:3
+	>=gnome-base/gnome-desktop-2.91.3:3
+	>=dev-libs/libgweather-2.90.0:2
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=x11-libs/libnotify-0.7
+	>=gnome-extra/evolution-data-server-${PV}[weather]
+	>=gnome-extra/gtkhtml-3.31.3:4.0
+	>=gnome-base/gconf-2:2
+	dev-libs/atk
+	>=dev-libs/libxml2-2.7.3:2
+	>=net-libs/libsoup-gnome-2.31.2:2.4
+	>=x11-misc/shared-mime-info-0.22
+	>=x11-themes/gnome-icon-theme-2.30.2.1
+	>=dev-libs/libgdata-0.4
+
+	x11-libs/libSM
+	x11-libs/libICE
+
+	clutter? (
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		x11-libs/mx )
+	connman? ( net-misc/connman )
+	crypt? ( || (
+		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
+		=app-crypt/gnupg-1.4* ) )
+	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.11.1
+		media-libs/libchamplain:0.8 )
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	ssl? (
+		>=dev-libs/nspr-4.6.1
+		>=dev-libs/nss-3.11 )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/pkgconfig-0.16
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	sys-devel/bison
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.9.1
+	app-text/docbook-xml-dtd:4.1.2
+	>=gnome-base/gnome-common-2.12
+	>=dev-util/gtk-doc-am-1.9
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2.12
+#	>=dev-util/gtk-doc-am-1.9
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/evolution-exchange-2.32"
+
+# Need EAPI=4 support in python eclass
+#REQUIRED_USE="map? ( clutter )
+#	^^ ( connman networkmanager )"
+
+pkg_setup() {
+	ELTCONF="--reverse-deps"
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
+	G2CONF="${G2CONF}
+		--without-glade-catalog
+		--without-kde-applnk-path
+		--enable-plugins=experimental
+		--disable-image-inline
+		--disable-mono
+		--disable-profiling
+		--disable-pst-import
+		--enable-canberra
+		--enable-weather
+		$(use_enable ssl nss)
+		$(use_enable ssl smime)
+		$(use_enable networkmanager nm)
+		$(use_enable connman)
+		$(use_enable gstreamer audio-inline)
+		$(use_enable map contacts-map)
+		$(use_enable python)
+		$(use_with clutter)
+		$(use_with ldap openldap)
+		$(use_with kerberos krb5 /usr)"
+
+	# 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.
+
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	if use ssl ; then
+		G2CONF="${G2CONF} --enable-nss=yes"
+	else
+		G2CONF="${G2CONF}
+			--without-nspr-libs
+			--without-nspr-includes
+			--without-nss-libs
+			--without-nss-includes"
+	fi
+
+	# NM and connman support cannot coexist
+	# XXX: remove with EAPI 4
+	if use networkmanager && use connman ; then
+		ewarn "It is not possible to enable both ConnMan and NetworkManager, disabling connman..."
+		G2CONF="${G2CONF} --disable-connman"
+	fi
+
+	python_set_active_version 2
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix compilation flags crazyness
+	# Note: sed configure.ac if eautoreconf
+	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS"/\1/' \
+		-i configure || die "CPPFLAGS sed failed"
+}
+
+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"
+}
diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml
index aeb80e407b4a..632bfb247a0f 100644
--- a/mail-client/evolution/metadata.xml
+++ b/mail-client/evolution/metadata.xml
@@ -10,6 +10,8 @@
 			<pkg>app-crypt/gnupg</pkg> and <pkg>app-crypt/pinentry</pkg></flag>
 		<flag name="ldap">Enable support for fetching contacts from an LDAP or
 			Active Directory server using <pkg>net-nds/openldap</pkg></flag>
+		<flag name="map">Enable support for displaying contacts on a map inside
+			evolution using <pkg>media-libs/libchamplain</pkg></flag>
 		<flag name="networkmanager">Allows Evolution to automagically toggle
 			online/offline mode by talking to <pkg>net-misc/networkmanager</pkg>
 			and getting the current network state</flag>