Fix glib-2.32 compilation, bug #412607 by Franz Fellner.

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

4 files changed, 30 insertions, 17 deletions

diff --git a/x11-terms/guake/ChangeLog b/x11-terms/guake/ChangeLog
index 54c7aba4f38a..cbd8e51ca0bf 100644
--- a/x11-terms/guake/ChangeLog
+++ b/x11-terms/guake/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/guake
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/ChangeLog,v 1.14 2012/03/14 03:33:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/ChangeLog,v 1.15 2012/04/19 09:11:59 pacho Exp $
+
+  19 Apr 2012; Pacho Ramos <pacho@gentoo.org> +files/guake-0.4.2-glib2.32.patch,
+  guake-0.4.2-r1.ebuild:
+  Fix glib-2.32 compilation, bug #412607 by Franz Fellner.
 
 *guake-0.4.2-r1 (14 Mar 2012)
 
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 40c8cf40ecfc..31e0ce0865f6 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX guake-0.4.2-glib2.32.patch 278 RMD160 e1a5cd18ea7bdb2158aa6ebcb0b9a4c75a644b95 SHA1 39e47701906fd8078e72ab33e4f3b1d9f72d13da SHA256 9628f6a0c2109e24ab06ed61c499db28852dee55191e2832d4a19cd41c29ced7
 AUX guake-0.4.2-int-ssl-port.patch 579 RMD160 88552d30da020552275af036681cb5c34726208a SHA1 ee1f23ed9d2c0a89df96e215c29c9f39db82f111 SHA256 58064f0cb6482c882e9f586c1920a574db98669dc1e842c1fb0f4e99d9befcea
 AUX guake-0.4.2-prefs-spinbox.patch 661 RMD160 0a28c7f8017c8bf30912326b8b36a542ca8eb093 SHA1 f2f2b025cc57eab5d7c062dcbb96c41477cce0d8 SHA256 4f77de8f86776561148947b0d6d0395cf8e6ac0c2a6eac6953ef78ec58bac833
 DIST guake_0.4.2.orig.tar.gz 440653 RMD160 b3effc40905e66532f3fc308ee71d7ff4145aa8b SHA1 97e1adbba7d1ec4569689b1b4a69a8f41421a02d SHA256 03482efacaff18537402e574efd6d804a1af9c3ee5ef87b0acc7a8fd572994bc
-EBUILD guake-0.4.2-r1.ebuild 1432 RMD160 ed104540c2830af9eecf9e82bfcfcadce5496e50 SHA1 d3d1f3e20df6bff3b04ddfc45405d8afdf48e59e SHA256 a479999317e05186c10620fc422abfd69bf6ad55b5d80d59b3e777c41b9a7ff0
+EBUILD guake-0.4.2-r1.ebuild 1426 RMD160 9725c993e1590e922ee7cf2b86255c191a90a07e SHA1 7a6f9d36584eac2ddb3db67e9ae5caf373e4f9d0 SHA256 094732c96c47e6293a84c3cf89d87ad5f29d036964f0c4de9511a26ae4fced33
 EBUILD guake-0.4.2.ebuild 1360 RMD160 2f6c28bcc7fceb7728d3f4981595418c5fe9a869 SHA1 0231aec5e1e256e8de0bcd96742cbc9b6c22dc8e SHA256 2428af6cb38ccf2e4fd42f73aa627c99ce10c1de916f4fb51d54833865f29792
-MISC ChangeLog 2064 RMD160 1f729d1a6d769e6031626c7061e6c0987cd52c4d SHA1 8709d65541be999f8fd568fd631ea1bdccbc819f SHA256 4c1df8d93d9d3b94b7564b4436c25c67a99245d6912894f43d2e6d5bf0e94ab2
+MISC ChangeLog 2228 RMD160 02c787647f3efde44f966fa47d85cafed61b2af7 SHA1 fa6c6b83d080baa7e1f5e6c3e95fa1ffbf543825 SHA256 82711db0f2bcb4e49b918acf78b085f818cd3f7c6e80d5ecfb0a67ec9b91cacf
 MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9gEZ4ACgkQC77qH+pIQ6TY2QD/Tvbq8rTpbNgd+6Xao/Wm3ATa
-JbxCEcW4gYfExiBV05wA/1imr6uFDF13fonKJ3KB9oPHJCuBX4ISd2sGj55RXP0k
-=ki0a
+iEYEARECAAYFAk+P1uUACgkQCaWpQKGI+9SoigCfZuDGQxD5Th2BUKRa7xRCRWLM
+vi8An2LCfBZO4AJ/p6lzLJ+ceLWB2l6d
+=rbSI
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/guake/files/guake-0.4.2-glib2.32.patch b/x11-terms/guake/files/guake-0.4.2-glib2.32.patch
new file mode 100644
index 000000000000..11a3c88f9324
--- /dev/null
+++ b/x11-terms/guake/files/guake-0.4.2-glib2.32.patch
@@ -0,0 +1,11 @@
+--- src/globalhotkeys/keybinder.h.org	2012-04-19 09:35:51.756585621 +0200
++++ src/globalhotkeys/keybinder.h	2012-04-19 09:36:06.675585632 +0200
+@@ -2,7 +2,7 @@
+ #ifndef __KEY_BINDER_H__
+ #define __KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/x11-terms/guake/guake-0.4.2-r1.ebuild b/x11-terms/guake/guake-0.4.2-r1.ebuild
index 129209d9d0f4..fe14eec41830 100644
--- a/x11-terms/guake/guake-0.4.2-r1.ebuild
+++ b/x11-terms/guake/guake-0.4.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/guake-0.4.2-r1.ebuild,v 1.1 2012/03/14 03:31:00 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/guake-0.4.2-r1.ebuild,v 1.2 2012/04/19 09:11:59 pacho Exp $
 
-EAPI=3
-
-GCONF_DEBUG=no
+EAPI=4
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.7"
 
 inherit eutils gnome2 python multilib
@@ -36,23 +36,20 @@ pkg_setup() {
 		--disable-dependency-tracking
 		$(use_enable nls)"
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-int-ssl-port.patch \
-		"${FILESDIR}"/${P}-prefs-spinbox.patch
+		"${FILESDIR}"/${P}-prefs-spinbox.patch \
+		"${FILESDIR}"/${P}-glib2.32.patch
 
 	sed -i -e s:/usr/bin/python:/usr/bin/python2: src/guake*.in || die
 
 	gnome2_src_prepare
 }
 
-src_install() {
-	gnome2_src_install
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 	python_mod_optimize /usr/$(get_libdir)/${PN}