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.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 34 insertions, 204 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/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"
-}