From a2b8cdbb399c42681dc3adcf56d4a8aa317e5894 Mon Sep 17 00:00:00 2001
From: Pacho Ramos <pacho@gentoo.org>
Date: Sat, 8 Oct 2011 21:25:45 +0000
Subject: [PATCH] Drop connman support for version to be stabilized as it
 cannot go to stable yet, remove .la files, drop old.

Package-Manager: portage-2.1.10.22/cvs/Linux x86_64
---
 mail-client/evolution/ChangeLog               |  9 ++-
 mail-client/evolution/Manifest                | 16 +++--
 ...32.2.ebuild => evolution-2.32.3-r1.ebuild} | 60 ++++++++++---------
 mail-client/evolution/evolution-2.32.3.ebuild | 23 ++-----
 4 files changed, 50 insertions(+), 58 deletions(-)
 rename mail-client/evolution/{evolution-2.32.2.ebuild => evolution-2.32.3-r1.ebuild} (78%)

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 563c584ddeb1..adc55798f47c 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.344 2011/10/05 17:49:25 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.345 2011/10/08 21:25:44 pacho Exp $
+
+*evolution-2.32.3-r1 (08 Oct 2011)
+
+  08 Oct 2011; Pacho Ramos <pacho@gentoo.org> -evolution-2.32.2.ebuild,
+  evolution-2.32.3.ebuild, +evolution-2.32.3-r1.ebuild:
+  Drop connman support for version to be stabilized as it cannot go to stable
+  yet, remove .la files, drop old.
 
   05 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org>
   evolution-2.32.2-r3.ebuild:
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 3c949674e29d..a576db5dd954 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -11,17 +11,15 @@ DIST evolution-2.32.3-patches.tar.xz 11784 RMD160 34e536268814b2c41fd081321f3435
 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 5596 RMD160 f900315ddabce559450ac0992e394094e405f2b7 SHA1 b366e6f5aa7d4d0447a1c37dd1a30e59a04d6ce2 SHA256 1f276b6d907f921d50dc4d0d1b19b0a1771834581735de29f39968ff43c489c7
-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
+EBUILD evolution-2.32.3-r1.ebuild 5729 RMD160 40605e84a04e118c9da9fa3b306412b02b4cfdbc SHA1 44d0cfdffe99493a37012d878f02bbab3a94ff0e SHA256 432a3c3a61f3638ab272840689b45bc1ba441a60e16f3e50c6e770ec3ece687a
+EBUILD evolution-2.32.3.ebuild 5460 RMD160 1a85e65c2b0b4a0217791e88308304ad10f9164f SHA1 9934748d0cc713ab78eb8e82f9af9fd57a3780db SHA256 c7fcd08ba3c7f22a7877aada0c8673a6b17722e319f8984a065dc83ae50dcda9
 EBUILD evolution-3.0.3.ebuild 5273 RMD160 df52e4b4df69de3822512d1606170e8cdcc86099 SHA1 e6795629d7df052e4b45bf59efe437a5871e91e7 SHA256 a11443c6385032fd8868ff838b95573856c4b01e120c2b5a44e4153cd3af10c4
-MISC ChangeLog 78535 RMD160 e8baeb10d01844c47468aab34b8c9bc1291c0f7d SHA1 e03f38f3b8bbf6c42f47808f709c6ce266165722 SHA256 1f452025b6325812cb25fa1b0e19a5e708985fab853c813c138bb1c18dc49f8b
+MISC ChangeLog 78808 RMD160 9ff9a64e2162e8c10f03b24442231a2b08b88f35 SHA1 d3ea2a0c563dd9bbdfc588af695793adade0ec1b SHA256 df90d2a131ffe7dbbcedae614488d40bfa838001ffcb5a5a994c61e15381c64e
 MISC metadata.xml 977 RMD160 5c829eaa573329f537d7d1b042b11185481046d6 SHA1 919fd156ebe38465ad7cea6b35e1f43aa6e25786 SHA256 3a5374d12556f024da2da451eb7015accced023642d375ab715e072dc0c0837a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk6MmKsACgkQIiMqcbOVdxSAxwP/dPJYbktZamBeR33BNbP78q/i
-P0tKKyOqw7b4wyA9QmSCH/e1kkcZBZw8938w0YGIN4w2+/2/TwhdlpKsbJiMkqTI
-bgPex82muWjrtB6n9TitpcCJ6NqTjYuZ1J4Vq7ECzEijyIeK7gQGgFkWVgxDk2Bk
-qv1KbYObyWo3iBCRiUo=
-=u9hR
+iEYEARECAAYFAk6Qv+EACgkQCaWpQKGI+9QpogCeN9HKVIBJOUsAb+XGPIwEMBT8
+xeQAnR+PEqVVArz/alQBGVNiA85kM8Zj
+=r8Jv
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.32.2.ebuild b/mail-client/evolution/evolution-2.32.3-r1.ebuild
similarity index 78%
rename from mail-client/evolution/evolution-2.32.2.ebuild
rename to mail-client/evolution/evolution-2.32.3-r1.ebuild
index 8a347d8807d8..7e47aeb01c0e 100644
--- a/mail-client/evolution/evolution-2.32.2.ebuild
+++ b/mail-client/evolution/evolution-2.32.3-r1.ebuild
@@ -1,9 +1,10 @@
 # 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-2.32.2.ebuild,v 1.9 2011/07/01 17:28:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.1 2011/10/08 21:25:44 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.4"
 
 inherit autotools flag-o-matic gnome2 python versionator
