Fix build failure with glib-2.32 (bug #439194, thanks to CC). Use python_clean_py-compile_files.

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

4 files changed, 50 insertions, 9 deletions

diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index 07a017e60fb1..148388a03c39 100644
--- a/gnome-extra/deskbar-applet/ChangeLog
+++ b/gnome-extra/deskbar-applet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/deskbar-applet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.154 2012/05/05 06:25:17 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.155 2012/10/23 06:40:00 tetromino Exp $
+
+  23 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  deskbar-applet-2.32.0.ebuild, +files/deskbar-applet-2.32.0-glib-2.32.patch:
+  Fix build failure with glib-2.32 (bug #439194, thanks to CC). Use
+  python_clean_py-compile_files.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> deskbar-applet-2.32.0.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/gnome-extra/deskbar-applet/Manifest b/gnome-extra/deskbar-applet/Manifest
index 9b41c192ccc2..e910f2aad549 100644
--- a/gnome-extra/deskbar-applet/Manifest
+++ b/gnome-extra/deskbar-applet/Manifest
@@ -1,4 +1,19 @@
-DIST deskbar-applet-2.32.0.tar.bz2 1068070 RMD160 9359f23b353c5ce80aad8a07b298b8deafe94e5f SHA1 8bc918fe59c63f600b79288787dc48f2e8d452fa SHA256 123f2231ac8449f8376030c1b25394f9bab18d5d219292afc6f27eda77d4e684
-EBUILD deskbar-applet-2.32.0.ebuild 2528 RMD160 5e0db1f2692b54fa8a1142c6a0feca92c328ce93 SHA1 8f32785918d3b4ca1c8b364570989f19a454bcf2 SHA256 19df0bf872656e8fe2d6b9b8ad446f919f17d73b07c7abf040c239f875b5c48c
-MISC ChangeLog 23016 RMD160 1d46404ad442fda9a3c5fc557277803419157aaa SHA1 afa0abfc60ca0e7d9fc94059ddaac40acd7e45d9 SHA256 17e4f23e29c5a2feffc8cb79f4dc2431cc8c03e44b3c4a22d247075bf8c67603
-MISC metadata.xml 413 RMD160 b43b823b1de922a86e22ab10f0f11954f51cebaa SHA1 278ad1cb047bfb613a7575d35875b01754776d8d SHA256 1388b8a4eeeec86628d3669c5fa22e9491e2ce21b8b76ad43a6b5b6b6c9fa6e2
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX deskbar-applet-2.32.0-glib-2.32.patch 558 SHA256 4f5b88ee43ff80d1d2f2c163e4a84ee3cc8056a1d565443ab648682ff27c8168 SHA512 aa415b245232d15866ff08e5ef23ef80a6707dae15726b88a1230bcb19cb0df975cdf30ba1a6bf845fdf504ed2d6dbd562b78214f89cb71788e631590b6126ae WHIRLPOOL 2d3839620330bb37e4bc3982f1d6ff58d95fcf0652b56b5d570a1787a0812bbbad7507928d60c510e30c2de36d000849a4c951a761c12001b6cfcd76a8159eca
+DIST deskbar-applet-2.32.0.tar.bz2 1068070 SHA256 123f2231ac8449f8376030c1b25394f9bab18d5d219292afc6f27eda77d4e684 SHA512 af0d2a6d776c28f3462001f7734d31d8f24a8e8e35ad300c07d1cb78ae8b6ebdf11163fb58db1f31d0de3e573883916e920b527ac9c42f3be35a09eb9488228f WHIRLPOOL 69a14b89a91cecfd8ab996ac8a1a29fbf0b256ccfc4ea7b2b368fa125b8a9c01853377c8f3a88fa1a38e6e85bcf39f0e398c73bc94bcb46633a6c6cecb5c507b
+EBUILD deskbar-applet-2.32.0.ebuild 2524 SHA256 a883de1cb9edfd71d9721ae2adeb4225e46a67f0f7218fbf6c4c98e3c5daeb85 SHA512 6f83ba7811315feb59d8ce8cbc4760debf583dd4d1637c14fde990f43463a377ede6e0979f35b36408a3688910dca904f808fedc7d83adeac11e43145090f805 WHIRLPOOL 6bece7946650afa5a285119c341785933a6e1c6722e4462b74166da8c3953a64c27bdd44ed628e483e9d9bd03951a1127e5ffd9d318f845c300c4a8d14e0c2dc
+MISC ChangeLog 23258 SHA256 ddd3adad714b4b77da26d25513bfb334f88ac90427f13d817d7db43a0e37a105 SHA512 6cd4ca24cdec6050a561ba2a4626e510a29f1e73b94168f521b97291fbd8a9f33c416df0140840bc44eb946f9d7150cfca9efbe1c24e18e2aa74ef43c9c62949 WHIRLPOOL a2d569564c964d5fe04c9c5f44a2fb781cd4d6fc9351626ee60ef2818f19a0ddb1a5a8e34b0ea2832903feb1e4af243ddeab8d2bc2634d42185aa8912f2c0ce8
+MISC metadata.xml 413 SHA256 1388b8a4eeeec86628d3669c5fa22e9491e2ce21b8b76ad43a6b5b6b6c9fa6e2 SHA512 5a3755c57955a10b819c7cc7a35c03ce1dad78740b1d51dfff267e2ec921d2e6041095e4593c2a928ed457399316d58b73c5a851daeccba0a3fe1a766692a923 WHIRLPOOL 54953e4d3664f14245c7012b90c00ca77d0190e57dd9e9a3d9b50f67e0145584ee4cbcce4e8b52e57fa2581519c029974f19344c2624f9862a9d6db7cbd10e66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQhjvBAAoJEJ0WA1zPCt1hssAH/1WT2LUb0s3NerFvxJeO2inj
+godzJDibzJhI3mUwKPU6OAcJt4bpsk3MK2tNdGs2vUXQV3x1N/A9rXwE3FQ34Std
+nbhwBJefE8jYs0CdySxXhBsiOY997yQGssvZ9vsP8O/zUaWPiOKX9iASvqFNSaQo
+yinz6WCdHn9NKPKS25LH+LCs1kjiv87XPjVqlShn5BC7L6QQ/g5KJn814uDvoMSl
+k6We8t4Ws+VjrV6FWDUv5SN65O/MjQ9COWf0qsBI2iVmDbIAbdPIcsrd/9gJ45EV
+oi0nYUWv+oO7mJ1HEQbjP3toEQdPifvIZfGObtRQbpMP+C93s0r0xKqQ4hGebjw=
+=KqAr
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.32.0.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.32.0.ebuild
index c972b1e5320d..a1a8c7535fe0 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.32.0.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.32.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.32.0.ebuild,v 1.12 2012/05/05 06:25:17 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.32.0.ebuild,v 1.13 2012/10/23 06:40:00 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -52,11 +52,11 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-glib-2.32.patch" #439194
+
 	gnome2_src_prepare
 
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
+	python_clean_py-compile_files
 
 	python_convert_shebangs -r 2 .
 }
diff --git a/gnome-extra/deskbar-applet/files/deskbar-applet-2.32.0-glib-2.32.patch b/gnome-extra/deskbar-applet/files/deskbar-applet-2.32.0-glib-2.32.patch
new file mode 100644
index 000000000000..756782c7c5af
--- /dev/null
+++ b/gnome-extra/deskbar-applet/files/deskbar-applet-2.32.0-glib-2.32.patch
@@ -0,0 +1,21 @@
+In >=glib-2.32, only <glib.h> can be included directly.
+
+--- a/deskbar/handlers/evolution/evolution.c
++++ b/deskbar/handlers/evolution/evolution.c
+@@ -1,5 +1,4 @@
+ #include <glib.h>
+-#include <glib/gstring.h>
+ #include <libebook/e-book.h>
+ #include <pango/pango.h>
+ #include <string.h>
+--- a/deskbar/handlers/evolution/evolution.h
++++ b/deskbar/handlers/evolution/evolution.h
+@@ -2,7 +2,7 @@
+ #ifndef __DESKBAR_EVOLUTION_H__
+ #define __DESKBAR_EVOLUTION_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ 
+ G_BEGIN_DECLS