Explicitly knock DISABLE_DEPRECATED and DISABLE_SINGLE_INCLUDES out of the compiler flags as this will not work correctly with stable libunique. Herd ack by leio on IRC.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 32 insertions, 9 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 089dff566e52..06f3b83397fe 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.293 2010/06/13 20:13:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.294 2010/06/14 00:46:16 chainsaw Exp $
+
+  14 Jun 2010; <chainsaw@gentoo.org>
+  files/evolution-2.30.1.2-configure.patch:
+  Explicitly knock DISABLE_DEPRECATED and DISABLE_SINGLE_INCLUDES out of the
+  compiler flags as this will not work correctly with stable libunique. Herd
+  ack by leio on IRC.
 
 *evolution-2.30.1.2-r1 (13 Jun 2010)
 
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 55c16f1cb232..5dc3027410df 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -11,7 +11,7 @@ AUX evolution-2.28.3.1-allow-setting-alarms_2.patch 2149 RMD160 a44c12bcdd3316a4
 AUX evolution-2.28.3.1-allow-setting-alarms_3.patch 1890 RMD160 e42285e4817e98eb63c4cee7c02821636fc1c382 SHA1 e90cbd558c59bed177a69bc80d42357712f87564 SHA256 3a2dfb68917f9ca9d3a17a67eff3bc465d4527385c3e35d6aeefdbb4121a4ddf
 AUX evolution-2.28.3.1-attachment-bar-RTL.patch 1360 RMD160 e2f512542837dd47c820f2a23b936f5a065665b7 SHA1 f2df4a491ccea878232dd55747526b4f80a40ff8 SHA256 1afb9010a997be10e168dcd050d4d8cb3bb85544f5f9f37c9bd17eb698579f49
 AUX evolution-2.28.3.1-unknown-attachment-size.patch 1182 RMD160 4df9108c74c3b1b1d6d828502d26feab93db7dca SHA1 d248e9d07f6279539b1fa03a59e4005fa6a3aebe SHA256 ae8314004b7e0cfd4f285459a9bfabd864fbb3d3954417e0f5eed8b7e1944a4b
-AUX evolution-2.30.1.2-configure.patch 687 RMD160 905805b7ff0377f70b64a30e27d3c8f439703dfb SHA1 d603d9eccd85059877f924666c731263759097d7 SHA256 1ae9ca4d22f258339c364906ef026c323b3f1f7fff0cb79d66b789965eb1e269
+AUX evolution-2.30.1.2-configure.patch 1243 RMD160 f7cefb76592fff6e2fba441993b546b8c9a30ca6 SHA1 6ca2073ce735bf40c4ca403d695a16976a6c3360 SHA256 c757dd941f9b4798ed6c0b5c6d23517700c9c232c60aca3b6f09f2c4278885a2
 DIST evolution-2.26.3.tar.bz2 36427464 RMD160 f2b3aa2275095feb2af406022c0a6bc8a381e8d5 SHA1 d0e247ccb903a57a5e6fe23cfb04535ea141e9fb SHA256 e37f8d21a8aa201e9a3d91a110ec9d4dc3feae978be45b0c16cf93adacd5605b
 DIST evolution-2.28.3.1.tar.bz2 29765375 RMD160 442c7b472caf94ba0aa1abbe253b810d15911a4f SHA1 412c8be73e483444ad69a4ad8c15b0db9520fe0a SHA256 9fda41b0994b1bb8d119f594597f77bb4af1a883588a39f7a81ec7a2eb18f5fd
 DIST evolution-2.30.1.2-patches.tar.bz2 26702 RMD160 f3468f2f6bb8ac9ee6add0b97fd6dbeeb36a5d76 SHA1 9054e255b4658384bf56968770ecd43ff3e6fc11 SHA256 f4d3581b323c88a42cacc93ffeddcd413c8cabc0f227e8b36b80fed6438ede12