@@ -13,12 +14,12 @@ MY_MAJORV=$(get_version_component_range 1-2)
 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
 HOMEPAGE="http://www.gnome.org/projects/evolution/"
 
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
+
 LICENSE="GPL-2 LGPL-2 OPENLDAP"
 SLOT="2.0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-# connman is not ready to be stabilized, bug #353440
-IUSE="clutter crypt doc gstreamer kerberos ldap networkmanager python ssl"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="clutter connman crypt doc 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
@@ -39,7 +40,7 @@ RDEPEND=">=dev-libs/glib-2.25.12:2
 	>=gnome-extra/gtkhtml-3.31.90:3.14
 	>=gnome-base/gconf-2:2
 	dev-libs/atk
-	>=dev-libs/libxml2-2.7.3
+	>=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
@@ -47,6 +48,7 @@ RDEPEND=">=dev-libs/glib-2.25.12:2
 	>=dev-libs/libgdata-0.4
 
 	clutter? ( media-libs/clutter:1.0[gtk] )
+	connman? ( net-misc/connman )
 	crypt? ( || (
 				  ( >=app-crypt/gnupg-2.0.1-r2
 					${PINENTRY_DEPEND} )
@@ -62,7 +64,6 @@ RDEPEND=">=dev-libs/glib-2.25.12:2
 		>=dev-libs/nss-3.11 )
 
 	!<gnome-extra/evolution-exchange-2.32"
-# connman? ( net-misc/connman )
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.16
@@ -91,7 +92,7 @@ pkg_setup() {
 		$(use_enable ssl nss)
 		$(use_enable ssl smime)
 		$(use_enable networkmanager nm)
-		--disable-connman
+		$(use_enable connman)
 		$(use_enable gstreamer audio-inline)
 		--disable-profiling
 		--disable-pst-import
@@ -121,10 +122,10 @@ pkg_setup() {
 	fi
 
 	# NM and connman support cannot coexist
-#	if use networkmanager && use connman ; then
-#		ewarn "It is not possible to enable both ConnMan and NetworkManager, disabling connman..."
-#		G2CONF="${G2CONF} --disable-connman"
-#	fi
+	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
 }
@@ -137,6 +138,15 @@ src_prepare() {
 	# 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|' \
@@ -144,10 +154,6 @@ src_prepare() {
 			-i configure.ac configure || die "sed 2 failed"
 	fi
 
-	# Fix compilation flags crazyness
-	sed -e 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
-		-i configure.ac configure || die "sed 1 failed"
-
 	# Fix compilation flags crazyness
 	sed -e 's/-D.*_DISABLE_DEPRECATED//' \
 		-i configure.ac configure || die "sed 1 failed"
@@ -156,23 +162,19 @@ src_prepare() {
 	eautoreconf
 }
 
-src_install() {
-	gnome2_src_install
-
-	find "${ED}"/usr/$(get_libdir)/evolution/${MY_MAJORV}/plugins \
-		-name "*.la" -delete || die "la files removal failed 1"
-	find "${ED}"/usr/$(get_libdir)/evolution/${MY_MAJORV}/modules \
-		-name "*.la" -delete || die "la files removal failed 2"
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-	elog "To change the default browser if you are not using GNOME, do:"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'firefox %s'"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'firefox %s'"
+	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 %s' with which ever browser you use."
+	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"
diff --git a/mail-client/evolution/evolution-2.32.3.ebuild b/mail-client/evolution/evolution-2.32.3.ebuild
index b4009e092e30..b23837980db4 100644
--- a/mail-client/evolution/evolution-2.32.3.ebuild
+++ b/mail-client/evolution/evolution-2.32.3.ebuild
@@ -1,9 +1,10 @@
 # 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-2.32.3.ebuild,v 1.1 2011/06/19 21:35:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3.ebuild,v 1.2 2011/10/08 21:25:45 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.4"
 
 inherit autotools flag-o-matic gnome2 python versionator
@@ -18,7 +19,7 @@ SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
 LICENSE="GPL-2 LGPL-2 OPENLDAP"
 SLOT="2.0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="clutter connman crypt doc gstreamer kerberos ldap networkmanager python ssl"
+IUSE="clutter crypt doc 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
@@ -47,7 +48,6 @@ RDEPEND=">=dev-libs/glib-2.25.12:2
 	>=dev-libs/libgdata-0.4
 
 	clutter? ( media-libs/clutter:1.0[gtk] )
-	connman? ( net-misc/connman )
 	crypt? ( || (
 				  ( >=app-crypt/gnupg-2.0.1-r2
 					${PINENTRY_DEPEND} )
@@ -91,7 +91,7 @@ pkg_setup() {
 		$(use_enable ssl nss)
 		$(use_enable ssl smime)
 		$(use_enable networkmanager nm)
-		$(use_enable connman)
+		--disable-connman
 		$(use_enable gstreamer audio-inline)
 		--disable-profiling
 		--disable-pst-import
@@ -120,12 +120,6 @@ pkg_setup() {
 			--without-nss-includes"
 	fi
 
-	# NM and connman support cannot coexist
-	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
 }
 
@@ -161,15 +155,6 @@ src_prepare() {
 	eautoreconf
 }
 
-src_install() {
-	gnome2_src_install
-
-	find "${ED}"/usr/$(get_libdir)/evolution/${MY_MAJORV}/plugins \
-		-name "*.la" -delete || die "la files removal failed 1"
-	find "${ED}"/usr/$(get_libdir)/evolution/${MY_MAJORV}/modules \
-		-name "*.la" -delete || die "la files removal failed 2"
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-- 
2.26.2