Fix building with latest automake dropping last -Werror instance we missed before (#442242 by evgenn), show message for changing browser only when people don't have gnome-default-applications-properties provider. Remove old.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 39 insertions, 214 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index b4a87bd3c899..f79238250eca 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.373 2012/10/27 07:24:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.374 2012/11/17 12:12:15 pacho Exp $
+
+  17 Nov 2012; Pacho Ramos <pacho@gentoo.org> -evolution-2.32.3.ebuild,
+  evolution-2.32.3-r1.ebuild:
+  Fix building with latest automake dropping last -Werror instance we missed
+  before (#442242 by evgenn), show message for changing browser only when people
+  don't have gnome-default-applications-properties provider. Remove old.
 
   27 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   evolution-3.4.4.ebuild:
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index b69f9bc994a3..b32c4a1a0ba1 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -16,20 +16,15 @@ DIST evolution-2.32.3-patches.tar.xz 11784 SHA256 eadfcd9d1663206f1d15457358afa7
 DIST evolution-2.32.3.tar.bz2 31966138 SHA256 33ab38780e9abb71506230e331e9c3534444b5ed3f17046f0b6371a00df686fb SHA512 7241954f4e6ab87151e2c4af0bd33d5f428ab5e01f935aafbfaf50714a495fe01fe54c3f3c6498d514880bf1c5271d491a523d79b2928827490204b9eee4c0d3 WHIRLPOOL 982ca39ff6c02adbd168a8c82a164636eaf908e0e4905195d321187199339a8e9725fa91b7d8d95b3ff5d32a9b7faf0a4a9da8d651915b4d1581788f722fb8c9
 DIST evolution-3.2.3.tar.xz 12419112 SHA256 a25d523e775c022ec9e68d7b989316e7252b687d70b9db2f60b72bb833099e9d SHA512 751bf3eaca2215ee9a3adfd41c2396b92ee4831763d5b5f1be555189b1ab1b476fa223e2ad34990145952babf54384611cef2e08ecf0df2ee30b59ba0481a23c WHIRLPOOL 58ceedf4863ff0f7fba596c8fa493308a9f4fd45d3a31f101316880bd15597b17aeac168fc2fecddaef387ac144a0c3dd2b14d78a1d3495d1ba3d601f7972169
 DIST evolution-3.4.4.tar.xz 11899620 SHA256 7e541d0894c1d48b89820b6466edafe40215f8cdb45b1c0e9635cc15f49ecb9a SHA512 b72100c39016c2e9436b2e2318918e57e8945dc850b9b47a6738c17b6b25048bcb29269b5e3a481939b493147b537a0158adf0f32aec98268489ccfa1fa7be6b WHIRLPOOL 0c621797311158cbd0e9322fb2af615bc123ff84c5c31470afd00c6ed9c12402b54ef0cec02cb87880843ca778e0cc451d9e72fc9b4a3b259ee5f185c6686f22
-EBUILD evolution-2.32.3-r1.ebuild 5981 SHA256 87a0fffec3984d99c900936b4f786559d5262eb85d22d81df744d8fe8e09319d SHA512 20ec53f098de2fe82764876c5c02774a7b962a04e63e1606f53f1bea0d6e22c4a5033b5b8460bc9d46001e61bc7f3a1052932f4ea1bd9a7d4635ed5399b05a64 WHIRLPOOL 2ff983acc62ed2b99cdcf2abff61ae4786298119909aac9bc5a15adadb82e7061a380907281be916e18000ad14217b211fa47a37b622d4223ffb226f6c9be848
-EBUILD evolution-2.32.3.ebuild 5565 SHA256 4039fafa64ab1a1aa232a3d235596fa9785ba01b8caf0f193072513136d07547 SHA512 dfc093a06d7bce2c143511b465e05ee7cc190c6c140300626d4cf0272987f31d2f0e45da7ac7fdecb1fb962c1bb7f6dabbb736250b84db7ebe73d07fa2ea3bec WHIRLPOOL 7fb6a32c8cda59f81ae17c035fcf69843176e3a2972a0b6cb3277152161897d73bc70c6292d91d168a317cdfaa41aafc6fae414ae54d27150bf02d2dedd48249
+EBUILD evolution-2.32.3-r1.ebuild 5980 SHA256 e2a8e8f51b1491cc421e4121cc36d84198418b53841f74ca3378851726dbf6cd SHA512 a2d6e7e084cae41523df743e432ca880a8d048faaeb8fcf528e443ceba87e6caa764b3515d1c6fcd3af0cfc51e788e10d8fb5ca18cb540e62e2b7219a09bf129 WHIRLPOOL d19ed8a66891cce0035056a5e42c2d7e33f94b6b2e259360a5e182ac2b184c2d783c90c04287b72b35de586b11346ea1a40a2b0e26862eaec42977d89539ab40
 EBUILD evolution-3.2.3-r1.ebuild 5713 SHA256 c9a3dc468a9777bb1e36749622d27ea0b26460cd82b9c061a04511b64f682753 SHA512 97dd03e86eeab6acc637da8b6ca2146a449bbceba8b6ad5b132d6587e011e0aeb903dc85030f81115b052c03943cadbafba20e4bddb72a4a0778a5211b2d69c5 WHIRLPOOL 063dd52d97c2d29c564d834c9a6eaf369afdb0dda5ae53b2599a49529762925ea1f70b44742b0da20a3a293e77850bc1540665e0d1f37f7f87c2e59734e85b4e
 EBUILD evolution-3.4.4.ebuild 5484 SHA256 70f5ebd77a5a830005b2c0683fa681a538a59d19eacc79b7fb154d4af1766a5a SHA512 89a41ac9acd29235946578e2f5d0f69cae098bc94997384c0a4db8561d908567dae5d376dd033aa482f700f491a5bf9aaecdc97227b2261d7afb1c79c6f9de95 WHIRLPOOL 8cb2d05496f5476f699cfc395b110ef4350b1a209d12ce85ba185733634c0b65e76d754642a8946ba96c5d80573413d5ca951c1b3d36c3051ec19d87dadb6aa6
-MISC ChangeLog 84256 SHA256 8f0d5f888c7b0679569e9fa4c8b7d160172f3fc0ecadfbabfb2c3235e135d1b5 SHA512 6d29ef39da684c56d1819c4b96b17c8ee181f74209c3a7888ebe82aa366b4aa04a7ea30825ebccc6b09accdf4f1567efba1e8f4fa22cc833fafefec63f8bc3c4 WHIRLPOOL bf0a6c51cbdbd0c7af9903d086e128ad142865b502954df65abd7cf3276f853dacefc871370fbf99ee80a0006203f85cdb98442b3e51cae668b74706bc8874ce
+MISC ChangeLog 84586 SHA256 f6553f9d4464bf40ec6c62186aee92c98d40e1a51c6f900fa65f236e1b532d41 SHA512 b45c69653288c4c91916fe85a484bb2028dd507b384b0a535d9495fac2a36560f85e52673a10ff1fc41e602fb3517903e58b13f67f8d7b6fa564ce222b4298d2 WHIRLPOOL 65465eed89c5d1f67a07f532b3a96b3aec8f0ba138350d9271d4d8e6d2617e29b10bb5c46629ac264eb2832a7320f0d5117d8a8693ffb3b9525079080c8b7dc7
 MISC metadata.xml 1097 SHA256 fd96c4817ed5c032a35790835aa072abbee8188b443e43f591badb35f8b38147 SHA512 7214c362d0304fe50699b9b9489155e6d3c1b8a85e0d625e733ad036837938ed844e9ed0b25743252946ceb891a9db3db1580738f4312ba4056c88c2ba35a2a1 WHIRLPOOL a80537a65b1dbf887b49c02aa9d9182ed91bc87a7674f48d33c6178c14c206f7dfaa314970a62e4da83417c3d8271e4f47eeab222c4fa2b8f737f243811c1d6d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQi4wnAAoJEJ0WA1zPCt1hD0EH/iiR18FMJUdbEC64oLEC0Lkp
-K5LJIXHvstaNvjzItwMg0xnBHDzet7IVItGjp/hBor0MqK/lvu2pD/o4FM1G97t1
-03/0cUlsIXBAuSM6hFhpnX/2jIeUBiD+vuE/2lcvn9VXpMteODaP+Fpn/m3dCcYK
-KWnUCEzgbqcu8QkBVYsWt35qcDQJXMC5mmoce70a5bppIn8mjs+QEwho/nbhy9FM
-vjbelVarGjyRauX64W90jcmFAKbE6O5mjXARw5maX82Vac3IPUMeIK0PpexKyAFy
-yZNOZgIjP31XB2ztPYUVosXb0qxawyY7pskPe/sRbB44FE4akwdMvfEUQHA1EHc=
-=b9tL
+iEYEAREIAAYFAlCnfyAACgkQCaWpQKGI+9TsggCfQpaoout1gQMDRjoUEIjXMptC
+elQAn0RnXlI3aRtDZ8+MXdoe9O7QOqCL
+=cY8S
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.32.3-r1.ebuild b/mail-client/evolution/evolution-2.32.3-r1.ebuild
index 8c59e450f15c..a87ce28171ba 100644
--- a/mail-client/evolution/evolution-2.32.3-r1.ebuild
+++ b/mail-client/evolution/evolution-2.32.3-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.15 2012/10/17 09:55:53 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.16 2012/11/17 12:12:15 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
 PYTHON_DEPEND="python? 2:2.5"
 
 inherit autotools eutils flag-o-matic gnome2 python versionator
@@ -84,6 +85,11 @@ DEPEND="${RDEPEND}
 #	>=gnome-base/gnome-common-2.12
 
 pkg_setup() {
+	python_pkg_setup
+	python_set_active_version 2
+}
+
+src_prepare() {
 	ELTCONF="--reverse-deps"
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
 	G2CONF="${G2CONF}
@@ -130,10 +136,6 @@ pkg_setup() {
 		G2CONF="${G2CONF} --disable-connman"
 	fi
 
-	python_set_active_version 2
-}
-
-src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-0.7.patch
 
 	# Fix invalid use of la file in contact-editor, upstream bug #635002
@@ -159,11 +161,9 @@ src_prepare() {
 			-i configure.ac configure || die "sed 2 failed"
 	fi
 
-	# Fix compilation flags crazyness
-	sed -e 's/-D.*_DISABLE_DEPRECATED//' \
-		-i configure.ac configure || die "sed 1 failed"
+	# Drop -Werror, bug #442242
+	sed -i -e 's/-Werror //' configure.ac || die
 
-	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 	gnome2_src_prepare
 }
@@ -171,19 +171,21 @@ src_prepare() {
 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"
+	if ! has_version gnome-base/gnome-control-center; then
+		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"
+	fi
 }
diff --git a/mail-client/evolution/evolution-2.32.3.ebuild b/mail-client/evolution/evolution-2.32.3.ebuild
deleted file mode 100644
index 617f3ab6e7d8..000000000000
--- a/mail-client/evolution/evolution-2.32.3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3.ebuild,v 1.13 2012/10/17 09:55:53 tetromino Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit autotools eutils flag-o-matic gnome2 python versionator
-
-MY_MAJORV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://projects.gnome.org/evolution/"
-
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) GPL-2+ LGPL-2 FDL-1.2+ OPENLDAP"
-SLOT="2.0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="clutter crypt gstreamer kerberos ldap 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
-RDEPEND=">=dev-libs/glib-2.25.12:2
-	>=x11-libs/gtk+-2.20.0:2
-	>=dev-libs/libunique-1.1.2:1
-	>=gnome-base/gnome-desktop-2.26:2
-	>=dev-libs/libgweather-2.25.3:2
-	<dev-libs/libgweather-2.91:2
-	media-libs/libcanberra[gtk]
-	>=x11-libs/libnotify-0.3
-	>=gnome-extra/evolution-data-server-${PV}[weather]
-	>=gnome-extra/gtkhtml-3.31.90:3.14
-	>=gnome-base/gconf-2:2
-	dev-libs/atk
-	>=dev-libs/libxml2-2.7.3:2
-	>=net-libs/libsoup-2.4:2.4
-	>=media-gfx/gtkimageview-1.6
-	>=x11-misc/shared-mime-info-0.22
-	>=x11-themes/gnome-icon-theme-2.30.2.1
-	>=dev-libs/libgdata-0.4
-
-	clutter? (
-		>=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* ) )
-	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 )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11 )
-
-	!<gnome-extra/evolution-exchange-2.32"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.5
-	sys-devel/gettext
-	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"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2.12
-
-pkg_setup() {
-	ELTCONF="--reverse-deps"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-	G2CONF="${G2CONF}
-		--without-kde-applnk-path
-		--enable-plugins=experimental
-		--enable-image-inline
-		--enable-canberra
-		--enable-weather
-		$(use_enable ssl nss)
-		$(use_enable ssl smime)
-		$(use_enable networkmanager nm)
-		--disable-connman
-		$(use_enable gstreamer audio-inline)
-		--disable-profiling
-		--disable-pst-import
-		$(use_enable python)
-		$(use_with clutter)
-		$(use_with ldap openldap)
-		$(use_with kerberos krb5 /usr)
-		--disable-contacts-map
-		--without-glade-catalog
-		--disable-mono
-		--disable-gtk3"
-
-	# 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
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-0.7.patch
-
-	# Fix invalid use of la file in contact-editor, upstream bug #635002
-	epatch "${FILESDIR}/${PN}-2.32.0-wrong-lafile-usage.patch"
-
-	# Fix compilation with --disable-smime, bug #356471
-	epatch "${FILESDIR}/${PN}-2.32.2-smime-fix.patch"
-
-	# Fix desktop file to work with latest glib
-	epatch "${FILESDIR}/${PN}-2.32.2-mime-handler.patch"
-
-	# Apply multiple backports from master fixing important bugs
-	epatch "${WORKDIR}/${P}-patches"/*.patch
-
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -e 's|mozilla-nss|nss|' \
-			-e 's|mozilla-nspr|nspr|' \
-			-i configure.ac configure || die "sed 2 failed"
-	fi
-
-	# Fix compilation flags crazyness
-	sed -e 's/-D.*_DISABLE_DEPRECATED//' \
-		-i configure.ac configure || die "sed 1 failed"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-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"
-}