@@ -20,12 +20,12 @@ EBUILD evolution-2.26.3.ebuild 4543 RMD160 be4487a89d3a2195a78f0ba2376227c01f556
 EBUILD evolution-2.28.3.1-r1.ebuild 5343 RMD160 b41f223e648639fc0505b0f1e0372a3c9ada180e SHA1 2f017ae516204faf0fcfef390698b0a78773f61c SHA256 657d8568fc3d54dd7886ab4c3eefb6b3ad82a5c871a5407c20c7f68e1eb2fcbc
 EBUILD evolution-2.28.3.1.ebuild 4851 RMD160 587cae4ba2745b2623156c61e1db0dc686c2fc55 SHA1 7f3c8b53af55cbbdba0b592253dd16ce87c3c1dd SHA256 85045aa14899dcbdaf8861a5d0868ebbe6f33dc1c298f52f90072856e5e6dcfc
 EBUILD evolution-2.30.1.2-r1.ebuild 4521 RMD160 ba079fbae92f3cadd56fef158c013d03a557220d SHA1 a0be81080474df725563887187de8180ddef2426 SHA256 d4da7f4ac985d7830215f63efc13eb22ceeac9d9ef7188ae5efb0be17c989f7c
-MISC ChangeLog 68702 RMD160 e9a45b838a47fddd638efed53ac174a4e551a7a1 SHA1 08286add28ca39aa7f28f3ba7b36abe457637e1b SHA256 8f4824d6ee9810f713f91e21126eef77e2aeb26334c40f1d5be54c4ee519867e
+MISC ChangeLog 68963 RMD160 1cf43c4c9a0f1e4e05e10739f886177ddbb080cc SHA1 60446cc04c3ea0e006ff4d4e220b88513df8a454 SHA256 cbc8b100521e8d9f38f43525a7f13c850b2a9534832b5804fafacd5e32fa9912
 MISC metadata.xml 1532 RMD160 44749261021a81bb77167cd8ea800eb18a99dfee SHA1 3a52cba14a151672c86eceb118e7757a12ec91a3 SHA256 d642c82216a4ce3c5f45ea007f4d5055beab1261baea130becc2d37d1bfb3797
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwVO9MACgkQCaWpQKGI+9TAwQCfRB6x/4QZHiLxF0aPUe+cG1Ky
-pzoAnA8l0wvORxuSGoaZYLzgmUZQUxcM
-=8VLd
+iEYEARECAAYFAkwVfCkACgkQp5vW4rUFj5ru5QCeI0W0JNgYcbbmcWUtdlq1bctM
+NMIAn1y/I9nM/aOgNYWGdOwvkdAWh7Yy
+=jGQp
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/files/evolution-2.30.1.2-configure.patch b/mail-client/evolution/files/evolution-2.30.1.2-configure.patch
index 8532f3e3a04c..2d94072c62a0 100644
--- a/mail-client/evolution/files/evolution-2.30.1.2-configure.patch
+++ b/mail-client/evolution/files/evolution-2.30.1.2-configure.patch
@@ -1,5 +1,6 @@
---- configure.ac~	2010-04-27 14:14:22.000000000 +0200
-+++ configure.ac	2010-06-12 22:24:39.000000000 +0200
+diff -uNr evolution-2.30.1.2.ORIG//configure.ac evolution-2.30.1.2/configure.ac
+--- evolution-2.30.1.2.ORIG//configure.ac	2010-06-14 01:06:50.342000001 +0100
++++ evolution-2.30.1.2/configure.ac	2010-06-14 01:07:42.948000001 +0100
 @@ -47,7 +47,6 @@
  m4_define([libxml_minimum_version], [2.7.3])
  m4_define([shared_mime_info_minimum_version], [0.22])
@@ -8,7 +9,23 @@
  m4_define([dbus_glib_minimum_version], [0.74])
  
  dnl Optional Packages
-@@ -224,7 +223,7 @@
+@@ -64,14 +63,7 @@
+ dnl Compiler Warning Flags
+ dnl ******************************
+ AS_COMPILER_FLAGS(WARNING_FLAGS,
+-	"-DG_DISABLE_DEPRECATED
+-	-DPANGO_DISABLE_DEPRECATED
+-	-DGDK_PIXBUF_DISABLE_DEPRECATED
+-	-DGDK_DISABLE_DEPRECATED
+-	-DGTK_DISABLE_DEPRECATED
+-	-DG_DISABLE_SINGLE_INCLUDES
+-	-DGTK_DISABLE_SINGLE_INCLUDES
+-	-Wall -Wextra
++	"-Wall -Wextra
+ 	-Wno-missing-field-initializers
+ 	-Wno-sign-compare
+ 	-Wno-unused-parameter
+@@ -224,7 +216,7 @@
  	 libxml-2.0 >= libxml_minimum_version
  	 shared-mime-info >= shared_mime_info_minimum_version
  	 gnome-desktop-2.0 >= gnome_desktop_minimum_version